faraday 0.8.10 → 0.8.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d43934c707a0fca6c31ccda1806c65af0c144b79
-  data.tar.gz: b30578af99d6349a20003d39441d66ee14f6992a
+  metadata.gz: 431792ff21fb498eb658855f87503d2081869616
+  data.tar.gz: c6b3a7f9c1a9f7a4a60eff2236b882dbd812eab4
 SHA512:
-  metadata.gz: 8ad0e359c5aac602dd49f1c5c74a3009f0b42b5b42948f86cac8fd510603d46d75ab24ed30c4795903fc0b74cb0a828def6287f3dd097a37ec0e30ab673d2ca5
-  data.tar.gz: c713445a9a4efae7891594e8bb8bd7835ca32333db26df84d1e27f5eb8e80481683cea59a40afc42f31e9b4e6419605748410cf85cb75f598534e94870ea8219
+  metadata.gz: 8855727969169984a104ba02c2ed27b4a86fb7d3a698fe6f5932c4858cb5e4f5eba9251d3742cb8d999b654f89ff2d073228738998f3199ae104e9e9883bd031
+  data.tar.gz: eda459cc1abe00450f0d48dab3b069544dd414001faf9be231e2215fa81efced7496a99a2baa6502f1d7bbe162f6b41f415cdef1cd9ce935a9de8752749997a3

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.8.10"
+  VERSION = "0.8.11"
 
   class << self
     attr_accessor :root_path, :lib_path

data/lib/faraday/adapter/em_synchrony.rb

@@ -70,6 +70,12 @@ module Faraday
         else
           raise Error::ConnectionFailed, err
         end
+      rescue RuntimeError => err
+        if err.message == "connection closed by server"
+          raise Error::ConnectionFailed, err
+        else
+          raise
+        end
       end
     end
   end

data/lib/faraday/adapter/excon.rb

@@ -32,6 +32,7 @@ module Faraday
           if req[:proxy]
             opts[:proxy] = {
               :host     => req[:proxy][:uri].host,
+              :hostname => req[:proxy][:uri].hostname,
               :port     => req[:proxy][:uri].port,
               :scheme   => req[:proxy][:uri].scheme,
               :user     => req[:proxy][:user],

data/lib/faraday/connection.rb

@@ -307,7 +307,12 @@ module Faraday
     end
 
     def dup
-      self.class.new(build_url(''), :headers => headers.dup, :params => params.dup, :builder => builder.dup, :ssl => ssl.dup)
+      self.class.new(build_url(''),
+                     :headers => headers.dup,
+                     :params => params.dup,
+                     :builder => builder.dup,
+                     :ssl => ssl.dup,
+                     :request => options.dup)
     end
 
     # Internal: Yields username and password extracted from a URI if they both exist.

data/lib/faraday/request/retry.rb

@@ -7,7 +7,9 @@ module Faraday
 
     def call(env)
       retries = @retries
+      request_body = env[:body]
       begin
+        env[:body] = request_body # after failure env[:body] is set to the response body
         @app.call(env)
       rescue StandardError, Timeout::Error
         if retries > 0

data/lib/faraday/utils.rb

@@ -12,6 +12,12 @@ module Faraday
         self.update hash
       end
 
+      # on dup/clone, we need to duplicate @names hash
+      def initialize_copy(other)
+        super
+        @names = other.names.dup
+      end
+
       # symbol -> string mapper + cache
       KeyMap = Hash.new do |map, key|
         map[key] = if key.respond_to?(:to_str) then key
@@ -65,6 +71,7 @@ module Faraday
 
       def replace(other)
         clear
+        @names.clear
         self.update other
         self
       end
@@ -83,6 +90,12 @@ module Faraday
             end
           }
       end
+
+      protected
+
+      def names
+        @names
+      end
     end
 
     # hash with stringified keys

data/script/package

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Usage: script/gem
+# Updates the gemspec and builds a new gem in the pkg directory.
+
+mkdir -p pkg
+gem build *.gemspec
+mv *.gem pkg

data/script/release

