curlyrest 0.1.26 → 0.1.27

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.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 36c68cb7fb08b8cb44f2f542903468b10be223b7
4
- data.tar.gz: e9b67323de62f1752d5a2d6cb653492776d420ee
3
+ metadata.gz: 1f101faf584784aa67d37c43322f6007701641e1
4
+ data.tar.gz: fa4a8820930ce3501bb0f0816713bff9589d73ff
5
5
  SHA512:
6
- metadata.gz: 6589afe14d42f4a8a9f2589257017e81f2f659acd9b884f0d008f4ae0ff3f9cfb0443e042e652ce145d98fdb3f4562259b841a10fbeaea8c943fdaf6cd0bce3a
7
- data.tar.gz: 74aa02f4dc6ad72dd55f58e309fd5e33e91537dd749c68a888f2e15a2c2d280fb20d858a2399cef7bd0ab9779289ce8f0605bd1a7f5adac9865aafbcd2ccebd2
6
+ metadata.gz: 90aef06764d76d36de7dc63addf7e9620600073b029623a5e20539c725d1a4e8bf3bf78b433e611a27f35946d56bbde1a1779ac8331fa692f42308799f9a294f
7
+ data.tar.gz: f7568860e5ac9b7d98d32ca5c7bfb7993bc93bfa601af2454508f84dfab59f4de0af5a0e59261f705dfe5acd3f6eb35b381a4cc7ebb1018b63a13b4a36035ec4
data/curlyrest.gemspec CHANGED
@@ -24,7 +24,7 @@ Gem::Specification.new do |spec|
24
24
  spec.require_paths = ['lib']
25
25
 
26
26
  spec.add_development_dependency 'bundler', '~> 1.11'
27
- spec.add_development_dependency 'byebug', '~> 2.0'
27
+ spec.add_development_dependency 'byebug'
28
28
  spec.add_development_dependency 'rake', '~> 10.0'
29
29
  spec.add_development_dependency 'rest-client', '~> 2.0'
30
30
  spec.add_development_dependency 'rspec', '~> 3.0'
data/lib/curlyrest.rb CHANGED
@@ -48,8 +48,10 @@ module Curlyrest
48
48
  def parse_status(line)
49
49
  re = %r{^HTTP\/(\d+|\d+\.\d+)\s(\d+)\s*(.*)$}
50
50
  return unless re.match(line.chop)
51
+
51
52
  r = Regexp.last_match(2)
52
53
  return if r && r == '100'
54
+
53
55
  @state = :headers
54
56
  @response = CurlResponse.new(Regexp.last_match(1),
55
57
  Regexp.last_match(2),
@@ -69,7 +71,7 @@ module Curlyrest
69
71
  end
70
72
 
71
73
  def parse_headers(line)
72
- if /^\s*$/.match?(line)
74
+ if /^\s*$/ =~ line
73
75
  @state = :body
74
76
  return
75
77
  end
@@ -190,57 +192,5 @@ module RestClient
190
192
  r = curl_transmit(uri, method, h, payload, &block)
191
193
  RestClient::Response.create(r.body, r, self)
192
194
  end
193
-
194
- def process_cookie_args!(uri, headers, args)
195
-
196
- # Avoid ambiguity in whether options from headers or options from
197
- # Request#initialize should take precedence by raising ArgumentError when
198
- # both are present. Prior versions of rest-client claimed to give
199
- # precedence to init options, but actually gave precedence to headers.
200
- # Avoid that mess by erroring out instead.
201
- if headers[:cookies] && args[:cookies]
202
- raise ArgumentError.new(
203
- "Cannot pass :cookies in Request.new() and in headers hash")
204
- end
205
-
206
- cookies_data = headers.delete(:cookies) || args[:cookies]
207
-
208
- # this method has problems if no cookies are in the request
209
- return if cookies_data.nil?
210
-
211
- # return copy of cookie jar as is
212
- if cookies_data.is_a?(HTTP::CookieJar)
213
- return cookies_data.dup
214
- end
215
-
216
- # convert cookies hash into a CookieJar
217
- jar = HTTP::CookieJar.new
218
-
219
- (cookies_data || []).each do |key, val|
220
-
221
- # Support for Array<HTTP::Cookie> mode:
222
- # If key is a cookie object, add it to the jar directly and assert that
223
- # there is no separate val.
224
- if key.is_a?(HTTP::Cookie)
225
- if val
226
- raise ArgumentError.new("extra cookie val: #{val.inspect}")
227
- end
228
-
229
- jar.add(key)
230
- next
231
- end
232
-
233
- if key.is_a?(Symbol)
234
- key = key.to_s
235
- end
236
-
237
- # assume implicit domain from the request URI, and set for_domain to
238
- # permit subdomains
239
- jar.add(HTTP::Cookie.new(key, val, domain: uri.hostname.downcase,
240
- path: '/', for_domain: true))
241
- end
242
-
243
- jar
244
- end
245
195
  end
246
196
  end
@@ -1,3 +1,3 @@
1
1
  module Curlyrest
2
- VERSION = '0.1.26'.freeze
2
+ VERSION = '0.1.27'.freeze
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: curlyrest
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.26
4
+ version: 0.1.27
5
5
  platform: ruby
6
6
  authors:
7
7
  - Keith Williams
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2018-09-24 00:00:00.000000000 Z
11
+ date: 2018-09-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -28,16 +28,16 @@ dependencies:
28
28
  name: byebug
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: '2.0'
33
+ version: '0'
34
34
  type: :development
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: '2.0'
40
+ version: '0'
41
41
  - !ruby/object:Gem::Dependency
42
42
  name: rake
43
43
  requirement: !ruby/object:Gem::Requirement