moved support for ntlm authentication to httpi-ntlm

since ntlm support caused quite some problems for people who didn't
even need it, i decided to move it into httpi-ntlm until it's stable.

CHANGELOG.md

@@ -1,3 +1,9 @@
+## 0.9.5 (2011-06-30)
+
+* Improvement: Moved support for NTLM authentication into a separate gem.
+  Since NTLM support caused quite some problems for people who didn't even
+  need it, I decided to move it into httpi-ntlm until it's stable.
+
 ## 0.9.4 (2011-05-15)
 
 * Fix: issues [34](https://github.com/rubiii/httpi/issues/34) and

README.md

@@ -172,9 +172,14 @@ HTTPI::Auth
 ``` ruby
 request.auth.basic("username", "password")   # HTTP basic auth credentials
 request.auth.digest("username", "password")  # HTTP digest auth credentials
-request.auth.ntlm("username", "password")    # NTLM auth credentials
 ```
 
+For experimental NTLM authentication, please use the [httpi-ntlm](rubygems.org/gems/httpi-ntml)
+gem and provide feedback.
+
+``` ruby
+request.auth.ntlm("username", "password")    # NTLM auth credentials
+```
 
 HTTPI::Auth::SSL
 ----------------

httpi.gemspec

@@ -15,7 +15,6 @@ Gem::Specification.new do |s|
   s.rubyforge_project = s.name
 
   s.add_dependency "rack"
-  s.add_dependency "pyu-ntlm-http",           ">= 0.1.3.1"
 
   s.add_development_dependency "rspec",       "~> 2.2"
   s.add_development_dependency "autotest"

lib/httpi/adapter.rb

@@ -14,9 +14,9 @@ module HTTPI
   module Adapter
 
     ADAPTERS = {
-      :httpclient => { :class => HTTPClient, :dependencies => ["httpclient"] },
-      :curb       => { :class => Curb,       :dependencies => ["curb"] },
-      :net_http   => { :class => NetHTTP,    :dependencies => ["net/https", "net/ntlm_http"] }
+      :httpclient => { :class => HTTPClient, :require => "httpclient" },
+      :curb       => { :class => Curb,       :require => "curb" },
+      :net_http   => { :class => NetHTTP,    :require => "net/https" }
     }
 
     LOAD_ORDER = [:httpclient, :curb, :net_http]
@@ -27,7 +27,7 @@ def use=(adapter)
         return @adapter = nil if adapter.nil?
 
         validate_adapter! adapter
-        load_dependencies adapter
+        load_adapter adapter
         @adapter = adapter
       end
 
@@ -50,16 +50,16 @@ def validate_adapter!(adapter)
       def default_adapter
         LOAD_ORDER.each do |adapter|
           begin
-            load_dependencies adapter
+            load_adapter adapter
             return adapter
           rescue LoadError
             next
           end
         end
       end
 
-      def load_dependencies(adapter)
-        ADAPTERS[adapter][:dependencies].each { |dependency| require dependency }
+      def load_adapter(adapter)
+        require ADAPTERS[adapter][:require]
       end
 
     end

lib/httpi/adapter/curb.rb

@@ -59,7 +59,6 @@ def setup_client(request)
         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)
@@ -84,11 +83,6 @@ def setup_ssl_auth(ssl)
         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

lib/httpi/adapter/httpclient.rb

@@ -66,7 +66,7 @@ def do_request(request)
 
       def setup_client(request)
         basic_setup request
-        setup_auth request if request.auth.http? || request.auth.ntlm?
+        setup_auth request if request.auth.http?
         setup_ssl_auth request.auth.ssl if request.auth.ssl?
       end
 

lib/httpi/adapter/net_http.rb

@@ -99,9 +99,7 @@ def request_client(type, request)
         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

lib/httpi/auth/config.rb

@@ -10,7 +10,7 @@ module Auth
     class Config
 
       # Supported authentication types.
-      TYPES = [:basic, :digest, :ssl, :ntlm]
+      TYPES = [:basic, :digest, :ssl]
 
       # Accessor for the HTTP basic auth credentials.
       def basic(*args)
@@ -43,17 +43,14 @@ def http?
         type == :basic || type == :digest
       end
 
-      # Accessor for the NTLM auth credentials.
+      # Only available with the httpi-ntlm gem.
       def ntlm(*args)
-        return @ntlm if args.empty?
-
-        self.type = :ntlm
-        @ntlm = args.flatten.compact
+        raise "Install the httpi-ntlm gem for experimental NTLM support"
       end
 
-      # Returns whether to use NTLM auth.
+      # Only available with the httpi-ntlm gem.
       def ntlm?
-        type == :ntlm
+        raise "Install the httpi-ntlm gem for experimental NTLM support"
       end
 
       # Returns the <tt>HTTPI::Auth::SSL</tt> object.