Skip to content

Commit f838203

Browse files
oestrichoestrich
committed
Update gems
1 parent bf6d5be commit f838203

4 files changed

Lines changed: 95 additions & 76 deletions

File tree

‎example/Gemfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
source 'https://rubygems.org'
22

3-
gem 'rails', '4.1.1'
3+
gem 'rails', '4.2.5.1'
44
gem 'sqlite3'
55
gem 'spring', group: :development
66
gem 'raddocs', :github => "smartlogic/raddocs"

‎example/Gemfile.lock‎

Lines changed: 88 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -10,130 +10,150 @@ GIT
1010
PATH
1111
remote: ../
1212
specs:
13-
rspec_api_documentation (4.0.0.pre)
13+
rspec_api_documentation (4.7.0)
1414
activesupport (>= 3.0.0)
1515
json (~> 1.4, >= 1.4.6)
1616
mustache (~> 0.99, >= 0.99.4)
17-
rspec (~> 3.0.0, >= 3.0.0)
17+
rspec (>= 3.0.0)
1818

1919
GEM
2020
remote: https://rubygems.org/
2121
specs:
22-
actionmailer (4.1.1)
23-
actionpack (= 4.1.1)
24-
actionview (= 4.1.1)
25-
mail (~> 2.5.4)
26-
actionpack (4.1.1)
27-
actionview (= 4.1.1)
28-
activesupport (= 4.1.1)
29-
rack (~> 1.5.2)
22+
actionmailer (4.2.5.1)
23+
actionpack (= 4.2.5.1)
24+
actionview (= 4.2.5.1)
25+
activejob (= 4.2.5.1)
26+
mail (~> 2.5, >= 2.5.4)
27+
rails-dom-testing (~> 1.0, >= 1.0.5)
28+
actionpack (4.2.5.1)
29+
actionview (= 4.2.5.1)
30+
activesupport (= 4.2.5.1)
31+
rack (~> 1.6)
3032
rack-test (~> 0.6.2)
31-
actionview (4.1.1)
32-
activesupport (= 4.1.1)
33+
rails-dom-testing (~> 1.0, >= 1.0.5)
34+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
35+
actionview (4.2.5.1)
36+
activesupport (= 4.2.5.1)
3337
builder (~> 3.1)
3438
erubis (~> 2.7.0)
35-
activemodel (4.1.1)
36-
activesupport (= 4.1.1)
39+
rails-dom-testing (~> 1.0, >= 1.0.5)
40+
rails-html-sanitizer (~> 1.0, >= 1.0.2)
41+
activejob (4.2.5.1)
42+
activesupport (= 4.2.5.1)
43+
globalid (>= 0.3.0)
44+
activemodel (4.2.5.1)
45+
activesupport (= 4.2.5.1)
3746
builder (~> 3.1)
38-
activerecord (4.1.1)
39-
activemodel (= 4.1.1)
40-
activesupport (= 4.1.1)
41-
arel (~> 5.0.0)
42-
activesupport (4.1.1)
43-
i18n (~> 0.6, >= 0.6.9)
47+
activerecord (4.2.5.1)
48+
activemodel (= 4.2.5.1)
49+
activesupport (= 4.2.5.1)
50+
arel (~> 6.0)
51+
activesupport (4.2.5.1)
52+
i18n (~> 0.7)
4453
json (~> 1.7, >= 1.7.7)
4554
minitest (~> 5.1)
46-
thread_safe (~> 0.1)
55+
thread_safe (~> 0.3, >= 0.3.4)
4756
tzinfo (~> 1.1)
48-
arel (5.0.1.20140414130214)
57+
arel (6.0.3)
4958
builder (3.2.2)
59+
concurrent-ruby (1.0.0)
5060
diff-lcs (1.2.5)
5161
erubis (2.7.0)
62+
globalid (0.3.6)
63+
activesupport (>= 4.1.0)
5264
haml (4.0.5)
5365
tilt
54-
hike (1.2.3)
55-
i18n (0.6.9)
56-
json (1.8.1)
57-
mail (2.5.4)
58-
mime-types (~> 1.16)
59-
treetop (~> 1.4.8)
60-
mime-types (1.25.1)
61-
minitest (5.3.4)
62-
multi_json (1.10.1)
63-
mustache (0.99.5)
64-
polyglot (0.3.5)
65-
rack (1.5.2)
66+
i18n (0.7.0)
67+
json (1.8.3)
68+
loofah (2.0.3)
69+
nokogiri (>= 1.5.9)
70+
mail (2.6.3)
71+
mime-types (>= 1.16, < 3)
72+
mime-types (2.99)
73+
mini_portile2 (2.0.0)
74+
minitest (5.8.4)
75+
mustache (0.99.8)
76+
nokogiri (1.6.7.2)
77+
mini_portile2 (~> 2.0.0.rc2)
78+
rack (1.6.4)
6679
rack-protection (1.5.3)
6780
rack
68-
rack-test (0.6.2)
81+
rack-test (0.6.3)
6982
rack (>= 1.0)
70-
rails (4.1.1)
71-
actionmailer (= 4.1.1)
72-
actionpack (= 4.1.1)
73-
actionview (= 4.1.1)
74-
activemodel (= 4.1.1)
75-
activerecord (= 4.1.1)
76-
activesupport (= 4.1.1)
83+
rails (4.2.5.1)
84+
actionmailer (= 4.2.5.1)
85+
actionpack (= 4.2.5.1)
86+
actionview (= 4.2.5.1)
87+
activejob (= 4.2.5.1)
88+
activemodel (= 4.2.5.1)
89+
activerecord (= 4.2.5.1)
90+
activesupport (= 4.2.5.1)
7791
bundler (>= 1.3.0, < 2.0)
78-
railties (= 4.1.1)
79-
sprockets-rails (~> 2.0)
80-
railties (4.1.1)
81-
actionpack (= 4.1.1)
82-
activesupport (= 4.1.1)
92+
railties (= 4.2.5.1)
93+
sprockets-rails
94+
rails-deprecated_sanitizer (1.0.3)
95+
activesupport (>= 4.2.0.alpha)
96+
rails-dom-testing (1.0.7)
97+
activesupport (>= 4.2.0.beta, < 5.0)
98+
nokogiri (~> 1.6.0)
99+
rails-deprecated_sanitizer (>= 1.0.1)
100+
rails-html-sanitizer (1.0.3)
101+
loofah (~> 2.0)
102+
railties (4.2.5.1)
103+
actionpack (= 4.2.5.1)
104+
activesupport (= 4.2.5.1)
83105
rake (>= 0.8.7)
84106
thor (>= 0.18.1, < 2.0)
85-
rake (10.3.2)
107+
rake (10.5.0)
86108
rspec (3.0.0)
87109
rspec-core (~> 3.0.0)
88110
rspec-expectations (~> 3.0.0)
89111
rspec-mocks (~> 3.0.0)
90-
rspec-core (3.0.1)
112+
rspec-core (3.0.4)
91113
rspec-support (~> 3.0.0)
92-
rspec-expectations (3.0.1)
114+
rspec-expectations (3.0.4)
93115
diff-lcs (>= 1.2.0, < 2.0)
94116
rspec-support (~> 3.0.0)
95-
rspec-mocks (3.0.1)
117+
rspec-mocks (3.0.4)
96118
rspec-support (~> 3.0.0)
97-
rspec-rails (3.0.1)
119+
rspec-rails (3.0.2)
98120
actionpack (>= 3.0)
99121
activesupport (>= 3.0)
100122
railties (>= 3.0)
101123
rspec-core (~> 3.0.0)
102124
rspec-expectations (~> 3.0.0)
103125
rspec-mocks (~> 3.0.0)
104126
rspec-support (~> 3.0.0)
105-
rspec-support (3.0.0)
127+
rspec-support (3.0.4)
106128
sinatra (1.4.5)
107129
rack (~> 1.4)
108130
rack-protection (~> 1.4)
109131
tilt (~> 1.3, >= 1.3.4)
110132
spring (1.1.3)
111-
sprockets (2.11.0)
112-
hike (~> 1.2)
113-
multi_json (~> 1.0)
114-
rack (~> 1.0)
115-
tilt (~> 1.1, != 1.3.0)
116-
sprockets-rails (2.1.3)
117-
actionpack (>= 3.0)
118-
activesupport (>= 3.0)
119-
sprockets (~> 2.8)
133+
sprockets (3.5.2)
134+
concurrent-ruby (~> 1.0)
135+
rack (> 1, < 3)
136+
sprockets-rails (3.0.1)
137+
actionpack (>= 4.0)
138+
activesupport (>= 4.0)
139+
sprockets (>= 3.0.0)
120140
sqlite3 (1.3.9)
121141
thor (0.19.1)
122-
thread_safe (0.3.4)
142+
thread_safe (0.3.5)
123143
tilt (1.4.1)
124-
treetop (1.4.15)
125-
polyglot
126-
polyglot (>= 0.3.1)
127-
tzinfo (1.2.1)
144+
tzinfo (1.2.2)
128145
thread_safe (~> 0.1)
129146

