Revert "Revert to old skool asset management"

This reverts commit b74ff06722.

Conflicts:

	Gemfile

Gemfile

@@ -1,10 +1,12 @@
 source 'http://rubygems.org'
 
 gem 'rails', '3.1.0.rc4'
+gem 'coffee-script'
 gem 'devise'
 gem 'geokit'
 gem 'haml'
 gem 'therubyracer', :platforms => :ruby
+gem 'uglifier'
 
 platforms :jruby do
   gem 'jruby-openssl'

Gemfile.lock

@@ -39,12 +39,18 @@ GEM
     bcrypt-ruby (2.1.4-java)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
+    coffee-script (2.2.0)
+      coffee-script-source
+      execjs
+    coffee-script-source (1.1.1)
     crack (0.1.8)
     devise (1.4.0)
       bcrypt-ruby (~> 2.1.2)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     erubis (2.7.0)
+    execjs (1.2.0)
+      multi_json (~> 1.0)
     geokit (1.6.0)
     haml (3.1.2)
     hike (1.1.0)
@@ -91,7 +97,7 @@ GEM
     simplecov (0.4.2)
       simplecov-html (~> 0.4.4)
     simplecov-html (0.4.5)
-    sprockets (2.0.0.beta.11)
+    sprockets (2.0.0.beta.10)
       hike (~> 1.1)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -106,6 +112,9 @@ GEM
     turn (0.8.2)
       ansi (>= 1.2.2)
     tzinfo (0.3.28)
+    uglifier (1.0.0)
+      execjs (>= 0.3.0)
+      multi_json (>= 1.0.2)
     unicorn (3.7.0)
       kgio (~> 2.3)
       rack
@@ -121,6 +130,7 @@ PLATFORMS
 
 DEPENDENCIES
   ZenTest
+  coffee-script
   devise
   geokit
   haml
@@ -132,5 +142,6 @@ DEPENDENCIES
   therubyracer
   therubyrhino
   turn
+  uglifier
   unicorn
   webmock

app/assets/javascripts/application.js

@@ -20,7 +20,7 @@ $(function() {
       new google.maps.Point(0, 0),
       new google.maps.Point(13.0, 18.0)
     );
-    var shadow = new google.maps.MarkerImage('/images/markers/shadow.png',
+    var shadow = new google.maps.MarkerImage('/assets/markers/shadow.png',
       new google.maps.Size(46.0, 37.0),
       new google.maps.Point(0, 0),
       new google.maps.Point(13.0, 18.0)
@@ -93,7 +93,7 @@ $(function() {
             }
             setTimeout(function() {
               point = new google.maps.LatLng(hydrant.lat, hydrant.lng);
-              color = '/images/markers/' + (hydrant.user_id ? 'green' : 'red') + '.png';
+              color = '/assets/markers/' + (hydrant.user_id ? 'green' : 'red') + '.png';
               addMarker(hydrant.id, point, color);
             }, i * 100);
           });
@@ -403,7 +403,7 @@ $(function() {
           success: function(data) {
             activeInfoWindow.setContent(data);
             activeInfoWindow.setContent(data);
-            image = new google.maps.MarkerImage('/images/markers/green.png',
+            image = new google.maps.MarkerImage('/assets/markers/green.png',
               new google.maps.Size(27.0, 37.0),
               new google.maps.Point(0, 0),
               new google.maps.Point(13.0, 18.0)
@@ -453,7 +453,7 @@ $(function() {
             },
             success: function(data) {
               activeInfoWindow.setContent(data);
-              image = new google.maps.MarkerImage('/images/markers/red.png',
+              image = new google.maps.MarkerImage('/assets/markers/red.png',
                 new google.maps.Size(27.0, 37.0),
                 new google.maps.Point(0, 0),
                 new google.maps.Point(13.0, 18.0)
@@ -504,7 +504,7 @@ $(function() {
             },
             success: function(data) {
               activeInfoWindow.setContent(data);
-              image = new google.maps.MarkerImage('/images/markers/red.png',
+              image = new google.maps.MarkerImage('/assets/markers/red.png',
                 new google.maps.Size(27.0, 37.0),
                 new google.maps.Point(0, 0),
                 new google.maps.Point(13.0, 18.0)

app/views/layouts/application.html.haml

@@ -3,13 +3,13 @@
   %head
     %title
       Adopt a Hydrant
-    = stylesheet_link_tag "/stylesheets/application.css"
+    = stylesheet_link_tag "application"
     = javascript_include_tag "http://maps.google.com/maps/api/js?sensor=false"
     = javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jquery/1/jquery.min.js"
     = javascript_include_tag "https://ajax.googleapis.com/ajax/libs/jqueryui/1/jquery-ui.min.js"
     = javascript_include_tag "https://github.com/scottschiller/Snowstorm/raw/master/snowstorm-min.js"
-    = javascript_include_tag "/javascripts/application.js"
-    = javascript_include_tag "/javascripts/analytics.js"
+    = javascript_include_tag "application"
+    = javascript_include_tag "analytics"
     = csrf_meta_tag
     %meta{:name => "viewport", :content => "initial-scale=1.0, user-scalable=no"}
   %body

app/views/layouts/info_window.html.haml

@@ -1,4 +1,4 @@
 #loader{:style => "display: none;"}
-  = image_tag "/images/ajax-loader.gif"
+  = image_tag "ajax-loader.gif"
 #info_window
   = yield

app/views/main/index.html.haml

@@ -11,7 +11,7 @@
     = hidden_field_tag "limit", params[:limit] || 50
     = submit_tag "Find fire hydrants", :tabindex => 12
   #logos
-    = image_tag "/images/logos/cfa.png", :alt => "Code for America", :title => "Code for America"
-    = image_tag "/images/logos/boston.png", :alt => "City of Boston", :title => "City of Boston"
-  = image_tag "/images/hydrant-in-snow.jpg", :id => "hydrant-in-snow"
+    = image_tag "logos/cfa.png", :alt => "Code for America", :title => "Code for America"
+    = image_tag "logos/boston.png", :alt => "City of Boston", :title => "City of Boston"
+  = image_tag "hydrant-in-snow.jpg", :id => "hydrant-in-snow"
 #map_canvas

config/environments/production.rb

@@ -12,7 +12,7 @@ AdoptAHydrant::Application.configure do
   config.serve_static_assets = true
 
   # Compress both stylesheets and JavaScripts
-  # config.assets.js_compressor  = :uglifier
+  config.assets.js_compressor  = :uglifier
   # config.assets.css_compressor = :scss
 
   # Specifies the header that your server uses for sending files