Skip to content

Commit 803c2da

Browse files
committed
第3章のはじまり
rails new し直して、Gemfileを編集した。 「リスト 3.1 サンプルアプリケーションで使うGemfile。」のところまで。
1 parent 4386e35 commit 803c2da

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+286
-788
lines changed

Gemfile

Lines changed: 18 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,33 @@
11
source 'https://rubygems.org'
22

3-
# Bundle edge Rails instead: gem 'rails', github: 'rails/rails'
4-
gem 'rails', '4.0.0'
53

6-
# Use sqlite3 as the database for Active Record
7-
group :development do
8-
gem 'sqlite3'
4+
5+
gem 'rails', '4.1.1'
6+
7+
group :development, :test do
8+
gem 'sqlite3', '1.3.8'
9+
gem 'rspec-rails', '2.13.1'
910
end
1011

11-
# Use SCSS for stylesheets
12-
gem 'sass-rails', '~> 4.0.0'
12+
group :test do
13+
gem 'selenium-webdriver', '2.35.1'
14+
gem 'capybara', '2.1.0'
15+
end
1316

14-
# Use Uglifier as compressor for JavaScript assets
17+
gem 'sass-rails', '~> 4.0.3'
1518
gem 'uglifier', '>= 1.3.0'
16-
17-
# Use CoffeeScript for .js.coffee assets and views
1819
gem 'coffee-rails', '~> 4.0.0'
19-
20-
# See https://github.com/sstephenson/execjs#readme for more supported runtimes
21-
# gem 'therubyracer', platforms: :ruby
22-
23-
# Use jquery as the JavaScript library
2420
gem 'jquery-rails'
25-
26-
# Turbolinks makes following links in your web application faster. Read more: https://github.com/rails/turbolinks
2721
gem 'turbolinks'
28-
29-
# Build JSON APIs with ease. Read more: https://github.com/rails/jbuilder
30-
gem 'jbuilder', '~> 1.2'
31-
32-
gem 'haml-rails'
22+
gem 'jbuilder', '~> 2.0'
3323

3424
group :doc do
35-
# bundle exec rake doc:rails generates the API under doc/api.
36-
gem 'sdoc', require: false
25+
gem 'sdoc', '0.3.20', require: false
3726
end
3827

39-
# Use ActiveModel has_secure_password
40-
# gem 'bcrypt-ruby', '~> 3.0.0'
41-
42-
# Use unicorn as the app server
43-
# gem 'unicorn'
44-
45-
# Use Capistrano for deployment
46-
# gem 'capistrano', group: :development
28+
group :production do
29+
gem 'pg', '0.15.1'
30+
gem 'rails_12factor', '0.0.2'
31+
end
4732

48-
# Use debugger
49-
# gem 'debugger', group: [:development, :test]
33+
gem 'spring', group: :development

Gemfile.lock

