faraday 0.9.0.rc1 → 0.9.0.rc2

data/CHANGELOG.md

@@ -0,0 +1,12 @@
+# Faraday Changelog
+
+## v0.9.0.pre
+
+* Add HTTPClient adapter (@hakanensari)
+* Improve Retry handler (@mislav)
+* Remove autoloading by default (@technoweenie)
+* Improve internal docs (@technoweenie, @mislav)
+* Respect user/password in http proxy string (@mislav)
+* Adapter options are structs.  Reinforces consistent options across adapters
+  (@technoweenie)
+

data/faraday.gemspec

@@ -20,7 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'multipart-post', '~> 1.1'
   spec.add_development_dependency 'bundler', '~> 1.0'
 
-  spec.files = %w(.document CONTRIBUTING.md Gemfile LICENSE.md README.md Rakefile)
+  spec.files = %w(.document CHANGELOG.md CONTRIBUTING.md Gemfile LICENSE.md README.md Rakefile)
   spec.files << "#{lib}.gemspec"
   spec.files += Dir.glob("lib/**/*.rb")
   spec.files += Dir.glob("test/**/*.rb")

data/lib/faraday.rb

@@ -14,7 +14,7 @@ require 'forwardable'
 #   conn.get '/'
 #
 module Faraday
-  VERSION = "0.9.0.rc1"
+  VERSION = "0.9.0.rc2"
 
   class << self
     # Public: Gets or sets the root path that Faraday is being loaded from.

data/lib/faraday/adapter/em_synchrony.rb

@@ -19,7 +19,7 @@ module Faraday
 
       def call(env)
         super
-        request = EventMachine::HttpRequest.new(URI::parse(env[:url].to_s), connection_config(env))
+        request = EventMachine::HttpRequest.new(Utils::URI(env[:url].to_s), connection_config(env))
 
         http_method = env[:method].to_s.downcase.to_sym
 

data/lib/faraday/connection.rb

@@ -322,7 +322,6 @@ module Faraday
     # Returns the new String path prefix.
     def path_prefix=(value)
       url_prefix.path = if value
-        value = value.chomp '/'
         value = '/' + value unless value[0,1] == '/'
         value
       end
@@ -363,27 +362,6 @@ module Faraday
       end
     end
 
-    # Takes a relative url for a request and combines it with the defaults
-    # set on the connection instance.
-    #
-    #   conn = Faraday::Connection.new { ... }
-    #   conn.url_prefix = "https://sushi.com/api?token=abc"
-    #   conn.scheme      # => https
-    #   conn.path_prefix # => "/api"
-    #
-    #   conn.build_url("nigiri?page=2")      # => https://sushi.com/api/nigiri?token=abc&page=2
-    #   conn.build_url("nigiri", :page => 2) # => https://sushi.com/api/nigiri?token=abc&page=2
-    #
-    def build_url(url, extra_params = nil)
-      uri = build_exclusive_url(url)
-
-      query_values = self.params.dup.merge_query(uri.query, options.params_encoder)
-      query_values.update extra_params if extra_params
-      uri.query = query_values.empty? ? nil : query_values.to_query(options.params_encoder)
-
-      uri
-    end
-
     # Internal: Build an absolute URL based on url_prefix.
     #
     # url    - A String or URI-like object
@@ -391,7 +369,7 @@ module Faraday
     #          of the resulting url (default: nil).
     #
     # Returns the resulting URI instance.
-    def build_exclusive_url(url, params = nil)
+    def build_exclusive_url(url = nil, params = nil)
       url = nil if url.respond_to?(:empty?) and url.empty?
       base = url_prefix
       if url and base.path and base.path !~ /\/$/
@@ -408,7 +386,7 @@ module Faraday
     #
     # Returns a Faraday::Connection.
     def dup
-      self.class.new(build_url(''), :headers => headers.dup, :params => params.dup, :builder => builder.dup, :ssl => ssl.dup)
+      self.class.new(build_exclusive_url, :headers => headers.dup, :params => params.dup, :builder => builder.dup, :ssl => ssl.dup)
     end
 
     # Internal: Yields username and password extracted from a URI if they both exist.

data/lib/faraday/utils.rb

@@ -1,4 +1,3 @@
-require 'uri'
 require 'thread'
 Faraday.require_libs 'parameters'
 
@@ -235,12 +234,27 @@ module Faraday
       if url.respond_to?(:host)
         url
       elsif url.respond_to?(:to_str)
-        Kernel.URI(url)
+        default_uri_parser.call(url)
       else
         raise ArgumentError, "bad argument (expected URI object or URI string)"
       end
     end
 
+    def default_uri_parser
+      @default_uri_parser ||= begin
+        require 'uri'
+        Kernel.method(:URI)
+      end
+    end
+
+    def default_uri_parser=(parser)
+      @default_uri_parser = if parser.respond_to?(:call) || parser.nil?
+        parser
+      else
+        parser.method(:parse)
+      end
+    end
+
     # Receives a String or URI and returns just the path with the query string sorted.
     def normalize_path(url)
       url = URI(url)

