Update rails dependency to version 3.2.0.rc2

.gitignore

@@ -1,27 +1,18 @@
-*.gem
+# See http://help.github.com/ignore-files/ for more about ignoring files.
-*.rbc
+#
-*.un~
+# If you find yourself ignoring temporary files generated by your text editor
-.*.sw[a-z]
+# or operating system, you probably want to add a global ignore instead:
-.DS_Store
+#   git config --global core.excludesfile ~/.gitignore_global
-.Spotlight-V100
+
-.Trashes
+# Ignore bundler config
-._*
+/.bundle
-.bundle
+
-.config
+# Include SimpleCov directory
-.sass-cache/
+/coverage
-.yardoc
+
-Icon?
+# Ignore the default SQLite database.
-InstalledFiles
+/db/*.sqlite3
-Session.vim
+
-_yardoc
+# Ignore all logfiles and tempfiles.
-coverage
+/log/*.log
-db/*.sqlite3
+/tmp
-doc/
-lib/bundler/man
-log/*.log
-pkg/
-rdoc/
-spec/reports
-test/tmp
-test/version_tmp
-tmp/

Gemfile

@@ -1,6 +1,6 @@
 source 'https://rubygems.org'
 
-gem 'rails', '~> 3.1.0'
+gem 'rails', '~> 3.2.0.rc2'
 
 gem 'arel'
 gem 'devise'

Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/sferik/rails_admin.git
-  revision: 5579332f8a58bf3aa8d61535aa09441af5edbaca
+  revision: 629e9fd9d4df25528e84d31afdc8ebeb0f56fbb3
   specs:
     rails_admin (0.0.1)
       bbenezech-nested_form (~> 0.0)
@@ -17,36 +17,35 @@ GIT
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (3.1.3)
+    actionmailer (3.2.0.rc2)
-      actionpack (= 3.1.3)
+      actionpack (= 3.2.0.rc2)
       mail (~> 2.3.0)
-    actionpack (3.1.3)
+    actionpack (3.2.0.rc2)
-      activemodel (= 3.1.3)
+      activemodel (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
+      journey (~> 1.0.0.rc1)
-      rack (~> 1.3.5)
+      rack (~> 1.4.0)
       rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
+      sprockets (~> 2.1.2)
-    activemodel (3.1.3)
+    activemodel (3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
+    activerecord (3.2.0.rc2)
-    activerecord (3.1.3)
+      activemodel (= 3.2.0.rc2)
-      activemodel (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      arel (~> 3.0.0.rc1)
-      arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
+    activeresource (3.2.0.rc2)
-      activemodel (= 3.1.3)
+      activemodel (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
-    activesupport (3.1.3)
+    activesupport (3.2.0.rc2)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
     addressable (2.2.6)
-    arel (2.2.1)
+    arel (3.0.0.rc1)
     bbenezech-nested_form (0.0.2)
     bcrypt-ruby (3.0.1)
     bcrypt-ruby (3.0.1-java)
@@ -54,9 +53,9 @@ GEM
       sass-rails (~> 3.1)
     bouncy-castle-java (1.5.0146.1)
     builder (3.0.0)
-    coffee-rails (3.1.1)
+    coffee-rails (3.2.1)
       coffee-script (>= 2.2.0)
-      railties (~> 3.1.0)
+      railties (~> 3.2.0.beta)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
@@ -79,8 +78,9 @@ GEM
     hpricot (0.8.5)
     hpricot (0.8.5-java)
     i18n (0.6.0)
-    jquery-rails (1.0.19)
+    journey (1.0.0.rc4)
-      railties (~> 3.0)
+    jquery-rails (2.0.0)
+      railties (>= 3.2.0.beta, < 5.0)
       thor (~> 0.14)
     jruby-openssl (0.7.4)
       bouncy-castle-java
@@ -99,13 +99,11 @@ GEM
     orm_adapter (0.0.6)
     pg (0.12.2)
     polyglot (0.3.3)
-    rack (1.3.6)
+    rack (1.4.0)
     rack-cache (1.1)
       rack (>= 0.4)
     rack-contrib (1.1.0)
       rack (>= 0.9.1)
-    rack-mount (0.8.3)
-      rack (>= 1.0.0)
     rack-pjax (0.5.5)
       hpricot (~> 0.8.4)
       rack (~> 1.3)
@@ -113,17 +111,17 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.3)
+    rails (3.2.0.rc2)
-      actionmailer (= 3.1.3)
+      actionmailer (= 3.2.0.rc2)
-      actionpack (= 3.1.3)
+      actionpack (= 3.2.0.rc2)
-      activerecord (= 3.1.3)
+      activerecord (= 3.2.0.rc2)
-      activeresource (= 3.1.3)
+      activeresource (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       bundler (~> 1.0)
-      railties (= 3.1.3)
+      railties (= 3.2.0.rc2)
-    railties (3.1.3)
+    railties (3.2.0.rc2)
-      actionpack (= 3.1.3)
+      actionpack (= 3.2.0.rc2)
-      activesupport (= 3.1.3)
+      activesupport (= 3.2.0.rc2)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -133,16 +131,15 @@ GEM
       json (~> 1.4)
     remotipart (1.0.1)
     sass (3.1.12)
-    sass-rails (3.1.5)
+    sass-rails (3.2.3)
-      actionpack (~> 3.1.0)
+      railties (~> 3.2.0.beta)
-      railties (~> 3.1.0)
+      sass (>= 3.1.10)
-      sass (~> 3.1.10)
+      tilt (~> 1.3)
-      tilt (~> 1.3.2)
     simplecov (0.5.4)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
     simplecov-html (0.5.3)
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -182,7 +179,7 @@ DEPENDENCIES
   jruby-openssl
   pg
   rack-contrib
-  rails (~> 3.1.0)
+  rails (~> 3.2.0.rc2)
   rails_admin!
   simplecov
   sqlite3

app/assets/javascripts/application.js

@@ -1,7 +1,13 @@
-// This is a manifest file that'll be compiled into including all the files listed below.
+// This is a manifest file that'll be compiled into application.js, which will include all the files
-// Add new JavaScript/Coffee code in separate files in this directory and they'll automatically
+// listed below.
-// be included in the compiled file accessible from http://example.com/assets/application.js
+//
+// Any JavaScript/Coffee file within this directory, lib/assets/javascripts, vendor/assets/javascripts,
+// or vendor/assets/javascripts of plugins, if any, can be referenced here using a relative path.
+//
 // It's not advisable to add code directly here, but if you do, it'll appear at the bottom of the
 // the compiled file.
 //
+// WARNING: THE FIRST BLANK LINE MARKS THE END OF WHAT'S TO BE PROCESSED, ANY BLANK LINE SHOULD
+// GO AFTER THE REQUIRES BELOW.
+//
 //= require_tree .

app/assets/stylesheets/application.css

@@ -1,7 +1,13 @@
 /*
- * This is a manifest file that'll automatically include all the stylesheets available in this directory
+ * This is a manifest file that'll be compiled into application.css, which will include all the files
- * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
+ * listed below.
- * the top of the compiled file, but it's generally better to create a new file per style scope.
+ *
+ * Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
+ * or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
+ *
+ * You're free to add application-wide styles to this file and they'll appear at the top of the
+ * compiled file, but it's generally better to create a new file per style scope.
+ *
  *= require_self
  *= require_tree .
 */

