faraday 0.9.0.rc6 → 0.9.0.rc7

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ca7a6a74fd366e7546ba28ccb1c27483fdfb6447
+  data.tar.gz: 991320c247d7c297118ab9bbf66c4abbfe141ec5
+SHA512:
+  metadata.gz: 54db2e8aeeae9dae10066a17642533230a58ef76ea25036428dbf053af9b9ed0fe98f83acaa36bdeaf3e84c30ccb679410ed9e1203b3133ce0de94f1febbae8b
+  data.tar.gz: e6fad8763e2b855fcc9341d314776bfebe162d070be92b566b48eec569732ce35718d0a4a4d920f46fd8e82c6ce308d4c4e176a13678a147f14cd55c73aef7b3

data/Gemfile

@@ -8,10 +8,10 @@ group :test do
   gem 'coveralls', :require => false
   gem 'em-http-request', '>= 1.1', :require => 'em-http'
   gem 'em-synchrony', '>= 1.0.3', :require => ['em-synchrony', 'em-synchrony/em-http']
-  gem 'excon', ['>= 0.25.3', '< 0.27.3']
+  gem 'excon', '>= 0.27.4'
   gem 'httpclient', '>= 2.2'
   gem 'leftright', '>= 0.9', :require => false
-  gem 'mime-types', '~> 1.25', :platforms => :ruby_18
+  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
   gem 'minitest', '~> 5.0.5'
   gem 'net-http-persistent', '>= 2.5', :require => false
   gem 'patron', '>= 0.4.2', :platforms => :ruby
@@ -21,4 +21,9 @@ group :test do
   gem 'typhoeus', '~> 0.3.3', :platforms => :ruby
 end
 
+platforms :rbx do
+  gem 'rubinius-coverage'
+  gem 'rubysl'
+end
+
 gemspec

data/README.md

@@ -184,6 +184,7 @@ implementations:
 * MRI 1.9.2
 * MRI 1.9.3
 * MRI 2.0.0
+* MRI 2.1.0
 * [JRuby][]
 * [Rubinius][]
 

data/faraday.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
   spec.homepage = 'https://github.com/lostisland/faraday'
   spec.licenses = ['MIT']
 
-  spec.add_dependency 'multipart-post', '~> 1.2.0'
+  spec.add_dependency 'multipart-post', '>= 1.2', '< 3'
   spec.add_development_dependency 'bundler', '~> 1.0'
 
   spec.files = %w(.document CHANGELOG.md CONTRIBUTING.md Gemfile LICENSE.md README.md Rakefile)

data/lib/faraday.rb

@@ -14,7 +14,7 @@ require 'forwardable'
 #   conn.get '/'
 #
 module Faraday
-  VERSION = "0.9.0.rc6"
+  VERSION = "0.9.0.rc7"
 
   class << self
     # Public: Gets or sets the root path that Faraday is being loaded from.
@@ -204,7 +204,8 @@ module Faraday
     def load_middleware(key)
       value = fetch_middleware(key)
       case value
-      when Module then value
+      when Module
+        value
       when Symbol, String
         middleware_mutex do
           @registered_middleware[key] = const_get(value)
@@ -261,7 +262,7 @@ class Object
   # Yields self.
   # Returns self.
   def tap
-    yield self
+    yield(self)
     self
   end unless Object.respond_to?(:tap)
 end

data/lib/faraday/adapter.rb

@@ -39,7 +39,7 @@ module Faraday
       env.body = body
       env.response_headers = Utils::Headers.new.tap do |response_headers|
         response_headers.update headers unless headers.nil?
-        yield response_headers if block_given?
+        yield(response_headers) if block_given?
       end
     end
   end

data/lib/faraday/adapter/net_http.rb

@@ -13,9 +13,10 @@ module Faraday
         EOFError,
         Errno::ECONNABORTED,
         Errno::ECONNREFUSED,
-        Errno::ENETUNREACH,
         Errno::ECONNRESET,
+        Errno::EHOSTUNREACH,
         Errno::EINVAL,
