From 911c6198226709e996769b395cbae92b770415e3 Mon Sep 17 00:00:00 2001 From: Vasily Polovnyov Date: Thu, 12 Sep 2013 19:12:36 +0400 Subject: [PATCH] upgrade to rails4 --- api_taster.gemspec | 2 +- spec/dummy/config/environments/development.rb | 5 ++--- spec/dummy/config/environments/production.rb | 2 ++ spec/dummy/config/environments/test.rb | 5 ++--- spec/mapper_spec.rb | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/api_taster.gemspec b/api_taster.gemspec index 4114d80..6f5666b 100644 --- a/api_taster.gemspec +++ b/api_taster.gemspec @@ -14,7 +14,7 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split($\) s.test_files = Dir["spec/**/*"] - s.add_dependency 'rails', '~> 3.2.0' + s.add_dependency 'rails', '~> 4.0.0' s.add_dependency 'jquery-rails' s.add_dependency 'sass-rails' s.add_dependency 'bootstrap-sass', '~> 2.1' diff --git a/spec/dummy/config/environments/development.rb b/spec/dummy/config/environments/development.rb index 3b9e645..9121010 100644 --- a/spec/dummy/config/environments/development.rb +++ b/spec/dummy/config/environments/development.rb @@ -6,9 +6,6 @@ # since you don't have to restart the web server when you make code changes. config.cache_classes = false - # Log error messages when you accidentally call methods on nil. - config.whiny_nils = true - # Show full error reports and disable caching config.consider_all_requests_local = true config.action_controller.perform_caching = false @@ -34,4 +31,6 @@ # Expands the lines which load the assets config.assets.debug = true + + config.eager_load = false end diff --git a/spec/dummy/config/environments/production.rb b/spec/dummy/config/environments/production.rb index 166953a..91c400f 100644 --- a/spec/dummy/config/environments/production.rb +++ b/spec/dummy/config/environments/production.rb @@ -64,4 +64,6 @@ # 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 + + config.eager_load = true end diff --git a/spec/dummy/config/environments/test.rb b/spec/dummy/config/environments/test.rb index 5eeb1e4..87c5f75 100644 --- a/spec/dummy/config/environments/test.rb +++ b/spec/dummy/config/environments/test.rb @@ -11,9 +11,6 @@ config.serve_static_assets = true config.static_cache_control = "public, max-age=3600" - # Log error messages when you accidentally call methods on nil - config.whiny_nils = true - # Show full error reports and disable caching config.consider_all_requests_local = true config.action_controller.perform_caching = false @@ -34,4 +31,6 @@ # Print deprecation notices to the stderr config.active_support.deprecation = :stderr + + config.eager_load = false end diff --git a/spec/mapper_spec.rb b/spec/mapper_spec.rb index 1127ef4..4b6f481 100644 --- a/spec/mapper_spec.rb +++ b/spec/mapper_spec.rb @@ -36,7 +36,7 @@ module ApiTaster before(:all) do Rails.application.routes.draw do resources :dummy_users do - member { map_method :patch, :update } + member { map_method :patch, [:update] } end end