httpi 0.9.3 → 0.9.4

data/lib/httpi.rb

@@ -133,6 +133,11 @@ module HTTPI
       send method, request, adapter
     end
 
+    # Shortcut for setting the default adapter to use.
+    def adapter=(adapter)
+      Adapter.use = adapter
+    end
+
     # Sets whether to log HTTP requests.
     attr_writer :log
 

data/lib/httpi/adapter.rb

@@ -14,30 +14,30 @@ module HTTPI
   module Adapter
 
     ADAPTERS = {
-      :httpclient => HTTPClient,
-      :curb       => Curb,
-      :net_http   => NetHTTP
+      :httpclient => { :class => HTTPClient, :dependencies => ["httpclient"] },
+      :curb       => { :class => Curb,       :dependencies => ["curb"] },
+      :net_http   => { :class => NetHTTP,    :dependencies => ["net/https", "net/ntlm_http"] }
     }
 
-    DEPENDENCIES = [
-      [:httpclient, ["httpclient"]],
-      [:curb,       ["curb"]],
-      [:net_http,   ["net/https", "net/ntlm_http"]]
-    ]
+    LOAD_ORDER = [:httpclient, :curb, :net_http]
 
     class << self
 
       def use=(adapter)
-        @adapter = adapter.nil? ? nil : validate_adapter!(adapter)
+        return @adapter = nil if adapter.nil?
+
+        validate_adapter! adapter
+        load_dependencies adapter
+        @adapter = adapter
       end
 
       def use
         @adapter ||= default_adapter
       end
 
-      def load(adapter = nil)
+      def load(adapter)
         adapter = adapter ? validate_adapter!(adapter) : use
-        [adapter, ADAPTERS[adapter]]
+        [adapter, ADAPTERS[adapter][:class]]
       end
 
     private
@@ -48,9 +48,9 @@ module HTTPI
       end
 
       def default_adapter
-        DEPENDENCIES.each do |(adapter, dependencies)|
+        LOAD_ORDER.each do |adapter|
           begin
-            dependencies.each { |dependency| require dependency }
+            load_dependencies adapter
             return adapter
           rescue LoadError
             next
@@ -58,6 +58,10 @@ module HTTPI
         end
       end
 
+      def load_dependencies(adapter)
+        ADAPTERS[adapter][:dependencies].each { |dependency| require dependency }
+      end
+
     end
   end
 end

data/lib/httpi/auth/ssl.rb

@@ -17,7 +17,7 @@ module HTTPI
       rescue TypeError, Errno::ENOENT
         false
       end
-      
+
       # Accessor for the cert key file to validate SSL certificates.
       attr_accessor :cert_key_file
 
@@ -29,18 +29,18 @@ module HTTPI
 
       # Accessor for the cacert file to validate SSL certificates.
       attr_accessor :ca_cert_file
-      
+
       # Returns the cert type to validate SSL certificates PEM|DER.
       def cert_type
         @cert_type ||= :pem
       end
-      
+
       # Sets the cert type to validate SSL certificates PEM|DER.
       def cert_type=(type)
         raise ArgumentError, "Invalid SSL cert type: #{type}" unless CERT_TYPES.include? type
         @cert_type = type
       end
-      
+
       # Returns the SSL verify mode. Defaults to <tt>:peer</tt>.
       def verify_mode
         @verify_mode ||= :peer

data/lib/httpi/request.rb

@@ -77,7 +77,7 @@ module HTTPI
     def mass_assign(args)
       ATTRIBUTES.each { |key| send("#{key}=", args[key]) if args[key] }
     end
- 
+
   private
 
     # Expects a +url+, validates its validity and returns a +URI+ object.

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 
 end

data/spec/httpi/adapter/curb_spec.rb

@@ -2,228 +2,231 @@ require "spec_helper"
 require "httpi/adapter/curb"
 require "httpi/request"
 
-require "curb"
-
-describe HTTPI::Adapter::Curb do
-  let(:adapter) { HTTPI::Adapter::Curb.new }
-  let(:curb) { Curl::Easy.any_instance }
-
-  describe "#get" do
-    before do
-      curb.expects(:http_get)
-      curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("Accept-encoding: utf-8")
-      curb.expects(:body_str).returns(Fixture.xml)
-    end
+# curb does not run on jruby
+unless RUBY_PLATFORM =~ /java/
+  require "curb"
 