+        Errno::ENETUNREACH,
         Net::HTTPBadResponse,
         Net::HTTPHeaderSyntaxError,
         Net::ProtocolError,

data/lib/faraday/adapter/test.rb

@@ -21,7 +21,7 @@ module Faraday
         def initialize
           # {:get => [Stub, Stub]}
           @stack, @consumed = {}, {}
-          yield self if block_given?
+          yield(self) if block_given?
         end
 
         def empty?
@@ -100,7 +100,7 @@ module Faraday
           params = query ?
             Faraday::Utils.parse_nested_query(query) :
             {}
-          super path, params, headers, body, block
+          super(path, params, headers, body, block)
         end
 
         def matches?(request_uri, request_headers, request_body)
@@ -138,7 +138,7 @@ module Faraday
       end
 
       def configure
-        yield stubs
+        yield(stubs)
       end
 
       def call(env)

data/lib/faraday/connection.rb

@@ -88,7 +88,7 @@ module Faraday
         end
       })
 
-      yield self if block_given?
+      yield(self) if block_given?
 
       @headers[:user_agent] ||= "Faraday v#{VERSION}"
     end
@@ -139,7 +139,7 @@ module Faraday
         def #{method}(url = nil, params = nil, headers = nil)
           run_request(:#{method}, url, nil, headers) { |request|
             request.params.update(params) if params
-            yield request if block_given?
+            yield(request) if block_given?
           }
         end
       RUBY
@@ -247,8 +247,10 @@ module Faraday
           h.klass.respond_to?(:supports_parallel?) and h.klass.supports_parallel?
         end
 
-        if handler then handler.klass.setup_parallel_manager
-        elsif block_given? then yield
+        if handler
+          handler.klass.setup_parallel_manager
+        elsif block_given?
+          yield
         end
       end
     end
@@ -369,7 +371,7 @@ module Faraday
         req.url(url)                if url
         req.headers.update(headers) if headers
         req.body = body             if body
-        yield req if block_given?
+        yield(req) if block_given?
       end
 
       builder.build_response(self, request)
@@ -383,7 +385,7 @@ module Faraday
         req.params  = self.params.dup
         req.headers = self.headers.dup
         req.options = self.options.merge(:proxy => self.proxy)
-        yield req if block_given?
+        yield(req) if block_given?
       end
     end
 
@@ -417,7 +419,7 @@ module Faraday
     # Internal: Yields username and password extracted from a URI if they both exist.
     def with_uri_credentials(uri)
       if uri.user and uri.password
-        yield Utils.unescape(uri.user), Utils.unescape(uri.password)
+        yield(Utils.unescape(uri.user), Utils.unescape(uri.password))
       end
     end
 

data/lib/faraday/error.rb

@@ -36,7 +36,12 @@ module Faraday
   class ConnectionFailed < ClientError;   end
   class ResourceNotFound < ClientError;   end
   class ParsingError     < ClientError;   end
-  class TimeoutError < ClientError; end
+
+  class TimeoutError < ClientError
+    def initialize(ex = nil)
+      super(ex || "timeout")
+    end
+  end
 
   class SSLError < ClientError
   end

data/lib/faraday/options.rb

@@ -8,9 +8,9 @@ module Faraday
     end
 
     # Public
-    def each(&block)
+    def each
       members.each do |key|
-        block.call key.to_sym, send(key)
+        yield(key.to_sym, send(key))
       end
     end
 
@@ -48,19 +48,17 @@ module Faraday
 
     # Public
     def fetch(key, *args)
-      return send(key) if symbolized_key_set.include?(key.to_sym)
-
-      key_setter = "#{key}="
-
-      if args.size > 0
-        return send(key_setter, args.first)
-      end
-
-      if block_given?
-        return send(key_setter, Proc.new.call(key))
+      unless symbolized_key_set.include?(key.to_sym)
+        key_setter = "#{key}="
+        if args.size > 0
+          send(key_setter, args.first)
+        elsif block_given?
+          send(key_setter, Proc.new.call(key))
+        else
+          raise self.class.fetch_error_class, "key not found: #{key.inspect}"
+        end
       end
