faraday 0.8.0 → 0.8.1

data/README.md

@@ -17,7 +17,7 @@ Faraday supports these adapters:
 It also includes a Rack adapter for hitting loaded Rack applications through
 Rack::Test, and a Test adapter for stubbing requests by hand.
 
-## <a name="usage"></a>Usage
+## Usage
 
 ```ruby
 conn = Faraday.new(:url => 'http://sushi.com') do |builder|
@@ -58,15 +58,8 @@ end
 
 conn.get do |req|
   req.url '/search'
-  req.options = {
-    :timeout => 5,                    # open/read timeout Integer in seconds
-    :open_timeout => 2,               # read timeout Integer in seconds
-    :proxy => {
-      :uri => "http://example.org/",  # proxy server URI
-      :user => "me",                  # proxy server username
-      :password => "test123"          # proxy server password
-    }
-  }
+  req.options[:timeout] = 5           # open/read timeout in seconds
+  req.options[:open_timeout] = 2      # connection open timeout in seconds
 end
 ```
 
@@ -149,7 +142,7 @@ later, response. Some keys are:
 :response_headers
 ```
 
-## <a name="testing"></a>Testing
+## Testing
 
 ```ruby
 # It's possible to define stubbed request outside a test adapter block.
@@ -184,11 +177,11 @@ resp = test.get '/else' #=> raises "no such stub" error
 stubs.verify_stubbed_calls
 ```
 
-## <a name="todo"></a>TODO
+## TODO
 * support streaming requests/responses
 * better stubbing API
 
-## <a name="pulls"></a>Note on Patches/Pull Requests
+## Note on Patches/Pull Requests
 1. Fork the project.
 2. Make your feature addition or bug fix.
 3. Add tests for it. This is important so I don't break it in a future version
@@ -202,7 +195,7 @@ We are pushing towards a 1.0 release, when we will have to follow [Semantic
 Versioning](http://semver.org/).  If your patch includes changes to break
 compatiblitity, note that so we can add it to the [Changelog](https://github.com/technoweenie/faraday/wiki/Changelog).
 
-## <a name="versions"></a>Supported Ruby Versions
+## Supported Ruby Versions
 This library aims to support and is [tested against][travis] the following Ruby
 implementations:
 
@@ -229,8 +222,8 @@ implementation, you will be personally responsible for providing patches in a
 timely fashion. If critical issues for a particular implementation exist at the
 time of a major release, support for that Ruby version may be dropped.
 
-## <a name="copyright"></a>Copyright
-Copyright (c) 2009-12 [Rick Olson](mailto:technoweenie@gmail.com), zack hobson.
+## Copyright
+Copyright (c) 2009-2012 [Rick Olson](mailto:technoweenie@gmail.com), zack hobson.
 See [LICENSE][] for details.
 
 [license]: https://github.com/technoweenie/faraday/blob/master/LICENSE.md

data/faraday.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = Gem::Requirement.new(">= 1.3.5") if s.respond_to? :required_rubygems_version=
 
   s.name    = 'faraday'
-  s.version = '0.8.0'
+  s.version = '0.8.1'
 
   s.summary     = "HTTP/REST API client library."
   # TODO: s.description

data/lib/faraday.rb

@@ -1,5 +1,5 @@
 module Faraday
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 
   class << self
     attr_accessor :root_path, :lib_path
@@ -33,13 +33,18 @@ module Faraday
     @default_connection ||= Connection.new
   end
 
-  begin
-    require RUBY_VERSION < '1.9' ? 'system_timer' : 'timeout'
-  rescue LoadError
+  if (!defined?(RUBY_ENGINE) || "ruby" == RUBY_ENGINE) && RUBY_VERSION < '1.9'
+    begin
+      require 'system_timer'
+      Timer = SystemTimer
+    rescue LoadError
+      warn "Faraday: you may want to install system_timer for reliable timeouts"
+    end
+  end
+
+  unless const_defined? :Timer
     require 'timeout'
-    warn "Faraday: you may want to install system_timer for reliable timeouts"
-  ensure
-    Timer = defined?(::SystemTimer) ? ::SystemTimer : ::Timeout
+    Timer = Timeout
   end
 
   module MiddlewareRegistry

data/lib/faraday/adapter/em_http.rb

@@ -4,6 +4,70 @@ module Faraday
     # when in EM reactor loop or for making parallel requests in
     # synchronous code.
     class EMHttp < Faraday::Adapter
+      module Options
+        def connection_config(env)
+          options = {}
+          configure_ssl(options, env)
+          configure_proxy(options, env)
+          configure_timeout(options, env)
+          options
+        end
+
+        def request_config(env)
+          options = {
+            :body => read_body(env),
+            :head => env[:request_headers],
+            # :keepalive => true,
+            # :file => 'path/to/file', # stream data off disk
+          }
+          configure_compression(options, env)
+          # configure_proxy_auth
+          # :proxy => {:authorization => [user, pass]}
+          # proxy[:username] && proxy[:password]
+          options
+        end
+
+        def read_body(env)
+          body = env[:body]
+          body.respond_to?(:read) ? body.read : body
+        end
+
+        def configure_ssl(options, env)
+          if ssl = env[:ssl]
+            # :ssl => {
+            #   :private_key_file => '/tmp/server.key',
+            #   :cert_chain_file => '/tmp/server.crt',
+            #   :verify_peer => false
+          end
+        end
+
+        def configure_proxy(options, env)
+          if proxy = request_options(env)[:proxy]
+            options[:proxy] = {
+              :host => proxy[:uri].host,
+              :port => proxy[:uri].port
+            }
+          end
+        end
+
+        def configure_timeout(options, env)
+          timeout, open_timeout = request_options(env).values_at(:timeout, :open_timeout)
+          options[:connect_timeout] = options[:inactivity_timeout] = timeout
+          options[:connect_timeout] = open_timeout if open_timeout
+        end
+
+        def configure_compression(options, env)
+          if env[:method] == :get and not options[:head].key? 'accept-encoding'
+            options[:head]['accept-encoding'] = 'gzip, compressed'
+          end
+        end
+
+        def request_options(env)
+          env[:request]
+        end
+      end
+
+      include Options
 
       dependency 'em-http'
 
@@ -80,67 +144,6 @@ module Faraday
         raise errklass, msg
       end
 
-      def connection_config(env)
-        options = {}
-        configure_ssl(options, env)
-        configure_proxy(options, env)
-        configure_timeout(options, env)
-        options
-      end
-
-      def request_config(env)
-        options = {
-          :body => read_body(env),
-          :head => env[:request_headers],
-          # :keepalive => true,
-          # :file => 'path/to/file', # stream data off disk
-        }
-        configure_compression(options, env)
-        # configure_proxy_auth
-        # :proxy => {:authorization => [user, pass]}
-        # proxy[:username] && proxy[:password]
-        options
-      end
-
-      def read_body(env)
-        body = env[:body]
-        body.respond_to?(:read) ? body.read : body
-      end
-
-      def configure_ssl(options, env)
-        if ssl = env[:ssl]
-          # :ssl => {
-          #   :private_key_file => '/tmp/server.key',
-          #   :cert_chain_file => '/tmp/server.crt',
-          #   :verify_peer => false
-        end
-      end
-
-      def configure_proxy(options, env)
-        if proxy = request_options(env)[:proxy]
-          options[:proxy] = {
-            :host => proxy[:uri].host,
-            :port => proxy[:uri].port
-          }
-        end
-      end
-
-      def configure_timeout(options, env)
-        timeout, open_timeout = request_options(env).values_at(:timeout, :open_timeout)
-        options[:connect_timeout] = options[:inactivity_timeout] = timeout
-        options[:connect_timeout] = open_timeout if open_timeout
-      end
-
-      def configure_compression(options, env)
-        if env[:method] == :get and not options[:head].key? 'accept-encoding'
-          options[:head]['accept-encoding'] = 'gzip, compressed'
-        end
-      end
-
-      def request_options(env)
-        env[:request]
-      end
-
       def parallel?(env)
         !!env[:parallel_manager]
       end

data/lib/faraday/adapter/em_synchrony.rb

@@ -3,6 +3,7 @@ require 'uri'
 module Faraday
   class Adapter
     class EMSynchrony < Faraday::Adapter
+      include EMHttp::Options
 
       dependency do
         require 'em-synchrony/em-http'
@@ -18,41 +19,13 @@ module Faraday
 
       def call(env)
         super
-        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
-          else
-            options[:body] = env[:body]
-          end
-        end
-
-        if req = env[:request]
-          if proxy = req[:proxy]
-            uri = 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
+        request = EventMachine::HttpRequest.new(URI::parse(env[:url].to_s), connection_config(env))        #   end
 
         http_method = env[:method].to_s.downcase.to_sym
 
         # Queue requests for parallel execution.
         if env[:parallel_manager]
-          env[:parallel_manager].add(request, http_method, options) do |resp|
+          env[:parallel_manager].add(request, http_method, request_config(env)) do |resp|
             save_response(env, resp.response_header.status, resp.response) do |resp_headers|
               resp.response_header.each do |name, value|
                 resp_headers[name.to_sym] = value
@@ -66,7 +39,7 @@ module Faraday
         # Execute single request.
         else
           client = nil
-          block = lambda { request.send(http_method, options) }
+          block = lambda { request.send(http_method, request_config(env)) }
 
           if !EM.reactor_running?
             EM.run do

data/lib/faraday/adapter/excon.rb

@@ -7,7 +7,7 @@ module Faraday
         super
 
         conn = ::Excon.new(env[:url].to_s)
-        if ssl = (env[:url].scheme == 'https' && env[:ssl])
+        if env[:url].scheme == 'https' && ssl = env[:ssl]
           ::Excon.ssl_verify_peer = !!ssl.fetch(:verify, true)
           ::Excon.ssl_ca_path = ssl[:ca_file] if ssl[:ca_file]
         end

data/test/helper.rb

@@ -1,7 +1,9 @@
 unless ENV['CI']
   begin
     require 'simplecov'
-    SimpleCov.start
+    SimpleCov.start do
+      add_filter 'test'
+    end
   rescue LoadError
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: faraday
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.8.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-23 00:00:00.000000000 Z
+date: 2012-05-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: multipart-post
-  requirement: &70331771782880 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70331771782880
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70331771781000 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331771781000
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70331771779420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331771779420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &70331771778040 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331771778040
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70331771775860 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +85,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70331771775860
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email: technoweenie@gmail.com
 executables: []
@@ -147,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.5
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.