From 48b271903184d319775e231382340491047bbf97 Mon Sep 17 00:00:00 2001
From: r888888888 <r888888888@gmail.com>
Date: Fri, 25 Apr 2014 13:51:06 -0700
Subject: [PATCH] Reenable asset compilation for production

---
 Gemfile                                     | 2 ++
 Gemfile.lock                                | 9 +++++++++
 app/assets/javascripts/application.js       | 1 -
 app/assets/stylesheets/application.css.scss | 1 -
 config/deploy.rb                            | 3 ++-
 config/environments/production.rb           | 6 +++---
 6 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/Gemfile b/Gemfile
index 1c547b5d1..810d3dfe7 100644
--- a/Gemfile
+++ b/Gemfile
@@ -13,7 +13,9 @@ end
 
 gem 'protected_attributes'
 gem "sass-rails", "~> 4.0.0"
+gem "sprockets-rails", :require => "sprockets/railtie"
 gem "uglifier"
+gem 'coffee-rails'
 gem "therubyracer", :platforms => :ruby
 gem "pry", :group => [:test, :development]
 gem "rails", "~> 4.1.0"
diff --git a/Gemfile.lock b/Gemfile.lock
index 81545bbb8..cade865e2 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -60,6 +60,13 @@ GEM
       capistrano (< 3.0)
     chronic (0.10.2)
     coderay (1.1.0)
+    coffee-rails (4.0.1)
+      coffee-script (>= 2.2.0)
+      railties (>= 4.0.0, < 5.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.7.0)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     daemons (1.1.9)
@@ -229,6 +236,7 @@ DEPENDENCIES
   aws-s3!
   bcrypt-ruby
   capistrano-unicorn
+  coffee-rails
   daemons
   dalli
   delayed_job
@@ -255,6 +263,7 @@ DEPENDENCIES
   shoulda
   simple_form
   simplecov
+  sprockets-rails
   sql-logging
   statistics2
   term-ansicolor
diff --git a/app/assets/javascripts/application.js b/app/assets/javascripts/application.js
index 67202dab6..b48188774 100644
--- a/app/assets/javascripts/application.js
+++ b/app/assets/javascripts/application.js
@@ -6,5 +6,4 @@
 //= require jquery.storageapi.js
 //= require rails.js
 //= require common.js
-//= require_self
 //= require_tree .
diff --git a/app/assets/stylesheets/application.css.scss b/app/assets/stylesheets/application.css.scss
index 1227981b7..c490c38b0 100644
--- a/app/assets/stylesheets/application.css.scss
+++ b/app/assets/stylesheets/application.css.scss
@@ -1,6 +1,5 @@
 /*
  *= require "jquery-ui-1.10.3.min.css"
- *= require_self
  *= require_tree "./common"
  *= require_tree "./specific"
 */
diff --git a/config/deploy.rb b/config/deploy.rb
index fe9c79f62..040ddc4a3 100644
--- a/config/deploy.rb
+++ b/config/deploy.rb
@@ -115,7 +115,8 @@ namespace :deploy do
 
   desc "Precompiles assets"
   task :precompile_assets do
-    run "cd #{current_path}; bundle exec rake assets:precompile"
+    run "cd #{current_path}; RAILS_ENV=#{rails_env} bundle exec rake assets:precompile"
+    # run "cd #{current_path}/public/assets; cp application-*.js application.js ; cp application-*.css application.css"
   end
 end
 
diff --git a/config/environments/production.rb b/config/environments/production.rb
index 069e428d5..a13727cd2 100644
--- a/config/environments/production.rb
+++ b/config/environments/production.rb
@@ -27,13 +27,13 @@ Rails.application.configure do
   # config.assets.css_compressor = :sass
 
   # Do not fallback to assets pipeline if a precompiled asset is missed.
-  config.assets.compile = false
+  config.assets.compile = true
 
   # Generate digests for assets URLs.
   config.assets.digest = true
 
   # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
+  # config.assets.version = '1.0'
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
@@ -59,7 +59,7 @@ Rails.application.configure do
 
   # Precompile additional assets.
   # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-  # config.assets.precompile += %w( search.js )
+  config.assets.precompile += %w( *.png *.jpg *.gif )
 
   # Ignore bad email addresses and do not raise email delivery errors.
   # Set this to true and configure the email server for immediate delivery to raise delivery errors.