Skip to content

Commit cb4a9df

Browse files
ebrobersongeofffranks
ebroberson
authored and
geofffranks
committed
Update for rails 6.1 and ruby 3.2
Signed-off-by: Geoff Franks <[email protected]>
1 parent 314a94e commit cb4a9df

File tree

23 files changed

+326
-183
lines changed

23 files changed

+326
-183
lines changed

‎Gemfile‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
11
source 'http://rubygems.org'
22

3-
gem 'rails', '3.0.12'
4-
gem 'gravatar_image_tag', '1.0.0.pre2'
5-
gem 'will_paginate', '3.0.pre2'
6-
gem 'sqlite3', '1.3.4'
7-
gem "pg", "~> 0.15.1"
8-
gem "cf-autoconfig", "~> 0.2.1"
9-
gem 'rails_12factor', group: :production
10-
ruby '2.1.9'
3+
gem 'rails', '~> 6.1'
4+
gem 'gravatar_image_tag'
5+
gem 'will_paginate'
6+
gem 'sqlite3'
7+
gem 'mysql2'
8+
gem 'pg'
9+
gem "cf-autoconfig"
10+
gem 'rails_12factor'
11+
gem 'thin'
12+
ruby '~> 3.2'
1113

1214
group :development do
13-
gem 'rspec-rails', '2.6.1'
14-
gem 'annotate', '2.4.0'
15-
gem 'faker', '0.3.1'
15+
gem 'rspec-rails'
16+
gem 'annotate'
17+
gem 'faker'
1618
end
1719

1820
group :test do
19-
gem 'rspec-rails', '2.6.1'
20-
gem 'webrat', '0.7.1'
21-
gem 'spork', '0.9.0.rc8'
22-
gem 'factory_girl_rails', '1.0'
21+
gem 'webrat'
22+
gem 'spork'
23+
gem 'factory_girl_rails'
2324
# gem 'autotest', '4.4.6'
2425
# gem 'autotest-rails-pure', '4.1.2'
2526
# gem 'autotest-fsevent', '0.2.4'

‎Gemfile.lock‎

