faraday 0.5.2 → 0.5.3

data/Gemfile

@@ -7,6 +7,9 @@ group :development, :test do
   gem 'patron', '~> 0.4'
   gem 'sinatra', '~> 1.1'
   gem 'typhoeus', '~> 0.1'
+  gem 'eventmachine', '~> 0.12'
+  gem 'em-http-request', '~> 0.2', :require => 'em-http'
+  gem 'em-synchrony', '~> 0.2', :require => ['em-synchrony', 'em-synchrony/em-http']
 end
 
 gemspec

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    faraday (0.5.2)
+    faraday (0.5.3)
       addressable (~> 2.2.2)
       multipart-post (~> 1.0.1)
       rack (>= 1.1.0, < 2)
@@ -10,8 +10,14 @@ GEM
   remote: http://rubygems.org/
   specs:
     addressable (2.2.2)
+    em-http-request (0.2.14)
+      addressable (>= 2.0.0)
+      eventmachine (>= 0.12.9)
+    em-synchrony (0.2.0)
+      eventmachine (>= 0.12.9)
+    eventmachine (0.12.10)
     multipart-post (1.0.1)
-    patron (0.4.9)
+    patron (0.4.10)
     rack (1.2.1)
     rake (0.8.7)
     sinatra (1.1.0)
@@ -26,6 +32,9 @@ PLATFORMS
 
 DEPENDENCIES
   addressable (~> 2.2.2)
+  em-http-request (~> 0.2)
+  em-synchrony (~> 0.2)
+  eventmachine (~> 0.12)
   faraday!
   multipart-post (~> 1.0.1)
   patron (~> 0.4)

data/README.md

@@ -7,16 +7,18 @@ This mess is gonna get raw, like sushi. So, haters to the left.
 ## Usage
 
     conn = Faraday::Connection.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
-      builder.use Faraday::Response::Yajl    # # parse body with yajl
+      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
+      builder.use Faraday::Adapter::EMSynchrony # make http request with eventmachine and synchrony
+      builder.use Faraday::Response::Yajl       # parse body with yajl
 
       # or use shortcuts
-      builder.request  :yajl     # Faraday::Request::Yajl
-      builder.adapter  :logger   # Faraday::Adapter::Logger
-      builder.adapter  :typhoeus # Faraday::Adapter::Typhoeus
-      builder.response :yajl     # Faraday::Response::Yajl
+      builder.request  :yajl         # Faraday::Request::Yajl
+      builder.adapter  :logger       # Faraday::Adapter::Logger
+      builder.adapter  :typhoeus     # Faraday::Adapter::Typhoeus
+      builder.adapter  :em_synchrony # Faraday::Adapter::EMSynchrony
+      builder.response :yajl         # Faraday::Response::Yajl
     end
 
     resp1 = conn.get '/nigiri/sake.json'

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.2'
-  s.date              = '2010-10-29'
+  s.version           = '0.5.3'
+  s.date              = '2010-11-09'
   s.rubyforge_project = 'faraday'
 
   ## Make sure your summary is short. The description may be as long
@@ -51,6 +51,7 @@ Gem::Specification.new do |s|
     lib/faraday.rb
     lib/faraday/adapter.rb
     lib/faraday/adapter/action_dispatch.rb
+    lib/faraday/adapter/em_synchrony.rb
     lib/faraday/adapter/net_http.rb
     lib/faraday/adapter/patron.rb
     lib/faraday/adapter/test.rb

data/lib/faraday.rb

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

data/lib/faraday/adapter.rb

@@ -10,6 +10,7 @@ module Faraday
       :ActionDispatch => 'action_dispatch',
       :NetHttp        => 'net_http',
       :Typhoeus       => 'typhoeus',
+      :EMSynchrony   => 'em_synchrony',
       :Patron         => 'patron',
       :Test           => 'test'
 
@@ -19,7 +20,7 @@ module Faraday
       :net_http        => :NetHttp,
       :typhoeus        => :Typhoeus,
       :patron          => :Patron,
-      :net_http        => :NetHttp
+      :em_synchrnoy    => :EMSynchrony
 
     def call(env)
       process_body_for_request(env)
@@ -77,9 +78,14 @@ module Faraday
     end
 
     def process_to_params(pieces, params, base = nil, &block)
-      params.each do |key, value|
+      params.to_a.each do |key, value|
         key_str = base ? "#{base}[#{key}]" : key
-        if value.kind_of?(Hash)
+
+        case value
+        when Array
+          values = value.inject([]) { |a,v| a << [nil, v] }
+          process_to_params(pieces, values, key_str, &block)
+        when Hash
           process_to_params(pieces, value, key_str, &block)
         else
           pieces << block.call(key_str, value)

data/lib/faraday/adapter/em_synchrony.rb

@@ -0,0 +1,78 @@
+require 'em-synchrony/em-http'
+require 'fiber'
+
+module Faraday
+  class Adapter
+    class EMSynchrony < Faraday::Adapter
+
+      class Header
+        include Net::HTTPHeader
+        def initialize response
+          @header = {}
+          response.response_header.each do |key, value|
+            case key
+            when "CONTENT_TYPE"; self.content_type = value
+            when "CONTENT_LENGTH"; self.content_length = value
+            else; self[key] = value
+            end
+          end
+        end
+      end
+
+      def call(env)
+        process_body_for_request(env)
+        
+        request = EventMachine::HttpRequest.new(URI::parse(env[:url].to_s))
+        
+        options = {:head => env[:request_headers]}
+
+        if env[:body]
+          if env[:body].respond_to? :read
+            options[:body] = env[:body].read
+          else
+            options[:body] = env[:body]
+          end
+        end
+
+        if req = env[:request]
+          if proxy = req[:proxy]
+            uri = Addressable::URI.parse(proxy[:uri])
+            options[:proxy] = {
+              :host => uri.host,
+              :port => uri.port
+            }
+            if proxy[:username] && proxy[:password]
+              options[:proxy][:authorization] = [proxy[:username], proxy[:password]]
+            end
+          end
+
+          # only one timeout currently supported by em http request
+          if req[:timeout] or req[:open_timeout]
+            options[:timeout] = [req[:timeout] || 0, req[:open_timeout] || 0].max
+          end
+        end
+
+        client = nil
+        block = lambda { request.send env[:method].to_s.downcase.to_sym, options }
+        if !EM.reactor_running?
+          EM.run {
+            Fiber.new do
+              client = block.call
+              EM.stop
+            end.resume
+          }
+        else
+          client = block.call
+        end
+
+        env.update(:status           => client.response_header.http_status.to_i,
+                   :response_headers => Header.new(client),
+                   :body             => client.response)
+
+        @app.call env
+      rescue Errno::ECONNREFUSED
+        raise Error::ConnectionFailed, "connection refused"
+      end
+    end
+  end
+end

data/test/adapters/live_test.rb

@@ -124,6 +124,21 @@ if Faraday::TestCase::LIVE_SERVER
           assert_equal '[1,2,3]', resp1.body
           assert_equal '[1,2,3]', resp2.body
         end
+
+        if adapter.to_s == "Faraday::Adapter::EMSynchrony"
+          instance_methods.grep(%r{Faraday::Adapter::EMSynchrony}).each do |method|
+            em = method.to_s.sub %r{^test_}, "test_under_em_"
+            define_method em do
+              EM.run do
+                Fiber.new do
+                  self.send method
+                  EM.stop
+                end.resume
+              end          
+            end
+          end
+          
+        end
       end
 
       def create_connection(adapter)

data/test/form_post_test.rb

@@ -39,4 +39,20 @@ class FormPostTest < Faraday::TestCase
     @app.process_body_for_request @env
     assert_equal 'abc', @env[:body]
   end
+
+  def test_processes_array_values
+    @env[:body] = {:a => [:b, 1]}
+    @app.process_body_for_request @env
+    assert_equal 'a[]=b&a[]=1', @env[:body]
+  end
+
+  def test_processes_nested_array_values
+    @env[:body] = {:a => [:b, {:c => :d}, [:e]]}
+    @app.process_body_for_request @env
+
+    # a[]=b&a[][c]=d&a[][]=e
+    assert_match /a\[\]=b/,      @env[:body]
+    assert_match /a\[\]\[c\]=d/, @env[:body]
+    assert_match /a\[\]\[\]=e/,  @env[:body]
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 2
-  version: 0.5.2
+  - 3
+  version: 0.5.3
 platform: ruby
 authors: 
 - Rick Olson
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-29 00:00:00 -07:00
+date: 2010-11-09 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: 3
         segments: 
         - 2
         - 2
@@ -57,7 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 1
         - 0
@@ -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"
@@ -105,6 +99,7 @@ files:
 - lib/faraday.rb
 - lib/faraday/adapter.rb
 - lib/faraday/adapter/action_dispatch.rb
+- lib/faraday/adapter/em_synchrony.rb
 - lib/faraday/adapter/net_http.rb
 - lib/faraday/adapter/patron.rb
 - lib/faraday/adapter/test.rb
@@ -147,7 +142,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -156,7 +150,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 23
       segments: 
       - 1
       - 3