faraday 0.5.6 → 0.5.7

data/README.md

@@ -6,7 +6,7 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 
 ## Usage
 
-    conn = Faraday::Connection.new(:url => 'http://sushi.com') do |builder|
+    conn = Faraday.new(:url => 'http://sushi.com') do |builder|
       builder.use Faraday::Request::Yajl        # convert body to json with Yajl lib
       builder.use Faraday::Adapter::Logger      # log the request somewhere?
       builder.use Faraday::Adapter::Typhoeus    # make http request with typhoeus
@@ -24,7 +24,8 @@ This mess is gonna get raw, like sushi. So, haters to the left.
     resp1 = conn.get '/nigiri/sake.json'
     resp2 = conn.post do |req|
       req.url  "/nigiri.json", :page => 2
-      req["Content-Type"] = 'application/json'
+      req.params['limit'] = 100 # &limit=100
+      req.headers["Content-Type"] = 'application/json'
       req.body = {:name => 'Unagi'}
     end
 
@@ -40,7 +41,7 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 
     # You can pass stubbed request to the test adapter or define them in a block
     # or a combination of the two.
-    test = Faraday::Connection.new do |builder|
+    test = Faraday.new do |builder|
       builder.adapter :test, stubs do |stub|
         stub.get('/ebi') {[ 200, {}, 'shrimp' ]}
       end
@@ -72,7 +73,7 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 * Add curb, em-http, fast_http
 
 ## Note on Patches/Pull Requests
- 
+
 * Fork the project.
 * Make your feature addition or bug fix.
 * Add tests for it. This is important so I don't break it in a
@@ -83,4 +84,4 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 
 ## Copyright
 
-Copyright (c) 2009-2010 rick, hobson. See LICENSE for details.
+Copyright (c) 2009-2011 rick, hobson. See LICENSE for details.

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.5.6'
-  s.date              = '2011-02-15'
+  s.version           = '0.5.7'
+  s.date              = '2011-02-27'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long
@@ -52,6 +52,7 @@ Gem::Specification.new do |s|
     lib/faraday/adapter/action_dispatch.rb
     lib/faraday/adapter/em_synchrony.rb
     lib/faraday/adapter/excon.rb
+    lib/faraday/adapter/logger.rb
     lib/faraday/adapter/net_http.rb
     lib/faraday/adapter/patron.rb
     lib/faraday/adapter/test.rb
@@ -69,6 +70,7 @@ Gem::Specification.new do |s|
     lib/faraday/upload_io.rb
     lib/faraday/utils.rb
     test/adapters/live_test.rb
+    test/adapters/logger_test.rb
     test/adapters/test_middleware_test.rb
     test/adapters/typhoeus_test.rb
     test/connection_app_test.rb

data/lib/faraday.rb

@@ -1,10 +1,15 @@
 module Faraday
-  VERSION = "0.5.6"
+  VERSION = "0.5.7"
 
   class << self
     attr_accessor :default_adapter
     attr_writer   :default_connection
 
+    def new(url = nil, options = {})
+      block = block_given? ? Proc.new : nil
+      Faraday::Connection.new(url, options, &block)
+    end
+
   private
     def method_missing(name, *args, &block)
       default_connection.send(name, *args, &block)

data/lib/faraday/adapter.rb

@@ -13,7 +13,8 @@ module Faraday
       :EMSynchrony    => 'em_synchrony',
       :Patron         => 'patron',
       :Excon          => 'excon',
-      :Test           => 'test'
+      :Test           => 'test',
+      :Logger         => 'logger'
 
     register_lookup_modules \
       :action_dispatch => :ActionDispatch,
@@ -22,7 +23,8 @@ module Faraday
       :typhoeus        => :Typhoeus,
       :patron          => :Patron,
       :em_synchrony    => :EMSynchrony,
-      :excon           => :Excon
+      :excon           => :Excon,
+      :logger          => :Logger
 
     def call(env)
       process_body_for_request(env)
@@ -79,10 +81,11 @@ module Faraday
       Faraday::CompositeReadIO.new(*parts.map{|p| p.to_io })
     end
 
-    def process_to_params(pieces, params, base = nil, &block)
+    def process_to_params(pieces, params, base = nil)
       params.to_a.each do |key, value|
         key_str = base ? "#{base}[#{key}]" : key
 
+        block = block_given? ? Proc.new : nil
         case value
         when Array
           values = value.inject([]) { |a,v| a << [nil, v] }

data/lib/faraday/adapter/em_synchrony.rb

