phew. rails 3.2.12, including some asset pipeline. still buggy.

Gemfile

@@ -1,17 +1,16 @@
 source 'http://rubygems.org'
 
-gem 'rails', '= 3.1.11'
+gem 'rails', '= 3.2.12'
 #gem 'sqlite3-ruby', '~> 1.3.1', :require => 'sqlite3'
 gem 'mysql2', '>= 0.3.11'
 
 # https://groups.google.com/d/topic/rubyonrails-security/4_YvCpLzL58/discussion
 gem 'json', '~> 1.7.7'
 
-gem 'compass', '~> 0.10.1'
+gem 'haml', '~> 4.0.0'
-gem 'haml', '~> 3.0.18'
 gem 'rdiscount', '~> 1.6.5'
 gem 'will_paginate', '~> 3.0.pre2'
-gem 'devise', '~> 1.1.5'
+gem 'devise', '~> 2.2.3'
 
 # unstable version of RocketAMF interprets info registry as a hash instead of an array
 gem 'RocketAMF', :git => 'git://github.com/rubyamf/rocketamf.git'
@@ -21,7 +20,7 @@ gem 'openneo-auth-signatory', '~> 0.1.0'
 
 gem 'jammit', '~> 0.6.5'
 
-gem 'hoptoad_notifier'
+gem 'airbrake', '~> 3.1.8'
 
 gem 'addressable', :require => ['addressable/template', 'addressable/uri']
 
@@ -65,6 +64,15 @@ gem "rest-client", "~> 1.6.7"
 
 gem "rails-i18n"
 
+# Needed for the new asset pipeline
+group :assets do
+  
+end
+
+gem 'sass-rails',    "~> 3.2.6"
+gem 'compass-rails', "~> 1.0.3"
+gem 'uglifier',      ">= 1.0.3"
+
 group :development do
   gem "bullet", "~> 4.1.5"
 end

Gemfile.lock

@@ -79,37 +79,40 @@ GEM
       Platform (>= 0.4.0)
       open4
     Platform (0.4.0)
-    actionmailer (3.1.11)
+    actionmailer (3.2.12)
-      actionpack (= 3.1.11)
+      actionpack (= 3.2.12)
-      mail (~> 2.3.3)
+      mail (~> 2.4.4)
-    actionpack (3.1.11)
+    actionpack (3.2.12)
-      activemodel (= 3.1.11)
+      activemodel (= 3.2.12)
-      activesupport (= 3.1.11)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
+      journey (~> 1.0.4)
-      rack (~> 1.3.6)
+      rack (~> 1.4.5)
       rack-cache (~> 1.2)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.4)
+      sprockets (~> 2.2.1)
-    activemodel (3.1.11)
+    activemodel (3.2.12)
-      activesupport (= 3.1.11)
+      activesupport (= 3.2.12)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
+    activerecord (3.2.12)
-    activerecord (3.1.11)
+      activemodel (= 3.2.12)
-      activemodel (= 3.1.11)
+      activesupport (= 3.2.12)
-      activesupport (= 3.1.11)
+      arel (~> 3.0.2)
-      arel (~> 2.2.3)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.11)
+    activeresource (3.2.12)
-      activemodel (= 3.1.11)
+      activemodel (= 3.2.12)
-      activesupport (= 3.1.11)
+      activesupport (= 3.2.12)
-    activesupport (3.1.11)
+    activesupport (3.2.12)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.3.3)
-    arel (2.2.3)
+    airbrake (3.1.8)
-    bcrypt-ruby (2.1.4)
+      activesupport
+      builder
+      json
+    arel (3.0.2)
+    bcrypt-ruby (3.0.1)
     builder (3.0.4)
     bullet (4.1.6)
       uniform_notifier (~> 1.0.0)
@@ -117,18 +120,27 @@ GEM
       activesupport (~> 3.0)
     character-encodings (0.4.1)
     chronic (0.6.7)
-    compass (0.10.6)
+    chunky_png (1.2.7)
-      haml (>= 3.0.4)
+    compass (0.12.2)
+      chunky_png (~> 1.2)
+      fssm (>= 0.2.7)
+      sass (~> 3.1)
+    compass-rails (1.0.3)
+      compass (>= 0.12.2, < 0.14)
     cookiejar (0.3.0)
-    devise (1.1.9)
+    devise (2.2.3)
-      bcrypt-ruby (~> 2.1.2)
+      bcrypt-ruby (~> 3.0)
-      warden (~> 1.0.2)
+      orm_adapter (~> 0.1)
+      railties (~> 3.1)
+      warden (~> 1.2.1)
     diff-lcs (1.2.1)
     dye (0.1.4)
     em-socksify (0.2.1)
       eventmachine (>= 1.0.0.beta.4)
     erubis (2.7.0)
     excon (0.19.3)
+    execjs (1.4.0)
+      multi_json (~> 1.0)
     factory_girl (2.6.4)
       activesupport (>= 2.3.9)
     factory_girl_rails (1.7.0)
@@ -145,17 +157,17 @@ GEM
       nokogiri (~> 1.5.0)
       ruby-hmac
     formatador (0.2.4)
-    haml (3.0.25)
+    fssm (0.2.10)
+    haml (4.0.0)
+      tilt
     hike (1.2.1)
-    hoptoad_notifier (2.4.11)
-      activesupport
-      builder
     http_parser.rb (0.5.3)
     i18n (0.6.4)
     jammit (0.6.5)
       yui-compressor (>= 0.9.3)
+    journey (1.0.4)
     json (1.7.7)
-    mail (2.3.3)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
@@ -174,6 +186,7 @@ GEM
     open4 (1.3.0)
     openneo-auth-signatory (0.1.0)
       ruby-hmac
+    orm_adapter (0.4.0)
     paper_trail (2.7.1)
       activerecord (~> 3.0)
       railties (~> 3.0)
@@ -184,35 +197,33 @@ GEM
     prompter (0.1.5)
       dye (>= 0.1.1)
       yard (>= 0.6.3)
-    rack (1.3.10)
+    rack (1.4.5)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-fiber_pool (0.9.2)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-protection (1.4.0)
       rack
     rack-ssl (1.3.3)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.1.11)
+    rails (3.2.12)
-      actionmailer (= 3.1.11)
+      actionmailer (= 3.2.12)
-      actionpack (= 3.1.11)
+      actionpack (= 3.2.12)
-      activerecord (= 3.1.11)
+      activerecord (= 3.2.12)
-      activeresource (= 3.1.11)
+      activeresource (= 3.2.12)
-      activesupport (= 3.1.11)
+      activesupport (= 3.2.12)
       bundler (~> 1.0)
-      railties (= 3.1.11)
+      railties (= 3.2.12)
     rails-i18n (0.7.2)
       i18n (~> 0.5)
-    railties (3.1.11)
+    railties (3.2.12)
-      actionpack (= 3.1.11)
+      actionpack (= 3.2.12)
-      activesupport (= 3.1.11)
+      activesupport (= 3.2.12)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
-      thor (~> 0.14.6)
+      thor (>= 0.14.6, < 2.0)
     rake (10.0.3)
     rdiscount (1.6.8)
     rdoc (3.12.2)
@@ -254,26 +265,35 @@ GEM
       tzinfo (>= 0.3.23)
     sanitize (2.0.3)
       nokogiri (>= 1.4.4, < 1.6)
+    sass (3.2.6)
+    sass-rails (3.2.6)
+      railties (~> 3.2.0)
+      sass (>= 3.1.10)
+      tilt (~> 1.3)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    sprockets (2.0.4)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
     subexec (0.2.2)
     swf_converter (0.0.3)
-    thor (0.14.6)
+    thor (0.17.0)
     tilt (1.3.4)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
     tzinfo (0.3.36)
+    uglifier (1.3.0)
+      execjs (>= 0.3.0)
+      multi_json (~> 1.0, >= 1.0.2)
     uniform_notifier (1.0.2)
     vegas (0.1.11)
       rack (>= 1.0.0)
-    warden (1.0.6)
+    warden (1.2.1)
       rack (>= 1.0)
     whenever (0.7.3)
       activesupport (>= 2.3.4)