-    it "should return a valid HTTPI::Response" do
-      adapter.get(basic_request).should match_response(:body => Fixture.xml)
-    end
-  end
+  describe HTTPI::Adapter::Curb do
+    let(:adapter) { HTTPI::Adapter::Curb.new }
+    let(:curb) { Curl::Easy.any_instance }
 
-  describe "#post" do
-    before do
-      curb.expects(:http_post)
-      curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("Accept-encoding: utf-8")
-      curb.expects(:body_str).returns(Fixture.xml)
-    end
+    describe "#get" do
+      before do
+        curb.expects(:http_get)
+        curb.expects(:response_code).returns(200)
+        curb.expects(:header_str).returns("Accept-encoding: utf-8")
+        curb.expects(:body_str).returns(Fixture.xml)
+      end
 
-    it "should return a valid HTTPI::Response" do
-      adapter.post(basic_request).should match_response(:body => Fixture.xml)
+      it "returns a valid HTTPI::Response" do
+        adapter.get(basic_request).should match_response(:body => Fixture.xml)
+      end
     end
-  end
 
-  describe "#post includes body of request" do
-    it "should send the body in the request" do
-      curb.expects(:http_post).with('xml=hi&name=123')
-      adapter.post(basic_request { |request| request.body = 'xml=hi&name=123' } )
-    end
-  end
+    describe "#post" do
+      before do
+        curb.expects(:http_post)
+        curb.expects(:response_code).returns(200)
+        curb.expects(:header_str).returns("Accept-encoding: utf-8")
+        curb.expects(:body_str).returns(Fixture.xml)
+      end
 
-  describe "#head" do
-    before do
-      curb.expects(:http_head)
-      curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("Accept-encoding: utf-8")
-      curb.expects(:body_str).returns(Fixture.xml)
+      it "returns a valid HTTPI::Response" do
+        adapter.post(basic_request).should match_response(:body => Fixture.xml)
+      end
     end
 
-    it "should return a valid HTTPI::Response" do
-      adapter.head(basic_request).should match_response(:body => Fixture.xml)
+    describe "#post" do
+      it "sends the body in the request" do
+        curb.expects(:http_post).with('xml=hi&name=123')
+        adapter.post(basic_request { |request| request.body = 'xml=hi&name=123' } )
+      end
     end
-  end
 
-  describe "#put" do
-    before do
-      curb.expects(:http_put)
-      curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("Accept-encoding: utf-8")
-      curb.expects(:body_str).returns(Fixture.xml)
-    end
+    describe "#head" do
+      before do
+        curb.expects(:http_head)
+        curb.expects(:response_code).returns(200)
+        curb.expects(:header_str).returns("Accept-encoding: utf-8")
+        curb.expects(:body_str).returns(Fixture.xml)
+      end
 
-    it "should return a valid HTTPI::Response" do
-      adapter.put(basic_request).should match_response(:body => Fixture.xml)
+      it "returns a valid HTTPI::Response" do
+        adapter.head(basic_request).should match_response(:body => Fixture.xml)
+      end
     end
-  end
 
-  describe "#put includes body of request" do
-    it "should send the body in the request" do
-      curb.expects(:http_put).with('xml=hi&name=123')
-      adapter.put(basic_request { |request| request.body = 'xml=hi&name=123' } )
-    end
-  end
+    describe "#put" do
+      before do
+        curb.expects(:http_put)
+        curb.expects(:response_code).returns(200)
+        curb.expects(:header_str).returns("Accept-encoding: utf-8")
+        curb.expects(:body_str).returns(Fixture.xml)
+      end
 
-  describe "#delete" do
-    before do
-      curb.expects(:http_delete)
-      curb.expects(:response_code).returns(200)
-      curb.expects(:header_str).returns("Accept-encoding: utf-8")
-      curb.expects(:body_str).returns("")
+      it "returns a valid HTTPI::Response" do
+        adapter.put(basic_request).should match_response(:body => Fixture.xml)
+      end
     end
 
-    it "should return a valid HTTPI::Response" do
-      adapter.delete(basic_request).should match_response(:body => "")
+    describe "#put" do
+      it "sends the body in the request" do
+        curb.expects(:http_put).with('xml=hi&name=123')
+        adapter.put(basic_request { |request| request.body = 'xml=hi&name=123' } )
+      end
     end
-  end
 
-  describe "settings:" do
-    before { curb.stubs(:http_get) }
+    describe "#delete" do
+      before do
+        curb.expects(:http_delete)
+        curb.expects(:response_code).returns(200)
+        curb.expects(:header_str).returns("Accept-encoding: utf-8")
+        curb.expects(:body_str).returns("")
+      end
 
-    describe "url" do
-      it "should always set the request url" do
-        curb.expects(:url=).with(basic_request.url.to_s)
-        adapter.get(basic_request)
+      it "returns a valid HTTPI::Response" do
+        adapter.delete(basic_request).should match_response(:body => "")
       end
     end
 
-    describe "proxy_url" do
-      it "should not be set if not specified" do
-        curb.expects(:proxy_url=).never
-        adapter.get(basic_request)
+    describe "settings:" do
+      before { curb.stubs(:http_get) }
+
+      describe "url" do
+        it "always sets the request url" do
+          curb.expects(:url=).with(basic_request.url.to_s)
+          adapter.get(basic_request)
+        end
       end
 
-      it "should be set if specified" do
-        request = basic_request { |request| request.proxy = "http://proxy.example.com" }
+      describe "proxy_url" do
+        it "is not set unless it's specified" do
+          curb.expects(:proxy_url=).never
+          adapter.get(basic_request)
+        end
 
-        curb.expects(:proxy_url=).with(request.proxy.to_s)
-        adapter.get(request)
-      end
-    end
+        it "is set if specified" do
+          request = basic_request { |request| request.proxy = "http://proxy.example.com" }
 
-    describe "timeout" do
-      it "should not be set if not specified" do
-        curb.expects(:timeout=).never
-        adapter.get(basic_request)
+          curb.expects(:proxy_url=).with(request.proxy.to_s)
+          adapter.get(request)
+        end
       end
 
-      it "should be set if specified" do
-        request = basic_request { |request| request.read_timeout = 30 }
+      describe "timeout" do
+        it "is not set unless it's specified" do
+          curb.expects(:timeout=).never
+          adapter.get(basic_request)
+        end
 
-        curb.expects(:timeout=).with(30)
-        adapter.get(request)
-      end
-    end
+        it "is set if specified" do
+          request = basic_request { |request| request.read_timeout = 30 }
 
-    describe "connect_timeout" do
-      it "should not be set if not specified" do
-        curb.expects(:connect_timeout=).never
-        adapter.get(basic_request)
+          curb.expects(:timeout=).with(30)
+          adapter.get(request)
+        end
       end
 
-      it "should be set if specified" do
-        request = basic_request { |request| request.open_timeout = 30 }
+      describe "connect_timeout" do
+        it "is not set unless it's specified" do
+          curb.expects(:connect_timeout=).never
+          adapter.get(basic_request)
+        end
+
+        it "is set if specified" do
+          request = basic_request { |request| request.open_timeout = 30 }
 
-        curb.expects(:connect_timeout=).with(30)
-        adapter.get(request)
+          curb.expects(:connect_timeout=).with(30)
+          adapter.get(request)
+        end
       end
-    end
 
-    describe "headers" do
-      it "should always be set" do
-        curb.expects(:headers=).with({})
-        adapter.get(basic_request)
+      describe "headers" do
+        it "is always set" do
+          curb.expects(:headers=).with({})
+          adapter.get(basic_request)
+        end
       end
-    end
 
-    describe "verbose" do
-      it "should always be set to false" do
-        curb.expects(:verbose=).with(false)
-        adapter.get(basic_request)
+      describe "verbose" do
+        it "is always set to false" do
+          curb.expects(:verbose=).with(false)
+          adapter.get(basic_request)
+        end
       end
-    end
 
-    describe "http_auth_types" do
-      it "should be set to :basic for HTTP basic auth" do
-        request = basic_request { |request| request.auth.basic "username", "password" }
+      describe "http_auth_types" do
+        it "is set to :basic for HTTP basic auth" do
+          request = basic_request { |request| request.auth.basic "username", "password" }
 
-        curb.expects(:http_auth_types=).with(:basic)
-        adapter.get(request)
-      end
+          curb.expects(:http_auth_types=).with(:basic)
+          adapter.get(request)
+        end
 
-      it "should be set to :digest for HTTP digest auth" do
-        request = basic_request { |request| request.auth.digest "username", "password" }
+        it "is set to :digest for HTTP digest auth" do
+          request = basic_request { |request| request.auth.digest "username", "password" }
 
-        curb.expects(:http_auth_types=).with(:digest)
-        adapter.get(request)
+          curb.expects(:http_auth_types=).with(:digest)
+          adapter.get(request)
+        end
       end
-    end
 
-    describe "username and password" do
-      it "should be set for HTTP basic auth" do
-        request = basic_request { |request| request.auth.basic "username", "password" }
+      describe "username and password" do
+        it "is set for HTTP basic auth" do
+          request = basic_request { |request| request.auth.basic "username", "password" }
 
-        curb.expects(:username=).with("username")
-        curb.expects(:password=).with("password")
-        adapter.get(request)
-      end
+          curb.expects(:username=).with("username")
+          curb.expects(:password=).with("password")
+          adapter.get(request)
+        end
 
-      it "should be set for HTTP digest auth" do
-        request = basic_request { |request| request.auth.digest "username", "password" }
+        it "is set for HTTP digest auth" do
+          request = basic_request { |request| request.auth.digest "username", "password" }
 
-        curb.expects(:username=).with("username")
-        curb.expects(:password=).with("password")
-        adapter.get(request)
+          curb.expects(:username=).with("username")
+          curb.expects(:password=).with("password")
+          adapter.get(request)
+        end
       end
-    end
 
-    context "(for SSL client auth)" do
-      let(:ssl_auth_request) do
-        basic_request do |request|
-          request.auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
-          request.auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
+      context "(for SSL client auth)" do
+        let(:ssl_auth_request) do
+          basic_request do |request|
+            request.auth.ssl.cert_key_file = "spec/fixtures/client_key.pem"
+            request.auth.ssl.cert_file = "spec/fixtures/client_cert.pem"
+          end
         end
-      end
 
-      it "cert_key, cert and ssl_verify_peer should be set" do
-        curb.expects(:cert_key=).with(ssl_auth_request.auth.ssl.cert_key_file)
-        curb.expects(:cert=).with(ssl_auth_request.auth.ssl.cert_file)
-        curb.expects(:ssl_verify_peer=).with(true)
-        curb.expects(:certtype=).with(ssl_auth_request.auth.ssl.cert_type.to_s.upcase)
+        it "cert_key, cert and ssl_verify_peer should be set" do
+          curb.expects(:cert_key=).with(ssl_auth_request.auth.ssl.cert_key_file)
+          curb.expects(:cert=).with(ssl_auth_request.auth.ssl.cert_file)
+          curb.expects(:ssl_verify_peer=).with(true)
+          curb.expects(:certtype=).with(ssl_auth_request.auth.ssl.cert_type.to_s.upcase)
 
-        adapter.get(ssl_auth_request)
-      end
+          adapter.get(ssl_auth_request)
+        end
 
-      it "should set the cert_type to DER if specified" do
-        ssl_auth_request.auth.ssl.cert_type = :der
-        curb.expects(:certtype=).with(:der.to_s.upcase)
+        it "sets the cert_type to DER if specified" do
+          ssl_auth_request.auth.ssl.cert_type = :der
+          curb.expects(:certtype=).with(:der.to_s.upcase)
 
-        adapter.get(ssl_auth_request)
-      end
+          adapter.get(ssl_auth_request)
+        end
 
-      it "should set the cacert if specified" do
-        ssl_auth_request.auth.ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
-        curb.expects(:cacert=).with(ssl_auth_request.auth.ssl.ca_cert_file)
+        it "sets the cacert if specified" do
+          ssl_auth_request.auth.ssl.ca_cert_file = "spec/fixtures/client_cert.pem"
+          curb.expects(:cacert=).with(ssl_auth_request.auth.ssl.ca_cert_file)
 
-        adapter.get(ssl_auth_request)
+          adapter.get(ssl_auth_request)
+        end
       end
     end
-  end
 
-  def basic_request
-    request = HTTPI::Request.new :url => "http://example.com"
-    yield request if block_given?
-    request
-  end
+    def basic_request
+      request = HTTPI::Request.new :url => "http://example.com"
+      yield request if block_given?
+      request
+    end
 
+  end
 end