faraday 0.8.9 → 0.8.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c87939e5902a41f09fffd6519d9db4bf1a74ebf1
-  data.tar.gz: d865dcdc6a8dda8913ead8db02ecde8672b4a69c
+  metadata.gz: d43934c707a0fca6c31ccda1806c65af0c144b79
+  data.tar.gz: b30578af99d6349a20003d39441d66ee14f6992a
 SHA512:
-  metadata.gz: 7767a066cdc2dbdf190b3077c8ce2da3b1d12fd010b00da3b5709ca779e3737024775c08648e339acd95ca07f07d9ac8587d1b26b14a99afa6af26b7be1a07f6
-  data.tar.gz: 12b6d78d9a166235cfc2e54dd1d62582995ada6826b75871c512ea253a89b3c5bcf6f4f47219c596ff401079e43cd39e8271144f928899a8aa5596218d2bb0ec
+  metadata.gz: 8ad0e359c5aac602dd49f1c5c74a3009f0b42b5b42948f86cac8fd510603d46d75ab24ed30c4795903fc0b74cb0a828def6287f3dd097a37ec0e30ab673d2ca5
+  data.tar.gz: c713445a9a4efae7891594e8bb8bd7835ca32333db26df84d1e27f5eb8e80481683cea59a40afc42f31e9b4e6419605748410cf85cb75f598534e94870ea8219

data/Gemfile

@@ -5,16 +5,18 @@ gem 'jruby-openssl', '~> 0.8.8', :platforms => :jruby
 gem 'rake'
 
 group :test do
+  gem 'test-unit'
   gem 'em-http-request', '>= 1.1', :require => 'em-http'
   gem 'em-synchrony', '>= 1.0', :require => ['em-synchrony', 'em-synchrony/em-http']
   gem 'excon', '>= 0.27.4'
   gem 'leftright', '>= 0.9', :require => false
+  gem 'mime-types', '~> 1.25', :platforms => [:jruby, :ruby_18]
   gem 'net-http-persistent', '>= 2.5', :require => false
   gem 'patron', '>= 0.4.2', :platforms => :ruby
   gem 'rack-test', '>= 0.6', :require => 'rack/test'
   gem 'simplecov'
   gem 'sinatra', '~> 1.3'
-  gem 'typhoeus', '~> 0.3.3', :platforms => :ruby
+  gem 'typhoeus', '~> 0.3.3', :platforms => [:ruby_18, :ruby_19, :ruby_20, :ruby_21]
 end
 
 gemspec

data/lib/faraday.rb

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

data/lib/faraday/adapter/net_http.rb

@@ -24,6 +24,7 @@ module Faraday
       ]
 
       NET_HTTP_EXCEPTIONS << OpenSSL::SSL::SSLError if defined?(OpenSSL)
+      NET_HTTP_EXCEPTIONS << Net::OpenTimeout if defined?(Net::OpenTimeout)
 
       def call(env)
         super
@@ -81,7 +82,7 @@ module Faraday
           Net::HTTP::Proxy(proxy[:uri].host, proxy[:uri].port, proxy[:user], proxy[:password])
         else
           Net::HTTP
-        end.new(env[:url].host, env[:url].port)
+        end.new(env[:url].host, env[:url].port || (env[:url].scheme == 'https' ? 443 : 80))
       end
 
       def configure_ssl(http, ssl)

data/lib/faraday/adapter/patron.rb

@@ -52,8 +52,14 @@ module Faraday
         # HAX: helps but doesn't work completely
         # https://github.com/toland/patron/issues/34
         ::Patron::Request::VALID_ACTIONS.tap do |actions|
-          actions << :patch unless actions.include? :patch
-          actions << :options unless actions.include? :options
+          if actions[0].is_a?(Symbol)
+            actions << :patch unless actions.include? :patch
+            actions << :options unless actions.include? :options
+          else
+            # Patron 0.4.20 and up
+            actions << "PATCH" unless actions.include? "PATCH"
+            actions << "OPTIONS" unless actions.include? "OPTIONS"
+          end
         end
       end
 

data/script/test

