faraday 0.7.4 → 0.7.5

data/Gemfile

@@ -1,29 +1,24 @@
 source 'http://rubygems.org'
 
-gem 'addressable', '~> 2.2.6'
-gem 'multipart-post', '~> 1.1.0'
-gem 'rack', ['>= 1.1.0', '<= 1.2.0']
-
 group :development do
   gem 'sinatra', '~> 1.2'
 end
 
 group :test do
-  gem 'em-http-request', '~> 0.3', :require => 'em-http'
-  gem 'em-synchrony', '~> 0.2', :require => ['em-synchrony', 'em-synchrony/em-http'], :platforms => :ruby_19
+  gem 'em-http-request', '~> 1.0', :require => 'em-http'
+  gem 'em-synchrony', '~> 1.0', :require => ['em-synchrony', 'em-synchrony/em-http'], :platforms => :ruby_19
   gem 'excon', '~> 0.6'
   gem 'leftright', '~> 0.9', :require => false
   gem 'patron', '~> 0.4'
-  gem 'rake', '~> 0.8'
-  gem 'test-unit', '~> 2.3'
   gem 'typhoeus', '~> 0.2'
-  gem 'webmock', '~> 1.6'
   # ActiveSupport::JSON will be used in ruby 1.8 and Yajl in 1.9; this is to test against both adapters
   gem 'activesupport', '~> 2.3', :require => nil, :platforms => [:ruby_18, :jruby]
-  gem 'yajl-ruby', '~> 0.8', :require => 'yajl', :platforms => :ruby_19
+  gem 'yajl-ruby', '~> 1.0', :require => 'yajl', :platforms => :ruby_19
 end
 
 platforms :jruby do
   gem 'jruby-openssl', '~> 0.7'
   gem 'ffi-ncurses', '~> 0.3'
 end
+
+gemspec

data/README.md

