faraday 0.5.5 → 0.5.6.pre

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.5'
-  s.date              = '2011-02-06'
+  s.version           = '0.5.6.pre'
+  s.date              = '2011-02-13'
   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/adapter.rb
     lib/faraday/adapter/action_dispatch.rb
     lib/faraday/adapter/em_synchrony.rb
+    lib/faraday/adapter/excon.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.5"
+  VERSION = "0.5.6.pre"
 
   class << self
     attr_accessor :default_adapter

data/lib/faraday/adapter.rb

@@ -12,6 +12,7 @@ module Faraday
       :Typhoeus       => 'typhoeus',
       :EMSynchrony    => 'em_synchrony',
       :Patron         => 'patron',
+      :Excon          => 'excon',
       :Test           => 'test'
 
     register_lookup_modules \
@@ -20,7 +21,8 @@ module Faraday
       :net_http        => :NetHttp,
       :typhoeus        => :Typhoeus,
       :patron          => :Patron,
-      :em_synchrony    => :EMSynchrony
+      :em_synchrony    => :EMSynchrony,
+      :excon           => :Excon
 
     def call(env)
       process_body_for_request(env)

data/lib/faraday/adapter/em_synchrony.rb

@@ -1,9 +1,12 @@
-require 'em-synchrony/em-http'
-require 'fiber'
-
 module Faraday
   class Adapter
     class EMSynchrony < Faraday::Adapter
+      begin
+        require 'em-synchrony/em-http'
+        require 'fiber'
+      rescue LoadError, NameError => e
+        self.load_error = e
+      end
 
       class Header
         include Net::HTTPHeader
@@ -21,9 +24,7 @@ module Faraday
 
       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]

data/lib/faraday/adapter/excon.rb

@@ -0,0 +1,41 @@
+module Faraday
+  class Adapter
+    class Excon < Faraday::Adapter
+      begin
+        require 'excon'
+      rescue LoadError, NameError => e
+        self.load_error = e
+      end
+
+      def call(env)
+        super
+
+        conn = ::Excon.new(env[:url].to_s)
+        if ssl = (env[:url].scheme == 'https' && env[:ssl])
+          ::Excon.ssl_verify_peer = !!ssl[:verify] if ssl.key?(:verify)
+          if ca_file = ssl[:ca_file]
+            ::Excon.ssl_ca_path = ca_file
+          end
+        end
+
+        resp = conn.request \
+          :method  => env[:method].to_s.upcase,
+          :headers => env[:request_headers],
+          :body    => env[:body]
+
+        env.update \
+          :status => resp.status.to_i,
+          :response_headers => {},
+          :body => resp.body
+
+        resp.headers.each do |key, value|
+          env[:response_headers][key.downcase] = value
+        end
+
+        @app.call env
+      rescue ::Excon::Errors::SocketError => e
+        raise Error::ConnectionFailed.new(e)
+      end
+    end
+  end
+end

data/test/adapters/live_test.rb

@@ -134,10 +134,9 @@ if Faraday::TestCase::LIVE_SERVER
                   self.send method
                   EM.stop
                 end.resume
-              end          
+              end
             end
           end
-          
         end
       end
 

metadata

@@ -1,8 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: faraday
 version: !ruby/object:Gem::Version 
-  prerelease: 
-  version: 0.5.5
+  hash: 961916020
+  prerelease: true
+  segments: 
+  - 0
+  - 5
+  - 6
+  - pre
+  version: 0.5.6.pre
 platform: ruby
 authors: 
 - Rick Olson
@@ -10,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-06 00:00:00 -05:00
+date: 2011-02-13 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -21,6 +27,10 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 8
         version: "0.8"
   type: :development
   version_requirements: *id001
@@ -32,6 +42,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 2
+        - 4
         version: 2.2.4
   type: :runtime
   version_requirements: *id002
@@ -43,6 +58,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
   type: :runtime
   version_requirements: *id003
@@ -54,9 +74,17 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 1
+        - 1
+        - 0
         version: 1.1.0
     - - <
       - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 2
         version: "2"
   type: :runtime
   version_requirements: *id004
@@ -78,6 +106,7 @@ files:
 - lib/faraday/adapter.rb
 - lib/faraday/adapter/action_dispatch.rb
 - lib/faraday/adapter/em_synchrony.rb
+- lib/faraday/adapter/excon.rb
 - lib/faraday/adapter/net_http.rb
 - lib/faraday/adapter/patron.rb
 - lib/faraday/adapter/test.rb
@@ -120,17 +149,25 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version 
-      version: 1.3.5
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
 
 rubyforge_project: faraday
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 2
 summary: HTTP/REST API client library.