faraday 0.7.2 → 0.7.3

data/faraday.gemspec

@@ -12,8 +12,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'faraday'
-  s.version           = '0.7.2'
-  s.date              = '2011-06-12'
+  s.version           = '0.7.3'
+  s.date              = '2011-06-27'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.7.2"
+  VERSION = "0.7.3"
 
   class << self
     attr_accessor :default_adapter

data/lib/faraday/adapter/typhoeus.rb

@@ -21,6 +21,13 @@ module Faraday
           :headers => env[:request_headers],
           :disable_ssl_peer_verification => (env[:ssl] && !env[:ssl].fetch(:verify, true))
 
+        if ssl = env[:ssl]
+          req.ssl_cert   = ssl[:client_cert_file] if ssl[:client_cert_file]
+          req.ssl_key    = ssl[:client_key_file]  if ssl[:client_key_file]
+          req.ssl_cacert = ssl[:ca_file]          if ssl[:ca_file]
+          req.ssl_capath = ssl[:ca_path]          if ssl[:ca_path]
+        end
+
         env_req = env[:request]
         req.timeout = req.connect_timeout = (env_req[:timeout] * 1000) if env_req[:timeout]
         req.connect_timeout = (env_req[:open_timeout] * 1000)          if env_req[:open_timeout]

data/lib/faraday/connection.rb

@@ -217,7 +217,9 @@ module Faraday
     def build_url(url, extra_params = nil)
       uri          = URI.parse(url.to_s)
       if @path_prefix && uri.path !~ /^\//
-        uri.path = "#{@path_prefix.size > 1 ? @path_prefix : nil}/#{uri.path}"
+        new_path = @path_prefix.size > 1 ? @path_prefix.dup : ''
+        new_path << "/#{uri.path}" unless uri.path.empty?
+        uri.path = new_path
       end
       uri.host   ||= @host
       uri.port   ||= @port

data/lib/faraday/error.rb

@@ -34,5 +34,7 @@ module Faraday
     class ConnectionFailed < ClientError;   end
     class ResourceNotFound < ClientError;   end
     class ParsingError     < ClientError;   end
+
+    class MissingDependency < StandardError; end
   end
 end

data/lib/faraday/request.rb

@@ -9,7 +9,7 @@ module Faraday
   #     req.body = 'abc'
   #   end
   #
-  class Request < Struct.new(:path, :params, :headers, :body)
+  class Request < Struct.new(:path, :params, :headers, :body, :options)
     extend AutoloadHelper
 
     autoload_all 'faraday/request',
@@ -32,8 +32,9 @@ module Faraday
 
     def initialize(request_method)
       @method = request_method
-      self.params = {}
+      self.params  = {}
       self.headers = {}
+      self.options = {}
     end
 
     def url(path, params = {})
@@ -68,13 +69,15 @@ module Faraday
     def to_env(connection)
       env_params  = connection.params.merge(params)
       env_headers = connection.headers.merge(headers)
+      request_options = Utils.deep_merge(connection.options, options)
+      Utils.deep_merge!(request_options, :proxy => connection.proxy)
 
       { :method           => method,
         :body             => body,
         :url              => connection.build_url(path, env_params),
         :request_headers  => env_headers,
         :parallel_manager => connection.parallel_manager,
-        :request          => connection.options.merge(:proxy => connection.proxy),
+        :request          => request_options,
         :ssl              => connection.ssl}
     end
   end

data/lib/faraday/request/json.rb

@@ -3,7 +3,11 @@ module Faraday
     self.mime_type = 'application/json'.freeze
 
     class << self
-      attr_accessor :adapter
+      attr_writer :adapter
+
+      def adapter
+        @adapter or raise Error::MissingDependency, "No JSON adapter available. Install either activesupport or yajl-ruby."
+      end
     end
 
     # loads the JSON encoder either from yajl-ruby or activesupport

data/lib/faraday/utils.rb

@@ -136,6 +136,23 @@ module Faraday
       (url.query ? "?#{sort_query_params(url.query)}" : "")
     end
 