@@ -26,7 +26,8 @@ module Faraday
         process_body_for_request(env)
         request = EventMachine::HttpRequest.new(URI::parse(env[:url].to_s))
         options = {:head => env[:request_headers]}
-
+        options[:ssl] = env[:ssl] if env[:ssl]
+        
         if env[:body]
           if env[:body].respond_to? :read
             options[:body] = env[:body].read

data/lib/faraday/adapter/logger.rb

@@ -0,0 +1,32 @@
+module Faraday
+  class Adapter
+    class Logger < Faraday::Adapter
+      def self.loaded?() false end
+
+      def initialize(app = nil, logger = nil)
+        super(app)
+        @logger = logger || begin
+          require 'logger'
+          ::Logger.new(STDOUT)
+        end
+      end
+
+      def call(env)
+        super
+        @logger.info "#{env[:method]} #{env[:url].to_s}"
+        @logger.debug("request") do
+          env[:request_headers].map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
+        end
+
+        env[:response].on_complete do |resp_env|
+          @logger.info("Status") { env[:status].to_s }
+          @logger.debug("response") do
+            resp_env[:response_headers].map { |k, v| "#{k}: #{v.inspect}" }.join("\n")
+          end
+        end
+
+        @app.call(env)
+      end
+    end
+  end
+end

data/lib/faraday/adapter/patron.rb

@@ -22,7 +22,6 @@ module Faraday
           :response_headers => resp.headers.
             inject({}) { |memo, (k, v)| memo.update(k.downcase => v) },
           :body             => resp.body
-        env[:response].finish(env)
 
         @app.call env
       rescue Errno::ECONNREFUSED

data/lib/faraday/adapter/test.rb

@@ -7,7 +7,7 @@ module Faraday
     #     end
     #   end
     # end
-    # 
+    #
     # resp = test.get '/nigiri/sake.json'
     # resp.body # => 'hi world'
     #

data/lib/faraday/adapter/typhoeus.rb

@@ -26,18 +26,19 @@ module Faraday
         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]
 
+        is_parallel = !!env[:parallel_manager]
         req.on_complete do |resp|
           env.update \
             :status           => resp.code,
             :response_headers => parse_response_headers(resp.headers),
             :body             => resp.body
-          env[:response].finish(env)
+          env[:response].finish(env) if !is_parallel
         end
 
         hydra = env[:parallel_manager] || self.class.setup_parallel_manager
         hydra.queue req
 
-        if !env[:parallel_manager]
+        if !is_parallel
           hydra.run
         end
 

data/lib/faraday/builder.rb

@@ -9,7 +9,8 @@ module Faraday
   class Builder
     attr_accessor :handlers
 
-    def self.create(&block)
+    def self.create
+      block = block_given? ? Proc.new : nil
       Builder.new(&block)
     end
 
@@ -19,17 +20,17 @@ module Faraday
       end
     end
 
-    def initialize(handlers = [], &block)
+    def initialize(handlers = [])
       @handlers = handlers
-      build(&block) if block_given?
+      build(Proc.new) if block_given?
     end
 
-    def build(options = {}, &block)
+    def build(options = {})
       inner = @handlers.shift
       if !options[:keep]
         @handlers.clear
       end
-      block.call(self)
+      yield self if block_given?
       run(inner || self.class.inner_app)
     end
 
@@ -51,23 +52,28 @@ module Faraday
       @handlers[1..-1].inject(inner_app) { |app, middleware| middleware.call(app) }
     end
 
-    def use(klass, *args, &block)
+    def use(klass, *args)
+      block = block_given? ? Proc.new : nil
       run(lambda { |app| klass.new(app, *args, &block) })
     end
 
-    def request(key, *args, &block)
+    def request(key, *args)
+      block = block_given? ? Proc.new : nil
       use_symbol(Faraday::Request, key, *args, &block)
     end
 
-    def response(key, *args, &block)
+    def response(key, *args)
+      block = block_given? ? Proc.new : nil
       use_symbol(Faraday::Response, key, *args, &block)
     end
 
-    def adapter(key, *args, &block)
+    def adapter(key, *args)
+      block = block_given? ? Proc.new : nil
       use_symbol(Faraday::Adapter, key, *args, &block)
     end
 
-    def use_symbol(mod, key, *args, &block)
+    def use_symbol(mod, key, *args)
+      block = block_given? ? Proc.new : nil
       use(mod.lookup_module(key), *args, &block)
     end
 

data/lib/faraday/connection.rb

@@ -17,7 +17,7 @@ module Faraday
     # :headers
     # :request
     # :ssl
