api_resource 0.2.6 → 0.2.7

Sign up to get free protection for your applications and to get access to all the features.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.2.6
1
+ 0.2.7
data/api_resource.gemspec CHANGED
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "api_resource"
8
- s.version = "0.2.6"
8
+ s.version = "0.2.7"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Ethan Langevin"]
12
- s.date = "2012-03-15"
12
+ s.date = "2012-03-20"
13
13
  s.description = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
14
14
  s.email = "ejl6266@gmail.com"
15
15
  s.extra_rdoc_files = [
@@ -241,7 +241,9 @@ module ApiResource
241
241
  # if response = LifebookerClient::Mocks.find_response(request)
242
242
  # response
243
243
  # else
244
- # raise InvalidRequestError.new("Could not find a response recorded for #{request.to_s} - Responses recorded are: - #{inspect_responses}")
244
+ # raise InvalidRequestError.new("Could not find a response
245
+ # recorded for #{request.to_s} - Responses recorded are: -
246
+ # #{inspect_responses}")
245
247
  # end
246
248
  # end
247
249
  instance_eval <<-EOE, __FILE__, __LINE__ + 1
@@ -251,7 +253,13 @@ module ApiResource
251
253
  request = MockRequest.new(:#{method}, path, opts)
252
254
  self.requests << request
253
255
  if response = Mocks.find_response(request)
254
- response[:response].tap{|resp| resp.generate_response(response[:params])}
256
+ response[:response].tap{|resp|
257
+ resp.generate_response(
258
+ request.params
259
+ .with_indifferent_access
260
+ .merge(response[:params].with_indifferent_access)
261
+ )
262
+ }
255
263
  else
256
264
  raise ApiResource::ResourceNotFound.new(
257
265
  MockResponse.new({}, {:headers => {"Content-type" => "application/json"}, :status_code => 404}),
@@ -24,5 +24,13 @@ describe Mocks do
24
24
 
25
25
  ApiResource.raise_missing_definition_error = old_err_status
26
26
  end
27
+
28
+ it "should merge params for a request" do
29
+ resp = ApiResource::Base.connection.get(
30
+ "/mock_with_block/1?#{{:test => "abc"}.to_query}"
31
+ )
32
+ resp["id"].should eql "1"
33
+ resp["test"].should eql "abc"
34
+ end
27
35
 
28
36
  end
@@ -8,6 +8,14 @@ Mocks.define do
8
8
  get(HashDealer.roll(:active_birthday_test_association_resource), :params => {:active => true, :birthday => true})
9
9
  end
10
10
 
11
+ endpoint("/mock_with_block/:id") do
12
+ get({:abc => 123}, {:params => {:test => "123"}.matcher}) do |params|
13
+ self[:test] = params[:test]
14
+ self[:id] = params[:id]
15
+ self
16
+ end
17
+ end
18
+
11
19
  endpoint('/multi_object_association') do
12
20
  get((0..4).to_a.collect{HashDealer.roll(:test_association_resource)}, :params => {})
13
21
  get((0..4).to_a.collect{HashDealer.roll(:active_test_association_resource)}, :params => {:active => true})
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: api_resource
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.2.6
4
+ version: 0.2.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-15 00:00:00.000000000 Z
12
+ date: 2012-03-20 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &2165270300 !ruby/object:Gem::Requirement
16
+ requirement: &2166348340 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - =
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.0.9
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2165270300
24
+ version_requirements: *2166348340
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: hash_dealer
27
- requirement: &2165256520 !ruby/object:Gem::Requirement
27
+ requirement: &2166347740 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2165256520
35
+ version_requirements: *2166347740
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rest-client
38
- requirement: &2165233680 !ruby/object:Gem::Requirement
38
+ requirement: &2166347160 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2165233680
46
+ version_requirements: *2166347160
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: log4r
49
- requirement: &2165231660 !ruby/object:Gem::Requirement
49
+ requirement: &2166346540 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *2165231660
57
+ version_requirements: *2166346540
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: differ
60
- requirement: &2165230180 !ruby/object:Gem::Requirement
60
+ requirement: &2166345920 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *2165230180
68
+ version_requirements: *2166345920
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: colorize
71
- requirement: &2165229340 !ruby/object:Gem::Requirement
71
+ requirement: &2166345080 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *2165229340
79
+ version_requirements: *2166345080
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: json
82
- requirement: &2165228280 !ruby/object:Gem::Requirement
82
+ requirement: &2166344200 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :runtime
89
89
  prerelease: false
90
- version_requirements: *2165228280
90
+ version_requirements: *2166344200
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rspec
93
- requirement: &2165227400 !ruby/object:Gem::Requirement
93
+ requirement: &2166343560 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *2165227400
101
+ version_requirements: *2166343560
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: ruby-debug19
104
- requirement: &2165226420 !ruby/object:Gem::Requirement
104
+ requirement: &2166342540 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *2165226420
112
+ version_requirements: *2166342540
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: growl
115
- requirement: &2165225600 !ruby/object:Gem::Requirement
115
+ requirement: &2166341860 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: '0'
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *2165225600
123
+ version_requirements: *2166341860
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec-rails
126
- requirement: &2165225020 !ruby/object:Gem::Requirement
126
+ requirement: &2166341020 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: '0'
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *2165225020
134
+ version_requirements: *2166341020
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: factory_girl
137
- requirement: &2165224220 !ruby/object:Gem::Requirement
137
+ requirement: &2166340020 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
142
142
  version: '0'
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *2165224220
145
+ version_requirements: *2166340020
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: simplecov
148
- requirement: &2165223520 !ruby/object:Gem::Requirement
148
+ requirement: &2166339400 !ruby/object:Gem::Requirement
149
149
  none: false
150
150
  requirements:
151
151
  - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
153
153
  version: '0'
154
154
  type: :development
155
155
  prerelease: false
156
- version_requirements: *2165223520
156
+ version_requirements: *2166339400
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: faker
159
- requirement: &2165222520 !ruby/object:Gem::Requirement
159
+ requirement: &2166338820 !ruby/object:Gem::Requirement
160
160
  none: false
161
161
  requirements:
162
162
  - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
164
164
  version: '0'
165
165
  type: :development
166
166
  prerelease: false
167
- version_requirements: *2165222520
167
+ version_requirements: *2166338820
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: guard
170
- requirement: &2165220880 !ruby/object:Gem::Requirement
170
+ requirement: &2166338240 !ruby/object:Gem::Requirement
171
171
  none: false
172
172
  requirements:
173
173
  - - ! '>='
@@ -175,10 +175,10 @@ dependencies:
175
175
  version: '0'
176
176
  type: :development
177
177
  prerelease: false
178
- version_requirements: *2165220880
178
+ version_requirements: *2166338240
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: guard-rspec
181
- requirement: &2165220040 !ruby/object:Gem::Requirement
181
+ requirement: &2166337600 !ruby/object:Gem::Requirement
182
182
  none: false
183
183
  requirements:
184
184
  - - ! '>='
@@ -186,10 +186,10 @@ dependencies:
186
186
  version: '0'
187
187
  type: :development
188
188
  prerelease: false
189
- version_requirements: *2165220040
189
+ version_requirements: *2166337600
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: mocha
192
- requirement: &2165218740 !ruby/object:Gem::Requirement
192
+ requirement: &2166318300 !ruby/object:Gem::Requirement
193
193
  none: false
194
194
  requirements:
195
195
  - - ! '>='
@@ -197,10 +197,10 @@ dependencies:
197
197
  version: '0'
198
198
  type: :development
199
199
  prerelease: false
200
- version_requirements: *2165218740
200
+ version_requirements: *2166318300
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: bundler
203
- requirement: &2165217560 !ruby/object:Gem::Requirement
203
+ requirement: &2166317760 !ruby/object:Gem::Requirement
204
204
  none: false
205
205
  requirements:
206
206
  - - ! '>='
@@ -208,10 +208,10 @@ dependencies:
208
208
  version: '0'
209
209
  type: :development
210
210
  prerelease: false
211
- version_requirements: *2165217560
211
+ version_requirements: *2166317760
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: jeweler
214
- requirement: &2165216380 !ruby/object:Gem::Requirement
214
+ requirement: &2166317240 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ~>
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: 1.6.4
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *2165216380
222
+ version_requirements: *2166317240
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: activerecord
225
- requirement: &2165215240 !ruby/object:Gem::Requirement
225
+ requirement: &2166316660 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - =
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: 3.0.9
231
231
  type: :development
232
232
  prerelease: false
233
- version_requirements: *2165215240
233
+ version_requirements: *2166316660
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: sqlite3
236
- requirement: &2165214200 !ruby/object:Gem::Requirement
236
+ requirement: &2166316120 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ! '>='
@@ -241,7 +241,7 @@ dependencies:
241
241
  version: '0'
242
242
  type: :development
243
243
  prerelease: false
244
- version_requirements: *2165214200
244
+ version_requirements: *2166316120
245
245
  description: A replacement for ActiveResource for RESTful APIs that handles associated
246
246
  object and multiple data sources
247
247
  email: ejl6266@gmail.com
@@ -325,7 +325,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
325
325
  version: '0'
326
326
  segments:
327
327
  - 0
328
- hash: -2414595039217114624
328
+ hash: 4226788220954517415
329
329
  required_rubygems_version: !ruby/object:Gem::Requirement
330
330
  none: false
331
331
  requirements: