From b25d4d256f246f81da6709b72dabbb4c9c3f064a Mon Sep 17 00:00:00 2001 From: Thibault Jouan Date: Sun, 18 Mar 2012 23:51:20 +0000 Subject: [PATCH] Update all bundled gems to lastest versions --- Gemfile.lock | 151 +++++++++---------- config/application.rb | 13 +- config/environments/development.rb | 9 +- config/environments/production.rb | 9 +- config/environments/test.rb | 10 +- config/initializers/inflections.rb | 5 + spec/views/home/index.html.haml_spec.rb | 2 +- spec/views/playlists/edit.html.haml_spec.rb | 2 +- spec/views/playlists/index.html.haml_spec.rb | 2 +- spec/views/playlists/new.html.haml_spec.rb | 2 +- spec/views/sessions/new.html.haml_spec.rb | 2 +- spec/views/tracks/new.html.haml_spec.rb | 2 +- spec/views/tracks/show.html.haml_spec.rb | 2 +- spec/views/users/new.html.haml_spec.rb | 2 +- 14 files changed, 120 insertions(+), 93 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index d84cc65..acaa8a1 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -1,35 +1,34 @@ GEM remote: http://rubygems.org/ specs: - 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.2) + actionpack (= 3.2.2) + mail (~> 2.4.0) + actionpack (3.2.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) builder (~> 3.0.0) erubis (~> 2.7.0) - i18n (~> 0.6) - rack (~> 1.3.5) + journey (~> 1.0.1) + rack (~> 1.4.0) rack-cache (~> 1.1) - rack-mount (~> 0.8.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.2) + activesupport (= 3.2.2) 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.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) + 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.2) + activemodel (= 3.2.2) + activesupport (= 3.2.2) + activesupport (3.2.2) + i18n (~> 0.6) multi_json (~> 1.0) - arel (2.2.1) + arel (3.0.2) bcrypt-ruby (3.0.1) builder (3.0.0) capybara (1.1.2) @@ -39,60 +38,60 @@ GEM rack-test (>= 0.5.4) selenium-webdriver (~> 2.0) xpath (~> 0.1.4) - childprocess (0.2.3) + childprocess (0.3.1) ffi (~> 1.0.6) diff-lcs (1.1.3) erubis (2.7.0) - factory_girl (2.3.2) - activesupport - factory_girl_rails (1.4.0) - factory_girl (~> 2.3.0) + factory_girl (2.6.4) + activesupport (>= 2.3.9) + factory_girl_rails (1.7.0) + factory_girl (~> 2.6.0) railties (>= 3.0.0) ffi (1.0.11) - guard (0.8.8) + guard (0.10.0) + ffi (>= 0.5.0) thor (~> 0.14.6) - guard-rspec (0.5.9) - guard (>= 0.8.4) - guard-spork (0.4.0) - guard (>= 0.8.4) + guard-rspec (0.6.0) + guard (>= 0.10.0) + guard-spork (0.5.2) + guard (>= 0.10.0) spork (>= 0.8.4) haml (3.1.4) hike (1.2.1) i18n (0.6.0) - json (1.6.3) - libnotify (0.6.0) - mail (2.3.0) + journey (1.0.3) + json (1.6.5) + libnotify (0.7.2) + mail (2.4.4) i18n (>= 0.4.0) mime-types (~> 1.16) treetop (~> 1.4.8) mime-types (1.17.2) - multi_json (1.0.4) - nokogiri (1.5.0) - pg (0.11.0) + multi_json (1.1.0) + nokogiri (1.5.2) + pg (0.13.2) polyglot (0.3.3) - rabl (0.6.0) + rabl (0.6.1) activesupport (>= 2.3.14) - multi_json (~> 1.0.3) - rack (1.3.5) - rack-cache (1.1) + multi_json (~> 1.1.0) + 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.2) + actionmailer (= 3.2.2) + actionpack (= 3.2.2) + activerecord (= 3.2.2) + activeresource (= 3.2.2) + activesupport (= 3.2.2) bundler (~> 1.0) - railties (= 3.1.3) - railties (3.1.3) - actionpack (= 3.1.3) - activesupport (= 3.1.3) + railties (= 3.2.2) + railties (3.2.2) + actionpack (= 3.2.2) + activesupport (= 3.2.2) rack-ssl (~> 1.3.2) rake (>= 0.8.7) rdoc (~> 3.4) @@ -100,30 +99,30 @@ GEM rake (0.9.2.2) rb-inotify (0.8.8) ffi (>= 0.5.0) - rdoc (3.11) + rdoc (3.12) json (~> 1.4) - rspec (2.7.0) - rspec-core (~> 2.7.0) - rspec-expectations (~> 2.7.0) - rspec-mocks (~> 2.7.0) - rspec-core (2.7.1) - rspec-expectations (2.7.0) - diff-lcs (~> 1.1.2) - rspec-mocks (2.7.0) - rspec-rails (2.7.0) - actionpack (~> 3.0) - activesupport (~> 3.0) - railties (~> 3.0) - rspec (~> 2.7.0) - rubyzip (0.9.5) - selenium-webdriver (2.14.0) - childprocess (>= 0.2.1) - ffi (~> 1.0.9) - multi_json (~> 1.0.4) + rspec (2.9.0) + rspec-core (~> 2.9.0) + rspec-expectations (~> 2.9.0) + rspec-mocks (~> 2.9.0) + rspec-core (2.9.0) + rspec-expectations (2.9.0) + diff-lcs (~> 1.1.3) + rspec-mocks (2.9.0) + rspec-rails (2.9.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec (~> 2.9.0) + rubyzip (0.9.6.1) + selenium-webdriver (2.20.0) + childprocess (>= 0.2.5) + ffi (~> 1.0) + multi_json (~> 1.0) rubyzip shoulda-matchers (1.0.0) - spork (0.9.0.rc9) - sprockets (2.0.3) + spork (0.9.0) + sprockets (2.1.2) hike (~> 1.2) rack (~> 1.0) tilt (~> 1.1, != 1.3.0) @@ -132,7 +131,7 @@ GEM treetop (1.4.10) polyglot polyglot (>= 0.3.1) - tzinfo (0.3.31) + tzinfo (0.3.32) xpath (0.1.4) nokogiri (~> 1.3) diff --git a/config/application.rb b/config/application.rb index 76ae342..23eecac 100644 --- a/config/application.rb +++ b/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 @@ -42,6 +42,17 @@ module Scube # BestStandardsSupport is setting this fucking X-UA-Compatible header... config.middleware.delete ActionDispatch::BestStandardsSupport + # 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 diff --git a/config/environments/development.rb b/config/environments/development.rb index 52c2230..c0c8692 100644 --- a/config/environments/development.rb +++ b/config/environments/development.rb @@ -2,7 +2,7 @@ Scube::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 @@ -22,6 +22,13 @@ Scube::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 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/config/environments/production.rb b/config/environments/production.rb index 76fafb6..4e543cd 100644 --- a/config/environments/production.rb +++ b/config/environments/production.rb @@ -33,8 +33,11 @@ Scube::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 @@ -57,4 +60,8 @@ Scube::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 diff --git a/config/environments/test.rb b/config/environments/test.rb index bb52d28..23f1ce1 100644 --- a/config/environments/test.rb +++ b/config/environments/test.rb @@ -2,9 +2,9 @@ Scube::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 @@ -29,10 +29,8 @@ Scube::Application.configure do # 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/config/initializers/inflections.rb b/config/initializers/inflections.rb index 9e8b013..5d8d9be 100644 --- a/config/initializers/inflections.rb +++ b/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/spec/views/home/index.html.haml_spec.rb b/spec/views/home/index.html.haml_spec.rb index caaebe8..b7e0536 100644 --- a/spec/views/home/index.html.haml_spec.rb +++ b/spec/views/home/index.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'home/index.html.haml' do +describe 'home/index' do before do assign :playlists, [ mock_model(Playlist, :name => 'Electro') diff --git a/spec/views/playlists/edit.html.haml_spec.rb b/spec/views/playlists/edit.html.haml_spec.rb index 210d408..9128556 100644 --- a/spec/views/playlists/edit.html.haml_spec.rb +++ b/spec/views/playlists/edit.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'playlists/edit.html.haml' do +describe 'playlists/edit' do let(:playlist) do mock_model(Playlist).as_new_record.as_null_object end diff --git a/spec/views/playlists/index.html.haml_spec.rb b/spec/views/playlists/index.html.haml_spec.rb index ad06eb7..836a504 100644 --- a/spec/views/playlists/index.html.haml_spec.rb +++ b/spec/views/playlists/index.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'playlists/index.html.haml' do +describe 'playlists/index' do before do assign :playlists, [ mock_model(Playlist, :name => 'Electro') diff --git a/spec/views/playlists/new.html.haml_spec.rb b/spec/views/playlists/new.html.haml_spec.rb index 147dc5d..be0860f 100644 --- a/spec/views/playlists/new.html.haml_spec.rb +++ b/spec/views/playlists/new.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'playlists/new.html.haml' do +describe 'playlists/new' do let(:playlist) do mock_model(Playlist).as_new_record.as_null_object end diff --git a/spec/views/sessions/new.html.haml_spec.rb b/spec/views/sessions/new.html.haml_spec.rb index df4f3bc..d4f2e86 100644 --- a/spec/views/sessions/new.html.haml_spec.rb +++ b/spec/views/sessions/new.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'sessions/new.html.haml' do +describe 'sessions/new' do it 'renders a form to sign in' do render rendered.should have_selector( diff --git a/spec/views/tracks/new.html.haml_spec.rb b/spec/views/tracks/new.html.haml_spec.rb index 7980d1c..0a35f33 100644 --- a/spec/views/tracks/new.html.haml_spec.rb +++ b/spec/views/tracks/new.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'tracks/new.html.haml' do +describe 'tracks/new' do let(:track) do mock_model(Track).as_new_record.as_null_object end diff --git a/spec/views/tracks/show.html.haml_spec.rb b/spec/views/tracks/show.html.haml_spec.rb index 6c1ab8b..aab3a12 100644 --- a/spec/views/tracks/show.html.haml_spec.rb +++ b/spec/views/tracks/show.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'tracks/show.html.haml' do +describe 'tracks/show' do let(:track) { Factory.create(:track) } before do diff --git a/spec/views/users/new.html.haml_spec.rb b/spec/views/users/new.html.haml_spec.rb index 6744306..04c5a66 100644 --- a/spec/views/users/new.html.haml_spec.rb +++ b/spec/views/users/new.html.haml_spec.rb @@ -1,6 +1,6 @@ require 'spec_helper' -describe 'users/new.html.haml' do +describe 'users/new' do let(:user) do mock_model(User).as_new_record.as_null_object end