httpi 0.7.9 → 0.8.0

data/httpi.gemspec

@@ -15,6 +15,7 @@ Gem::Specification.new do |s|
   s.rubyforge_project = s.name
 
   s.add_dependency "rack"
+  s.add_dependency "ntlm-http", ">= 0.1.1"
 
   s.add_development_dependency "httpclient", "~> 2.1.5"
   s.add_development_dependency "curb", "~> 0.7.8"

data/lib/httpi.rb

@@ -73,7 +73,7 @@ module HTTPI
 
   REQUEST_METHODS = [:get, :post, :head, :put, :delete]
 
-  DEFAULT_LOG_LEVEL = :debug
+  DEFAULT_LOG_LEVEL = :warn
 
   class << self
 
@@ -154,7 +154,7 @@ module HTTPI
 
     # Returns the log level. Defaults to :debug.
     def log_level
-      @log_level ||= :debug
+      @log_level ||= DEFAULT_LOG_LEVEL
     end
 
     # Logs given +messages+.
@@ -185,7 +185,7 @@ module HTTPI
       adapter ||= Adapter.use
       adapter, adapter_class = Adapter.find adapter
       
-      HTTPI.log "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter"
+      HTTPI.logger.debug "HTTPI executes HTTP #{method.to_s.upcase} using the #{adapter} adapter"
       yield adapter_class.new(request)
     end
 

data/lib/httpi/adapter.rb

@@ -33,9 +33,9 @@ module HTTPI
     # 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" }
+        :httpclient => { :class => HTTPClient, :require => ["httpclient"] },
+        :curb       => { :class => Curb,       :require => ["curb"] },
+        :net_http   => { :class => NetHTTP,    :require => ["net/https", "net/ntlm_http"] }
       }
     end
 
@@ -54,12 +54,12 @@ module HTTPI
 
     # Tries to load and return the given +adapter+ name and class and falls back to the +FALLBACK+ adapter.
     def self.load_adapter(adapter)
-      require adapters[adapter][:require]
+      adapters[adapter][:require].each { |dependency| require dependency }
       [adapter, adapters[adapter][:class]]
     rescue LoadError
-      HTTPI.log "HTTPI tried to use the #{adapter} adapter, but was unable to find the library in the LOAD_PATH.",
+      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."
-      
+
       require adapters[FALLBACK][:require]
       [FALLBACK, adapters[FALLBACK][:class]]
     end

data/lib/httpi/adapter/curb.rb

@@ -59,6 +59,7 @@ module HTTPI
         basic_setup request
         setup_http_auth request if request.auth.http?
         setup_ssl_auth request.auth.ssl if request.auth.ssl?
+        setup_ntlm_auth request if request.auth.ntlm?
       end
 
       def basic_setup(request)
@@ -83,6 +84,11 @@ module HTTPI
         client.ssl_verify_peer = ssl.verify_mode == :peer
       end
 
+      def setup_ntlm_auth(request)
+        client.username, client.password = *request.auth.credentials
+        client.http_auth_types = request.auth.type
+      end
+
       def respond_with(client)
         status, headers = parse_header_string(client.header_str)
         Response.new client.response_code, headers, client.body_str
@@ -93,7 +99,7 @@ module HTTPI
       def parse_header_string(header_string)
         status, headers = nil, {}
         return [status, headers] unless header_string
-        
+
         header_string.split(/\r\n/).each do |header|
           if header =~ %r|^HTTP/1.[01] \d\d\d (.*)|
             status = $1
@@ -110,7 +116,7 @@ module HTTPI
             end
           end
         end
-        
+
         [status, headers]
       end
 

data/lib/httpi/adapter/httpclient.rb

@@ -66,7 +66,7 @@ module HTTPI
 
       def setup_client(request)
         basic_setup request
-        setup_http_auth request if request.auth.http?
+        setup_auth request if request.auth.http? || request.auth.ntlm?
         setup_ssl_auth request.auth.ssl if request.auth.ssl?
       end
 
@@ -76,7 +76,7 @@ module HTTPI
         client.receive_timeout = request.read_timeout if request.read_timeout
       end
 
-      def setup_http_auth(request)
+      def setup_auth(request)
         client.set_auth request.url, *request.auth.credentials
       end
 

data/lib/httpi/adapter/net_http.rb

