api_resource 0.3.5 → 0.3.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/VERSION +1 -1
  2. data/api_resource.gemspec +3 -3
  3. data/lib/api_resource/base.rb +2 -1
  4. data/lib/api_resource/connection.rb +8 -7
  5. data/spec/lib/connection_spec.rb +62 -1
  6. metadata +54 -54
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.5
1
+ 0.3.6
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.3.5"
8
+ s.version = "0.3.6"
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-07-07"
12
+ s.date = "2012-07-12"
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 = [
@@ -83,7 +83,7 @@ Gem::Specification.new do |s|
83
83
  s.homepage = "http://github.com/ejlangev/resource"
84
84
  s.licenses = ["MIT"]
85
85
  s.require_paths = ["lib"]
86
- s.rubygems_version = "1.8.11"
86
+ s.rubygems_version = "1.8.17"
87
87
  s.summary = "A replacement for ActiveResource for RESTful APIs that handles associated object and multiple data sources"
88
88
 
89
89
  if s.respond_to? :specification_version then
data/lib/api_resource/base.rb CHANGED
@@ -123,6 +123,7 @@ module ApiResource
123
123
 
124
124
  def token_with_new_token_set=(new_token)
125
125
  self.token_without_new_token_set = new_token
126
+ self.connection(true)
126
127
  self.descendants.each do |child|
127
128
  child.send(:token=, new_token)
128
129
  end
@@ -177,7 +178,7 @@ module ApiResource
177
178
  alias_method_chain :open_timeout=, :connection_reset
178
179
 
179
180
  def connection(refresh = false)
180
- @connection = Connection.new(self.site, self.format) if refresh || @connection.nil?
181
+ @connection = Connection.new(self.site, self.format, self.headers) if refresh || @connection.nil?
181
182
  @connection.timeout = self.timeout
182
183
  @connection
183
184
  end
data/lib/api_resource/connection.rb CHANGED
@@ -20,7 +20,7 @@ module ApiResource
20
20
  }
21
21
 
22
22
  attr_reader :site, :user, :password, :auth_type, :timeout, :proxy, :ssl_options
23
- attr_accessor :format
23
+ attr_accessor :format, :headers
24
24
 
25
25
  class << self
26
26
  def requests
@@ -30,12 +30,13 @@ module ApiResource
30
30
 
31
31
  # The +site+ parameter is required and will set the +site+
32
32
  # attribute to the URI for the remote resource service.
33
- def initialize(site, format = ApiResource::Formats::JsonFormat)
33
+ def initialize(site, format = ApiResource::Formats::JsonFormat, headers)
34
34
  raise ArgumentError, 'Missing site URI' unless site
35
35
  @user = @password = nil
36
36
  @uri_parser = URI.const_defined?(:Parser) ? URI::Parser.new : URI
37
37
  self.site = site
38
38
  self.format = format
39
+ self.headers = headers
39
40
  end
40
41
 
41
42
  # Set URI for remote service.
@@ -50,7 +51,7 @@ module ApiResource
50
51
  @timeout = timeout
51
52
  end
52
53
 
53
- def get(path, headers = {})
54
+ def get(path, headers = self.headers)
54
55
  # our site and headers for this request
55
56
  site = self.site.merge(path)
56
57
  headers = build_request_headers(headers, :get, site)
@@ -60,17 +61,17 @@ module ApiResource
60
61
  end
61
62
  end
62
63
 
63
- def delete(path, headers = {})
64
+ def delete(path, headers = self.headers)
64
65
  request(:delete, path, build_request_headers(headers, :delete, self.site.merge(path)))
65
66
  return true
66
67
  end
67
68
 
68
- def head(path, headers = {})
69
+ def head(path, headers = self.headers)
69
70
  request(:head, path, build_request_headers(headers, :head, self.site.merge(path)))
70
71
  end
71
72
 
72
73
 
73
- def put(path, body = {}, headers = {})
74
+ def put(path, body = {}, headers = self.headers)
74
75
  # If there's a file to send then we can't use JSON or XML
75
76
  if !body.is_a?(String) && RestClient::Payload.has_file?(body)
76
77
  format.decode(request(:put, path, body, build_request_headers(headers, :put, self.site.merge(path))))
