Update all gems and update dummy app to Rails 3.2.3. Note that Paperc…

…lip 3.0.1 is broken.
reinaldomendes · Apr 20, 2012 · c514d03 · c514d03
1 parent 68e237e
commit c514d03
Show file tree

Hide file tree

Showing 9 changed files with 114 additions and 84 deletions.
diff --git a/Gemfile b/Gemfile
@@ -2,7 +2,7 @@ source "http://rubygems.org"
 
 gemspec
 
-gem "rails", "3.1.3"
+gem "rails", "3.2.3"
 
 platforms :mri_18 do
   group :test do
@@ -24,7 +24,7 @@ platforms :ruby do
   end
 
   group :active_record do
-    gem "paperclip"
+    gem "paperclip", "< 3.0.1" # https://github.com/thoughtbot/paperclip/issues/807
     gem "carrierwave"
     gem "mini_magick"
   end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -9,38 +9,37 @@ GEM
   remote: http://rubygems.org/
   specs:
     SystemTimer (1.2.3)
-    actionmailer (3.1.3)
-      actionpack (= 3.1.3)
-      mail (~> 2.3.0)
-    actionpack (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
+    actionmailer (3.2.3)
+      actionpack (= 3.2.3)
+      mail (~> 2.4.4)
+    actionpack (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
-      i18n (~> 0.6)
-      rack (~> 1.3.5)
-      rack-cache (~> 1.1)
-      rack-mount (~> 0.8.2)
+      journey (~> 1.0.1)
+      rack (~> 1.4.0)
+      rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.3)
-    activemodel (3.1.3)
-      activesupport (= 3.1.3)
+      sprockets (~> 2.1.2)
+    activemodel (3.2.3)
+      activesupport (= 3.2.3)
       builder (~> 3.0.0)
-      i18n (~> 0.6)
-    activerecord (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-      arel (~> 2.2.1)
+    activerecord (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+      arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.3)
-      activemodel (= 3.1.3)
-      activesupport (= 3.1.3)
-    activesupport (3.1.3)
+    activeresource (3.2.3)
+      activemodel (= 3.2.3)
+      activesupport (= 3.2.3)
+    activesupport (3.2.3)
+      i18n (~> 0.6)
       multi_json (~> 1.0)
-    arel (2.2.1)
-    bson (1.5.2)
-    bson_ext (1.5.2)
-      bson (= 1.5.2)
+    arel (3.0.2)
+    bson (1.6.2)
+    bson_ext (1.6.2)
+      bson (~> 1.6.2)
     builder (3.0.0)
     capybara (1.1.2)
       mime-types (>= 1.16)
@@ -51,88 +50,88 @@ GEM
       xpath (~> 0.1.4)
     carrierwave (0.5.8)
       activesupport (~> 3.0)
-    carrierwave-mongoid (0.1.3)
-      carrierwave (>= 0.5.6)
+    carrierwave-mongoid (0.1.7)
+      carrierwave (~> 0.5.6)
       mongoid (~> 2.1)
-    childprocess (0.2.4)
+    childprocess (0.3.1)
       ffi (~> 1.0.6)
     cocaine (0.2.1)
     columnize (0.3.6)
     erubis (2.7.0)
     ffi (1.0.11)
     hike (1.2.1)
     i18n (0.6.0)
-    json (1.6.4)
-    kgio (2.7.0)
+    journey (1.0.3)
+    json (1.6.6)
+    kgio (2.7.4)
     linecache (0.46)
       rbx-require-relative (> 0.0.4)
-    mail (2.3.0)
+    mail (2.4.4)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.17.2)
     mini_magick (3.4)
       subexec (~> 0.2.1)
-    mongo (1.5.2)
-      bson (= 1.5.2)
-    mongoid (2.3.4)
+    mongo (1.6.2)
+      bson (~> 1.6.2)
+    mongoid (2.4.7)
       activemodel (~> 3.1)
       mongo (~> 1.3)
       tzinfo (~> 0.3.22)
     mongoid-paperclip (0.0.7)
       paperclip (>= 2.3.6)
-    multi_json (1.0.4)
+    multi_json (1.2.0)
     mynyml-redgreen (0.7.1)
       term-ansicolor (>= 1.0.4)
-    nokogiri (1.5.0)
-    orm_adapter (0.0.6)
-    paperclip (2.4.5)
-      activerecord (>= 2.3.0)
-      activesupport (>= 2.3.2)
+    nokogiri (1.5.2)
+    orm_adapter (0.0.7)
+    paperclip (3.0.0)
+      activemodel (>= 3.0.0)
+      activerecord (>= 3.0.0)
+      activesupport (>= 3.0.0)
       cocaine (>= 0.0.2)
       mime-types
     polyglot (0.3.3)
-    rack (1.3.6)
-    rack-cache (1.1)
+    rack (1.4.1)
+    rack-cache (1.2)
       rack (>= 0.4)
-    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.3)
-      actionmailer (= 3.1.3)
-      actionpack (= 3.1.3)
-      activerecord (= 3.1.3)
-      activeresource (= 3.1.3)
-      activesupport (= 3.1.3)
+    rails (3.2.3)
+      actionmailer (= 3.2.3)
+      actionpack (= 3.2.3)
+      activerecord (= 3.2.3)
+      activeresource (= 3.2.3)
+      activesupport (= 3.2.3)
       bundler (~> 1.0)