-    def initialize(url = nil, options = {}, &block)
+    def initialize(url = nil, options = {})
       if url.is_a?(Hash)
         options = url
         url     = options[:url]
@@ -32,7 +32,8 @@ module Faraday
       merge_params  @params,  options[:params]  if options[:params]
       merge_headers @headers, options[:headers] if options[:headers]
 
-      if block
+      if block_given?
+        block    = Proc.new
         @builder = Builder.new
         @builder.build { block.call(self) }
       else
@@ -60,23 +61,28 @@ module Faraday
       @builder.build(options, &block)
     end
 
-    def get(url = nil, headers = nil, &block)
+    def get(url = nil, headers = nil)
+      block = block_given? ? Proc.new : nil
       run_request(:get, url, nil, headers, &block)
     end
 
-    def post(url = nil, body = nil, headers = nil, &block)
+    def post(url = nil, body = nil, headers = nil)
+      block = block_given? ? Proc.new : nil
       run_request(:post, url, body, headers, &block)
     end
 
-    def put(url = nil, body = nil, headers = nil, &block)
+    def put(url = nil, body = nil, headers = nil)
+      block = block_given? ? Proc.new : nil
       run_request(:put, url, body, headers, &block)
     end
 
-    def head(url = nil, headers = nil, &block)
+    def head(url = nil, headers = nil)
+      block = block_given? ? Proc.new : nil
       run_request(:head, url, nil, headers, &block)
     end
 
-    def delete(url = nil, headers = nil, &block)
+    def delete(url = nil, headers = nil)
+      block = block_given? ? Proc.new : nil
       run_request(:delete, url, nil, headers, &block)
     end
 

data/lib/faraday/error.rb

@@ -6,7 +6,7 @@ module Faraday
       end
 
       def message
-        @inner_exception.respond_to?(:message) ? 
+        @inner_exception.respond_to?(:message) ?
           @inner_exception.message             :
           @inner_exception.to_s
       end

data/lib/faraday/request.rb

@@ -3,8 +3,9 @@ module Faraday
   #
   #   @connection.post do |req|
   #     req.url 'http://localhost', 'a' => '1' # 'http://localhost?a=1'
-  #     req.headers['b'] = '2' # header
-  #     req['b']         = '2' # header
+  #     req.headers['b'] = '2' # Header
+  #     req.params['c']  = '3' # GET Param
+  #     req['b']         = '2' # also Header
   #     req.body = 'abc'
   #   end
   #