config/application.rb

@@ -4,7 +4,7 @@ require 'rails/all'
 
 if defined?(Bundler)
   # If you precompile assets before deploying to production, use this line
-  Bundler.require *Rails.groups(:assets => %w(development test))
+  Bundler.require(*Rails.groups(:assets => %w(development test)))
   # If you want your assets lazily compiled in production, use this line
   # Bundler.require(:default, :assets, Rails.env)
 end
@@ -39,6 +39,17 @@ module AdoptAThing
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    # Use SQL instead of Active Record's schema dumper when creating the database.
+    # This is necessary if your schema can't be completely dumped by the schema dumper,
+    # like if you have constraints or database-specific column types
+    # config.active_record.schema_format = :sql
+
+    # Enforce whitelist mode for mass assignment.
+    # This will create an empty whitelist of attributes available for mass-assignment for all models
+    # in your app. As such, your models will need to explicitly whitelist or blacklist accessible
+    # parameters by using an attr_accessible or attr_protected declaration.
+    # config.active_record.whitelist_attributes = true
+
     # Enable the asset pipeline
     config.assets.enabled = true
 

config/environments/development.rb

@@ -2,7 +2,7 @@ AdoptAThing::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # In the development environment your application's code is reloaded on
-  # every request.  This slows down response time but is perfect for development
+  # every request. This slows down response time but is perfect for development
   # since you don't have to restart the web server when you make code changes.
   config.cache_classes = false
 
