httpi 0.9.4 → 0.9.5

data/.travis.yml

@@ -1,7 +1,8 @@
-script: "rake"
+script: "rake ci"
 rvm:
   - 1.8.7
   - 1.9.2
   - ree
   - rbx
   - jruby
+  - ruby-head

data/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

data/Gemfile

@@ -6,3 +6,4 @@ gem "jruby-openssl", :platforms => :jruby
 # http clients
 gem "httpclient", "~> 2.1.7"
 gem "curb", "~> 0.7.8", :platforms => :ruby
+gem "mock-server", :git => "https://github.com/djanowski/mock-server.git"

data/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
 ----------------

data/Rakefile

@@ -5,14 +5,14 @@ require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new do |t|
   t.pattern = "spec/httpi/**/*_spec.rb"
-  t.rspec_opts = %w(-fd -c)
 end
 
 desc "Run RSpec integration examples"
-RSpec::Core::RakeTask.new "spec:integration" do |t|
+RSpec::Core::RakeTask.new "spec_integration" do |t|
   t.pattern = "spec/integration/*_spec.rb"
-  t.rspec_opts = %w(-fd -c)
 end
 
 task :default => :spec
-task :test => :spec
+
+desc "Run RSpec code and integration examples"
+task :ci => [:spec, :spec_integration]

data/httpi.gemspec

@@ -15,13 +15,11 @@ 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"
   s.add_development_dependency "mocha",       "~> 0.9.9"
   s.add_development_dependency "webmock",     "~> 1.4.0"
-  s.add_development_dependency "mock-server", "~> 0.1.1"
 
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"

data/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 @@ module HTTPI
         return @adapter = nil if adapter.nil?
 
         validate_adapter! adapter
-        load_dependencies adapter
+        load_adapter adapter
         @adapter = adapter
       end
 
@@ -50,7 +50,7 @@ module HTTPI
       def default_adapter
         LOAD_ORDER.each do |adapter|
           begin
-            load_dependencies adapter
+            load_adapter adapter
             return adapter
           rescue LoadError
             next
@@ -58,8 +58,8 @@ module HTTPI
         end
       end
 
-      def load_dependencies(adapter)
-        ADAPTERS[adapter][:dependencies].each { |dependency| require dependency }
+      def load_adapter(adapter)
+        require ADAPTERS[adapter][:require]
       end
 
     end

data/lib/httpi/adapter/curb.rb

@@ -59,7 +59,6 @@ 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)
@@ -84,11 +83,6 @@ 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

data/lib/httpi/adapter/httpclient.rb

@@ -66,7 +66,7 @@ module HTTPI
 
       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
 

data/lib/httpi/adapter/net_http.rb

@@ -99,9 +99,7 @@ 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, :ntlm]
+      TYPES = [:basic, :digest, :ssl]
 
       # Accessor for the HTTP basic auth credentials.
       def basic(*args)
@@ -43,17 +43,14 @@ module HTTPI
         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.

data/lib/httpi/version.rb

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

data/spec/integration/request_spec.rb

@@ -77,7 +77,7 @@ describe HTTPI do
     end
   end
 
-  HTTPI::Adapter.adapters.keys.each do |adapter|
+  HTTPI::Adapter::ADAPTERS.keys.each do |adapter|
     context "using :#{adapter}" do
       let(:adapter) { adapter }
       it_should_behave_like "an HTTP client"
@@ -85,7 +85,7 @@ describe HTTPI do
     end
   end
 
-  (HTTPI::Adapter.adapters.keys - [:net_http]).each do |adapter|
+  (HTTPI::Adapter::ADAPTERS.keys - [:net_http]).each do |adapter|
     context "using :#{adapter}" do
       let(:adapter) { adapter }
       it_should_behave_like "it works with HTTP digest auth"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 51
+  hash: 49
   prerelease: 
   segments: 
   - 0
   - 9
-  - 4
-  version: 0.9.4
+  - 5
+  version: 0.9.5
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-15 00:00:00 Z
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
@@ -32,27 +32,10 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: pyu-ntlm-http
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 73
-        segments: 
-        - 0
-        - 1
-        - 3
-        - 1
-        version: 0.1.3.1
-  type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,11 +46,11 @@ dependencies:
         - 2
         version: "2.2"
   type: :development
-  version_requirements: *id003
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: autotest
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,11 +60,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id004
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -93,11 +76,11 @@ dependencies:
         - 9
         version: 0.9.9
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: webmock
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -109,23 +92,7 @@ dependencies:
         - 0
         version: 1.4.0
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: mock-server
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 1
-        - 1
-        version: 0.1.1
-  type: :development
-  version_requirements: *id007
+  version_requirements: *id005
 description: HTTPI provides a common interface for Ruby HTTP libraries.
 email: me@rubiii.com
 executables: []
@@ -136,7 +103,6 @@ extra_rdoc_files: []
 
 files: 
 - .autotest
-- .gemtest
 - .gitignore
 - .rspec
 - .travis.yml
@@ -208,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: httpi
-rubygems_version: 1.7.2
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Interface for Ruby HTTP libraries