Bumping to Rails 3.1. Syncing all the generated files with a fresh app.

Author: bamnet

.gitignore

@@ -1,7 +1,8 @@
 .bundle
 db/*.sqlite3
 log/*.log
-tmp/**/*
+tmp/
+.sass-cache/
 tmp/restart.txt
 config/database.yml
 public/.htaccess

Gemfile

@@ -1,13 +1,13 @@
 # Edit this Gemfile to bundle your application's dependencies.
 source 'http://rubygems.org'
 
-gem "rails", "3.1.0.rc6"
+gem "rails", "3.1.0"
 
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails', "~> 3.1.0.rc"
-  gem 'coffee-rails', "~> 3.1.0.rc"
+  gem 'sass-rails', "~> 3.1.0"
+  gem 'coffee-rails', "~> 3.1.0"
   gem 'uglifier'
 end
 

Gemfile.lock

@@ -1,49 +1,49 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
+    actionmailer (3.1.0)
+      actionpack (= 3.1.0)
       mail (~> 2.3.0)
-    actionpack (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    actionpack (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.2)
-      rack-cache (~> 1.0.2)
-      rack-mount (~> 0.8.1)
-      rack-test (~> 0.6.0)
-      sprockets (~> 2.0.0.beta.12)
-    activemodel (3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
-      bcrypt-ruby (~> 2.1.4)
+      rack-cache (~> 1.0.3)
+      rack-mount (~> 0.8.2)
+      rack-test (~> 0.6.1)
+      sprockets (~> 2.0.0)
+    activemodel (3.1.0)
+      activesupport (= 3.1.0)
+      bcrypt-ruby (~> 3.0.0)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    activerecord (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.0.rc6)
-      activemodel (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
-    activesupport (3.1.0.rc6)
+    activeresource (3.1.0)
+      activemodel (= 3.1.0)
+      activesupport (= 3.1.0)
+    activesupport (3.1.0)
       multi_json (~> 1.0)
     ansi (1.3.0)
     arel (2.2.1)
-    bcrypt-ruby (2.1.4)
+    bcrypt-ruby (3.0.0)
     builder (3.0.0)
     cancan (1.6.5)
-    coffee-rails (3.1.0.rc.6)
+    coffee-rails (3.1.0)
       coffee-script (>= 2.2.0)
       railties (~> 3.1.0.rc1)
     coffee-script (2.2.0)
       coffee-script-source
       execjs
     coffee-script-source (1.1.2)
-    devise (1.4.2)
-      bcrypt-ruby (~> 2.1.2)
+    devise (1.4.3)
+      bcrypt-ruby (~> 3.0)
       orm_adapter (~> 0.0.3)
       warden (~> 1.0.3)
     erubis (2.7.0)
@@ -63,51 +63,51 @@ GEM
     orm_adapter (0.0.5)
     polyglot (0.3.2)
     rack (1.3.2)
-    rack-cache (1.0.2)
+    rack-cache (1.0.3)
       rack (>= 0.4)
-    rack-mount (0.8.2)
+    rack-mount (0.8.3)
       rack (>= 1.0.0)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.0.rc6)
-      actionmailer (= 3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
-      activerecord (= 3.1.0.rc6)
-      activeresource (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+    rails (3.1.0)
+      actionmailer (= 3.1.0)
+      actionpack (= 3.1.0)
+      activerecord (= 3.1.0)
+      activeresource (= 3.1.0)
+      activesupport (= 3.1.0)
       bundler (~> 1.0)
-      railties (= 3.1.0.rc6)
-    railties (3.1.0.rc6)
-      actionpack (= 3.1.0.rc6)
-      activesupport (= 3.1.0.rc6)
+      railties (= 3.1.0)
+    railties (3.1.0)
+      actionpack (= 3.1.0)
+      activesupport (= 3.1.0)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     rake (0.9.2)
-    rdoc (3.9.3)
+    rdoc (3.9.4)
     rmagick (2.13.1)
     sass (3.1.7)
-    sass-rails (3.1.0.rc.6)
-      actionpack (~> 3.1.0.rc6)
-      railties (~> 3.1.0.rc6)
+    sass-rails (3.1.0)
+      actionpack (~> 3.1.0)
+      railties (~> 3.1.0)
       sass (>= 3.1.4)
-    sprockets (2.0.0.beta.14)
+    sprockets (2.0.0)
       hike (~> 1.2)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
+      tilt (!= 1.3.0, ~> 1.1)
     sqlite3 (1.3.4)
     thor (0.14.6)
-    tilt (1.3.2)
+    tilt (1.3.3)
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
     turn (0.8.2)
       ansi (>= 1.2.2)
     tzinfo (0.3.29)
-    uglifier (1.0.1)
+    uglifier (1.0.2)
       execjs (>= 0.3.0)
       multi_json (>= 1.0.2)
     warden (1.0.5)
@@ -118,12 +118,12 @@ PLATFORMS
 
 DEPENDENCIES
   cancan
-  coffee-rails (~> 3.1.0.rc)
+  coffee-rails (~> 3.1.0)
   devise
   jquery-rails
-  rails (= 3.1.0.rc6)
+  rails (= 3.1.0)
   rmagick (>= 2.12.2)
-  sass-rails (~> 3.1.0.rc)
+  sass-rails (~> 3.1.0)
   sqlite3
   turn
   uglifier

app/controllers/application_controller.rb

@@ -3,10 +3,10 @@ class ApplicationController < ActionController::Base
   before_filter :set_locale
 
   def set_locale
-  	if user_signed_in? && current_user.locale != ""
-  	  session[:locale] = current_user.locale
-  	end
-  	
-  	I18n.locale = session[:locale] || I18n.default_locale
+    if user_signed_in? && current_user.locale != ""
+      session[:locale] = current_user.locale
+    end
+
+    I18n.locale = session[:locale] || I18n.default_locale
   end
 end

app/mailers/.gitkeep

@@ -2,11 +2,7 @@
 <html>
 <head>
   <title><%= controller.action_name.titleize %> - <%= controller.controller_name.titleize %> - Concerto Signage Panel</title>
-  
-  <%#= stylesheet_link_tag 'base' %>
-  <%#= stylesheet_link_tag 'jquery-ui-1.8.5.custom' %>
-  <%#= stylesheet_link_tag 'datetime' %>
-  
+    
   <%= stylesheet_link_tag "application" %>
   <%= javascript_include_tag "application" %>
 

app/views/layouts/application.html.erb

@@ -2,10 +2,12 @@
 
 require 'rails/all'
 
-# If you have a Gemfile, require the default gems, the ones in the
-# current environment and also include :assets gems if in development
-# or test environments.
-Bundler.require *Rails.groups(:assets) if defined?(Bundler)
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  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
 
 module Concerto
   class Application < Rails::Application
@@ -32,9 +34,6 @@ class Application < Rails::Application
     config.i18n.load_path += Dir[Rails.root.join('config', 'locales', '**', '*.{rb,yml}')]
     config.i18n.default_locale = :en
 
-    # JavaScript files you want as :defaults (application.js is always included).
-    # config.action_view.javascript_expansions[:defaults] = ['jquery-1.4.3', 'jquery-ujs/src/rails']
-
     # Configure the default encoding used in templates for Ruby 1.9.
     config.encoding = "utf-8"
 
@@ -43,5 +42,8 @@ class Application < Rails::Application
 
     # Enable the asset pipeline
     config.assets.enabled = true
+
+    # Version of your assets, change this if you want to expire all your assets
+    config.assets.version = '1.0'
   end
 end

config/application.rb

@@ -24,4 +24,7 @@
 
   # Do not compress assets
   config.assets.compress = false
+
+  # Expands the lines which load the assets
+  config.assets.debug = true
 end

config/environments/development.rb

@@ -14,9 +14,18 @@
   # 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
+
   # Specifies the header that your server uses for sending files
-  # (comment out if your front-end server doesn't support this)
-  config.action_dispatch.x_sendfile_header = "X-Sendfile" # Use 'X-Accel-Redirect' for nginx
+  # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache
+  # config.action_dispatch.x_sendfile_header = 'X-Accel-Redirect' # for nginx
 
   # Force all access to the app over SSL, use Strict-Transport-Security, and use secure cookies.
   # config.force_ssl = true

config/environments/production.rb

@@ -36,4 +36,7 @@
 
   # 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/environments/test.rb

@@ -4,5 +4,5 @@
 
 # Use the database for sessions instead of the cookie-based default,
 # which shouldn't be used to store highly confidential information
-# (create the session table with "rake db:sessions:create")
+# (create the session table with "rails generate session_migration")
 # Concerto::Application.config.session_store :active_record_store

config/initializers/session_store.rb

@@ -0,0 +1,14 @@
+# Be sure to restart your server when you modify this file.
+#
+# This file contains settings for ActionController::ParamsWrapper which
+# is enabled by default.
+
+# Enable parameter wrapping for JSON. You can disable this by setting :format to an empty array.
+ActiveSupport.on_load(:action_controller) do
+  wrap_parameters :format => [:json]
+end
+
+# Disable root element in JSON by default.
+ActiveSupport.on_load(:active_record) do
+  self.include_root_in_json = false
+end

config/initializers/wrap_parameters.rb

@@ -1,8 +1,11 @@
 require 'test_helper'
 require 'rails/performance_test_help'
 
-# Profiling results for each test method are written to tmp/performance.
-class BrowsingTest < ActionController::PerformanceTest
+class BrowsingTest < ActionDispatch::PerformanceTest
+  # Refer to the documentation for all available options
+  # self.profile_options = { :runs => 5, :metrics => [:wall_time, :memory]
+  #                          :output => 'tmp/performance', :formats => [:flat] }
+
   def test_homepage
     get '/'
   end

lib/assets/.gitkeep

@@ -1,5 +1,5 @@
 ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
+require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 
 class ActiveSupport::TestCase