Lines changed: 205 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -1,126 +1,221 @@
11
GEM
22
remote: http://rubygems.org/
33
specs:
4-
abstract (1.0.0)
5-
actionmailer (3.0.12)
6-
actionpack (= 3.0.12)
7-
mail (~> 2.2.19)
8-
actionpack (3.0.12)
9-
activemodel (= 3.0.12)
10-
activesupport (= 3.0.12)
11-
builder (~> 2.1.2)
12-
erubis (~> 2.6.6)
13-
i18n (~> 0.5.0)
14-
rack (~> 1.2.5)
15-
rack-mount (~> 0.6.14)
16-
rack-test (~> 0.5.7)
17-
tzinfo (~> 0.3.23)
18-
activemodel (3.0.12)
19-
activesupport (= 3.0.12)
20-
builder (~> 2.1.2)
21-
i18n (~> 0.5.0)
22-
activerecord (3.0.12)
23-
activemodel (= 3.0.12)
24-
activesupport (= 3.0.12)
25-
arel (~> 2.0.10)
26-
tzinfo (~> 0.3.23)
27-
activeresource (3.0.12)
28-
activemodel (= 3.0.12)
29-
activesupport (= 3.0.12)
30-
activesupport (3.0.12)
31-
annotate (2.4.0)
32-
arel (2.0.10)
33-
builder (2.1.2)
4+
actioncable (6.1.7.6)
5+
actionpack (= 6.1.7.6)
6+
activesupport (= 6.1.7.6)
7+
nio4r (~> 2.0)
8+
websocket-driver (>= 0.6.1)
9+
actionmailbox (6.1.7.6)
10+
actionpack (= 6.1.7.6)
11+
activejob (= 6.1.7.6)
12+
activerecord (= 6.1.7.6)
13+
activestorage (= 6.1.7.6)
14+
activesupport (= 6.1.7.6)
15+
mail (>= 2.7.1)
16+
actionmailer (6.1.7.6)
17+
actionpack (= 6.1.7.6)
18+
actionview (= 6.1.7.6)
19+
activejob (= 6.1.7.6)
20+
activesupport (= 6.1.7.6)
21+
mail (~> 2.5, >= 2.5.4)
22+
rails-dom-testing (~> 2.0)
23+
actionpack (6.1.7.6)
24+
actionview (= 6.1.7.6)
25+
activesupport (= 6.1.7.6)
26+
rack (~> 2.0, >= 2.0.9)
27+
rack-test (>= 0.6.3)
28+
rails-dom-testing (~> 2.0)
29+
rails-html-sanitizer (~> 1.0, >= 1.2.0)
30+
actiontext (6.1.7.6)
31+
actionpack (= 6.1.7.6)
32+
activerecord (= 6.1.7.6)
33+
activestorage (= 6.1.7.6)
34+
activesupport (= 6.1.7.6)
35+
nokogiri (>= 1.8.5)
36+
actionview (6.1.7.6)
37+
activesupport (= 6.1.7.6)
38+
builder (~> 3.1)
39+
erubi (~> 1.4)
40+
rails-dom-testing (~> 2.0)
41+
rails-html-sanitizer (~> 1.1, >= 1.2.0)
42+
activejob (6.1.7.6)
43+
activesupport (= 6.1.7.6)
44+
globalid (>= 0.3.6)
45+
activemodel (6.1.7.6)
46+
activesupport (= 6.1.7.6)
47+
activerecord (6.1.7.6)
48+
activemodel (= 6.1.7.6)
49+
activesupport (= 6.1.7.6)
50+
activestorage (6.1.7.6)
51+
actionpack (= 6.1.7.6)
52+
activejob (= 6.1.7.6)
53+
activerecord (= 6.1.7.6)
54+
activesupport (= 6.1.7.6)
55+
marcel (~> 1.0)
56+
mini_mime (>= 1.1.0)
57+
activesupport (6.1.7.6)
58+
concurrent-ruby (~> 1.0, >= 1.0.2)
59+
i18n (>= 1.6, < 2)
60+
minitest (>= 5.1)
61+
tzinfo (~> 2.0)
62+
zeitwerk (~> 2.3)
63+
annotate (3.2.0)
64+
activerecord (>= 3.2, < 8.0)
65+
rake (>= 10.4, < 14.0)
66+
builder (3.2.4)
3467
cf-autoconfig (0.2.1)
3568
cf-runtime (= 0.2.0)
3669
cf-runtime (0.2.0)
37-
diff-lcs (1.1.2)
38-
erubis (2.6.6)
39-
abstract (>= 1.0.0)
40-
factory_girl (1.3.3)
41-
factory_girl_rails (1.0)
42-
factory_girl (~> 1.3)
43-
rails (>= 3.0.0.beta4)
44-
faker (0.3.1)
45-
gravatar_image_tag (1.0.0.pre2)
46-
i18n (0.5.0)
47-
json (1.6.6)
48-
mail (2.2.19)
49-
activesupport (>= 2.3.6)
50-
i18n (>= 0.4.0)
51-
mime-types (~> 1.16)
52-
treetop (~> 1.4.8)
53-
mime-types (1.18)
54-
nokogiri (1.4.4)
55-
pg (0.15.1)
56-
polyglot (0.3.3)
57-
rack (1.2.5)
58-
rack-mount (0.6.14)
59-
rack (>= 1.0.0)
60-
rack-test (0.5.7)
61-
rack (>= 1.0)
62-
rails (3.0.12)
63-
actionmailer (= 3.0.12)
64-
actionpack (= 3.0.12)
65-
activerecord (= 3.0.12)
66-
activeresource (= 3.0.12)
67-
activesupport (= 3.0.12)
68-
bundler (~> 1.0)
69-
railties (= 3.0.12)
70-
rails_12factor (0.0.2)
70+
concurrent-ruby (1.2.2)
71+
crass (1.0.6)
72+
daemons (1.4.1)
73+
date (3.3.4)
74+
diff-lcs (1.5.0)
75+
erubi (1.12.0)
76+
eventmachine (1.2.7)
77+
factory_girl (4.9.0)
78+
activesupport (>= 3.0.0)
79+
factory_girl_rails (4.9.0)
80+
factory_girl (~> 4.9.0)
81+
railties (>= 3.0.0)
82+
faker (3.2.2)
83+
i18n (>= 1.8.11, < 2)
84+
globalid (1.2.1)
85+
activesupport (>= 6.1)
86+
gravatar_image_tag (1.2.0)
87+
i18n (1.14.1)
88+
concurrent-ruby (~> 1.0)
89+
loofah (2.21.4)
90+
crass (~> 1.0.2)
91+
nokogiri (>= 1.12.0)
92+
mail (2.8.1)
93+
mini_mime (>= 0.1.1)
94+
net-imap
95+
net-pop
96+
net-smtp
97+
marcel (1.0.2)
98+
method_source (1.0.0)
99+
mini_mime (1.1.5)
100+
minitest (5.20.0)
101+
mysql2 (0.5.5)
102+
net-imap (0.4.4)
103+
date
104+
net-protocol
105+
net-pop (0.1.2)
106+
net-protocol
107+
net-protocol (0.2.2)
108+
timeout
109+
net-smtp (0.4.0)
110+
net-protocol
111+
nio4r (2.5.9)
112+
nokogiri (1.15.4-x86_64-linux)
113+
racc (~> 1.4)
114+
pg (1.5.4)
115+
racc (1.7.3)
116+
rack (2.2.8)
117+
rack-test (2.1.0)
118+
rack (>= 1.3)
119+
rails (6.1.7.6)
120+
actioncable (= 6.1.7.6)
121+
actionmailbox (= 6.1.7.6)
122+
actionmailer (= 6.1.7.6)
123+
actionpack (= 6.1.7.6)
124+
actiontext (= 6.1.7.6)
125+
actionview (= 6.1.7.6)
126+
activejob (= 6.1.7.6)
127+
activemodel (= 6.1.7.6)
128+
activerecord (= 6.1.7.6)
129+
activestorage (= 6.1.7.6)
130+
activesupport (= 6.1.7.6)
131+
bundler (>= 1.15.0)
132+
railties (= 6.1.7.6)
133+
sprockets-rails (>= 2.0.0)
134+
rails-dom-testing (2.2.0)
135+
activesupport (>= 5.0.0)
136+
minitest
137+
nokogiri (>= 1.6)
138+
rails-html-sanitizer (1.6.0)
139+
loofah (~> 2.21)
140+
nokogiri (~> 1.14)
141+
rails_12factor (0.0.3)
71142
rails_serve_static_assets
72143
rails_stdout_logging
73-
rails_serve_static_assets (0.0.2)
74-
rails_stdout_logging (0.0.3)
75-
railties (3.0.12)
76-
actionpack (= 3.0.12)
77-
activesupport (= 3.0.12)
78-
rake (>= 0.8.7)
79-
rdoc (~> 3.4)
80-
thor (~> 0.14.4)
81-
rake (0.9.2.2)
82-
rdoc (3.12)
83-
json (~> 1.4)
84-
rspec (2.6.0)
85-
rspec-core (~> 2.6.0)
86-
rspec-expectations (~> 2.6.0)
87-
rspec-mocks (~> 2.6.0)
88-
rspec-core (2.6.4)
89-
rspec-expectations (2.6.0)
90-
diff-lcs (~> 1.1.2)
91-
rspec-mocks (2.6.0)
92-
rspec-rails (2.6.1)
93-
actionpack (~> 3.0)
94-
activesupport (~> 3.0)
95-
railties (~> 3.0)
96-
rspec (~> 2.6.0)
97-
spork (0.9.0.rc8)
98-
sqlite3 (1.3.4)
99-
thor (0.14.6)
100-
treetop (1.4.10)
101-
polyglot
102-
polyglot (>= 0.3.1)
103-
tzinfo (0.3.32)
104-
webrat (0.7.1)
144+
rails_serve_static_assets (0.0.5)
145+
rails_stdout_logging (0.0.5)
146+
railties (6.1.7.6)
147+
actionpack (= 6.1.7.6)
148+
activesupport (= 6.1.7.6)
149+
method_source
150+
rake (>= 12.2)
151+
thor (~> 1.0)
152+
rake (13.1.0)
153+
rspec-core (3.12.2)
154+
rspec-support (~> 3.12.0)
155+
rspec-expectations (3.12.3)
156+
diff-lcs (>= 1.2.0, < 2.0)
157+
rspec-support (~> 3.12.0)
158+
rspec-mocks (3.12.6)
159+
diff-lcs (>= 1.2.0, < 2.0)
160+
rspec-support (~> 3.12.0)
161+
rspec-rails (6.0.3)
162+
actionpack (>= 6.1)
163+
activesupport (>= 6.1)
164+
railties (>= 6.1)
165+
rspec-core (~> 3.12)
166+
rspec-expectations (~> 3.12)
167+
rspec-mocks (~> 3.12)
168+
rspec-support (~> 3.12)
169+
rspec-support (3.12.1)
170+
spork (0.9.2)
171+
sprockets (4.2.1)
172+
concurrent-ruby (~> 1.0)
173+
rack (>= 2.2.4, < 4)
174+
sprockets-rails (3.4.2)
175+
actionpack (>= 5.2)
176+
activesupport (>= 5.2)
177+
sprockets (>= 3.0.0)
178+
sqlite3 (1.6.8-x86_64-linux)
179+
thin (1.8.2)
180+
daemons (~> 1.0, >= 1.0.9)
181+
eventmachine (~> 1.0, >= 1.0.4)
182+
rack (>= 1, < 3)
183+
thor (1.3.0)
184+
timeout (0.4.1)
185+
tzinfo (2.0.6)
186+
concurrent-ruby (~> 1.0)
187+
webrat (0.7.3)
105188
nokogiri (>= 1.2.0)
106189
rack (>= 1.0)
107190
rack-test (>= 0.5.3)
108-
will_paginate (3.0.pre2)
191+
websocket-driver (0.7.6)
192+
websocket-extensions (>= 0.1.0)
193+
websocket-extensions (0.1.5)
194+
will_paginate (4.0.0)
195+
zeitwerk (2.6.12)
109196