Lines changed: 101 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -1,53 +1,58 @@
11
GEM
22
remote: https://rubygems.org/
33
specs:
4-
actionmailer (4.0.0)
5-
actionpack (= 4.0.0)
6-
mail (~> 2.5.3)
7-
actionpack (4.0.0)
8-
activesupport (= 4.0.0)
9-
builder (~> 3.1.0)
10-
erubis (~> 2.7.0)
4+
actionmailer (4.1.1)
5+
actionpack (= 4.1.1)
6+
actionview (= 4.1.1)
7+
mail (~> 2.5.4)
8+
actionpack (4.1.1)
9+
actionview (= 4.1.1)
10+
activesupport (= 4.1.1)
1111
rack (~> 1.5.2)
1212
rack-test (~> 0.6.2)
13-
activemodel (4.0.0)
14-
activesupport (= 4.0.0)
15-
builder (~> 3.1.0)
16-
activerecord (4.0.0)
17-
activemodel (= 4.0.0)
18-
activerecord-deprecated_finders (~> 1.0.2)
19-
activesupport (= 4.0.0)
20-
arel (~> 4.0.0)
21-
activerecord-deprecated_finders (1.0.3)
22-
activesupport (4.0.0)
23-
i18n (~> 0.6, >= 0.6.4)
24-
minitest (~> 4.2)
25-
multi_json (~> 1.3)
13+
actionview (4.1.1)
14+
activesupport (= 4.1.1)
15+
builder (~> 3.1)
16+
erubis (~> 2.7.0)
17+
activemodel (4.1.1)
18+
activesupport (= 4.1.1)
19+
builder (~> 3.1)
20+
activerecord (4.1.1)
21+
activemodel (= 4.1.1)
22+
activesupport (= 4.1.1)
23+
arel (~> 5.0.0)
24+
activesupport (4.1.1)
25+
i18n (~> 0.6, >= 0.6.9)
26+
json (~> 1.7, >= 1.7.7)
27+
minitest (~> 5.1)
2628
thread_safe (~> 0.1)
27-
tzinfo (~> 0.3.37)
28-
arel (4.0.2)
29-
builder (3.1.4)
29+
tzinfo (~> 1.1)
30+
arel (5.0.1.20140414130214)
31+
builder (3.2.2)
32+
capybara (2.1.0)
33+
mime-types (>= 1.16)
34+
nokogiri (>= 1.3.3)
35+
rack (>= 1.0.0)
36+
rack-test (>= 0.5.4)
37+
xpath (~> 2.0)
38+
childprocess (0.5.3)
39+
ffi (~> 1.0, >= 1.0.11)
3040
coffee-rails (4.0.1)
3141
coffee-script (>= 2.2.0)
3242
railties (>= 4.0.0, < 5.0)
3343
coffee-script (2.2.0)
3444
coffee-script-source
3545
execjs
3646
coffee-script-source (1.7.0)
47+
diff-lcs (1.2.5)
3748
erubis (2.7.0)
3849
execjs (2.2.0)
39-
haml (4.0.5)
40-
tilt
41-
haml-rails (0.5.1)
42-
actionpack (~> 4.0.0)
43-
activesupport (~> 4.0.0)
44-
haml (>= 3.1, < 5.0)
45-
railties (~> 4.0.0)
50+
ffi (1.9.3)
4651
hike (1.2.3)
4752
i18n (0.6.9)
48-
jbuilder (1.5.3)
49-
activesupport (>= 3.0.0)
50-
multi_json (>= 1.2.0)
53+
jbuilder (2.1.0)
54+
activesupport (>= 3.0.0, < 5)
55+
multi_json (~> 1.2)
5156
jquery-rails (3.1.0)
5257
railties (>= 3.0, < 5.0)
5358
thor (>= 0.14, < 2.0)
@@ -56,48 +61,76 @@ GEM
5661
mime-types (~> 1.16)
5762
treetop (~> 1.4.8)
5863
mime-types (1.25.1)
59-
minitest (4.7.5)
64+
mini_portile (0.6.0)
65+
minitest (5.3.4)
6066
multi_json (1.10.1)
67+
nokogiri (1.6.2.1)
68+
mini_portile (= 0.6.0)
69+
pg (0.15.1)
6170
polyglot (0.3.5)
6271
rack (1.5.2)
6372
rack-test (0.6.2)
6473
rack (>= 1.0)
65-
rails (4.0.0)
66-
actionmailer (= 4.0.0)
67-
actionpack (= 4.0.0)
68-
activerecord (= 4.0.0)
69-
activesupport (= 4.0.0)
74+
rails (4.1.1)
75+
actionmailer (= 4.1.1)
76+
actionpack (= 4.1.1)
77+
actionview (= 4.1.1)
78+
activemodel (= 4.1.1)
79+
activerecord (= 4.1.1)
80+
activesupport (= 4.1.1)
7081
bundler (>= 1.3.0, < 2.0)
71-
railties (= 4.0.0)
72-
sprockets-rails (~> 2.0.0)
73-
railties (4.0.0)
74-
actionpack (= 4.0.0)
75-
activesupport (= 4.0.0)
82+
railties (= 4.1.1)
83+
sprockets-rails (~> 2.0)
84+
rails_12factor (0.0.2)
85+
rails_serve_static_assets
86+
rails_stdout_logging
87+
rails_serve_static_assets (0.0.2)
88+
rails_stdout_logging (0.0.3)
89+
railties (4.1.1)
90+
actionpack (= 4.1.1)
91+
activesupport (= 4.1.1)
7692
rake (>= 0.8.7)
7793
thor (>= 0.18.1, < 2.0)
7894
rake (10.3.2)
79-
rdoc (4.1.1)
95+
rdoc (3.12.2)
8096
json (~> 1.4)
97+
rspec-core (2.13.1)
98+
rspec-expectations (2.13.0)
99+
diff-lcs (>= 1.1.3, < 2.0)
100+
rspec-mocks (2.13.1)
101+
rspec-rails (2.13.1)
102+
actionpack (>= 3.0)
103+
activesupport (>= 3.0)
104+
railties (>= 3.0)
105+
rspec-core (~> 2.13.0)
106+
rspec-expectations (~> 2.13.0)
107+
rspec-mocks (~> 2.13.0)
108+
rubyzip (0.9.9)
81109
sass (3.2.19)
82110
sass-rails (4.0.3)
83111
railties (>= 4.0.0, < 5.0)
84112
sass (~> 3.2.0)
85113
sprockets (~> 2.8, <= 2.11.0)
86114
sprockets-rails (~> 2.0)
87-
sdoc (0.4.0)
88-
json (~> 1.8)
89-
rdoc (~> 4.0, < 5.0)
115+
sdoc (0.3.20)
116+
json (>= 1.1.3)
117+
rdoc (~> 3.10)
118+
selenium-webdriver (2.35.1)
119+
childprocess (>= 0.2.5)
120+
multi_json (~> 1.0)
121+
rubyzip (< 1.0.0)
122+
websocket (~> 1.0.4)
123+
spring (1.1.3)
90124
sprockets (2.11.0)
91125
hike (~> 1.2)
92126
multi_json (~> 1.0)
93127
rack (~> 1.0)
94128
tilt (~> 1.1, != 1.3.0)
95-
sprockets-rails (2.0.1)
129+
sprockets-rails (2.1.3)
96130
actionpack (>= 3.0)
97131
activesupport (>= 3.0)
98132
sprockets (~> 2.8)
99-
sqlite3 (1.3.9)
100-
sqlite3 (1.3.9-x86-mingw32)
133+
sqlite3 (1.3.8)
101134
thor (0.19.1)
102135
thread_safe (0.3.4)
103136
tilt (1.4.1)
@@ -106,23 +139,31 @@ GEM
106139
polyglot (>= 0.3.1)
107140
turbolinks (2.2.2)
108141
coffee-rails
109-
tzinfo (0.3.39)
110-
uglifier (2.5.0)
142+
tzinfo (1.2.1)
143+
thread_safe (~> 0.1)
144+
uglifier (2.5.1)
111145
execjs (>= 0.3.0)
112146
json (>= 1.8.0)
147+
websocket (1.0.7)
148+
xpath (2.0.0)
149+
nokogiri (~> 1.3)
113150

114151
PLATFORMS
115152
ruby
116-
x86-mingw32
117153

118154
DEPENDENCIES
155+
capybara (= 2.1.0)
119156
coffee-rails (~> 4.0.0)
120-
haml-rails
121-
jbuilder (~> 1.2)
157+
jbuilder (~> 2.0)
122158
jquery-rails
123-
rails (= 4.0.0)
124-
sass-rails (~> 4.0.0)
125-
sdoc
126-
sqlite3
159+
pg (= 0.15.1)
160+
rails (= 4.1.1)
161+
rails_12factor (= 0.0.2)
162+
rspec-rails (= 2.13.1)
163+
sass-rails (~> 4.0.3)
164+
sdoc (= 0.3.20)
165+
selenium-webdriver (= 2.35.1)
166+
spring
167+
sqlite3 (= 1.3.8)
127168
turbolinks
128169
uglifier (>= 1.3.0)

Rakefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@
33

44
require File.expand_path('../config/application', __FILE__)
55

6-
Tutorial::Application.load_tasks
6+
Rails.application.load_tasks

app/assets/javascripts/microposts.js.coffee

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/javascripts/users.js.coffee

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/application.css

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@
55
* Any CSS and SCSS file within this directory, lib/assets/stylesheets, vendor/assets/stylesheets,
66
* or vendor/assets/stylesheets of plugins, if any, can be referenced here using a relative path.
77
*
8-
* You're free to add application-wide styles to this file and they'll appear at the top of the
9-
* compiled file, but it's generally better to create a new file per style scope.
8+
* You're free to add application-wide styles to this file and they'll appear at the bottom of the
9+
* compiled file so the styles you add here take precedence over styles defined in any styles
10+
* defined in the other CSS/SCSS files in this directory. It is generally better to create a new
11+
* file per style scope.
1012
*
11-
*= require_self
1213
*= require_tree .
14+
*= require_self
1315
*/

app/assets/stylesheets/microposts.css.scss

Lines changed: 0 additions & 3 deletions
This file was deleted.

app/assets/stylesheets/scaffolds.css.scss

Lines changed: 0 additions & 69 deletions
This file was deleted.

0 commit comments

Comments
 (0)