-
-      raise self.class.fetch_error_class, "key not found: #{key.inspect}"
+      send(key)
     end
 
     # Public
@@ -180,8 +178,10 @@ module Faraday
 
     def self.from(value)
       case value
-      when String then value = {:uri => Utils.URI(value)}
-      when URI then value = {:uri => value}
+      when String
+        value = {:uri => Utils.URI(value)}
+      when URI
+        value = {:uri => value}
       when Hash, Options
         if uri = value.delete(:uri)
           value[:uri] = Utils.URI(uri)

data/lib/faraday/rack_builder.rb

@@ -63,7 +63,7 @@ module Faraday
     def build(options = {})
       raise_if_locked
       @handlers.clear unless options[:keep]
-      yield self if block_given?
+      yield(self) if block_given?
     end
 
     def [](idx)

data/lib/faraday/request.rb

@@ -23,21 +23,25 @@ module Faraday
 
     def self.create(request_method)
       new(request_method).tap do |request|
-        yield request if block_given?
+        yield(request) if block_given?
       end
     end
 
     # Public: Replace params, preserving the existing hash type
     def params=(hash)
-      if params then params.replace hash
-      else super
+      if params
+        params.replace hash
+      else
+        super
       end
     end
 
     # Public: Replace request headers, preserving the existing hash type
     def headers=(hash)
-      if headers then headers.replace hash
-      else super
+      if headers
+        headers.replace hash
+      else
+        super
       end
     end
 

data/lib/faraday/request/authorization.rb

@@ -5,8 +5,10 @@ module Faraday
     # Public
     def self.header(type, token)
       case token
-      when String, Symbol then "#{type} #{token}"
-      when Hash then build_hash(type.to_s, token)
+      when String, Symbol
+        "#{type} #{token}"
+      when Hash
+        build_hash(type.to_s, token)
       else
         raise ArgumentError, "Can't build an Authorization #{type} header from #{token.inspect}"
       end

data/lib/faraday/request/retry.rb

@@ -104,8 +104,10 @@ module Faraday
       (class << matcher; self; end).class_eval do
         define_method(:===) do |error|
           exceptions.any? do |ex|
-            if ex.is_a? Module then error.is_a? ex
-            else error.class.to_s == ex.to_s
+            if ex.is_a? Module
+              error.is_a? ex
+            else
+              error.class.to_s == ex.to_s
             end
           end
         end

data/lib/faraday/request/url_encoded.rb

@@ -18,7 +18,7 @@ module Faraday
     def match_content_type(env)
       if process_request?(env)
         env.request_headers[CONTENT_TYPE] ||= self.class.mime_type
-        yield env.body unless env.body.respond_to?(:to_str)
+        yield(env.body) unless env.body.respond_to?(:to_str)
       end
     end
 

data/lib/faraday/response.rb

@@ -54,7 +54,7 @@ module Faraday
       if not finished?
         @on_complete_callbacks << Proc.new
       else
-        yield env
+        yield(env)
       end
       return self
     end

data/lib/faraday/utils.rb

@@ -22,7 +22,8 @@ module Faraday
 
       # symbol -> string mapper + cache
       KeyMap = Hash.new do |map, key|
-        value = if key.respond_to?(:to_str) then key
+        value = if key.respond_to?(:to_str)
+          key
         else
           key.to_s.split('_').            # :user_agent => %w(user agent)
             each { |w| w.capitalize! }.   # => %w(User Agent)
@@ -42,7 +43,7 @@ module Faraday
         k = (@names[k.downcase] ||= k)
         # join multiple values with a comma
         v = v.to_ary.join(', ') if v.respond_to? :to_ary
-        super k, v
+        super(k, v)
       end
 
       def fetch(k, *args, &block)
@@ -55,7 +56,7 @@ module Faraday
         k = KeyMap[k]
         if k = @names[k.downcase]
           @names.delete k.downcase
-          super k
+          super(k)
         end
       end
 