110197
PLATFORMS
111-
ruby
198+
x86_64-linux
112199

113200
DEPENDENCIES
114-
annotate (= 2.4.0)
115-
cf-autoconfig (~> 0.2.1)
116-
factory_girl_rails (= 1.0)
117-
faker (= 0.3.1)
118-
gravatar_image_tag (= 1.0.0.pre2)
119-
pg (~> 0.15.1)
120-
rails (= 3.0.12)
201+
annotate
202+
cf-autoconfig
203+
factory_girl_rails
204+
faker
205+
gravatar_image_tag
206+
mysql2
207+
pg
208+
rails (~> 6.1)
121209
rails_12factor
122-
rspec-rails (= 2.6.1)
123-
spork (= 0.9.0.rc8)
124-
sqlite3 (= 1.3.4)
125-
webrat (= 0.7.1)
126-
will_paginate (= 3.0.pre2)
210+
rspec-rails
211+
spork
212+
sqlite3
213+
thin
214+
webrat
215+
will_paginate
216+
217+
RUBY VERSION
218+
ruby 3.2.2p53
219+
220+
BUNDLED WITH
221+
2.4.21

‎app/assets/config/manifest.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
//= link_tree ../images
2+
//= link_directory ../stylesheets .css
3+
//= link_tree ../../javascript .js
4+
//= link_tree ../../../vendor/javascript .js

‎app/assets/images/.keep‎

Whitespace-only changes.

‎app/assets/stylesheets/.gitkeep‎

Whitespace-only changes.

‎app/controllers/microposts_controller.rb‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
class MicropostsController < ApplicationController
2-
before_filter :authenticate
3-
before_filter :authorized_user, :only => :destroy
2+
before_action :authenticate
3+
before_action :authorized_user, :only => :destroy
44

55
def create
6-
@micropost = current_user.microposts.build(params[:micropost])
6+
@micropost = current_user.microposts.build(params[:micropost].permit([:content]))
77
if @micropost.save
88
redirect_to root_path, :flash => { :success => "Micropost created!" }
99
else
@@ -23,4 +23,4 @@ def authorized_user
2323
@micropost = current_user.microposts.find_by_id(params[:id])
2424
redirect_to root_path if @micropost.nil?
2525
end
26-
end
26+
end

0 commit comments

Comments
 (0)