data/test/connection_test.rb

@@ -1,5 +1,4 @@
 require File.expand_path('../helper', __FILE__)
-require 'uri'
 
 class TestConnection < Faraday::TestCase
 
@@ -105,112 +104,108 @@ class TestConnection < Faraday::TestCase
   def test_build_url_uses_connection_host_as_default_uri_host
     conn = Faraday::Connection.new
     conn.host = 'sushi.com'
-    uri = conn.build_url("/sake.html")
+    uri = conn.build_exclusive_url("/sake.html")
     assert_equal 'sushi.com', uri.host
   end
 
   def test_build_url_overrides_connection_port_for_absolute_urls
     conn = Faraday::Connection.new
     conn.port = 23
-    uri = conn.build_url("http://sushi.com")
+    uri = conn.build_exclusive_url("http://sushi.com")
     assert_equal 80, uri.port
   end
 
   def test_build_url_uses_connection_scheme_as_default_uri_scheme
     conn = Faraday::Connection.new 'http://sushi.com'
-    uri = conn.build_url("/sake.html")
+    uri = conn.build_exclusive_url("/sake.html")
     assert_equal 'http', uri.scheme
   end
 
   def test_build_url_uses_connection_path_prefix_to_customize_path
     conn = Faraday::Connection.new
     conn.path_prefix = '/fish'
-    uri = conn.build_url("sake.html")
+    uri = conn.build_exclusive_url("sake.html")
     assert_equal '/fish/sake.html', uri.path
   end
 
   def test_build_url_uses_root_connection_path_prefix_to_customize_path
     conn = Faraday::Connection.new
     conn.path_prefix = '/'
-    uri = conn.build_url("sake.html")
+    uri = conn.build_exclusive_url("sake.html")
     assert_equal '/sake.html', uri.path
   end
 
   def test_build_url_forces_connection_path_prefix_to_be_absolute
     conn = Faraday::Connection.new
     conn.path_prefix = 'fish'
-    uri = conn.build_url("sake.html")
+    uri = conn.build_exclusive_url("sake.html")
     assert_equal '/fish/sake.html', uri.path
   end
 
   def test_build_url_ignores_connection_path_prefix_trailing_slash
     conn = Faraday::Connection.new
     conn.path_prefix = '/fish/'
-    uri = conn.build_url("sake.html")
+    uri = conn.build_exclusive_url("sake.html")
     assert_equal '/fish/sake.html', uri.path
   end
 
   def test_build_url_allows_absolute_uri_to_ignore_connection_path_prefix
     conn = Faraday::Connection.new
     conn.path_prefix = '/fish'
-    uri = conn.build_url("/sake.html")
+    uri = conn.build_exclusive_url("/sake.html")
     assert_equal '/sake.html', uri.path
   end
 
   def test_build_url_parses_url_params_into_path
     conn = Faraday::Connection.new
-    uri = conn.build_url("http://sushi.com/sake.html")
+    uri = conn.build_exclusive_url("http://sushi.com/sake.html")
     assert_equal '/sake.html', uri.path
   end
 
   def test_build_url_doesnt_add_ending_slash_given_nil_url
     conn = Faraday::Connection.new
     conn.url_prefix = "http://sushi.com/nigiri"
-    uri = conn.build_url(nil)
+    uri = conn.build_exclusive_url
     assert_equal "/nigiri", uri.path
   end
 
   def test_build_url_doesnt_add_ending_slash_given_empty_url
     conn = Faraday::Connection.new
     conn.url_prefix = "http://sushi.com/nigiri"
-    uri = conn.build_url('')
+    uri = conn.build_exclusive_url('')
     assert_equal "/nigiri", uri.path
   end
 
   def test_build_url_parses_url_params_into_query