@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+# Usage: script/release
+# Build the package, tag a commit, push it to origin, and then release the
+# package publicly.
+
+set -e
+
+version="$(script/package | grep Version: | awk '{print $2}')"
+[ -n "$version" ] || exit 1
+
+git commit -a -m "faraday $version"
+git tag "v${version}"
+git push origin "v${version}" HEAD
+gem push pkg/*-${version}.gem

data/test/adapters/integration.rb

@@ -194,8 +194,10 @@ module Adapters
           conn.get '/echo'
         end
 
-        unless self.class.ssl_mode? && self.class.jruby?
+        unless self.class.ssl_mode? && (self.class.jruby? ||
+            adapter == :em_http || adapter == :em_synchrony)
           # JRuby raises "End of file reached" which cannot be distinguished from a 407
+          # EM raises "connection closed by server" due to https://github.com/igrigorik/em-socksify/pull/19
           assert_equal %{407 "Proxy Authentication Required "}, err.message
         end
       end

data/test/connection_test.rb

@@ -212,6 +212,20 @@ class TestConnection < Faraday::TestCase
     assert_equal '/sake.html', uri.path
   end
 
+  def test_request_header_change_does_not_modify_connection_header
+    connection = Faraday.new(:url => "https://asushi.com/sake.html")
+    connection.headers = { "Authorization"=>"token abc123" }
+
+    request = connection.build_request(:get)
+    request.headers.delete("Authorization")
+
+    assert_equal connection.headers.keys.sort, ["Authorization"]
+    assert connection.headers.include?("Authorization")
+
+    assert_equal request.headers.keys.sort, []
+    assert !request.headers.include?("Authorization")
+  end
+
   def test_proxy_accepts_string
     with_env 'http_proxy', "http://duncan.proxy.com:80" do
       conn = Faraday::Connection.new
@@ -303,7 +317,8 @@ class TestConnection < Faraday::TestCase
     conn = Faraday::Connection.new 'http://sushi.com/foo',
       :ssl => { :verify => :none },
       :headers => {'content-type' => 'text/plain'},
-      :params => {'a'=>'1'}
+      :params => {'a'=>'1'},
+      :request => {:timeout => 5}
 
     other = conn.dup
 
@@ -314,11 +329,14 @@ class TestConnection < Faraday::TestCase
     other.basic_auth('', '')
     other.headers['content-length'] = 12
     other.params['b'] = '2'
+    other.options[:open_timeout] = 10
 
     assert_equal 2, other.builder.handlers.size
     assert_equal 2, conn.builder.handlers.size
     assert !conn.headers.key?('content-length')
     assert !conn.params.key?('b')
+    assert_equal 5, other.options[:timeout]
+    assert_nil conn.options[:open_timeout]
   end
 
   def test_init_with_block

data/test/middleware/retry_test.rb

@@ -6,20 +6,51 @@ module Middleware
       @stubs = Faraday::Adapter::Test::Stubs.new
       @conn = Faraday.new do |b|
         b.request :retry, 2
+        b.use ContentValidator
         b.adapter :test, @stubs
       end
     end
 
+    ContentValidator = Struct.new(:app) do
+      def call(env)
+        response = app.call(env)
+        type = response[:content_type]
+        raise "wrong content-type: %p" % type unless type == "application/json"
+      end
+    end
+
     def test_retries
       times_called = 0
 
       @stubs.post("/echo") do
         times_called += 1
-        raise "Error occurred"
+        [200, {}, "hello"]
       end
 
       @conn.post("/echo") rescue nil
       assert_equal times_called, 3
     end
+
+    def test_retry_with_body
+      times_called = 0
+      bodies_received = []
+
+      @stubs.post("/echo") do |env|
+        times_called += 1
+        bodies_received << env[:body]
+        if times_called < 2
+          [200, {"Content-type" => "text/plain"}, "hello"]
+        else
+          [200, {"Content-type" => "application/json"}, '{"message": "hello"}']
+        end
+      end
+
+      body = {:foo => "bar"}
+      @conn.post("/echo", body)
+
+      assert_equal times_called, 2
+      assert_same body, bodies_received[0]
+      assert_same body, bodies_received[1]
+    end
   end
 end

data/test/utils_test.rb

@@ -18,5 +18,13 @@ class TestUtils < Faraday::TestCase
     assert_equal '%2432%2C000.00', Faraday::Utils.escape(str)
   end
 
+  def test_replace_header_hash
+    headers = Faraday::Utils::Headers.new('authorization' => 't0ps3cr3t!')
+    assert headers.include?('authorization')
+
+    headers.replace({'content-type' => 'text/plain'})
+
+    assert !headers.include?('authorization')
+  end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-21 00:00:00.000000000 Z
+date: 2015-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -63,7 +63,9 @@ files:
 - lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
 - script/generate_certs
+- script/package
 - script/proxy-server
+- script/release
 - script/server
 - script/test
 - test/adapters/default_test.rb
@@ -111,8 +113,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
 test_files: []
+has_rdoc: