Permalink
Browse files

Update to Rails 4.0

  • Loading branch information...
Pluies committed Oct 4, 2015
1 parent d9b3e9f commit 930ba2adbdedf80beb2b487f7c32e2e19eb3c245
Showing with 74 additions and 95 deletions.
  1. +5 −15 Gemfile
  2. +58 −72 Gemfile.lock
  3. +2 −3 config/environments/development.rb
  4. +2 −0 config/environments/production.rb
  5. +2 −0 config/environments/test.rb
  6. +5 −5 config/routes.rb
View
20 Gemfile
@@ -1,11 +1,10 @@
source 'http://rubygems.org'
gem 'rails', '3.2.22'
group :assets do
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
end
gem 'rails', '~> 4.0.0'
gem 'sass-rails'
gem 'coffee-rails'
gem 'uglifier'
gem 'therubyracer' # To interpret coffeescript
gem 'sqlite3'
gem 'jquery-rails'
@@ -22,15 +21,6 @@ group :test do
# gem 'ruby-debug19'
end
# Gems used only for assets and not required
# in production environments by default.
group :assets do
gem 'therubyracer' # To interpret coffeescript
# gem 'sass-rails', " ~> 3.1.0"
# gem 'coffee-rails', "~> 3.1.0"
# gem 'uglifier'
end
# Deploy with Capistrano
gem 'capistrano'
gem 'rvm'
View
@@ -2,50 +2,47 @@ GEM
remote: http://rubygems.org/
specs:
ZenTest (4.11.0)
actionmailer (3.2.22)
actionpack (= 3.2.22)
mail (~> 2.5.4)
actionpack (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
actionmailer (4.0.13)
actionpack (= 4.0.13)
mail (~> 2.5, >= 2.5.4)
actionpack (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
erubis (~> 2.7.0)
journey (~> 1.0.4)
rack (~> 1.4.5)
rack-cache (~> 1.2)
rack-test (~> 0.6.1)
sprockets (~> 2.2.1)
activemodel (3.2.22)
activesupport (= 3.2.22)
builder (~> 3.0.0)
activerecord (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
arel (~> 3.0.2)
tzinfo (~> 0.3.29)
activeresource (3.2.22)
activemodel (= 3.2.22)
activesupport (= 3.2.22)
activesupport (3.2.22)
i18n (~> 0.6, >= 0.6.4)
multi_json (~> 1.0)
rack (~> 1.5.2)
rack-test (~> 0.6.2)
activemodel (4.0.13)
activesupport (= 4.0.13)
builder (~> 3.1.0)
activerecord (4.0.13)
activemodel (= 4.0.13)
activerecord-deprecated_finders (~> 1.0.2)
activesupport (= 4.0.13)
arel (~> 4.0.0)
activerecord-deprecated_finders (1.0.4)
activesupport (4.0.13)
i18n (~> 0.6, >= 0.6.9)
minitest (~> 4.2)
multi_json (~> 1.3)
thread_safe (~> 0.1)
tzinfo (~> 0.3.37)
ansi (1.5.0)
arel (3.0.3)
arel (4.0.2)
autotest (4.4.6)
ZenTest (>= 4.4.1)
autotest-inotify (0.0.6)
autotest (>= 4.2.4)
rb-inotify
autotest-rails-pure (4.1.2)
autotest-standalone (4.5.11)
builder (3.0.4)
builder (3.1.4)
capistrano (3.4.0)
i18n
rake (>= 10.0.0)
sshkit (~> 1.3)
coffee-rails (3.2.2)
coffee-rails (4.1.0)
coffee-script (>= 2.2.0)
railties (~> 3.2.0)
railties (>= 4.0.0, < 5.0)
coffee-script (2.4.1)
coffee-script-source
execjs
@@ -57,55 +54,43 @@ GEM
ffi (1.9.10)
geocoder (1.2.11)
gmaps4rails (2.1.2)
hike (1.2.3)
http_accept_language (2.0.5)
i18n (0.7.0)
journey (1.0.4)
jquery-rails (3.1.4)
railties (>= 3.0, < 5.0)
thor (>= 0.14, < 2.0)
json (1.8.3)
libv8 (3.16.14.11)
lodash-rails (3.10.1)
railties (>= 3.1)
mail (2.5.4)
mime-types (~> 1.16)
treetop (~> 1.4.8)
mime-types (1.25.1)
mail (2.6.3)
mime-types (>= 1.16, < 3)
mime-types (2.6.2)
minitest (4.7.5)
multi_json (1.11.2)
net-scp (1.2.1)
net-ssh (>= 2.6.5)
net-ssh (3.0.1)
polyglot (0.3.5)
power_assert (0.2.4)
rack (1.4.7)
rack-cache (1.2)
rack (>= 0.4)
rack-ssl (1.3.4)
rack
rack (1.5.5)
rack-test (0.6.3)
rack (>= 1.0)
rails (3.2.22)
actionmailer (= 3.2.22)
actionpack (= 3.2.22)
activerecord (= 3.2.22)
activeresource (= 3.2.22)
activesupport (= 3.2.22)
bundler (~> 1.0)
railties (= 3.2.22)
railties (3.2.22)
actionpack (= 3.2.22)
activesupport (= 3.2.22)
rack-ssl (~> 1.3.2)
rails (4.0.13)
actionmailer (= 4.0.13)
actionpack (= 4.0.13)
activerecord (= 4.0.13)
activesupport (= 4.0.13)
bundler (>= 1.3.0, < 2.0)
railties (= 4.0.13)
sprockets-rails (~> 2.0)
railties (4.0.13)
actionpack (= 4.0.13)
activesupport (= 4.0.13)
rake (>= 0.8.7)
rdoc (~> 3.4)
thor (>= 0.14.6, < 2.0)
thor (>= 0.18.1, < 2.0)
rake (10.4.2)
rb-inotify (0.9.5)
ffi (>= 0.5.0)
rdoc (3.12.2)
json (~> 1.4)
ref (2.0.0)
rspec-core (3.3.2)
rspec-support (~> 3.3.0)
@@ -126,18 +111,21 @@ GEM
rspec-support (3.3.0)
rvm (1.11.3.9)
sass (3.4.18)
sass-rails (3.2.6)
railties (~> 3.2.0)
sass (>= 3.1.10)
tilt (~> 1.3)
sass-rails (5.0.4)
railties (>= 4.0.0, < 5.0)
sass (~> 3.1)
sprockets (>= 2.8, < 4.0)
sprockets-rails (>= 2.0, < 4.0)
tilt (>= 1.1, < 3)
spork (0.9.2)
spork-testunit (0.0.8)
spork (>= 0.6.0)
sprockets (2.2.3)
hike (~> 1.2)
multi_json (~> 1.0)
rack (~> 1.0)
tilt (~> 1.1, != 1.3.0)
sprockets (3.3.5)
rack (> 1, < 3)
sprockets-rails (2.3.3)
actionpack (>= 3.0)
activesupport (>= 3.0)
sprockets (>= 2.8, < 4.0)
sqlite3 (1.3.10)
sshkit (1.7.1)
colorize (>= 0.7.0)
@@ -149,10 +137,8 @@ GEM
libv8 (~> 3.16.14.0)
ref
thor (0.19.1)
tilt (1.4.1)
treetop (1.4.15)
polyglot
polyglot (>= 0.3.1)
thread_safe (0.3.5)
tilt (2.0.1)
turn (0.9.7)
ansi
minitest (~> 4)
@@ -175,7 +161,7 @@ DEPENDENCIES
http_accept_language
jquery-rails
lodash-rails
rails (= 3.2.22)
rails (~> 4.0.0)
rspec-rails
rvm
sass-rails
@@ -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
@@ -27,4 +24,6 @@
# Expands the lines which load the assets
config.assets.debug = true
config.eager_load = false
end
@@ -57,4 +57,6 @@
# Send deprecation notices to registered listeners
config.active_support.deprecation = :notify
config.eager_load = false
end
@@ -39,4 +39,6 @@
# Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
config.assets.allow_debugging = true
config.eager_load = false
end
View
@@ -1,12 +1,12 @@
Antipodes::Application.routes.draw do
# Sample of regular route:
# match 'products/:id' => 'catalog#view'
# get 'products/:id' => 'catalog#view'
root :to => 'places#index'
match 'geocode' => 'places#geocode'
match 'antipodes' => 'places#antipodes'
match 'country' => 'countries#show'
match 'country/antipodes' => 'countries#antipodes'
get 'geocode' => 'places#geocode'
get 'antipodes' => 'places#antipodes'
get 'country' => 'countries#show'
get 'country/antipodes' => 'countries#antipodes'
end

0 comments on commit 930ba2a

Please sign in to comment.