@@ -79,7 +80,7 @@ module ApiResource
79
80
  end
80
81
  end
81
82
 
82
- def post(path, body = {}, headers = {})
83
+ def post(path, body = {}, headers = self.headers)
83
84
  if !body.is_a?(String) && RestClient::Payload.has_file?(body)
84
85
  format.decode(request(:post, path, body, build_request_headers(headers, :post, self.site.merge(path))))
85
86
  else
data/spec/lib/connection_spec.rb CHANGED
@@ -10,10 +10,71 @@ describe Connection do
10
10
  end
11
11
 
12
12
  it "should be able to set a default token value, which is passed through each request" do
13
- TestResource.connection.expects(:get).with("/test_resources/1.json", "Lifebooker-Token" => "abc")
13
+ ApiResource::Mocks::Connection.expects(:get).with("/test_resources/1.json", {"Accept"=>"application/json", "Lifebooker-Token" => "abc"}).returns(ApiResource::Mocks::MockResponse.new({}))
14
14
  ApiResource::Base.token = "abc"
15
15
  TestResource.find(1)
16
16
  end
17
+
18
+ it "should set the Lifebooker-Token if one is present for GET requests" do
19
+ token = Kernel.rand(100000).to_s
20
+ ApiResource::Mocks::Connection.expects(:get).with("/test_resources/1.json", {"Accept"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
21
+
22
+ ApiResource::Base.token = token
23
+
24
+ TestResource.connection.get("/test_resources/1.json")
25
+ end
26
+
27
+ it "should set the Lifebooker-Token if one is present for DELETE requests" do
28
+ token = Kernel.rand(100000).to_s
29
+ ApiResource::Mocks::Connection.expects(:delete).with("/test_resources/1.json", {"Accept"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
30
+
31
+ ApiResource::Base.token = token
32
+
33
+ TestResource.connection.delete("/test_resources/1.json")
34
+ end
35
+
36
+ it "should set the Lifebooker-Token if one is present for :head requests" do
37
+ token = Kernel.rand(100000).to_s
38
+ ApiResource::Mocks::Connection.expects(:head).with("/test_resources/1.json", {"Accept"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
39
+
40
+ ApiResource::Base.token = token
41
+
42
+ TestResource.connection.head("/test_resources/1.json")
43
+ end
44
+
45
+ it "should set the Lifebooker-Token if one is present for POST requests" do
46
+ token = Kernel.rand(100000).to_s
47
+ ApiResource::Mocks::Connection.expects(:post).with("/test_resources/1.json", {}, {"Content-Type"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
48
+
49
+ ApiResource::Base.token = token
50
+
51
+ TestResource.connection.post("/test_resources/1.json")
52
+ end
53
+
54
+ it "should set the Lifebooker-Token if one is present for PUT requests" do
55
+ token = Kernel.rand(100000).to_s
56
+ ApiResource::Mocks::Connection.expects(:put).with("/test_resources/1.json", {}, {"Content-Type"=>"application/json", 'Lifebooker-Token' => "#{token}"}).returns(ApiResource::Mocks::MockResponse.new({}))
57
+
58
+ ApiResource::Base.token = token
59
+
60
+ TestResource.connection.put("/test_resources/1.json")
61
+ end
62
+
63
+ it "should set its headers upon initialization" do
64
+ token = Kernel.rand(100000).to_s
65
+ ApiResource::Base.token = token
66
+
67
+ TestResource.connection.headers.include?("Lifebooker-Token").should eql true
68
+ TestResource.connection.headers["Lifebooker-Token"] = token
69
+ end
70
+
71
+ it "should reset headers upon initialization" do
72
+ token = Kernel.rand(100000).to_s
73
+ ApiResource::Base.token = token
74
+
75
+ TestResource.connection.headers.include?("Lifebooker-Token").should eql true
76
+ TestResource.connection.headers["Lifebooker-Token"] = token
77
+ end
17
78
 
18
79
  it "should be able to set a token for a given block" do
19
80
  ApiResource::Base.token = "123456"
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.3.5
4
+ version: 0.3.6
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-07-07 00:00:00.000000000 Z
12
+ date: 2012-07-12 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &2160638840 !ruby/object:Gem::Requirement
16
+ requirement: &70142911940040 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '3'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2160638840
24
+ version_requirements: *70142911940040
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: hash_dealer
27
- requirement: &2160649640 !ruby/object:Gem::Requirement
27
+ requirement: &70142911938960 !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: *2160649640
35
+ version_requirements: *70142911938960
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rest-client
38
- requirement: &2160661900 !ruby/object:Gem::Requirement
38
+ requirement: &70142911938200 !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: *2160661900
46
+ version_requirements: *70142911938200
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: log4r
49
- requirement: &2160671720 !ruby/object:Gem::Requirement
49
+ requirement: &70142911937380 !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: *2160671720
57
+ version_requirements: *70142911937380
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: differ
60
- requirement: &2160679940 !ruby/object:Gem::Requirement
60
+ requirement: &70142911936380 !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: *2160679940
68
+ version_requirements: *70142911936380
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: colorize
71
- requirement: &2160773040 !ruby/object:Gem::Requirement
71
+ requirement: &70142911935440 !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: *2160773040
79
+ version_requirements: *70142911935440
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: json
82
- requirement: &2161308060 !ruby/object:Gem::Requirement
82
+ requirement: &70142911934640 !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: *2161308060
90
+ version_requirements: *70142911934640
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: pry
93
- requirement: &2168857960 !ruby/object:Gem::Requirement
93
+ requirement: &70142911933820 !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: *2168857960
101
+ version_requirements: *70142911933820
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: pry-doc
104
- requirement: &2169018780 !ruby/object:Gem::Requirement
104
+ requirement: &70142911932800 !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: *2169018780
112
+ version_requirements: *70142911932800
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: pry-nav
115
- requirement: &2169045040 !ruby/object:Gem::Requirement
115
+ requirement: &70142911931120 !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: *2169045040
123
+ version_requirements: *70142911931120
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: rspec
126
- requirement: &2169382600 !ruby/object:Gem::Requirement
126
+ requirement: &70142911930520 !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: *2169382600
134
+ version_requirements: *70142911930520
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: ruby-debug19
137
- requirement: &2169382120 !ruby/object:Gem::Requirement
137
+ requirement: &70142911929840 !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: *2169382120
145
+ version_requirements: *70142911929840
146
146
  - !ruby/object:Gem::Dependency
147
147
  name: growl
148
- requirement: &2169381640 !ruby/object:Gem::Requirement
148
+ requirement: &70142911928860 !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: *2169381640
156
+ version_requirements: *70142911928860
157
157
  - !ruby/object:Gem::Dependency
158
158
  name: rspec-rails
159
- requirement: &2169381160 !ruby/object:Gem::Requirement
159
+ requirement: &70142911920480 !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: *2169381160
167
+ version_requirements: *70142911920480
168
168
  - !ruby/object:Gem::Dependency
169
169
  name: factory_girl
170
- requirement: &2169380680 !ruby/object:Gem::Requirement
170
+ requirement: &70142911919560 !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: *2169380680
178
+ version_requirements: *70142911919560
179
179
  - !ruby/object:Gem::Dependency
180
180
  name: simplecov
181
- requirement: &2169380200 !ruby/object:Gem::Requirement
181
+ requirement: &70142911918840 !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: *2169380200
189
+ version_requirements: *70142911918840
190
190
  - !ruby/object:Gem::Dependency
191
191
  name: faker
192
- requirement: &2169379720 !ruby/object:Gem::Requirement
192
+ requirement: &70142911918180 !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: *2169379720
200
+ version_requirements: *70142911918180
201
201
  - !ruby/object:Gem::Dependency
202
202
  name: guard-bundler
203
- requirement: &2169379240 !ruby/object:Gem::Requirement
203
+ requirement: &70142911917380 !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: *2169379240
211
+ version_requirements: *70142911917380
212
212
  - !ruby/object:Gem::Dependency
213
213
  name: guard-rspec
214
- requirement: &2169378760 !ruby/object:Gem::Requirement
214
+ requirement: &70142911916660 !ruby/object:Gem::Requirement
215
215
  none: false
216
216
  requirements:
217
217
  - - ! '>='
@@ -219,10 +219,10 @@ dependencies:
219
219
  version: '0'
220
220
  type: :development
221
221
  prerelease: false
222
- version_requirements: *2169378760
222
+ version_requirements: *70142911916660
223
223
  - !ruby/object:Gem::Dependency
224
224
  name: guard-spork
225
- requirement: &2169378280 !ruby/object:Gem::Requirement
225
+ requirement: &70142911915980 !ruby/object:Gem::Requirement
226
226
  none: false
227
227
  requirements:
228
228
  - - ! '>='
@@ -230,10 +230,10 @@ dependencies:
230
230
  version: '0'
231
231
  type: :development
232
232
  prerelease: false
233
- version_requirements: *2169378280
233
+ version_requirements: *70142911915980
234
234
  - !ruby/object:Gem::Dependency
235
235
  name: mocha
236
- requirement: &2169377800 !ruby/object:Gem::Requirement
236
+ requirement: &70142911915260 !ruby/object:Gem::Requirement
237
237
  none: false
238
238
  requirements:
239
239
  - - ! '>='
@@ -241,10 +241,10 @@ dependencies:
241
241
  version: '0'
242
242
  type: :development
243
243
  prerelease: false
244
- version_requirements: *2169377800
244
+ version_requirements: *70142911915260
245
245
  - !ruby/object:Gem::Dependency
246
246
  name: bundler
247
- requirement: &2169377320 !ruby/object:Gem::Requirement
247
+ requirement: &70142911914660 !ruby/object:Gem::Requirement
248
248
  none: false
249
249
  requirements:
250
250
  - - ! '>='
@@ -252,10 +252,10 @@ dependencies:
252
252
  version: '0'
253
253
  type: :development
254
254
  prerelease: false
255
- version_requirements: *2169377320
255
+ version_requirements: *70142911914660
256
256
  - !ruby/object:Gem::Dependency
257
257
  name: jeweler
258
- requirement: &2169376840 !ruby/object:Gem::Requirement
258
+ requirement: &70142911913880 !ruby/object:Gem::Requirement
259
259
  none: false
260
260
  requirements:
261
261
  - - ~>
@@ -263,10 +263,10 @@ dependencies:
263
263
  version: 1.6.4
264
264
  type: :development
265
265
  prerelease: false
266
- version_requirements: *2169376840
266
+ version_requirements: *70142911913880
267
267
  - !ruby/object:Gem::Dependency
268
268
  name: activerecord
269
- requirement: &2169372220 !ruby/object:Gem::Requirement
269
+ requirement: &70142911913220 !ruby/object:Gem::Requirement
270
270
  none: false
271
271
  requirements:
272
272
  - - ~>
@@ -274,10 +274,10 @@ dependencies:
274
274
  version: '3'
275
275
  type: :development
276
276
  prerelease: false
277
- version_requirements: *2169372220
277
+ version_requirements: *70142911913220
278
278
  - !ruby/object:Gem::Dependency
279
279
  name: sqlite3
280
- requirement: &2169368180 !ruby/object:Gem::Requirement
280
+ requirement: &70142911912420 !ruby/object:Gem::Requirement
281
281
  none: false
282
282
  requirements:
283
283
  - - ! '>='
@@ -285,7 +285,7 @@ dependencies:
285
285
  version: '0'
286
286
  type: :development
287
287
  prerelease: false
288
- version_requirements: *2169368180
288
+ version_requirements: *70142911912420
289
289
  description: A replacement for ActiveResource for RESTful APIs that handles associated
290
290
  object and multiple data sources
291
291
  email: ejl6266@gmail.com
@@ -372,7 +372,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
372
372
  version: '0'
373
373
  segments:
374
374
  - 0
375
- hash: -736365968347087456
375
+ hash: 2471187332102726494
376
376
  required_rubygems_version: !ruby/object:Gem::Requirement
377
377
  none: false
378
378
  requirements:
@@ -381,7 +381,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
381
381
  version: '0'
382
382
  requirements: []
383
383
  rubyforge_project:
384
- rubygems_version: 1.8.11
384
+ rubygems_version: 1.8.17
385
385
  signing_key:
386
386
  specification_version: 3
387
387
  summary: A replacement for ActiveResource for RESTful APIs that handles associated