httpi 0.8.0 → 0.9.0

data/CHANGELOG.md

@@ -0,0 +1,32 @@
+## 0.9.0 (2011-03-08)
+
+* Feature: improved the adapter loading process ([d4a091](https://github.com/rubiii/savon/commit/d4a091)) [rubiii].
+
+  Instead of using HTTPClient as the default and falling back to NetHTTP, the loading process now does the following:
+
+  1. Check if either HTTPClient, Curb or NetHTTP are already defined.
+     If any one of those is defined, use it.
+
+  2. Try to require HTTPClient, Curb and NetHTTP at last.
+     If any one of those can be required, use it.
+
+  Of course you can still manually specify the adapter to use.
+
+* Fix: [issue 22](https://github.com/rubiii/httpi/issues/22) argument error on logging adapter warning [rubiii].
+
+* Fix: [issue 23](https://github.com/rubiii/httpi/issues/23) the HTTPI.log method now works as expected [rubiii].
+
+## 0.8.0 (2011-03-07)
+
+* Feature: added support for NTLM authentication ([96ceb1](https://github.com/rubiii/savon/commit/96ceb1)) [MattHall].
+
+  You should now be able to use NTLM authentication by specifying your credentials via `HTTPI::Auth::Config#ntlm`:
+
+      request = HTTPI::Request.new
+      request.auth.ntlm "username", "password"
+
+* Improvement: changed the default log level to :warn ([d01591](https://github.com/rubiii/savon/commit/d01591))
+  and log at appropriate levels ([21ee1b](https://github.com/rubiii/savon/commit/21ee1b)) [ichverstehe].
+
+* Fix: [issue 18](https://github.com/rubiii/httpi/issues/18) don't mask exceptions in decoded_gzip_body
+  ([f3811b](https://github.com/rubiii/savon/commit/f3811b)) [fj].

data/lib/httpi.rb

@@ -24,7 +24,7 @@ require "httpi/adapter"
 #   request = HTTPI::Request.new
 #   request.url = "http://example.com"
 #   request.body = "<some>xml</some>"
-#   
+#
 #   HTTPI.post request, :httpclient
 #
 # === Shortcuts
@@ -45,7 +45,7 @@ require "httpi/adapter"
 #   request = HTTPI::Request.new
 #   request.url = "http://example.com"
 #   request.body = "<some>xml</some>"
-#   
+#
 #   HTTPI.put request, :httpclient
 #
 # === Shortcuts
@@ -80,7 +80,7 @@ module HTTPI
     # Executes an HTTP GET request.
     def get(request, adapter = nil)
       request = Request.new :url => request if request.kind_of? String
-      
+
       with_adapter :get, request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.get request
@@ -90,7 +90,7 @@ module HTTPI
     # Executes an HTTP POST request.
     def post(*args)
       request, adapter = request_and_adapter_from(args)
-      
+
       with_adapter :post, request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.post request
@@ -100,7 +100,7 @@ module HTTPI
     # Executes an HTTP HEAD request.
     def head(request, adapter = nil)
       request = Request.new :url => request if request.kind_of? String
-      
+
       with_adapter :head, request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.head request
@@ -110,7 +110,7 @@ module HTTPI
     # Executes an HTTP PUT request.
     def put(*args)
       request, adapter = request_and_adapter_from(args)
-      
+
       with_adapter :put, request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.put request
@@ -120,7 +120,7 @@ module HTTPI
     # Executes an HTTP DELETE request.
     def delete(request, adapter = nil)
       request = Request.new :url => request if request.kind_of? String
-      
+
       with_adapter :delete, request, adapter do |adapter|
         yield adapter.client if block_given?
         adapter.delete request
@@ -159,7 +159,8 @@ module HTTPI
 
     # Logs given +messages+.
     def log(*messages)
-      logger.send log_level, messages.join(" ") if log?
+      level = Symbol === messages.first ? messages.shift : log_level
+      logger.send level, messages.join(" ") if log?
     end
 
     # Reset the default config.
@@ -182,10 +183,9 @@ module HTTPI
     # Expects a request +method+, a +request+ and an +adapter+ (defaults to
     # <tt>Adapter.use</tt>) and yields an instance of the adapter to a given block.
     def with_adapter(method, request, adapter)
-      adapter ||= Adapter.use
-      adapter, adapter_class = Adapter.find adapter
-      
-      HTTPI.logger.debug "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter"
+      adapter, adapter_class = Adapter.load adapter
+
+      log :debug, "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter"
       yield adapter_class.new(request)
     end
 

data/lib/httpi/adapter.rb

@@ -13,56 +13,55 @@ module HTTPI
   # * net/http
   module Adapter
 
-    # The default adapter.
-    DEFAULT = :httpclient
+    ADAPTERS = {
+      :httpclient => HTTPClient,
+      :curb       => Curb,
+      :net_http   => NetHTTP
+    }
 
-    # The fallback (worst-choice) adapter.
-    FALLBACK = :net_http
+    DEPENDENCIES = [
+      [:httpclient, ["httpclient"]],
+      [:curb,       ["curb"]],
+      [:net_http,   ["net/https", "net/ntlm_http"]]
+    ]
 
-    # Returns the adapter to use. Defaults to <tt>HTTPI::Adapter::DEFAULT</tt>.
-    def self.use
-      @use ||= DEFAULT
-    end
+    class << self
 
-    # Sets the +adapter+ to use. Raises an +ArgumentError+ unless the +adapter+ exists.
-    def self.use=(adapter)
-      validate_adapter! adapter
-      @use = adapter
-    end
+      def use=(adapter)
+        @adapter = adapter.nil? ? nil : validate_adapter!(adapter)
+      end
 
-    # Returns a memoized +Hash+ of adapters.
-    def self.adapters
-      @adapters ||= {
-        :httpclient => { :class => HTTPClient, :require => ["httpclient"] },
-        :curb       => { :class => Curb,       :require => ["curb"] },
-        :net_http   => { :class => NetHTTP,    :require => ["net/https", "net/ntlm_http"] }
-      }
-    end
+      def use
+        @adapter ||= default_adapter
+      end
 
-    # Returns an +adapter+. Raises an +ArgumentError+ unless the +adapter+ exists.
-    def self.find(adapter)
-      validate_adapter! adapter
-      load_adapter adapter
-    end
+      def load(adapter = nil)
+        adapter = adapter ? validate_adapter!(adapter) : use
+        [adapter, ADAPTERS[adapter]]
+      end
 
-  private
+    private
 
-    # Raises an +ArgumentError+ unless the +adapter+ exists.
-    def self.validate_adapter!(adapter)
-      raise ArgumentError, "Invalid HTTPI adapter: #{adapter}" unless adapters[adapter]
-    end
+      def validate_adapter!(adapter)
+        raise ArgumentError, "Invalid HTTPI adapter: #{adapter}" unless ADAPTERS[adapter]
+        adapter
+      end
 
-    # Tries to load and return the given +adapter+ name and class and falls back to the +FALLBACK+ adapter.
-    def self.load_adapter(adapter)
-      adapters[adapter][:require].each { |dependency| require dependency }
-      [adapter, adapters[adapter][:class]]
-    rescue LoadError
-      HTTPI.logger.warn "HTTPI tried to use the #{adapter} adapter, but was unable to find the library in the LOAD_PATH.",
-        "Falling back to using the #{FALLBACK} adapter now."
+      def default_adapter
+        return :httpclient if defined?(::HTTPClient)
+        return :curb if defined?(::Curl::Easy)
+        return :net_http if defined?(::NetHTTP)
 
-      require adapters[FALLBACK][:require]
-      [FALLBACK, adapters[FALLBACK][:class]]
-    end
+        DEPENDENCIES.each do |(adapter, dependencies)|
+          begin
+            dependencies.each { |dependency| require dependency }
+            return adapter
+          rescue LoadError
+            next
+          end
+        end
+      end
 
+    end
   end
 end

data/lib/httpi/version.rb

@@ -1,5 +1,5 @@
 module HTTPI
 
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 
 end

data/spec/httpi/adapter_spec.rb

@@ -1,68 +1,40 @@
 require "spec_helper"
 require "httpi/adapter"
 
+
 describe HTTPI::Adapter do
   let(:adapter) { HTTPI::Adapter }
 
   describe ".use" do
-    it "should default to HTTPClient" do
-      adapter.use.should == :httpclient
-    end
-    
-    it "should accept an adapter to use" do
+    it "should set the adapter to use" do
+      adapter.use.should_not == :curb
+
       adapter.use = :curb
       adapter.use.should == :curb
-      
-      # reset to default
-      adapter.use = HTTPI::Adapter::DEFAULT
-    end
 
-    it "should raise an ArgumentError in case of an invalid adapter" do
-      lambda { adapter.use = :unknown }.should raise_error(ArgumentError)
+      adapter.use = nil  # reset
     end
-  end
 
-  describe ".adapters" do
-    it "should return a Hash of adapter details" do
-      adapter.adapters.should == {
-        :httpclient => { :class => HTTPI::Adapter::HTTPClient, :require => "httpclient" },
-        :curb       => { :class => HTTPI::Adapter::Curb,       :require => "curb" },
-        :net_http   => { :class => HTTPI::Adapter::NetHTTP,    :require => "net/https" }
-      }
+    it "should default to use the HTTPClient adapter" do
+      adapter.use.should == :httpclient
     end
 
-    it "should return a memoized Hash" do
-      adapter.adapters.should equal(adapter.adapters)
+    it "should raise an ArgumentError in case of an invalid adapter" do
+      lambda { adapter.use = :unknown }.should raise_error(ArgumentError)
     end
   end
 
-  describe ".find" do
-    it "should return the adapter name and class for a given Symbol" do
-      adapter.find(:httpclient).should == [:httpclient, HTTPI::Adapter::HTTPClient]
+  describe ".load" do
+    it "should return the adapter name and it's class for a given adapter" do
+      adapter.load(:curb).should == [:curb, HTTPI::Adapter::Curb]
     end
 
-    it "should raise an ArgumentError in case of an invalid adapter" do
-      lambda { adapter.find :unknown }.should raise_error(ArgumentError)
+    it "should return the HTTPClient adapter name and it's class by default" do
+      adapter.load.should == [:httpclient, HTTPI::Adapter::HTTPClient]
     end
 
-    context "when the given adapter could not be found" do
-      before do
-        adapter.expects(:require).with("httpclient").raises(LoadError)
-        adapter.expects(:require).with(HTTPI::Adapter.adapters[HTTPI::Adapter::FALLBACK][:require])
-      end
-
-      it "should fall back to use the HTTPI::Adapter::FALLBACK adapter" do
-        adapter.find :httpclient
-      end
-
-      it "should log that the adapter to use could not be required" do
-        HTTPI.expects(:log).with(
-          "HTTPI tried to use the httpclient adapter, but was unable to find the library in the LOAD_PATH.",
-          "Falling back to using the #{HTTPI::Adapter::FALLBACK} adapter now."
-        )
-        
-        adapter.find :httpclient
-      end
+    it "should raise an ArgumentError in case of an invalid adapter" do
+      lambda { adapter.use = :unknown }.should raise_error(ArgumentError)
     end
   end
 

data/spec/httpi/httpi_spec.rb

@@ -3,14 +3,14 @@ require "httpi"
 
 describe HTTPI do
   let(:client) { HTTPI }
-  let(:default_adapter) { HTTPI::Adapter.find(HTTPI::Adapter.use)[1] }
-  let(:curb) { HTTPI::Adapter.find(:curb)[1] }
+  let(:httpclient) { HTTPI::Adapter.load(:httpclient)[1] }
+  let(:curb) { HTTPI::Adapter.load(:curb)[1] }
 
   describe ".get(request)" do
     it "should execute an HTTP GET request using the default adapter" do
       request = HTTPI::Request.new
-      default_adapter.any_instance.expects(:get).with(request)
-      
+      httpclient.any_instance.expects(:get).with(request)
+
       client.get request
     end
   end
@@ -19,7 +19,7 @@ describe HTTPI do
     it "should execute an HTTP GET request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:get).with(request)
-      
+
       client.get request, :curb
     end
   end
@@ -27,8 +27,8 @@ describe HTTPI do
   describe ".get(url)" do
     it "should execute an HTTP GET request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      default_adapter.any_instance.expects(:get).with(instance_of(HTTPI::Request))
-      
+      httpclient.any_instance.expects(:get).with(instance_of(HTTPI::Request))
+
       client.get "http://example.com"
     end
   end
@@ -37,7 +37,7 @@ describe HTTPI do
     it "should execute an HTTP GET request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       curb.any_instance.expects(:get).with(instance_of(HTTPI::Request))
-      
+
       client.get "http://example.com", :curb
     end
   end
@@ -45,8 +45,8 @@ describe HTTPI do
   describe ".post(request)" do
     it "should execute an HTTP POST request using the default adapter" do
       request = HTTPI::Request.new
-      default_adapter.any_instance.expects(:post).with(request)
-      
+      httpclient.any_instance.expects(:post).with(request)
+
       client.post request
     end
   end
@@ -55,7 +55,7 @@ describe HTTPI do
     it "should execute an HTTP POST request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:post).with(request)
-      
+
       client.post request, :curb
     end
   end
@@ -64,8 +64,8 @@ describe HTTPI do
     it "should execute an HTTP POST request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      default_adapter.any_instance.expects(:post).with(instance_of(HTTPI::Request))
-      
+      httpclient.any_instance.expects(:post).with(instance_of(HTTPI::Request))
+
       client.post "http://example.com", "<some>xml</some>"
     end
   end
@@ -75,7 +75,7 @@ describe HTTPI do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
       curb.any_instance.expects(:post).with(instance_of(HTTPI::Request))
-      
+
       client.post "http://example.com", "<some>xml</some>", :curb
     end
   end
@@ -83,8 +83,8 @@ describe HTTPI do
   describe ".head(request)" do
     it "should execute an HTTP HEAD request using the default adapter" do
       request = HTTPI::Request.new
-      default_adapter.any_instance.expects(:head).with(request)
-      
+      httpclient.any_instance.expects(:head).with(request)
+
       client.head request
     end
   end
@@ -93,7 +93,7 @@ describe HTTPI do
     it "should execute an HTTP HEAD request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:head).with(request)
-      
+
       client.head request, :curb
     end
   end
@@ -101,8 +101,8 @@ describe HTTPI do
   describe ".head(url)" do
     it "should execute an HTTP HEAD request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      default_adapter.any_instance.expects(:head).with(instance_of(HTTPI::Request))
-      
+      httpclient.any_instance.expects(:head).with(instance_of(HTTPI::Request))
+
       client.head "http://example.com"
     end
   end
@@ -111,7 +111,7 @@ describe HTTPI do
     it "should execute an HTTP HEAD request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       curb.any_instance.expects(:head).with(instance_of(HTTPI::Request))
-      
+
       client.head "http://example.com", :curb
     end
   end
@@ -119,8 +119,8 @@ describe HTTPI do
   describe ".put(request)" do
     it "should execute an HTTP PUT request using the default adapter" do
       request = HTTPI::Request.new
-      default_adapter.any_instance.expects(:put).with(request)
-      
+      httpclient.any_instance.expects(:put).with(request)
+
       client.put request
     end
   end
@@ -129,7 +129,7 @@ describe HTTPI do
     it "should execute an HTTP PUT request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:put).with(request)
-      
+
       client.put request, :curb
     end
   end
@@ -138,8 +138,8 @@ describe HTTPI do
     it "should execute an HTTP PUT request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
-      default_adapter.any_instance.expects(:put).with(instance_of(HTTPI::Request))
-      
+      httpclient.any_instance.expects(:put).with(instance_of(HTTPI::Request))
+
       client.put "http://example.com", "<some>xml</some>"
     end
   end
@@ -149,7 +149,7 @@ describe HTTPI do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       HTTPI::Request.any_instance.expects(:body=).with("<some>xml</some>")
       curb.any_instance.expects(:put).with(instance_of(HTTPI::Request))
-      
+
       client.put "http://example.com", "<some>xml</some>", :curb
     end
   end
@@ -157,8 +157,8 @@ describe HTTPI do
   describe ".delete(request)" do
     it "should execute an HTTP DELETE request using the default adapter" do
       request = HTTPI::Request.new
-      default_adapter.any_instance.expects(:delete).with(request)
-      
+      httpclient.any_instance.expects(:delete).with(request)
+
       client.delete request
     end
   end
@@ -167,7 +167,7 @@ describe HTTPI do
     it "should execute an HTTP DELETE request using the given adapter" do
       request = HTTPI::Request.new
       curb.any_instance.expects(:delete).with(request)
-      
+
       client.delete request, :curb
     end
   end
@@ -175,8 +175,8 @@ describe HTTPI do
   describe ".delete(url)" do
     it "should execute an HTTP DELETE request using the default adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
-      default_adapter.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
-      
+      httpclient.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
+
       client.delete "http://example.com"
     end
   end
@@ -185,7 +185,7 @@ describe HTTPI do
     it "should execute an HTTP DELETE request using the given adapter" do
       HTTPI::Request.any_instance.expects(:url=).with("http://example.com")
       curb.any_instance.expects(:delete).with(instance_of(HTTPI::Request))
-      
+
       client.delete "http://example.com", :curb
     end
   end
@@ -215,7 +215,7 @@ describe HTTPI do
         lambda { client.request method, "invalid" }.should raise_error(ArgumentError)
       end
 
-      HTTPI::Adapter.adapters.each do |adapter, values|
+      HTTPI::Adapter::ADAPTERS.each do |adapter, adapter_class|
         client_class = {
           :httpclient => lambda { HTTPClient },
           :curb       => lambda { Curl::Easy },
@@ -223,10 +223,10 @@ describe HTTPI do
         }
 
         context "using #{adapter}" do
-          before { values[:class].any_instance.expects(method) }
+          before { adapter_class.any_instance.expects(method) }
 
           it "should log that we're executing an HTTP request" do
-            HTTPI.expects(:log).with("HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter")
+            HTTPI.expects(:log).with(:debug, "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter")
             client.request method, request, adapter
           end
 
@@ -236,26 +236,6 @@ describe HTTPI do
           end
         end
       end
-
-      HTTPI::Adapter.adapters.reject { |key, value| key == HTTPI::Adapter::FALLBACK }.each do |adapter, values|
-        context "when #{adapter} could not be loaded" do
-          before do
-            HTTPI::Adapter.expects(:require).with(values[:require]).raises(LoadError)
-            HTTPI::Adapter.expects(:require).with("net/https")
-            HTTPI::Adapter::NetHTTP.any_instance.expects(method)
-          end
-
-          it "should fall back to using the FALLBACK adapter" do
-            HTTPI.expects(:log).with(
-              "HTTPI tried to use the #{adapter} adapter, but was unable to find the library in the LOAD_PATH.",
-              "Falling back to using the #{HTTPI::Adapter::FALLBACK} adapter now."
-            )
-            HTTPI.expects(:log).with("HTTPI executes HTTP #{method.to_s.upcase} using the #{HTTPI::Adapter::FALLBACK} adapter")
-            
-            client.request method, request, adapter
-          end
-        end
-      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 +01:00
+date: 2011-03-08 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -154,6 +154,7 @@ files:
 - .autotest
 - .gitignore
 - .rspec
+- CHANGELOG.md
 - Gemfile
 - LICENSE
 - README.md