@@ -149,7 +149,7 @@ run_test_files() {
 
 check_warnings() {
   # Display Ruby warnings from this project's source files. Abort if any were found.
-  num="$(grep -F "$PWD" "$warnings" | grep -v "${PWD}/bundle" | sort | uniq -c | sort -rn | tee /dev/stderr | wc -l)"
+  num="$(grep -F "$PWD" "$warnings" | grep -v "${PWD}/vendor/bundle" | sort | uniq -c | sort -rn | tee /dev/stderr | wc -l)"
   rm -f "$warnings"
   if [ "$num" -gt 0 ]; then
     echo "FAILED: this test suite doesn't tolerate Ruby syntax warnings!" >&2

data/test/adapters/net_http_test.rb

@@ -1,4 +1,6 @@
 require File.expand_path('../integration', __FILE__)
+require 'ostruct'
+require 'uri'
 
 module Adapters
   class NetHttpTest < Faraday::TestCase
@@ -10,5 +12,34 @@ module Adapters
 
     Integration.apply(self, *behaviors)
 
+    def test_no_explicit_http_port_number
+      url = URI('http://example.com')
+      url.port = nil
+
+      adapter = Faraday::Adapter::NetHttp.new
+      http = adapter.net_http_connection(:url => url, :request => {})
+
+      assert_equal 80, http.port
+    end
+
+    def test_no_explicit_https_port_number
+      url = URI('https://example.com')
+      url.port = nil
+
+      adapter = Faraday::Adapter::NetHttp.new
+      http = adapter.net_http_connection(:url => url, :request => {})
+
+      assert_equal 443, http.port
+    end
+
+    def test_explicit_port_number
+      url = URI('https://example.com:1234')
+
+      adapter = Faraday::Adapter::NetHttp.new
+      http = adapter.net_http_connection(:url => url, :request => {})
+
+      assert_equal 1234, http.port
+    end
+
   end
 end

data/test/adapters/patron_test.rb

@@ -11,7 +11,7 @@ module Adapters
 
       # https://github.com/toland/patron/issues/52
       undef :test_GET_with_body
-    end unless jruby?
+    end unless RUBY_VERSION < '1.9' or jruby?
 
   end
 end

data/test/adapters/typhoeus_test.rb

@@ -15,7 +15,7 @@ module Adapters
 
       # inconsistent outcomes ranging from successful response to connection error
       undef :test_proxy_auth_fail if ssl_mode?
-    end unless jruby?
+    end unless jruby? or ruby_22_plus?
 
   end
 end

data/test/helper.rb

@@ -1,11 +1,10 @@
-unless ENV['CI']
-  begin
-    require 'simplecov'
-    SimpleCov.start do
-      add_filter 'test'
-      add_filter '/bundle/'
-    end
-  rescue LoadError
+if RUBY_VERSION >= '1.9'
+  require 'simplecov'
+
+  SimpleCov.start do
+    add_filter '/bundle/'
+    add_filter '/test/'
+    minimum_coverage(88.74)
   end
 end
 
@@ -71,6 +70,10 @@ module Faraday
       defined? RUBY_ENGINE and 'rbx' == RUBY_ENGINE
     end
 
+    def self.ruby_22_plus?
+      RUBY_VERSION > '2.2'
+    end
+
     def self.ssl_mode?
       ENV['SSL'] == 'yes'
     end

data/test/parameters_test.rb

@@ -0,0 +1,24 @@
+require File.expand_path("../helper", __FILE__)
+
+class TestParameters < Faraday::TestCase
+  # emulates ActiveSupport::SafeBuffer#gsub
+  FakeSafeBuffer = Struct.new(:string) do
+    def to_s() self end
+    def gsub(regex)
+      string.gsub(regex) {
+        match, = $&, '' =~ /a/
+        yield(match)
+      }
+    end
+  end
+
+  def test_escaping_safe_buffer_nested
+    monies = FakeSafeBuffer.new("$32,000.00")
+    assert_equal "a=%2432%2C000.00", Faraday::Utils.build_nested_query("a" => monies)
+  end
+
+  def test_escaping_safe_buffer_flat
+    monies = FakeSafeBuffer.new("$32,000.00")
+    assert_equal "a=%2432%2C000.00", Faraday::Utils.build_query("a" => monies)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.8.9
+  version: 0.8.10
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-10 00:00:00.000000000 Z
+date: 2015-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -24,34 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -115,6 +87,7 @@ files:
 - test/middleware/retry_test.rb
 - test/middleware_stack_test.rb
 - test/multibyte.txt
+- test/parameters_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
 - test/utils_test.rb
@@ -143,4 +116,3 @@ signing_key:
 specification_version: 2
 summary: HTTP/REST API client library.
 test_files: []
-has_rdoc: