bumped to rails 2.3.11

Gemfile

@@ -2,7 +2,7 @@
 # This preamble is the current preamble for Rails 3 apps; edit as needed.
 source 'http://rubygems.org'
 
-gem 'rails', '3.0.3'
+gem 'rails', '3.0.4'
 
 gem 'haml'
 gem 'json'

Gemfile.lock

@@ -1,62 +1,62 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    RedCloth (4.2.3)
+    RedCloth (4.2.5)
     abstract (1.0.0)
-    actionmailer (3.0.3)
-      actionpack (= 3.0.3)
-      mail (~> 2.2.9)
-    actionpack (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    actionmailer (3.0.4)
+      actionpack (= 3.0.4)
+      mail (~> 2.2.15)
+    actionpack (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.4)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.13)
-      rack-test (~> 0.5.6)
+      rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.3)
-      activesupport (= 3.0.3)
+    activemodel (3.0.4)
+      activesupport (= 3.0.4)
       builder (~> 2.1.2)
       i18n (~> 0.4)
-    activerecord (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
+    activerecord (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
       arel (~> 2.0.2)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.3)
-      activemodel (= 3.0.3)
-      activesupport (= 3.0.3)
-    activesupport (3.0.3)
-    arel (2.0.6)
+    activeresource (3.0.4)
+      activemodel (= 3.0.4)
+      activesupport (= 3.0.4)
+    activesupport (3.0.4)
+    arel (2.0.8)
     builder (2.1.2)
     compass (0.10.6)
       haml (>= 3.0.4)
     configuration (1.1.0)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
-    exceptional (2.0.29)
+    exceptional (2.0.32)
       rack
     fuubar (0.0.3)
       rspec (~> 2.0)
       rspec-instafail (~> 0.1.4)
       ruby-progressbar (~> 0.0.9)
     git (1.2.5)
     growl (1.0.3)
-    guard (0.2.2)
+    guard (0.3.0)
       open_gem (~> 1.4.2)
-      thor (~> 0.14.3)
+      thor (~> 0.14.6)
     guard-rspec (0.1.9)
       guard (>= 0.2.2)
-    haml (3.0.24)
+    haml (3.0.25)
     i18n (0.5.0)
-    json (1.4.6)
+    json (1.5.1)
     launchy (0.3.7)
       configuration (>= 0.0.5)
       rake (>= 0.8.1)
-    mail (2.2.12)
+    mail (2.2.15)
       activesupport (>= 2.3.6)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -68,43 +68,43 @@ GEM
     rack (1.2.1)
     rack-mount (0.6.13)
       rack (>= 1.0.0)
-    rack-test (0.5.6)
+    rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.3)
-      actionmailer (= 3.0.3)
-      actionpack (= 3.0.3)
-      activerecord (= 3.0.3)
-      activeresource (= 3.0.3)
-      activesupport (= 3.0.3)
+    rails (3.0.4)
+      actionmailer (= 3.0.4)
+      actionpack (= 3.0.4)
+      activerecord (= 3.0.4)
+      activeresource (= 3.0.4)
+      activesupport (= 3.0.4)
       bundler (~> 1.0)
-      railties (= 3.0.3)
-    railties (3.0.3)
-      actionpack (= 3.0.3)
-      activesupport (= 3.0.3)
+      railties (= 3.0.4)
+    railties (3.0.4)
+      actionpack (= 3.0.4)
+      activesupport (= 3.0.4)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.8.7)
-    rb-fsevent (0.3.9)
+    rb-fsevent (0.3.10)
     redis (2.1.1)
-    rspec (2.2.0)
-      rspec-core (~> 2.2)
-      rspec-expectations (~> 2.2)
-      rspec-mocks (~> 2.2)
-    rspec-core (2.2.1)
-    rspec-expectations (2.2.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
       diff-lcs (~> 1.1.2)
-    rspec-instafail (0.1.5)
-    rspec-mocks (2.2.0)
-    rspec-rails (2.2.1)
+    rspec-instafail (0.1.6)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
       actionpack (~> 3.0)
       activesupport (~> 3.0)
       railties (~> 3.0)
-      rspec (~> 2.2.0)
+      rspec (~> 2.5.0)
     ruby-progressbar (0.0.9)
     thor (0.14.6)
     treetop (1.4.9)
       polyglot (>= 0.3.1)
-    tzinfo (0.3.23)
+    tzinfo (0.3.24)
 
 PLATFORMS
   ruby
@@ -121,7 +121,7 @@ DEPENDENCIES
   guard-rspec
   haml
   json
-  rails (= 3.0.3)
+  rails (= 3.0.4)
   rb-fsevent
   redis
   rspec-rails

Guardfile

@@ -2,13 +2,13 @@
 # More info at http://github.com/guard/guard#readme
 
 guard 'rspec', :version => 2 do
-  watch('^spec/(.*)_spec.rb')
-  watch('^lib/(.*)\.rb')                              { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('^spec/spec_helper.rb')                       { "spec" }
+  watch(/^spec\/(.*)_spec.rb/)
+  watch(/^lib\/(.*)\.rb/)                               { |m| "spec/lib/#{m[1]}_spec.rb" }
+  watch(/^spec\/spec_helper.rb/)                        { "spec" }
 
   # Rails example
-  watch('^app/(.*)\.rb')                              { |m| "spec/#{m[1]}_spec.rb" }
+  watch(/^app\/(.*)\.rb/)                               { |m| "spec/#{m[1]}_spec.rb" }
   # watch('^lib/(.*)\.rb')                              { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('^config/routes.rb')                          { "spec/controllers" }
-  watch('^app/controllers/application_controller.rb') { "spec/controllers" }
+  watch(/^config\/routes.rb/)                           { "spec/controllers" }
+  watch(/^app\/controllers\/application_controller.rb/) { "spec/controllers" }
 end

config/initializers/compass.rb

@@ -1,5 +1,5 @@
 require 'compass'
 # If you have any compass plugins, require them here.
-Compass.add_project_configuration(File.join(Rails.root, "config", "compass.config"))
+Compass.add_project_configuration(File.join(Rails.root.to_s, "config", "compass.config"))
 Compass.configuration.environment = Rails.env.to_sym
 Compass.configure_sass_plugin!