+    # Recursive hash update
+    def deep_merge!(target, hash)
+      hash.each do |key, value|
+        if Hash === value and Hash === target[key]
+          target[key] = deep_merge(target[key], value)
+        else
+          target[key] = value
+        end
+      end
+      target
+    end
+
+    # Recursive hash merge
+    def deep_merge(source, hash)
+      deep_merge!(source.dup, hash)
+    end
+
     protected
 
     def sort_query_params(query)

data/test/connection_test.rb

@@ -147,6 +147,13 @@ class TestConnection < Faraday::TestCase
     assert_equal '/sake.html', uri.path
   end
 
+  def test_build_url_doesnt_add_ending_slash
+    conn = Faraday::Connection.new
+    conn.url_prefix = "http://sushi.com/nigiri"
+    uri = conn.build_url(nil)
+    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')

data/test/env_test.rb

@@ -2,55 +2,79 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class EnvTest < Faraday::TestCase
   def setup
-    @conn = Faraday.new :url => 'http://sushi.com/api', :headers => {'Mime-Version' => '1.0'}
+    @conn = Faraday.new :url => 'http://sushi.com/api',
+      :headers => {'Mime-Version' => '1.0'},
+      :request => {:oauth => {:consumer_key => 'anonymous'}}
+
     @conn.options[:timeout]      = 3
     @conn.options[:open_timeout] = 5
     @conn.ssl[:verify]           = false
     @conn.proxy 'http://proxy.com'
-    @input = { :body => 'abc' }
-    @env = env_for @conn do |req|
-      req.url 'foo.json', 'a' => 1
-      req['Server'] = 'Faraday'
-      req.body = @input[:body]
-    end
   end
 
   def test_request_create_stores_method
-    assert_equal :get, @env[:method]
+    env = make_env(:get)
+    assert_equal :get, env[:method]
   end
 
   def test_request_create_stores_addressable_uri
-    assert_equal 'http://sushi.com/api/foo.json?a=1', @env[:url].to_s
+    env = make_env do |req|
+      req.url 'foo.json', 'a' => 1
+    end
+    assert_equal 'http://sushi.com/api/foo.json?a=1', env[:url].to_s
   end
 
   def test_request_create_stores_headers
-    headers = @env[:request_headers]
+    env = make_env do |req|
+      req['Server'] = 'Faraday'
+    end
+    headers = env[:request_headers]
     assert_equal '1.0', headers['mime-version']
     assert_equal 'Faraday', headers['server']
   end
 
   def test_request_create_stores_body
-    assert_equal @input[:body], @env[:body]
+    env = make_env do |req|
+      req.body = 'hi'
+    end
+    assert_equal 'hi', env[:body]
   end
 
-  def test_request_create_stores_timeout_options
-    assert_equal 3, @env[:request][:timeout]
-    assert_equal 5, @env[:request][:open_timeout]
+  def test_global_request_options
+    env = make_env
+    assert_equal 3, env[:request][:timeout]
+    assert_equal 5, env[:request][:open_timeout]
+  end
+
+  def test_per_request_options
+    env = make_env do |req|
+      req.options[:timeout] = 10
+      req.options[:custom] = true
+      req.options[:oauth] = {:consumer_secret => 'xyz'}
+    end
+    assert_equal 10, env[:request][:timeout]
+    assert_equal 5, env[:request][:open_timeout]
+    assert_equal true, env[:request][:custom]
+
+    oauth_expected = {:consumer_secret => 'xyz', :consumer_key => 'anonymous'}
+    assert_equal oauth_expected, env[:request][:oauth]
   end
 
   def test_request_create_stores_ssl_options
-    assert_equal false, @env[:ssl][:verify]
+    env = make_env
+    assert_equal false, env[:ssl][:verify]
   end
 
   def test_request_create_stores_proxy_options
-    assert_equal 'proxy.com', @env[:request][:proxy][:uri].host
+    env = make_env
+    assert_equal 'proxy.com', env[:request][:proxy][:uri].host
   end
 