-    conn = Faraday::Connection.new
-    uri = conn.build_url("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
+    uri = build_url("http://sushi.com/sake.html", 'a[b]' => '1 + 2')
     assert_equal "a%5Bb%5D=1+%2B+2", uri.query
   end
 
   def test_build_url_escapes_per_spec
-    conn = Faraday::Connection.new
-    uri = conn.build_url('http:/', 'a' => '1+2 foo~bar.-baz')
+    uri = build_url('http:/', 'a' => '1+2 foo~bar.-baz')
     assert_equal "a=1%2B2+foo~bar.-baz", uri.query
   end
 
   def test_build_url_bracketizes_nested_params_in_query
-    conn = Faraday::Connection.new
-    uri = conn.build_url("http://sushi.com/sake.html", 'a' => {'b' => 'c'})
-    assert_equal "a%5Bb%5D=c", uri.query
+    url = build_url nil, 'a' => {'b' => 'c'}
+    assert_equal "a%5Bb%5D=c", url.query
   end
 
   def test_build_url_bracketizes_repeated_params_in_query
-    conn = Faraday::Connection.new
-    uri = conn.build_url("http://sushi.com/sake.html", 'a' => [1, 2])
+    uri = build_url("http://sushi.com/sake.html", 'a' => [1, 2])
     assert_equal "a%5B%5D=1&a%5B%5D=2", uri.query
   end
 
   def test_build_url_without_braketizing_repeated_params_in_query
-    conn = Faraday::Connection.new
-    conn.options.params_encoder = Faraday::FlatParamsEncoder
-    uri = conn.build_url("http://sushi.com/sake.html", 'a' => [1, 2])
+    uri = build_url 'http://sushi.com', 'a' => [1, 2] do |conn|
+      conn.options.params_encoder = Faraday::FlatParamsEncoder
+    end
     assert_equal "a=1&a=2", uri.query
   end
 
   def test_build_url_parses_url
     conn = Faraday::Connection.new
-    uri = conn.build_url("http://sushi.com/sake.html")
+    uri = conn.build_exclusive_url("http://sushi.com/sake.html")
     assert_equal "http",       uri.scheme
     assert_equal "sushi.com",  uri.host
     assert_equal '/sake.html', uri.path
@@ -219,13 +214,31 @@ class TestConnection < Faraday::TestCase
   def test_build_url_parses_url_and_changes_scheme
     conn = Faraday::Connection.new :url => "http://sushi.com/sushi"
     conn.scheme = 'https'
-    uri = conn.build_url("sake.html")
+    uri = conn.build_exclusive_url("sake.html")
     assert_equal 'https://sushi.com/sushi/sake.html', uri.to_s
   end
 
+  def test_build_url_joins_url_to_base_with_ending_slash
+    conn = Faraday::Connection.new :url => "http://sushi.com/sushi/"
+    uri = conn.build_exclusive_url("sake.html")
+    assert_equal 'http://sushi.com/sushi/sake.html', uri.to_s
+  end
+
+  def test_build_url_used_default_base_with_ending_slash
+    conn = Faraday::Connection.new :url => "http://sushi.com/sushi/"
+    uri = conn.build_exclusive_url
+    assert_equal 'http://sushi.com/sushi/', uri.to_s
+  end
+
+  def test_build_url_overrides_base
+    conn = Faraday::Connection.new :url => "http://sushi.com/sushi/"
+    uri = conn.build_exclusive_url('/sake/')
+    assert_equal 'http://sushi.com/sake/', uri.to_s
+  end
+
   def test_build_url_handles_uri_instances
     conn = Faraday::Connection.new
-    uri = conn.build_url(URI('/sake.html'))
+    uri = conn.build_exclusive_url(URI('/sake.html'))
     assert_equal '/sake.html', uri.path
   end
 
@@ -286,7 +299,7 @@ class TestConnection < Faraday::TestCase
 
     other = conn.dup
 
-    assert_equal conn.build_url(''), other.build_url('')
+    assert_equal conn.build_exclusive_url, other.build_exclusive_url
     assert_equal 'text/plain', other.headers['content-type']
     assert_equal '1', other.params['a']
 
@@ -314,6 +327,13 @@ class TestConnection < Faraday::TestCase
     assert_equal 1, conn.builder.handlers.size
     assert_equal '/omnom', conn.path_prefix
   end
+
+  def build_url(url, params)
+    conn = Faraday::Connection.new(url, :params => params)
+    yield conn if block_given?
+    req = conn.build_request(:get)
+    req.to_env(conn).url
+  end
 end
 
 class TestRequestParams < Faraday::TestCase

data/test/utils_test.rb

@@ -0,0 +1,37 @@
+require File.expand_path('../helper', __FILE__)
+
+class TestUtils < Faraday::TestCase
+  def setup
+    @url = "http://example.com/abc"
+  end
+
+  def teardown
+    Faraday::Utils.default_uri_parser = nil
+  end
+
+  def test_parses_with_default
+    assert_equal %(#<Method: Kernel.URI>), Faraday::Utils.default_uri_parser.to_s
+    uri = normalize(@url)
+    assert_equal 'example.com', uri.host
+  end
+
+  def test_parses_with_URI
+    Faraday::Utils.default_uri_parser = ::URI
+    assert_equal %(#<Method: URI.parse>), Faraday::Utils.default_uri_parser.to_s
+    uri = normalize(@url)
+    assert_equal 'example.com', uri.host
+  end
+
+  def test_parses_with_block
+    Faraday::Utils.default_uri_parser = lambda do |uri|
+      "booya#{"!" * uri.size}"
+    end
+
+    assert_equal 'booya!!!!!!!!!!!!!!!!!!!!!!', normalize(@url)
+  end
+
+  def normalize(url)
+    Faraday::Utils::URI(url)
+  end
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.9.0.rc1
+  version: 0.9.0.rc2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-08 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
@@ -50,6 +50,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .document
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE.md
@@ -115,6 +116,7 @@ files:
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
 - test/strawberry.rb
+- test/utils_test.rb
 - script/console
 - script/generate_certs
 - script/package
@@ -173,3 +175,4 @@ test_files:
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
 - test/strawberry.rb
+- test/utils_test.rb