@@ -289,11 +309,12 @@ PLATFORMS
 DEPENDENCIES
   RocketAMF!
   addressable
+  airbrake (~> 3.1.8)
   bullet (~> 4.1.5)
   carrierwave (~> 0.5.8)
   character-encodings (~> 0.4.1)
-  compass (~> 0.10.1)
+  compass-rails (~> 1.0.3)
-  devise (~> 1.1.5)
+  devise (~> 2.2.3)
   em-http-request!
   em-mysqlplus!
   em-synchrony!
@@ -302,8 +323,7 @@ DEPENDENCIES
   flex!
   fog (~> 1.8.0)
   globalize3!
-  haml (~> 3.0.18)
+  haml (~> 4.0.0)
-  hoptoad_notifier
   http_accept_language!
   jammit (~> 0.6.5)
   json (~> 1.7.7)
@@ -319,7 +339,7 @@ DEPENDENCIES
   parallel (~> 0.5.17)
   patron (~> 0.4.18)
   rack-fiber_pool
-  rails (= 3.1.11)
+  rails (= 3.2.12)
   rails-i18n
   rdiscount (~> 1.6.5)
   resque (~> 1.23.0)
@@ -329,6 +349,8 @@ DEPENDENCIES
   right_aws (~> 2.1.0)
   rspec-rails (~> 2.0.0.beta.22)
   sanitize (~> 2.0.3)
+  sass-rails (~> 3.2.6)
   swf_converter (~> 0.0.3)
+  uglifier (>= 1.0.3)
   whenever (~> 0.7.3)
   will_paginate (~> 3.0.pre2)

app/assets/stylesheets/application.css.sass

@@ -1,4 +1,5 @@
 @import compass
+
 @import partials/clean/constants
 @import partials/clean/mixins
 
@@ -24,5 +25,4 @@
 @import static/donate
 @import static/image_mode
 @import static/terms
-@import users/top_contributors
+@import users/top_contributors
-

app/assets/stylesheets/closet_hangers/_index.sass

@@ -1,6 +1,6 @@
-@import "partials/context_button"
+@import "../partials/context_button"
-@import "partials/icon"
+@import "../partials/icon"
-@import "partials/secondary_nav"
+@import "../partials/secondary_nav"
 
 body.closet_hangers-index
   +secondary-nav
@@ -18,7 +18,7 @@ body.closet_hangers-index
     input[name=q]
       &.loading
         background:
-          image: url(/images/loading.gif)
+          image: image-url("loading.gif")
           position: 2px center
           repeat: no-repeat
         padding-left: $icon-width + 4px

app/assets/stylesheets/outfits/_edit.sass

@@ -1,4 +1,4 @@
-@import ../shared/jquery.jgrowl
+@import partials/jquery.jgrowl
 @import partials/wardrobe
 
 @import "partials/context_button"
@@ -451,7 +451,7 @@ body.outfits-edit
         .outfit-thumbnail-wrapper
           +opacity(.5)
           background:
-            image: url(/images/outfits/small_default.png)
+            image: image-url("small_default.png")
             position: center center
             size: $outfit-inner-size $outfit-inner-size
           cursor: pointer

app/assets/stylesheets/outfits/_new.sass

@@ -1,4 +1,3 @@
-@import "compass/css3/gradient"
 @import "partials/campaign-progress"
 
 body.outfits-new

app/assets/stylesheets/partials/_campaign-progress.sass

@@ -2,7 +2,7 @@
   .campaign-progress-wrapper
     +border-radius(8px)
     background: #aaa
-    +linear-gradient(color-stops(#ccc, #aaa))
+    background-image: linear-gradient(color-stops(#ccc, #aaa))
 
     border: 4px solid $module-border-color
     clear: both
@@ -21,7 +21,7 @@
 
   .campaign-progress
     background: $module-border-color
-    +linear-gradient(color-stops($module-border-color + #222, $module-border-color))
+    background-image: linear-gradient(color-stops($module-border-color + #222, $module-border-color))
     border-right: 1px solid $module-border-color
 
   .campaign-progress-wrapper, .campaign-progress
@@ -41,5 +41,4 @@
 
   &.campaign-loaded
     .campaign-progress-wrapper
-      visibility: visible
+      visibility: visible
-

app/assets/stylesheets/static/_donate.sass

@@ -1,4 +1,3 @@
-@import "compass/css3/gradient"
 @import "compass/css3/text-shadow"
 
 @import "partials/campaign-progress"

app/views/layouts/application.html.haml

@@ -12,7 +12,7 @@
     /[if IE]
       = include_javascript_libraries :html5
     = yield :stylesheets
-    = stylesheet_link_tag "compiled/screen"
+    = stylesheet_link_tag "application"
     = yield :meta
     = open_graph_tags
     = csrf_meta_tag

config/application.rb

@@ -44,6 +44,10 @@ module OpenneoImpressItems
     Mime::Type.register "image/gif", :gif
 
     ActionController::Base.config.relative_url_root = ''
+
+    config.assets.enabled = true
+    config.assets.version = '1.0'
+    config.assets.paths << Rails.root.join('app', 'assets', 'fonts')
   end
 end
 

config/compass.rb

@@ -1,11 +0,0 @@
-# This configuration file works with both the Compass command line tool and within Rails.
-# Require any additional compass plugins here.
-project_type = :rails
-project_path = RAILS_ROOT if defined?(RAILS_ROOT)
-# Set this to the root of your project when deployed:
-http_path = "/"
-css_dir = "public/stylesheets/compiled"
-sass_dir = "app/stylesheets"
-environment = Compass::AppIntegration::Rails.env
-# To enable relative paths to assets via compass helper functions. Uncomment:
-# relative_assets = true

config/environments/development.rb

@@ -17,6 +17,19 @@ OpenneoImpressItems::Application.configure do
   config.action_mailer.raise_delivery_errors = false
 
   config.active_support.deprecation = :log
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Log the query plan for queries taking more than this (works
+  # with SQLite, MySQL, and PostgreSQL)
+  config.active_record.auto_explain_threshold_in_seconds = 0.5
+
+  # Do not compress assets
+  config.assets.compress = false
+   
+  # Expands the lines which load the assets
+  config.assets.debug = true
 end
 
 LocalImpressHost = 'betanewimpress.openneo.net'

config/environments/production.rb

@@ -41,6 +41,24 @@ OpenneoImpressItems::Application.configure do
   # config.threadsafe!
   
   config.active_support.deprecation = :log
+
+  # Compress JavaScripts and CSS
+  config.assets.compress = true
+   
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  config.assets.compile = false
+   
+  # Generate digests for assets URLs
+  config.assets.digest = true
+   
+  # Defaults to Rails.root.join("public/assets")
+  # config.assets.manifest = YOUR_PATH
+   
+  # Precompile additional assets (application.js, application.css, and all non-JS/CSS are already added)
+  # config.assets.precompile += %w( search.js )
+   
+  # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
+  # config.force_ssl = true
 end
 
 LocalImpressHost = 'newimpress.openneo.net'

config/environments/test.rb

@@ -28,6 +28,13 @@ OpenneoImpressItems::Application.configure do
   # config.active_record.schema_format = :sql
   
   config.active_support.deprecation = :stderr
+
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
+
+  # Configure static asset server for tests with Cache-Control for performance
+  config.serve_static_assets = true
+  config.static_cache_control = "public, max-age=3600"
 end
 
 RemoteImpressHost = 'impress.openneo.net'

config/initializers/airbrake.rb

@@ -1,4 +1,4 @@
-HoptoadNotifier.configure do |config|
+Airbrake.configure do |config|
   config.api_key = 'a6efc0e697585c2d338b1585137a9798'
 end
 

config/initializers/compass.rb

@@ -1,5 +0,0 @@
-require 'compass'
-rails_root = Rails.root.to_s
-Compass.add_project_configuration(Rails.root.join(rails_root, "config", "compass.rb"))
-Compass.configure_sass_plugin!
-Compass.handle_configuration_change!