@@ -71,7 +72,7 @@ module Faraday
       { :method           => request_method,
         :body             => body,
         :url              => connection.build_url(path, env_params),
-        :request_headers  => env_headers.update(headers),
+        :request_headers  => env_headers,
         :parallel_manager => connection.parallel_manager,
         :response         => Response.new,
         :request          => connection.options.merge(:proxy => connection.proxy),

data/lib/faraday/response.rb

@@ -41,7 +41,9 @@ module Faraday
     end
 
     def finish(env)
-      env[:body] ||= ''
+      return self if @status
+      env[:body]             ||= ''
+      env[:response_headers] ||= {}
       @on_complete_callbacks.each { |c| c.call(env) }
       @status, @headers, @body = env[:status], env[:response_headers], env[:body]
       self

data/lib/faraday/response/active_support_json.rb

@@ -23,8 +23,8 @@ module Faraday
 
     def self.parse(body)
       ActiveSupport::JSON.decode(body)
-    rescue Object => err
-      raise Faraday::Error::ParsingError.new(err)
+    rescue Object
+      raise Faraday::Error::ParsingError, $!
     end
   end
 end

data/lib/faraday/response/yajl.rb

@@ -19,8 +19,8 @@ module Faraday
 
     def self.parse(body)
       Yajl::Parser.parse(body)
-    rescue Object => err
-      raise Faraday::Error::ParsingError.new(err)
+    rescue Object
+      raise Faraday::Error::ParsingError, $!
     end
   end
 end

data/test/adapters/logger_test.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.join(File.dirname(__FILE__), '..', 'helper'))
+require 'stringio'
+require 'logger'
+
+module Adapters
+  class LoggerTest < Faraday::TestCase
+    def setup
+      @io     = StringIO.new
+      @logger = Logger.new(@io)
+      @logger.level = Logger::DEBUG
+
+      @conn = Faraday.new do |b|
+        b.adapter :logger, @logger
+        b.adapter :test do |stubs|
+          stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }
+        end
+      end
+      @resp = @conn.get '/hello', :accept => 'text/html'
+    end
+
+    def test_still_returns_output
+      assert_equal 'hello', @resp.body
+    end
+
+    def test_logs_method_and_url
+      assert_match "get /hello", @io.string
+    end
+
+    def test_logs_request_headers
+      assert_match %(Accept: "text/html), @io.string
+    end
+
+    def test_logs_response_headers
+      assert_match %(Content-Type: "text/html), @io.string
+    end
+  end
+end

data/test/adapters/test_middleware_test.rb

@@ -4,7 +4,7 @@ module Adapters
   class TestMiddleware < Faraday::TestCase
     def setup
       @stubs = Faraday::Adapter::Test::Stubs.new
-      @conn  = Faraday::Connection.new do |builder|
+      @conn  = Faraday.new do |builder|
         builder.adapter :test, @stubs
       end
       @stubs.get('/hello') { [200, {'Content-Type' => 'text/html'}, 'hello'] }

data/test/connection_app_test.rb

@@ -23,7 +23,7 @@ class TestConnectionApps < Faraday::TestCase
   end
 
   def setup
-    @conn = Faraday::Connection.new do |b|
+    @conn = Faraday.new do |b|
       b.use TestMiddleWare
       b.use TestAdapter
     end

data/test/env_test.rb

@@ -2,7 +2,7 @@ require File.expand_path(File.join(File.dirname(__FILE__), 'helper'))
 
 class TestEnv < Faraday::TestCase
   def setup
-    @conn = Faraday::Connection.new :url => 'http://sushi.com/api', :headers => {'Mime-Version' => '1.0'}
+    @conn = Faraday.new :url => 'http://sushi.com/api', :headers => {'Mime-Version' => '1.0'}
     @conn.options[:timeout]      = 3
     @conn.options[:open_timeout] = 5
     @conn.ssl[:verify]           = false

data/test/request_middleware_test.rb

@@ -16,7 +16,7 @@ class RequestMiddlewareTest < Faraday::TestCase
 
 private
   def create_json_connection(encoder)
-    Faraday::Connection.new do |b|
+    Faraday.new do |b|
       b.use encoder
       b.adapter :test do |stub|
         stub.post('echo_body') do |env|

data/test/response_middleware_test.rb

@@ -25,13 +25,13 @@ class ResponseMiddlewareTest < Faraday::TestCase
 
     define_method "test_use_#{key}_to_raise_Faraday_Error_Parsing_with_no_json_content" do
       assert_raises Faraday::Error::ParsingError do
-        response = create_json_connection(encoder).get('bad_json')
+        create_json_connection(encoder).get('bad_json')
       end
     end
   end
 
   def create_json_connection(encoder)
-    Faraday::Connection.new do |b|
+    Faraday.new do |b|
       b.adapter :test do |stub|
         stub.get('json')  { [200, {'Content-Type' => 'text/html'}, "[1,2,3]"] }
         stub.get('blank') { [200, {'Content-Type' => 'text/html'}, ''] }

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: false
   segments: 
   - 0
   - 5
-  - 6
-  version: 0.5.6
+  - 7
+  version: 0.5.7
 platform: ruby
 authors: 
 - Rick Olson
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-15 00:00:00 -08:00
+date: 2011-02-27 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 27
         segments: 
         - 0
         - 8
@@ -41,7 +39,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 2
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -73,7 +69,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 19
         segments: 
         - 1
         - 1
@@ -81,7 +76,6 @@ dependencies:
         version: 1.1.0
     - - <
       - !ruby/object:Gem::Version 
-        hash: 7
         segments: 
         - 2
         version: "2"
@@ -106,6 +100,7 @@ files:
 - lib/faraday/adapter/action_dispatch.rb
 - lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/excon.rb
+- lib/faraday/adapter/logger.rb
 - lib/faraday/adapter/net_http.rb
 - lib/faraday/adapter/patron.rb
 - lib/faraday/adapter/test.rb
@@ -123,6 +118,7 @@ files:
 - lib/faraday/upload_io.rb
 - lib/faraday/utils.rb
 - test/adapters/live_test.rb
+- test/adapters/logger_test.rb
 - test/adapters/test_middleware_test.rb
 - test/adapters/typhoeus_test.rb
 - test/connection_app_test.rb
@@ -148,7 +144,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -157,7 +152,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 17
       segments: 
       - 1
       - 3
@@ -172,6 +166,7 @@ specification_version: 2
 summary: HTTP/REST API client library.
 test_files: 
 - test/adapters/live_test.rb
+- test/adapters/logger_test.rb
 - test/adapters/test_middleware_test.rb
 - test/adapters/typhoeus_test.rb
 - test/connection_app_test.rb