faraday 0.7.1 → 0.7.2
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 +2 -2
- data/lib/faraday.rb +1 -1
- data/lib/faraday/adapter/net_http.rb +7 -7
- metadata +6 -6
data/Gemfile
CHANGED
@@ -19,7 +19,7 @@ group :test do
|
|
19
19
|
gem 'typhoeus', '~> 0.2'
|
20
20
|
gem 'webmock', '~> 1.6'
|
21
21
|
# ActiveSupport::JSON will be used in ruby 1.8 and Yajl in 1.9; this is to test against both adapters
|
22
|
-
gem 'activesupport', '~> 3
|
22
|
+
gem 'activesupport', '~> 2.3', :require => nil, :platforms => [:ruby_18, :jruby]
|
23
23
|
gem 'yajl-ruby', '~> 0.8', :require => 'yajl', :platforms => :ruby_19
|
24
24
|
end
|
25
25
|
|
data/faraday.gemspec
CHANGED
@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
|
|
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.7.
|
16
|
-
s.date = '2011-06-
|
15
|
+
s.version = '0.7.2'
|
16
|
+
s.date = '2011-06-12'
|
17
17
|
s.rubyforge_project = 'faraday'
|
18
18
|
|
19
19
|
## Make sure your summary is short. The description may be as long
|
data/lib/faraday.rb
CHANGED
@@ -15,15 +15,15 @@ module Faraday
|
|
15
15
|
|
16
16
|
http = net_http_class(env).new(url.host, url.inferred_port)
|
17
17
|
|
18
|
-
if http.use_ssl = (url.scheme == 'https' && env[:ssl])
|
19
|
-
ssl = env[:ssl]
|
18
|
+
if http.use_ssl = (url.scheme == 'https' && (ssl = env[:ssl]) && true)
|
20
19
|
http.verify_mode = ssl[:verify_mode] || ssl.fetch(:verify, true) ?
|
21
20
|
OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
|
22
|
-
http.cert
|
23
|
-
http.key
|
24
|
-
http.ca_file
|
25
|
-
http.ca_path
|
26
|
-
http.cert_store
|
21
|
+
http.cert = ssl[:client_cert] if ssl[:client_cert]
|
22
|
+
http.key = ssl[:client_key] if ssl[:client_key]
|
23
|
+
http.ca_file = ssl[:ca_file] if ssl[:ca_file]
|
24
|
+
http.ca_path = ssl[:ca_path] if ssl[:ca_path]
|
25
|
+
http.cert_store = ssl[:cert_store] if ssl[:cert_store]
|
26
|
+
http.verify_depth = ssl[:verify_depth] if ssl[:verify_depth]
|
27
27
|
end
|
28
28
|
|
29
29
|
http.read_timeout = http.open_timeout = req[:timeout] if req[:timeout]
|
metadata
CHANGED
@@ -1,13 +1,13 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: faraday
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
hash:
|
5
|
-
prerelease:
|
4
|
+
hash: 7
|
5
|
+
prerelease:
|
6
6
|
segments:
|
7
7
|
- 0
|
8
8
|
- 7
|
9
|
-
-
|
10
|
-
version: 0.7.
|
9
|
+
- 2
|
10
|
+
version: 0.7.2
|
11
11
|
platform: ruby
|
12
12
|
authors:
|
13
13
|
- Rick Olson
|
@@ -15,7 +15,7 @@ autorequire:
|
|
15
15
|
bindir: bin
|
16
16
|
cert_chain: []
|
17
17
|
|
18
|
-
date: 2011-06-
|
18
|
+
date: 2011-06-12 00:00:00 -07:00
|
19
19
|
default_executable:
|
20
20
|
dependencies:
|
21
21
|
- !ruby/object:Gem::Dependency
|
@@ -197,7 +197,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
197
197
|
requirements: []
|
198
198
|
|
199
199
|
rubyforge_project: faraday
|
200
|
-
rubygems_version: 1.
|
200
|
+
rubygems_version: 1.6.2
|
201
201
|
signing_key:
|
202
202
|
specification_version: 2
|
203
203
|
summary: HTTP/REST API client library.
|