-  def env_for(connection)
-    env_setup = Faraday::Request.create(:get) do |req|
-      yield req
-    end
-    env_setup.to_env(connection)
+  private
+
+  def make_env(method = :get, connection = @conn, &block)
+    request = Faraday::Request.create(method, &block)
+    request.to_env(connection)
   end
 end
 

data/test/request_middleware_test.rb

@@ -42,6 +42,37 @@ class RequestMiddlewareTest < Faraday::TestCase
     assert_equal '{"a":"b"}', response.body
   end
 
+  def test_json_fails_with_useful_message_when_no_json_adapter_available
+    without_json_adapter do
+      expected_msg = "No JSON adapter available. Install either activesupport or yajl-ruby."
+      # assert_raise doesn't work to check the message (at least on 1.8.7)
+      begin
+        @conn.post('/echo', { :fruit => %w[apples oranges] }, 'content-type' => 'application/json')
+        fail "Exception not raised"
+      rescue Faraday::Error::MissingDependency => e
+        assert_equal expected_msg, e.message
+      end
+    end
+  end
+
+  def test_url_encoded_does_not_fail_when_no_json_adapter_available
+    without_json_adapter do
+      assert_nothing_raised {
+        @conn.post('/echo', { :fruit => %w[apples oranges] })
+      }
+    end
+  end
+
+  def without_json_adapter
+    original_adapter = Faraday::Request::JSON.adapter
+    Faraday::Request::JSON.adapter = nil
+    begin
+      yield
+    ensure
+      Faraday::Request::JSON.adapter = original_adapter
+    end
+  end
+
   def test_url_encoded_no_header
     response = @conn.post('/echo', { :fruit => %w[apples oranges] })
     assert_equal 'application/x-www-form-urlencoded', response.headers['Content-Type']

metadata

@@ -1,131 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: faraday
-version: !ruby/object:Gem::Version 
-  hash: 7
+version: !ruby/object:Gem::Version
+  version: 0.7.3
   prerelease: 
-  segments: 
-  - 0
-  - 7
-  - 2
-  version: 0.7.2
 platform: ruby
-authors: 
+authors:
 - Rick Olson
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-12 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-27 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70354659979760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 9
-        version: "0.9"
+      - !ruby/object:Gem::Version
+        version: '0.9'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: test-unit
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70354659979760
+- !ruby/object:Gem::Dependency
+  name: test-unit
+  requirement: &70354659979200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 5
-        segments: 
-        - 2
-        - 3
-        version: "2.3"
+      - !ruby/object:Gem::Version
+        version: '2.3'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70354659979200
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: &70354659978700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 6
-        version: "1.6"
+      - !ruby/object:Gem::Version
+        version: '1.6'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: addressable
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70354659978700
+- !ruby/object:Gem::Dependency
+  name: addressable
+  requirement: &70354659978200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 11
-        segments: 
-        - 2
-        - 2
-        - 6
+      - !ruby/object:Gem::Version
         version: 2.2.6
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: multipart-post
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70354659978200
+- !ruby/object:Gem::Dependency
+  name: multipart-post
+  requirement: &70354659977700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70354659977700
+- !ruby/object:Gem::Dependency
+  name: rack
+  requirement: &70354659977160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 1
-        - 1
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
     - - <
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 2
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id006
+  prerelease: false
+  version_requirements: *70354659977160
 description: HTTP/REST API client library.
 email: technoweenie@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - LICENSE.md
 - README.md
@@ -165,43 +125,31 @@ files:
 - test/middleware_stack_test.rb
 - test/request_middleware_test.rb
 - test/response_middleware_test.rb
-has_rdoc: true
 homepage: http://github.com/technoweenie/faraday
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 17
-      segments: 
-      - 1
-      - 3
-      - 5
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.5
 requirements: []
-
 rubyforge_project: faraday
-rubygems_version: 1.6.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.
-test_files: 
+test_files:
 - test/adapters/live_test.rb
 - test/adapters/logger_test.rb
 - test/adapters/net_http_test.rb