130147
PLATFORMS
131148
ruby
132149

133150
DEPENDENCIES
134151
raddocs!
135-
rails (= 4.1.1)
152+
rails (= 4.2.5.1)
136153
rspec-rails
137154
rspec_api_documentation!
138155
spring
139156
sqlite3
157+
158+
BUNDLED WITH
159+
1.11.2

‎example/app/controllers/orders_controller.rb‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,21 @@
11
class OrdersController < ApplicationController
2-
respond_to :json
3-
42
def index
5-
respond_with Order.all
3+
render :json => Order.all
64
end
75

86
def show
9-
respond_with Order.find(params[:id])
7+
render :json => Order.find(params[:id])
108
end
119

1210
def create
13-
respond_with Order.create(order_params)
11+
order = Order.create(order_params)
12+
render :json => order, :status => 201, :location => order_url(order)
1413
end
1514

1615
def update
1716
order = Order.find(params[:id])
1817
order.update(order_params)
19-
respond_with order
18+
render :nothing => true, :status => 204
2019
end
2120

2221
def destroy

‎example/spec/acceptance/orders_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
head "/orders" do
2727
example_request "Getting the headers" do
28-
expect(response_headers["Cache-Control"]).to eq("no-cache")
28+
expect(response_headers["Cache-Control"]).to eq("max-age=0, private, must-revalidate")
2929
end
3030
end
3131

0 commit comments

Comments
 (0)