@@ -93,8 +94,10 @@ module Faraday
           map  { |h| h.split(/:\s+/, 2) }.reject { |p| p[0].nil? }. # split key and value, ignore blank lines
           each { |key, value|
             # join multiple values with a comma
-            if self[key] then self[key] << ', ' << value
-            else self[key] = value
+            if self[key]
+              self[key] << ', ' << value
+            else
+              self[key] = value
             end
           }
       end

data/test/adapters/excon_test.rb

@@ -12,6 +12,9 @@ module Adapters
       # Excon lets OpenSSL::SSL::SSLError be raised without any way to
       # distinguish whether it happened because of a 407 proxy response
       undef :test_proxy_auth_fail if ssl_mode?
+
+      # https://github.com/geemus/excon/issues/358
+      undef :test_connection_error if RUBY_VERSION >= '2.1.0'
     end
   end
 end

data/test/authentication_middleware_test.rb

@@ -3,7 +3,7 @@ require File.expand_path('../helper', __FILE__)
 class AuthenticationMiddlewareTest < Faraday::TestCase
   def conn
     Faraday::Connection.new('http://example.net/') do |builder|
-      yield builder
+      yield(builder)
       builder.adapter :test do |stub|
         stub.get('/auth-echo') do |env|
           [200, {}, env[:request_headers]['Authorization']]

data/test/connection_test.rb

@@ -171,13 +171,13 @@ class TestConnection < Faraday::TestCase
     uri = conn.build_exclusive_url('')
     assert_equal "/nigiri", uri.path
   end
-  
+
   def test_build_exclusive_url_doesnt_use_connection_params
     conn = Faraday::Connection.new "http://sushi.com/nigiri"
     conn.params = {:a => 1}
     assert_equal "http://sushi.com/nigiri", conn.build_exclusive_url.to_s
   end
-  
+
   def test_build_exclusive_url_uses_argument_params
     conn = Faraday::Connection.new "http://sushi.com/nigiri"
     conn.params = {:a => 1}
@@ -186,13 +186,13 @@ class TestConnection < Faraday::TestCase
     url = conn.build_exclusive_url(nil, params)
     assert_equal "http://sushi.com/nigiri?a=2", url.to_s
   end
-  
+
   def test_build_url_uses_params
     conn = Faraday::Connection.new "http://sushi.com/nigiri"
     conn.params = {:a => 1, :b => 1}
     assert_equal "http://sushi.com/nigiri?a=1&b=1", conn.build_url.to_s
   end
-  
+
   def test_build_url_merges_params
     conn = Faraday::Connection.new "http://sushi.com/nigiri"
     conn.params = {:a => 1, :b => 1}
@@ -395,7 +395,7 @@ class TestConnection < Faraday::TestCase
 
   def env_url(url, params)
     conn = Faraday::Connection.new(url, :params => params)
-    yield conn if block_given?
+    yield(conn) if block_given?
     req = conn.build_request(:get)
     req.to_env(conn).url
   end
@@ -404,7 +404,7 @@ end
 class TestRequestParams < Faraday::TestCase
   def create_connection(*args)
     @conn = Faraday::Connection.new(*args) do |conn|
-      yield conn if block_given?
+      yield(conn) if block_given?
       class << conn.builder
         undef app
         def app() lambda { |env| env } end
@@ -515,7 +515,7 @@ class TestRequestParams < Faraday::TestCase
 
   def get(*args)
     env = @conn.get(*args) do |req|
-      yield req if block_given?
+      yield(req) if block_given?
     end
     env[:url].query
   end

data/test/middleware/retry_test.rb

@@ -48,7 +48,7 @@ module Middleware
       assert_raises(Errno::ETIMEDOUT) {
         conn(:max => 2, :interval => 0.1).post("/unstable")
       }
-      assert_in_delta 0.2, Time.now - started, 0.03
+      assert_in_delta 0.2, Time.now - started, 0.04
     end
 
     def test_calls_sleep_amount

data/test/middleware_stack_test.rb

