Skip to content

Commit 930ba2a

Browse files
committed
Update to Rails 4.0
1 parent d9b3e9f commit 930ba2a

File tree

6 files changed

+74
-95
lines changed

6 files changed

+74
-95
lines changed

Gemfile

+5-15
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
source 'http://rubygems.org'
22

3-
gem 'rails', '3.2.22'
4-
group :assets do
5-
gem 'sass-rails'
6-
gem 'coffee-rails'
7-
gem 'uglifier'
8-
end
3+
gem 'rails', '~> 4.0.0'
4+
gem 'sass-rails'
5+
gem 'coffee-rails'
6+
gem 'uglifier'
7+
gem 'therubyracer' # To interpret coffeescript
98

109
gem 'sqlite3'
1110
gem 'jquery-rails'
@@ -22,15 +21,6 @@ group :test do
2221
# gem 'ruby-debug19'
2322
end
2423

25-
# Gems used only for assets and not required
26-
# in production environments by default.
27-
group :assets do
28-
gem 'therubyracer' # To interpret coffeescript
29-
# gem 'sass-rails', " ~> 3.1.0"
30-
# gem 'coffee-rails', "~> 3.1.0"
31-
# gem 'uglifier'
32-
end
33-
3424
# Deploy with Capistrano
3525
gem 'capistrano'
3626
gem 'rvm'

Gemfile.lock

+58-72
Original file line numberDiff line numberDiff line change
@@ -2,50 +2,47 @@ GEM
22
remote: http://rubygems.org/
33
specs:
44
ZenTest (4.11.0)
5-
actionmailer (3.2.22)
6-
actionpack (= 3.2.22)
7-
mail (~> 2.5.4)
8-
actionpack (3.2.22)
9-
activemodel (= 3.2.22)
10-
activesupport (= 3.2.22)
11-
builder (~> 3.0.0)
5+
actionmailer (4.0.13)
6+
actionpack (= 4.0.13)
7+
mail (~> 2.5, >= 2.5.4)
8+
actionpack (4.0.13)
9+
activesupport (= 4.0.13)
10+
builder (~> 3.1.0)
1211
erubis (~> 2.7.0)
13-
journey (~> 1.0.4)
14-
rack (~> 1.4.5)
15-
rack-cache (~> 1.2)
16-
rack-test (~> 0.6.1)
17-
sprockets (~> 2.2.1)
18-
activemodel (3.2.22)
19-
activesupport (= 3.2.22)
20-
builder (~> 3.0.0)
21-
activerecord (3.2.22)
22-
activemodel (= 3.2.22)
23-
activesupport (= 3.2.22)
24-
arel (~> 3.0.2)
25-
tzinfo (~> 0.3.29)
26-
activeresource (3.2.22)
27-
activemodel (= 3.2.22)
28-
activesupport (= 3.2.22)
29-
activesupport (3.2.22)
30-
i18n (~> 0.6, >= 0.6.4)
31-
multi_json (~> 1.0)
12+
rack (~> 1.5.2)
13+
rack-test (~> 0.6.2)
14+
activemodel (4.0.13)
15+
activesupport (= 4.0.13)
16+
builder (~> 3.1.0)
17+
activerecord (4.0.13)
18+
activemodel (= 4.0.13)
19+
activerecord-deprecated_finders (~> 1.0.2)
20+
activesupport (= 4.0.13)
21+
arel (~> 4.0.0)
22+
activerecord-deprecated_finders (1.0.4)
23+
activesupport (4.0.13)
24+
i18n (~> 0.6, >= 0.6.9)
25+
minitest (~> 4.2)
26+
multi_json (~> 1.3)
27+
thread_safe (~> 0.1)
28+
tzinfo (~> 0.3.37)
3229
ansi (1.5.0)
33-
arel (3.0.3)
30+
arel (4.0.2)
3431
autotest (4.4.6)
3532
ZenTest (>= 4.4.1)
3633
autotest-inotify (0.0.6)
3734
autotest (>= 4.2.4)
3835
rb-inotify
3936
autotest-rails-pure (4.1.2)
4037
autotest-standalone (4.5.11)
41-
builder (3.0.4)
38+
builder (3.1.4)
4239
capistrano (3.4.0)
4340
i18n
4441
rake (>= 10.0.0)
4542
sshkit (~> 1.3)
46-
coffee-rails (3.2.2)
43+
coffee-rails (4.1.0)
4744
coffee-script (>= 2.2.0)
48-
railties (~> 3.2.0)
45+
railties (>= 4.0.0, < 5.0)
4946
coffee-script (2.4.1)
5047
coffee-script-source
5148
execjs
@@ -57,55 +54,43 @@ GEM
5754
ffi (1.9.10)
5855
geocoder (1.2.11)
5956
gmaps4rails (2.1.2)
60-
hike (1.2.3)
6157
http_accept_language (2.0.5)
6258
i18n (0.7.0)
63-
journey (1.0.4)
6459
jquery-rails (3.1.4)
6560
railties (>= 3.0, < 5.0)
6661
thor (>= 0.14, < 2.0)
6762
json (1.8.3)
6863
libv8 (3.16.14.11)
6964
lodash-rails (3.10.1)
7065
railties (>= 3.1)
71-
mail (2.5.4)
72-
mime-types (~> 1.16)
73-
treetop (~> 1.4.8)
74-
mime-types (1.25.1)
66+
mail (2.6.3)
67+
mime-types (>= 1.16, < 3)
68+
mime-types (2.6.2)
7569
minitest (4.7.5)
7670
multi_json (1.11.2)
7771
net-scp (1.2.1)
7872
net-ssh (>= 2.6.5)
7973
net-ssh (3.0.1)
80-
polyglot (0.3.5)
8174
power_assert (0.2.4)
82-
rack (1.4.7)
83-
rack-cache (1.2)
84-
rack (>= 0.4)
85-
rack-ssl (1.3.4)
86-
rack
75+
rack (1.5.5)
8776
rack-test (0.6.3)
8877
rack (>= 1.0)
89-
rails (3.2.22)
90-
actionmailer (= 3.2.22)
91-
actionpack (= 3.2.22)
92-
activerecord (= 3.2.22)
93-
activeresource (= 3.2.22)
94-
activesupport (= 3.2.22)
95-
bundler (~> 1.0)
96-
railties (= 3.2.22)
97-
railties (3.2.22)
98-
actionpack (= 3.2.22)
99-
activesupport (= 3.2.22)
100-
rack-ssl (~> 1.3.2)
78+
rails (4.0.13)
79+
actionmailer (= 4.0.13)
80+
actionpack (= 4.0.13)
81+
activerecord (= 4.0.13)
82+
activesupport (= 4.0.13)
83+
bundler (>= 1.3.0, < 2.0)
84+
railties (= 4.0.13)
85+
sprockets-rails (~> 2.0)
86+
railties (4.0.13)
87+
actionpack (= 4.0.13)
88+
activesupport (= 4.0.13)
10189
rake (>= 0.8.7)
102-
rdoc (~> 3.4)
103-
thor (>= 0.14.6, < 2.0)
90+
thor (>= 0.18.1, < 2.0)
10491
rake (10.4.2)
10592
rb-inotify (0.9.5)
10693
ffi (>= 0.5.0)
107-
rdoc (3.12.2)
108-
json (~> 1.4)
10994
ref (2.0.0)
11095
rspec-core (3.3.2)
11196
rspec-support (~> 3.3.0)
@@ -126,18 +111,21 @@ GEM
126111
rspec-support (3.3.0)
127112
rvm (1.11.3.9)
128113
sass (3.4.18)
129-
sass-rails (3.2.6)
130-
railties (~> 3.2.0)
131-
sass (>= 3.1.10)
132-
tilt (~> 1.3)
114+
sass-rails (5.0.4)
115+
railties (>= 4.0.0, < 5.0)
116+
sass (~> 3.1)
117+
sprockets (>= 2.8, < 4.0)
118+
sprockets-rails (>= 2.0, < 4.0)
119+
tilt (>= 1.1, < 3)
133120
spork (0.9.2)
134121
spork-testunit (0.0.8)
135122
spork (>= 0.6.0)
136-
sprockets (2.2.3)
137-
hike (~> 1.2)
138-
multi_json (~> 1.0)
139-
rack (~> 1.0)
140-
tilt (~> 1.1, != 1.3.0)
123+
sprockets (3.3.5)
124+
rack (> 1, < 3)
125+
sprockets-rails (2.3.3)
126+
actionpack (>= 3.0)
127+
activesupport (>= 3.0)
128+
sprockets (>= 2.8, < 4.0)
141129
sqlite3 (1.3.10)
142130
sshkit (1.7.1)
143131
colorize (>= 0.7.0)
@@ -149,10 +137,8 @@ GEM
149137
libv8 (~> 3.16.14.0)
150138
ref
151139
thor (0.19.1)
152-
tilt (1.4.1)
153-
treetop (1.4.15)
154-
polyglot
155-
polyglot (>= 0.3.1)
140+
thread_safe (0.3.5)
141+
tilt (2.0.1)
156142
turn (0.9.7)
157143
ansi
158144
minitest (~> 4)
@@ -175,7 +161,7 @@ DEPENDENCIES
175161
http_accept_language
176162
jquery-rails
177163
lodash-rails
178-
rails (= 3.2.22)
164+
rails (~> 4.0.0)
179165
rspec-rails
180166
rvm
181167
sass-rails

config/environments/development.rb

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
# since you don't have to restart the web server when you make code changes.
77
config.cache_classes = false
88

9-
# Log error messages when you accidentally call methods on nil.
10-
config.whiny_nils = true
11-
129
# Show full error reports and disable caching
1310
config.consider_all_requests_local = true
1411
config.action_controller.perform_caching = false
@@ -27,4 +24,6 @@
2724

2825
# Expands the lines which load the assets
2926
config.assets.debug = true
27+
28+
config.eager_load = false
3029
end

config/environments/production.rb

+2
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,6 @@
5757

5858
# Send deprecation notices to registered listeners
5959
config.active_support.deprecation = :notify
60+
61+
config.eager_load = false
6062
end

config/environments/test.rb

+2
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,6 @@
3939

4040
# Allow pass debug_assets=true as a query parameter to load pages with unpackaged assets
4141
config.assets.allow_debugging = true
42+
43+
config.eager_load = false
4244
end

config/routes.rb

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
Antipodes::Application.routes.draw do
22

33
# Sample of regular route:
4-
# match 'products/:id' => 'catalog#view'
4+
# get 'products/:id' => 'catalog#view'
55

66
root :to => 'places#index'
7-
match 'geocode' => 'places#geocode'
8-
match 'antipodes' => 'places#antipodes'
9-
match 'country' => 'countries#show'
10-
match 'country/antipodes' => 'countries#antipodes'
7+
get 'geocode' => 'places#geocode'
8+
get 'antipodes' => 'places#antipodes'
9+
get 'country' => 'countries#show'
10+
get 'country/antipodes' => 'countries#antipodes'
1111

1212
end

0 commit comments

Comments
 (0)