@@ -23,6 +23,13 @@ AdoptAThing::Application.configure do
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
+  # Raise exception on mass assignment protection for ActiveRecord 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
 

config/environments/production.rb

@@ -8,12 +8,18 @@ AdoptAThing::Application.configure do
   config.consider_all_requests_local       = false
   config.action_controller.perform_caching = true
 
+  # Disable Rails's static asset server (Apache or nginx will already do this)
+  # config.serve_static_assets = false
+
   # Enable Rails's static asset server
   config.serve_static_assets = true
 
   # Compress JavaScripts and CSS
   config.assets.compress = true
 
+  # Don't fallback to assets pipeline if a precompiled asset is missed
+  # config.assets.compile = false
+
   # Fallback to assets pipeline if a precompiled asset is missed
   config.assets.compile = true
 
@@ -33,8 +39,11 @@ AdoptAThing::Application.configure do
   # See everything in the log (default is :info)
   # config.log_level = :debug
 
+  # Prepend all log lines with the following tags
+  # config.log_tags = [ :subdomain, :uuid ]
+
   # Use a different logger for distributed setups
-  # config.logger = SyslogLogger.new
+  # config.logger = ActiveSupport::TaggedLogging.new(SyslogLogger.new)
 
   # Use a different cache store in production
   # config.cache_store = :mem_cache_store
@@ -46,6 +55,7 @@ AdoptAThing::Application.configure do
   # config.assets.precompile += %w( search.js )
 
   # Disable delivery errors, bad email addresses will be ignored
+  # config.action_mailer.raise_delivery_errors = false
   config.action_mailer.raise_delivery_errors = true
   config.action_mailer.delivery_method = :smtp
   config.action_mailer.default_url_options = {:host => 'adoptahydrant.org'}
@@ -59,6 +69,10 @@ AdoptAThing::Application.configure do
 
   # Send deprecation notices to registered listeners
   config.active_support.deprecation = :notify
+
+  # 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
 end
 
 ActionMailer::Base.smtp_settings = {
@@ -67,5 +81,5 @@ ActionMailer::Base.smtp_settings = {
   :authentication => :plain,
   :user_name      => ENV['SENDGRID_USERNAME'],
   :password       => ENV['SENDGRID_PASSWORD'],
-  :domain         => ENV['SENDGRID_DOMAIN']
+  :domain         => ENV['SENDGRID_DOMAIN'],
 }

config/environments/test.rb

@@ -2,9 +2,9 @@ AdoptAThing::Application.configure do
   # Settings specified here will take precedence over those in config/application.rb
 
   # The test environment is used exclusively to run your application's
-  # test suite.  You never need to work with it otherwise.  Remember that
+  # test suite. You never need to work with it otherwise. Remember that
   # your test database is "scratch space" for the test suite and is wiped
-  # and recreated between test runs.  Don't rely on the data there!
+  # and recreated between test runs. Don't rely on the data there!
   config.cache_classes = true
 
   # Configure static asset server for tests with Cache-Control for performance
@@ -30,14 +30,9 @@ AdoptAThing::Application.configure do
   config.action_mailer.delivery_method = :test
   config.action_mailer.default_url_options = {:host => 'localhost:3000'}
 
-  # Use SQL instead of Active Record's schema dumper when creating the test database.
+  # Raise exception on mass assignment protection for ActiveRecord models
-  # This is necessary if your schema can't be completely dumped by the schema dumper,
+  config.active_record.mass_assignment_sanitizer = :strict
-  # like if you have constraints or database-specific column types
-  # config.active_record.schema_format = :sql
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr
-
-  # Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
-  config.assets.allow_debugging = true
 end

config/initializers/inflections.rb

@@ -8,3 +8,8 @@
 #   inflect.irregular 'person', 'people'
 #   inflect.uncountable %w( fish sheep )
 # end
+#
+# These inflection rules are supported but not enabled by default:
+# ActiveSupport::Inflector.inflections do |inflect|
+#   inflect.acronym 'RESTful'
+# end

public/500.html

@@ -20,7 +20,6 @@
   <!-- This file lives in public/500.html -->
   <div class="dialog">
     <h1>We're sorry, but something went wrong.</h1>
-    <p>We've been notified about this issue and we'll take a look at it shortly.</p>
   </div>
 </body>
 </html>