@@ -161,6 +161,32 @@ Note on Patches/Pull Requests
   (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
 * Send me a pull request. Bonus points for topic branches.
 
+Supported Rubies
+----------------
+This library aims to support and is [tested
+against](http://travis-ci.org/technoweenie/faraday) the following Ruby
+implementations:
+
+* Ruby 1.8.7
+* Ruby 1.9.1
+* Ruby 1.9.2
+* [Rubinius](http://rubini.us)
+* [Ruby Enterprise Edition](http://www.rubyenterpriseedition.com/)
+
+If something doesn't work on one of these interpreters, it should be considered
+a bug.
+
+This library may inadvertently work (or seem to work) on other Ruby
+implementations, however support will only be provided for the versions listed
+above.
+
+If you would like this library to support another Ruby version, you may
+volunteer to be a maintainer. Being a maintainer entails making sure all tests
+run and pass on that implementation. When something breaks on your
+implementation, you will be personally responsible for providing patches in a
+timely fashion. If critical issues for a particular implementation exist at the
+time of a major release, support for that Ruby version may be dropped.
+
 Copyright
 ---------
 Copyright (c) 2009-2011 rick, hobson. See [LICENSE][license] for details.

data/faraday.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'faraday'
-  s.version           = '0.7.4'
-  s.date              = '2011-07-08'
+  s.version           = '0.7.5'
+  s.date              = '2011-10-04'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long
@@ -32,12 +32,12 @@ Gem::Specification.new do |s|
   ## require 'NAME.rb' or'/lib/NAME/file.rb' can be as require 'NAME/file.rb'
   s.require_paths = %w[lib]
 
+  s.add_dependency 'addressable', '~> 2.2.6'
+  s.add_dependency 'multipart-post', '~> 1.1.3'
+  s.add_dependency 'rack', ['>= 1.1.0', '< 2']
   s.add_development_dependency 'rake', '~> 0.9'
-  s.add_development_dependency 'test-unit', '~> 2.3'
-  s.add_development_dependency 'webmock', '~> 1.6'
-  s.add_runtime_dependency 'addressable', '~> 2.2.6'
-  s.add_runtime_dependency 'multipart-post', '~> 1.1.0'
-  s.add_runtime_dependency 'rack', ['>= 1.1.0', '< 2']
+  s.add_development_dependency 'test-unit', '~> 2.4'
+  s.add_development_dependency 'webmock', '~> 1.7'
 
   ## Leave this section as-is. It will be automatically generated from the
   ## contents of your Git repository via the gemspec task. DO NOT REMOVE
@@ -88,5 +88,5 @@ Gem::Specification.new do |s|
 
   ## Test files will be grabbed from the file list. Make sure the path glob
   ## matches what you actually use.
-  s.test_files = s.files.select { |path| path =~ /^test\/.*_test\.rb/ }
+  s.test_files = s.files.select { |path| path =~ %r{^test/*/.+\.rb} }
 end

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.7.4"
+  VERSION = "0.7.5"
 
   class << self
     attr_accessor :default_adapter

data/lib/faraday/adapter/net_http.rb

@@ -16,8 +16,19 @@ module Faraday
         http = net_http_class(env).new(url.host, url.inferred_port)
 
         if http.use_ssl = (url.scheme == 'https' && (ssl = env[:ssl]) && true)
-          http.verify_mode = ssl[:verify_mode] || ssl.fetch(:verify, true) ?
-                               OpenSSL::SSL::VERIFY_PEER : OpenSSL::SSL::VERIFY_NONE
+          http.verify_mode = ssl[:verify_mode] || begin
+            if ssl.fetch(:verify, true) 
+              OpenSSL::SSL::VERIFY_PEER
+              # Use the default cert store by default, i.e. system ca certs
+              store = OpenSSL::X509::Store.new
+              store.set_default_paths
+              http.cert_store = store
+              OpenSSL::SSL::VERIFY_PEER
+            else
+              OpenSSL::SSL::VERIFY_NONE
+            end
+          end
+
           http.cert         = ssl[:client_cert]  if ssl[:client_cert]
           http.key          = ssl[:client_key]   if ssl[:client_key]
           http.ca_file      = ssl[:ca_file]      if ssl[:ca_file]

data/lib/faraday/adapter/typhoeus.rb

@@ -29,6 +29,16 @@ module Faraday
         end
 
         env_req = env[:request]
+        
+        if proxy = env_req[:proxy]
+          req.proxy = "#{proxy[:uri].host}:#{proxy[:uri].port}"
+          
+          if proxy[:username] && proxy[:password]
+            req.proxy_username = proxy[:username]
+            req.proxy_password = proxy[:password]
+          end
+        end
+        
         req.timeout = req.connect_timeout = (env_req[:timeout] * 1000) if env_req[:timeout]
         req.connect_timeout = (env_req[:open_timeout] * 1000)          if env_req[:open_timeout]
 

data/lib/faraday/connection.rb

@@ -1,6 +1,10 @@
 require 'addressable/uri'
-require 'set'
 require 'base64'
+require 'set'
+require 'faraday/builder'
+require 'faraday/request'
+require 'faraday/response'
+require 'faraday/utils'
 
 module Faraday
   class Connection
@@ -233,7 +237,7 @@ module Faraday
     end
 
     def dup
-      self.class.new(build_url(''), :headers => headers.dup, :params => params.dup, :builder => builder.dup)
+      self.class.new(build_url(''), :headers => headers.dup, :params => params.dup, :builder => builder.dup, :ssl => ssl.dup)
     end
 
     def proxy_arg_to_uri(arg)

data/test/connection_test.rb

@@ -238,15 +238,16 @@ class TestConnection < Faraday::TestCase
   end
 
   def test_dups_connection_object
-    conn = Faraday::Connection.new 'http://sushi.com/foo' do |b|
+    conn = Faraday::Connection.new 'http://sushi.com/foo', :ssl => { :verify => :none } do |b|
       b.adapter :net_http
     end
     conn.headers['content-type'] = 'text/plain'
     conn.params['a'] = '1'
 
     duped = conn.dup
+
     assert_equal conn.build_url(''), duped.build_url('')
-    [:headers, :params, :builder].each do |attr|
+    [:headers, :params, :builder, :ssl].each do |attr|
       assert_equal     conn.send(attr),           duped.send(attr)
       assert_not_equal conn.send(attr).object_id, duped.send(attr).object_id
     end

metadata

@@ -1,95 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: faraday
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.7.5
   prerelease: 
-  version: 0.7.4
 platform: ruby
-authors: 
+authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-07-08 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2011-10-04 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70213347338660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0.9"
-  type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
+      - !ruby/object:Gem::Version
+        version: 2.2.6
+  type: :runtime
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70213347338660
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: &70213347338000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2.3"
-  type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
+      - !ruby/object:Gem::Version
+        version: 1.1.3
+  type: :runtime
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70213347338000
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70213347336580 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+    - - <
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70213347336580
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70213347335860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70213347335860
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70213347335220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 2.2.6
-  type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: multipart-post
+      - !ruby/object:Gem::Version
+        version: '2.4'
+  type: :development
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70213347335220
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70213347334540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-  type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack
+      - !ruby/object:Gem::Version
+        version: '1.7'
+  type: :development
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.1.0
-    - - <
-      - !ruby/object:Gem::Version 
-        version: "2"
-  type: :runtime
-  version_requirements: *id006
+  version_requirements: *70213347334540
 description: HTTP/REST API client library.
 email: technoweenie@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - LICENSE.md
 - README.md
@@ -131,38 +127,37 @@ files:
 - test/response_middleware_test.rb
 homepage: http://github.com/technoweenie/faraday
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: faraday
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
-test_files: 
+test_files:
 - test/adapters/live_test.rb
 - test/adapters/logger_test.rb
 - test/adapters/net_http_test.rb
 - test/adapters/test_middleware_test.rb
 - test/connection_test.rb
 - test/env_test.rb
+- test/helper.rb
+- test/live_server.rb
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb