faraday 0.8.11 → 0.9.0.rc1

data/test/options_test.rb

@@ -0,0 +1,126 @@
+require File.expand_path('../helper', __FILE__)
+
+class OptionsTest < Faraday::TestCase
+  class SubOptions < Faraday::Options.new(:sub); end
+  class Options < Faraday::Options.new(:a, :b, :c)
+    options :c => SubOptions
+  end
+
+  def test_request_proxy_setter
+    options = Faraday::RequestOptions.new
+    assert_nil options.proxy
+
+    assert_raises NoMethodError do
+      options[:proxy] = {:booya => 1}
+    end
+
+    options[:proxy] = {:user => 'user'}
+    assert_kind_of Faraday::ProxyOptions, options.proxy
+    assert_equal 'user', options.proxy.user
+
+    options.proxy = nil
+    assert_nil options.proxy
+  end
+
+  def test_proxy_options_from_string
+    options = Faraday::ProxyOptions.from 'http://user:pass@example.org'
+    assert_equal 'user', options.user
+    assert_equal 'pass', options.password
+    assert_kind_of URI, options.uri
+    assert_equal '', options.path
+    assert_equal 80, options.port
+    assert_equal 'example.org', options.host
+    assert_equal 'http', options.scheme
+  end
+
+  def test_from_options
+    options = Options.new 1
+
+    value = Options.from(options)
+    assert_equal 1, value.a
+    assert_nil value.b
+  end
+
+  def test_from_options_with_sub_object
+    sub = SubOptions.new 1
+    options = Options.from :a => 1, :c => sub
+    assert_kind_of Options, options
+    assert_equal 1, options.a
+    assert_nil options.b
+    assert_kind_of SubOptions, options.c
+    assert_equal 1, options.c.sub
+  end
+
+  def test_from_hash
+    options = Options.from :a => 1
+    assert_kind_of Options, options
+    assert_equal 1, options.a
+    assert_nil options.b
+  end
+
+  def test_from_hash_with_sub_object
+    options = Options.from :a => 1, :c => {:sub => 1}
+    assert_kind_of Options, options
+    assert_equal 1, options.a
+    assert_nil options.b
+    assert_kind_of SubOptions, options.c
+    assert_equal 1, options.c.sub
+  end
+
+  def test_from_deep_hash
+    hash = {:b => 1}
+    options = Options.from :a => hash
+    assert_equal 1, options.a[:b]
+
+    hash[:b] = 2
+    assert_equal 1, options.a[:b]
+
+    options.a[:b] = 3
+    assert_equal 2, hash[:b]
+    assert_equal 3, options.a[:b]
+  end
+
+  def test_from_nil
+    options = Options.from(nil)
+    assert_kind_of Options, options
+    assert_nil options.a
+    assert_nil options.b
+  end
+
+  def test_invalid_key
+    assert_raises NoMethodError do
+      Options.from :invalid => 1
+    end
+  end
+
+  def test_update
+    options = Options.new 1
+    assert_equal 1, options.a
+    assert_nil options.b
+
+    updated = options.update :a => 2, :b => 3
+    assert_equal 2, options.a
+    assert_equal 3, options.b
+    assert_equal options, updated
+  end
+
+  def test_delete
+    options = Options.new 1
+    assert_equal 1, options.a
+    assert_equal 1, options.delete(:a)
+    assert_nil options.a
+  end
+
+  def test_merge
+    options = Options.new 1
+    assert_equal 1, options.a
+    assert_nil options.b
+
+    dup = options.merge :a => 2, :b => 3
+    assert_equal 2, dup.a
+    assert_equal 3, dup.b
+    assert_equal 1, options.a
+    assert_nil options.b
+  end
+end
+

data/test/request_middleware_test.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path('../helper', __FILE__)
 
 Faraday::CompositeReadIO.class_eval { attr_reader :ios }
 
@@ -62,12 +62,22 @@ class RequestMiddlewareTest < Faraday::TestCase
     assert_equal expected, Faraday::Utils.parse_nested_query(response.body)
   end
 
+  def test_url_encoded_non_nested
+    response = @conn.post('/echo', { :dimensions => ['date', 'location']}) do |req|
+      req.options.params_encoder = Faraday::FlatParamsEncoder
+    end
+    assert_equal 'application/x-www-form-urlencoded', response.headers['Content-Type']
+    expected = { 'dimensions' => ['date', 'location'] }
+    assert_equal expected, Faraday::Utils.parse_query(response.body)
+    assert_equal 'dimensions=date&dimensions=location', response.body
+  end
+
   def test_url_encoded_unicode
     err = capture_warnings {
       response = @conn.post('/echo', {:str => "eé cç aã aâ"})
       assert_equal "str=e%C3%A9+c%C3%A7+a%C3%A3+a%C3%A2", response.body
     }
-    assert err.empty?, "stderr did include: #{err}"
+    assert err.empty?
   end
 
   def test_url_encoded_unicode_with_kcode_set
@@ -76,7 +86,7 @@ class RequestMiddlewareTest < Faraday::TestCase
         response = @conn.post('/echo', {:str => "eé cç aã aâ"})
         assert_equal "str=e%C3%A9+c%C3%A7+a%C3%A3+a%C3%A2", response.body
       }
-      assert err.empty?, "stderr did include: #{err}"
+      assert err.empty?
     end
   end
 
@@ -96,7 +106,7 @@ class RequestMiddlewareTest < Faraday::TestCase
     response = @conn.post('/echo', payload)
 
     assert_kind_of Faraday::CompositeReadIO, response.body
-    assert_equal "multipart/form-data; boundary=%s" % Faraday::Request::Multipart::DEFAULT_BOUNDARY,
+    assert_equal "multipart/form-data;boundary=%s" % Faraday::Request::Multipart::DEFAULT_BOUNDARY,
       response.headers['Content-Type']
 
     response.body.send(:ios).map{|io| io.read}.each do |io|
@@ -106,7 +116,7 @@ class RequestMiddlewareTest < Faraday::TestCase
     end
     assert_equal [], regexes
   end
-
+  
   def test_multipart_with_arrays
     # assume params are out of order
     regexes = [
@@ -118,7 +128,7 @@ class RequestMiddlewareTest < Faraday::TestCase
     response = @conn.post('/echo', payload)
 
     assert_kind_of Faraday::CompositeReadIO, response.body
-    assert_equal "multipart/form-data; boundary=%s" % Faraday::Request::Multipart::DEFAULT_BOUNDARY,
+    assert_equal "multipart/form-data;boundary=%s" % Faraday::Request::Multipart::DEFAULT_BOUNDARY,
       response.headers['Content-Type']
 
     response.body.send(:ios).map{|io| io.read}.each do |io|
@@ -128,5 +138,5 @@ class RequestMiddlewareTest < Faraday::TestCase
     end
     assert_equal [], regexes
   end
-
+  
 end

data/test/response_middleware_test.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
+require File.expand_path('../helper', __FILE__)
 
 class ResponseMiddlewareTest < Faraday::TestCase
   def setup
@@ -19,9 +19,7 @@ class ResponseMiddlewareTest < Faraday::TestCase
   end
 
   def test_success
-    assert_nothing_raised do
-      @conn.get('ok')
-    end
+    assert @conn.get('ok')
   end
 
   def test_raises_not_found

data/test/strawberry.rb

@@ -0,0 +1,2 @@
+class MiddlewareStackTest::Strawberry < MiddlewareStackTest::Handler
+end

metadata

@@ -1,77 +1,99 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.8.11
+  version: 0.9.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
 description: 
 email: technoweenie@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- .document
+- CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
 - README.md
 - Rakefile
-- lib/faraday.rb
-- lib/faraday/adapter.rb
+- faraday.gemspec
 - lib/faraday/adapter/em_http.rb
-- lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/em_synchrony/parallel_manager.rb
+- lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/excon.rb
+- lib/faraday/adapter/httpclient.rb
 - lib/faraday/adapter/net_http.rb
 - lib/faraday/adapter/net_http_persistent.rb
 - lib/faraday/adapter/patron.rb
 - lib/faraday/adapter/rack.rb
 - lib/faraday/adapter/test.rb
 - lib/faraday/adapter/typhoeus.rb
-- lib/faraday/builder.rb
+- lib/faraday/adapter.rb
+- lib/faraday/autoload.rb
 - lib/faraday/connection.rb
 - lib/faraday/error.rb
 - lib/faraday/middleware.rb
-- lib/faraday/request.rb
+- lib/faraday/options.rb
+- lib/faraday/parameters.rb
+- lib/faraday/rack_builder.rb
 - lib/faraday/request/authorization.rb
 - lib/faraday/request/basic_authentication.rb
+- lib/faraday/request/instrumentation.rb
 - lib/faraday/request/multipart.rb
 - lib/faraday/request/retry.rb
 - lib/faraday/request/token_authentication.rb
 - lib/faraday/request/url_encoded.rb
-- lib/faraday/response.rb
+- lib/faraday/request.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
-- script/generate_certs
-- script/package
-- script/proxy-server
-- script/release
-- script/server
-- script/test
+- lib/faraday.rb
 - test/adapters/default_test.rb
 - test/adapters/em_http_test.rb
 - test/adapters/em_synchrony_test.rb
 - test/adapters/excon_test.rb
+- test/adapters/httpclient_test.rb
 - test/adapters/integration.rb
 - test/adapters/logger_test.rb
 - test/adapters/net_http_persistent_test.rb
@@ -86,36 +108,68 @@ files:
 - test/env_test.rb
 - test/helper.rb
 - test/live_server.rb
+- test/middleware/instrumentation_test.rb
 - test/middleware/retry_test.rb
 - test/middleware_stack_test.rb
-- test/multibyte.txt
-- test/parameters_test.rb
+- test/options_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
-- test/utils_test.rb
+- test/strawberry.rb
+- script/console
+- script/generate_certs
+- script/package
+- script/release
+- script/server
+- script/test
 homepage: https://github.com/lostisland/faraday
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
-test_files: []
-has_rdoc: 
+test_files:
+- test/adapters/default_test.rb
+- test/adapters/em_http_test.rb
+- test/adapters/em_synchrony_test.rb
+- test/adapters/excon_test.rb
+- test/adapters/httpclient_test.rb
+- test/adapters/integration.rb
+- test/adapters/logger_test.rb
+- test/adapters/net_http_persistent_test.rb
+- test/adapters/net_http_test.rb
+- test/adapters/patron_test.rb
+- test/adapters/rack_test.rb
+- test/adapters/test_middleware_test.rb
+- test/adapters/typhoeus_test.rb
+- test/authentication_middleware_test.rb
+- test/composite_read_io_test.rb
+- test/connection_test.rb
+- test/env_test.rb
+- test/helper.rb
+- test/live_server.rb
+- test/middleware/instrumentation_test.rb
+- test/middleware/retry_test.rb
+- test/middleware_stack_test.rb
+- test/options_test.rb
+- test/request_middleware_test.rb
+- test/response_middleware_test.rb
+- test/strawberry.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 431792ff21fb498eb658855f87503d2081869616
-  data.tar.gz: c6b3a7f9c1a9f7a4a60eff2236b882dbd812eab4
-SHA512:
-  metadata.gz: 8855727969169984a104ba02c2ed27b4a86fb7d3a698fe6f5932c4858cb5e4f5eba9251d3742cb8d999b654f89ff2d073228738998f3199ae104e9e9883bd031
-  data.tar.gz: eda459cc1abe00450f0d48dab3b069544dd414001faf9be231e2215fa81efced7496a99a2baa6502f1d7bbe162f6b41f415cdef1cd9ce935a9de8752749997a3

data/script/proxy-server

@@ -1,41 +0,0 @@
-#!/usr/bin/env ruby
-# Usage: script/proxy-server [-p PORT] [-u USER:PASSWORD]
-require 'webrick'
-require 'webrick/httpproxy'
-
-port = 4001
-
-if found = ARGV.index('-p')
-  port = ARGV[found + 1].to_i
-end
-if found = ARGV.index('-u')
-  username, password = ARGV[found + 1].split(':', 2)
-end
-
-match_credentials = lambda { |credentials|
-  got_username, got_password = credentials.to_s.unpack("m*")[0].split(":", 2)
-  got_username == username && got_password == password
-}
-
-log_io = $stdout
-log_io.sync = true
-
-webrick_opts = {
-  :Port => port, :Logger => WEBrick::Log::new(log_io),
-  :AccessLog => [[log_io, "[%{X-Faraday-Adapter}i] %m  %U  ->  %s %b"]],
-  :ProxyAuthProc => lambda { |req, res|
-    if username
-      type, credentials = req.header['proxy-authorization'].first.to_s.split(/\s+/, 2)
-      unless "Basic" == type && match_credentials.call(credentials)
-        raise WEBrick::HTTPStatus::ProxyAuthenticationRequired
-      end
-    end
-  }
-}
-
-proxy = WEBrick::HTTPProxyServer.new(webrick_opts)
-
-trap(:TERM) { proxy.shutdown }
-trap(:INT) { proxy.shutdown }
-
-proxy.start