faraday 0.5.4 → 0.5.5
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.
- data/Gemfile +1 -1
- data/faraday.gemspec +4 -4
- data/lib/faraday.rb +1 -1
- data/lib/faraday/adapter/net_http.rb +3 -3
- metadata +6 -33
data/Gemfile
CHANGED
@@ -8,7 +8,7 @@ group :development, :test do
|
|
8
8
|
gem 'sinatra', '~> 1.1'
|
9
9
|
gem 'typhoeus', '~> 0.2'
|
10
10
|
gem 'eventmachine', '~> 0.12'
|
11
|
-
gem 'em-http-request', '~> 0.
|
11
|
+
gem 'em-http-request', '~> 0.3', :require => 'em-http'
|
12
12
|
major, minor, patch = RUBY_VERSION.split('.')
|
13
13
|
if major.to_i >= 1 && minor.to_i >= 9
|
14
14
|
gem 'em-synchrony', '~> 0.2', :require => ['em-synchrony', 'em-synchrony/em-http']
|
data/faraday.gemspec
CHANGED
@@ -6,14 +6,14 @@
|
|
6
6
|
## http://docs.rubygems.org/read/chapter/20
|
7
7
|
Gem::Specification.new do |s|
|
8
8
|
s.specification_version = 2 if s.respond_to? :specification_version=
|
9
|
-
s.required_rubygems_version = Gem::Requirement.new(">= 1.3.
|
9
|
+
s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
|
10
10
|
|
11
11
|
## Leave these as is they will be modified for you by the rake gemspec task.
|
12
12
|
## If your rubyforge_project name is different, then edit it and comment out
|
13
13
|
## the sub! line in the Rakefile
|
14
14
|
s.name = 'faraday'
|
15
|
-
s.version = '0.5.
|
16
|
-
s.date = '2011-
|
15
|
+
s.version = '0.5.5'
|
16
|
+
s.date = '2011-02-06'
|
17
17
|
s.rubyforge_project = 'faraday'
|
18
18
|
|
19
19
|
## Make sure your summary is short. The description may be as long
|
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
|
|
33
33
|
s.require_paths = %w[lib]
|
34
34
|
|
35
35
|
s.add_development_dependency('rake', '~> 0.8')
|
36
|
-
s.add_runtime_dependency('addressable', '~> 2.2.
|
36
|
+
s.add_runtime_dependency('addressable', '~> 2.2.4')
|
37
37
|
s.add_runtime_dependency('multipart-post', '~> 1.1.0')
|
38
38
|
s.add_runtime_dependency('rack', ['>= 1.1.0', "< 2"])
|
39
39
|
|
data/lib/faraday.rb
CHANGED
@@ -26,7 +26,7 @@ module Faraday
|
|
26
26
|
http.ca_file = ssl[:ca_file] if ssl[:ca_file]
|
27
27
|
end
|
28
28
|
req = env[:request]
|
29
|
-
http.read_timeout =
|
29
|
+
http.read_timeout = http.open_timeout = req[:timeout] if req[:timeout]
|
30
30
|
http.open_timeout = req[:open_timeout] if req[:open_timeout]
|
31
31
|
|
32
32
|
full_path = full_path_for(env[:url].path, env[:url].query, env[:url].fragment)
|
@@ -55,8 +55,8 @@ module Faraday
|
|
55
55
|
:body => http_resp.body
|
56
56
|
|
57
57
|
@app.call env
|
58
|
-
rescue Errno::ECONNREFUSED
|
59
|
-
raise Error::ConnectionFailed.new(
|
58
|
+
rescue Errno::ECONNREFUSED => e
|
59
|
+
raise Error::ConnectionFailed.new(e)
|
60
60
|
end
|
61
61
|
|
62
62
|
def net_http_class(env)
|
metadata
CHANGED
@@ -1,12 +1,8 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: faraday
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
prerelease:
|
5
|
-
|
6
|
-
- 0
|
7
|
-
- 5
|
8
|
-
- 4
|
9
|
-
version: 0.5.4
|
4
|
+
prerelease:
|
5
|
+
version: 0.5.5
|
10
6
|
platform: ruby
|
11
7
|
authors:
|
12
8
|
- Rick Olson
|
@@ -14,7 +10,7 @@ autorequire:
|
|
14
10
|
bindir: bin
|
15
11
|
cert_chain: []
|
16
12
|
|
17
|
-
date: 2011-
|
13
|
+
date: 2011-02-06 00:00:00 -05:00
|
18
14
|
default_executable:
|
19
15
|
dependencies:
|
20
16
|
- !ruby/object:Gem::Dependency
|
@@ -25,9 +21,6 @@ dependencies:
|
|
25
21
|
requirements:
|
26
22
|
- - ~>
|
27
23
|
- !ruby/object:Gem::Version
|
28
|
-
segments:
|
29
|
-
- 0
|
30
|
-
- 8
|
31
24
|
version: "0.8"
|
32
25
|
type: :development
|
33
26
|
version_requirements: *id001
|
@@ -39,11 +32,7 @@ dependencies:
|
|
39
32
|
requirements:
|
40
33
|
- - ~>
|
41
34
|
- !ruby/object:Gem::Version
|
42
|
-
|
43
|
-
- 2
|
44
|
-
- 2
|
45
|
-
- 2
|
46
|
-
version: 2.2.2
|
35
|
+
version: 2.2.4
|
47
36
|
type: :runtime
|
48
37
|
version_requirements: *id002
|
49
38
|
- !ruby/object:Gem::Dependency
|
@@ -54,10 +43,6 @@ dependencies:
|
|
54
43
|
requirements:
|
55
44
|
- - ~>
|
56
45
|
- !ruby/object:Gem::Version
|
57
|
-
segments:
|
58
|
-
- 1
|
59
|
-
- 1
|
60
|
-
- 0
|
61
46
|
version: 1.1.0
|
62
47
|
type: :runtime
|
63
48
|
version_requirements: *id003
|
@@ -69,15 +54,9 @@ dependencies:
|
|
69
54
|
requirements:
|
70
55
|
- - ">="
|
71
56
|
- !ruby/object:Gem::Version
|
72
|
-
segments:
|
73
|
-
- 1
|
74
|
-
- 1
|
75
|
-
- 0
|
76
57
|
version: 1.1.0
|
77
58
|
- - <
|
78
59
|
- !ruby/object:Gem::Version
|
79
|
-
segments:
|
80
|
-
- 2
|
81
60
|
version: "2"
|
82
61
|
type: :runtime
|
83
62
|
version_requirements: *id004
|
@@ -141,23 +120,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
141
120
|
requirements:
|
142
121
|
- - ">="
|
143
122
|
- !ruby/object:Gem::Version
|
144
|
-
segments:
|
145
|
-
- 0
|
146
123
|
version: "0"
|
147
124
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
148
125
|
none: false
|
149
126
|
requirements:
|
150
127
|
- - ">="
|
151
128
|
- !ruby/object:Gem::Version
|
152
|
-
|
153
|
-
- 1
|
154
|
-
- 3
|
155
|
-
- 6
|
156
|
-
version: 1.3.6
|
129
|
+
version: 1.3.5
|
157
130
|
requirements: []
|
158
131
|
|
159
132
|
rubyforge_project: faraday
|
160
|
-
rubygems_version: 1.
|
133
|
+
rubygems_version: 1.5.0
|
161
134
|
signing_key:
|
162
135
|
specification_version: 2
|
163
136
|
summary: HTTP/REST API client library.
|