@@ -9,7 +9,7 @@ module HTTPI
     # Adapter for the Net::HTTP client.
     # http://ruby-doc.org/stdlib/libdoc/net/http/rdoc/
     class NetHTTP
-
+      
       def initialize(request)
         self.client = new_client request
       end
@@ -88,6 +88,7 @@ module HTTPI
         client.ca_file = ssl.ca_cert_file if ssl.ca_cert_file
         client.verify_mode = ssl.openssl_verify_mode
       end
+      
 
       def request_client(type, request)
         request_class = case type
@@ -99,7 +100,10 @@ module HTTPI
         end
         
         request_client = request_class.new request.url.request_uri, request.headers
+        
         request_client.basic_auth *request.auth.credentials if request.auth.basic?
+        request_client.ntlm_auth *request.auth.credentials if request.auth.ntlm?
+        
         request_client
       end
 

data/lib/httpi/auth/config.rb

@@ -10,7 +10,7 @@ module HTTPI
     class Config
 
       # Supported authentication types.
-      TYPES = [:basic, :digest, :ssl]
+      TYPES = [:basic, :digest, :ssl, :ntlm]
 
       # Accessor for the HTTP basic auth credentials.
       def basic(*args)
@@ -43,6 +43,19 @@ module HTTPI
         type == :basic || type == :digest
       end
 
+      # Accessor for the NTLM auth credentials.
+      def ntlm(*args)
+        return @ntlm if args.empty?
+
+        self.type = :ntlm
+        @ntlm = args.flatten.compact
+      end
+
+      # Returns whether to use NTLM auth.
+      def ntlm?
+        type == :ntlm
+      end
+
       # Returns the <tt>HTTPI::Auth::SSL</tt> object.
       def ssl
         @ssl ||= SSL.new

data/lib/httpi/response.rb

@@ -68,9 +68,10 @@ module HTTPI
     # Returns the gzip decoded response body.
     def decoded_gzip_body
       gzip = Zlib::GzipReader.new StringIO.new(raw_body)
+      raise ArgumentError.new "couldn't create gzip reader" unless gzip
       gzip.read
     ensure
-      gzip.close
+      gzip.close if gzip
     end
 
     # Returns the DIME decoded response body.

data/lib/httpi/version.rb

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

data/spec/httpi/httpi_spec.rb

@@ -291,8 +291,8 @@ describe HTTPI do
     end
 
     describe ".log_level" do
-      it "should default to :debug" do
-        HTTPI.log_level.should == :debug
+      it "should default to :warn" do
+        HTTPI.log_level.should == :warn
       end
 
       it "should set the log level to use" do
@@ -303,6 +303,7 @@ describe HTTPI do
 
     describe ".log" do
       it "should log given messages" do
+        HTTPI.log_level = :debug
         HTTPI.logger.expects(:debug).with("Log this")
         HTTPI.log "Log", "this"
       end

data/spec/httpi/response_spec.rb

@@ -79,6 +79,12 @@ describe HTTPI::Response do
       it "should return the (gzip decoded) HTTP response body" do
         response.body.should == Fixture.xml
       end
+
+      it "should bubble Zlib errors" do
+        arbitrary_error = Class.new(ArgumentError)
+        Zlib::GzipReader.expects(:new).raises(arbitrary_error)
+        lambda { response.body }.should raise_error(arbitrary_error)
+      end
     end
 
     describe "#raw_body" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 63
   prerelease: 
   segments: 
   - 0
-  - 7
-  - 9
-  version: 0.7.9
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-26 00:00:00 +01:00
+date: 2011-03-07 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,9 +34,25 @@ dependencies:
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: httpclient
+  name: ntlm-http
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 0
+        - 1
+        - 1
+        version: 0.1.1
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: httpclient
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,11 +64,11 @@ dependencies:
         - 5
         version: 2.1.5
   type: :development
-  version_requirements: *id002
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: curb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,11 +80,11 @@ dependencies:
         - 8
         version: 0.7.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -79,11 +95,11 @@ dependencies:
         - 2
         version: "2.2"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -93,11 +109,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,11 +125,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id006
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -125,7 +141,7 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id007
+  version_requirements: *id008
 description: HTTPI provides a common interface for Ruby HTTP libraries.
 email: me@rubiii.com
 executables: []