@@ -149,7 +149,7 @@ class MiddlewareStackTest < Faraday::TestCase
   def build_stack(*handlers)
     @builder.build do |b|
       handlers.each { |handler| b.use(*handler) }
-      yield b if block_given?
+      yield(b) if block_given?
 
       b.adapter :test do |stub|
         stub.get '/' do |env|

data/test/utils_test.rb

@@ -11,7 +11,7 @@ class TestUtils < Faraday::TestCase
     def gsub(regex)
       string.gsub(regex) {
         match, = $&, '' =~ /a/
-        yield match
+        yield(match)
       }
     end
   end

metadata

@@ -1,66 +1,56 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: faraday
-version: !ruby/object:Gem::Version 
-  hash: -2653310500
-  prerelease: 6
-  segments: 
-  - 0
-  - 9
-  - 0
-  - rc
-  - 6
-  version: 0.9.0.rc6
+version: !ruby/object:Gem::Version
+  version: 0.9.0.rc7
 platform: ruby
-authors: 
+authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-11-09 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-01-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: multipart-post
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 1
-        - 2
-        - 0
-        version: 1.2.0
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 0
-        version: "1.0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email: technoweenie@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
-- .document
+files:
+- ".document"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
@@ -68,10 +58,12 @@ files:
 - README.md
 - Rakefile
 - faraday.gemspec
+- lib/faraday.rb
+- lib/faraday/adapter.rb
 - lib/faraday/adapter/em_http.rb
 - lib/faraday/adapter/em_http_ssl_patch.rb
-- lib/faraday/adapter/em_synchrony/parallel_manager.rb
 - lib/faraday/adapter/em_synchrony.rb
+- lib/faraday/adapter/em_synchrony/parallel_manager.rb
 - lib/faraday/adapter/excon.rb
 - lib/faraday/adapter/httpclient.rb
 - lib/faraday/adapter/net_http.rb
@@ -80,7 +72,6 @@ files:
 - lib/faraday/adapter/rack.rb
 - lib/faraday/adapter/test.rb
 - lib/faraday/adapter/typhoeus.rb
-- lib/faraday/adapter.rb
 - lib/faraday/autoload.rb
 - lib/faraday/connection.rb
 - lib/faraday/error.rb
@@ -88,6 +79,7 @@ files:
 - lib/faraday/options.rb
 - lib/faraday/parameters.rb
 - lib/faraday/rack_builder.rb
+- lib/faraday/request.rb
 - lib/faraday/request/authorization.rb
 - lib/faraday/request/basic_authentication.rb
 - lib/faraday/request/instrumentation.rb
@@ -95,13 +87,18 @@ files:
 - lib/faraday/request/retry.rb
 - lib/faraday/request/token_authentication.rb
 - lib/faraday/request/url_encoded.rb
-- lib/faraday/request.rb
+- lib/faraday/response.rb
 - lib/faraday/response/logger.rb
 - lib/faraday/response/raise_error.rb
-- lib/faraday/response.rb
 - lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
-- lib/faraday.rb
+- script/console
+- script/generate_certs
+- script/package
+- script/proxy-server
+- script/release
+- script/server
+- script/test
 - test/adapters/default_test.rb
 - test/adapters/em_http_test.rb
 - test/adapters/em_synchrony_test.rb
@@ -124,56 +121,37 @@ files:
 - test/middleware/instrumentation_test.rb
 - test/middleware/retry_test.rb
 - test/middleware_stack_test.rb
+- test/multibyte.txt
 - test/options_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
 - test/strawberry.rb
 - test/utils_test.rb
-- test/multibyte.txt
-- script/console
-- script/generate_certs
-- script/package
-- script/proxy-server
-- script/release
-- script/server
-- script/test
-has_rdoc: true
 homepage: https://github.com/lostisland/faraday
-licenses: 
+licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
-  requirements: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
   - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_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 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.6.2
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
-test_files: 
+test_files:
 - test/adapters/default_test.rb
 - test/adapters/em_http_test.rb
 - test/adapters/em_synchrony_test.rb