-      railties (= 3.1.3)
-    railties (3.1.3)
-      actionpack (= 3.1.3)
-      activesupport (= 3.1.3)
+      railties (= 3.2.3)
+    railties (3.2.3)
+      actionpack (= 3.2.3)
+      activesupport (= 3.2.3)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (~> 0.14.6)
     raindrops (0.8.0)
     rake (0.9.2.2)
-    rbx-require-relative (0.0.5)
+    rbx-require-relative (0.0.9)
     rdoc (3.12)
       json (~> 1.4)
     ruby-debug (0.10.4)
       columnize (>= 0.1)
       ruby-debug-base (~> 0.10.4.0)
     ruby-debug-base (0.10.4)
       linecache (>= 0.3)
-    rubyzip (0.9.5)
-    selenium-webdriver (2.15.0)
-      childprocess (>= 0.2.1)
-      ffi (~> 1.0.9)
-      multi_json (~> 1.0.4)
+    rubyzip (0.9.7)
+    selenium-webdriver (2.20.0)
+      childprocess (>= 0.2.5)
+      ffi (~> 1.0)
+      multi_json (~> 1.0)
       rubyzip
-    sprockets (2.0.3)
+    sprockets (2.1.2)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -144,7 +143,7 @@ GEM
     treetop (1.4.10)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.31)
+    tzinfo (0.3.33)
     unicorn (4.0.1)
       kgio (~> 2.4)
       rack
@@ -166,8 +165,8 @@ DEPENDENCIES
   mongoid
   mongoid-paperclip
   mynyml-redgreen (~> 0.7.1)
-  paperclip
-  rails (= 3.1.3)
+  paperclip (< 3.0.1)
+  rails (= 3.2.3)
   ruby-debug
   sqlite3
   unicorn (~> 4.0.1)
diff --git a/test/dummy/config/application.rb b/test/dummy/config/application.rb
@@ -2,8 +2,15 @@
 
 require 'rails/all'
 
-Bundler.require :default, CKEDITOR_ORM
-require "ckeditor"
+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)
+  Bundler.require(:default, CKEDITOR_ORM)
+end
+
+require 'ckeditor'
 
 module Dummy
   class Application < Rails::Application
@@ -13,10 +20,7 @@ class Application < Rails::Application
 
     # Custom directories with classes and modules you want to be autoloadable.
     config.autoload_paths += %W(#{config.root}/../../lib/generators/ckeditor/templates/#{CKEDITOR_ORM}/#{CKEDITOR_BACKEND})
-
-    if CKEDITOR_BACKEND == :carrierwave
-      config.autoload_paths += %W(#{config.root}/../../lib/generators/ckeditor/templates/base/#{CKEDITOR_BACKEND}/uploaders)
-    end
+    config.autoload_paths += %W(#{config.root}/../../lib/generators/ckeditor/templates/base/#{CKEDITOR_BACKEND}/uploaders)
 
     # Only load the plugins named here, in the order given (default is alphabetical).
     # :all can be used as a placeholder for all plugins not explicitly named.
@@ -39,11 +43,21 @@ class Application < Rails::Application
     # 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 = false
+
     # 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
-
diff --git a/test/dummy/config/boot.rb b/test/dummy/config/boot.rb
@@ -7,4 +7,4 @@
   Bundler.setup
 end
 
-$:.unshift File.expand_path('../../../../lib', __FILE__)
+$:.unshift File.expand_path('../../../../lib', __FILE__)
diff --git a/test/dummy/config/environments/development.rb b/test/dummy/config/environments/development.rb
@@ -2,7 +2,7 @@
   # 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
 
@@ -22,6 +22,13 @@
   # Only use best-standards-support built into browsers
   config.action_dispatch.best_standards_support = :builtin
 
+  # 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
 

diff --git a/test/dummy/config/environments/production.rb b/test/dummy/config/environments/production.rb
@@ -33,8 +33,11 @@
   # 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
@@ -57,4 +60,8 @@
 
   # 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
diff --git a/test/dummy/config/environments/test.rb b/test/dummy/config/environments/test.rb
@@ -2,9 +2,9 @@
   # 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
@@ -29,10 +29,8 @@
   # ActionMailer::Base.deliveries array.
   config.action_mailer.delivery_method = :test
 
-  # Use SQL instead of Active Record's schema dumper when creating the test 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
+  # Raise exception on mass assignment protection for Active Record models
+  config.active_record.mass_assignment_sanitizer = :strict
 
   # Print deprecation notices to the stderr
   config.active_support.deprecation = :stderr

diff --git a/test/dummy/config/initializers/inflections.rb b/test/dummy/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
diff --git a/test/functional/posts_controller_test.rb b/test/functional/posts_controller_test.rb
@@ -6,7 +6,7 @@ def setup
   end
 
   def teardown
-    @post.destroy
+    @post.destroy rescue nil
   end
 
   test "include javascripts" do