httpi 0.9.5 → 0.9.6

data/.travis.yml

@@ -1,8 +1,11 @@
-script: "rake ci"
+language: "ruby"
+script: "bundle exec rake ci"
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
+  - jruby-18mode
+  - jruby-19mode
+  - rbx-18mode
+  - rbx-19mode
   - ree
-  - rbx
-  - jruby
-  - ruby-head

data/CHANGELOG.md

@@ -1,3 +1,22 @@
+## 0.9.6 (2012-02-23)
+
+* Feature: Merged [pull request 46](https://github.com/rubiii/httpi/pull/46) to support
+  request body Hashes. Fixes [issue 45](https://github.com/rubiii/httpi/issues/45).
+
+    ``` ruby
+    request.body = { :foo => :bar, :baz => :foo }  # => "foo=bar&baz=foo"
+    ```
+
+* Feature: Merged [pull request 43](https://github.com/rubiii/httpi/pull/43) to allow
+  proxy authentication with net/http.
+
+* Feature: Merged [pull request 42](https://github.com/rubiii/httpi/pull/42) which sets up
+  HTTP basic authentication if user information is present in the URL.
+
+* Fix: Merged [pull request 44](https://github.com/rubiii/httpi/pull/44) to fix
+  [issue 26](https://github.com/rubiii/httpi/issues/26) and probably also
+  [issue 32](https://github.com/rubiii/httpi/issues/32) - SSL client authentication.
+
 ## 0.9.5 (2011-06-30)
 
 * Improvement: Moved support for NTLM authentication into a separate gem.

data/README.md

@@ -1,4 +1,4 @@
-HTTPI [![Build Status](http://travis-ci.org/rubiii/httpi.png)](http://travis-ci.org/rubiii/httpi)
+HTTPI [![Build Status](https://secure.travis-ci.org/rubiii/httpi.png)](http://travis-ci.org/rubiii/httpi)
 =====
 
 HTTPI provides a common interface for Ruby HTTP libraries.

data/Rakefile

@@ -1,6 +1,4 @@
-require "bundler"
-Bundler::GemHelper.install_tasks
-
+require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
 RSpec::Core::RakeTask.new do |t|

data/httpi.gemspec

@@ -16,10 +16,13 @@ Gem::Specification.new do |s|
 
   s.add_dependency "rack"
 
-  s.add_development_dependency "rspec",       "~> 2.2"
+  s.add_development_dependency "rake",    "~> 0.8.7"
+  s.add_development_dependency "rspec",   "~> 2.7"
+  s.add_development_dependency "mocha",   "~> 0.9.9"
+  s.add_development_dependency "webmock", "~> 1.4.0"
+
   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 "ZenTest", "4.5.0"
 
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"

data/lib/httpi/adapter/net_http.rb

@@ -63,8 +63,9 @@ module HTTPI
       attr_writer :client
 
       def new_client(request)
-        proxy = request.proxy || URI("")
-        Net::HTTP::Proxy(proxy.host, proxy.port).new request.url.host, request.url.port
+        proxy_url = request.proxy || URI("")
+        proxy = Net::HTTP::Proxy(proxy_url.host, proxy_url.port, proxy_url.user, proxy_url.password)
+        proxy.new request.url.host, request.url.port
       end
 
       def do_request(type, request)

data/lib/httpi/auth/ssl.rb

@@ -13,7 +13,7 @@ module HTTPI
 
       # Returns whether SSL configuration is present.
       def present?
-        (verify_mode == :none) || (cert && cert_key)
+        (verify_mode == :none) || (cert && cert_key) || ca_cert_file
       rescue TypeError, Errno::ENOENT
         false
       end

data/lib/httpi/request.rb

@@ -24,6 +24,7 @@ module HTTPI
     # Sets the +url+ to access. Raises an +ArgumentError+ unless the +url+ is valid.
     def url=(url)
       @url = normalize_url! url
+      auth.basic @url.user, @url.password || '' if @url.user
     end
 
     # Returns the +url+ to access.
@@ -61,7 +62,13 @@ module HTTPI
       headers["Accept-Encoding"] = "gzip,deflate"
     end
 
-    attr_accessor :body, :open_timeout, :read_timeout
+    attr_accessor :open_timeout, :read_timeout
+    attr_reader :body
+
+    # Sets a body request given a String or a Hash.
+    def body=(params)
+      @body = params.kind_of?(Hash) ? Rack::Utils.build_query(params) : params
+    end
 
     # Returns the <tt>HTTPI::Authentication</tt> object.
     def auth

data/lib/httpi/version.rb

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

data/spec/httpi/request_spec.rb

@@ -31,6 +31,16 @@ describe HTTPI::Request do
     it "raises an ArgumentError in case of an invalid url" do
       expect { request.url = "invalid" }.to raise_error(ArgumentError)
     end
+
+    it "uses username and password as basic authentication if present in the URL" do
+      request.url = "http://username:password@example.com"
+      request.auth.basic.should == ['username', 'password']
+    end
+
+    it "uses a blank password if only username is specified in the URL" do
+      request.url = "http://username@example.com"
+      request.auth.basic.should == ['username', '']
+    end
   end
 
   describe "#proxy" do
@@ -91,10 +101,15 @@ describe HTTPI::Request do
   end
 
   describe "#body" do
-    it "lets you specify the HTTP request body" do
+    it "lets you specify the HTTP request body using a String" do
       request.body = "<some>xml</some>"
       request.body.should == "<some>xml</some>"
     end
+
+    it "lets you specify the HTTP request body using a Hash" do
+      request.body = {:foo => :bar, :baz => :foo}
+      request.body.split("&").should =~ ["foo=bar", "baz=foo"]
+    end
   end
 
   describe "#open_timeout" do

data/spec/integration/request_spec.rb

@@ -9,7 +9,7 @@ describe HTTPI do
 
   before :all do
     WebMock.allow_net_connect!
-    
+
     @username = "admin"
     @password = "pwd"
     @error_message = "Authorization Required"
@@ -78,17 +78,21 @@ describe HTTPI do
   end
 
   HTTPI::Adapter::ADAPTERS.keys.each do |adapter|
-    context "using :#{adapter}" do
-      let(:adapter) { adapter }
-      it_should_behave_like "an HTTP client"
-      it_should_behave_like "it works with HTTP basic auth"
+    unless adapter == :curb && RUBY_PLATFORM =~ /java/
+      context "using :#{adapter}" do
+        let(:adapter) { adapter }
+        it_should_behave_like "an HTTP client"
+        it_should_behave_like "it works with HTTP basic auth"
+      end
     end
   end
 
   (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"
+    unless adapter == :curb && RUBY_PLATFORM =~ /java/
+      context "using :#{adapter}" do
+        let(:adapter) { adapter }
+        it_should_behave_like "it works with HTTP digest auth"
+      end
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: httpi
 version: !ruby/object:Gem::Version 
-  hash: 49
+  hash: 55
   prerelease: 
   segments: 
   - 0
   - 9
-  - 5
-  version: 0.9.5
+  - 6
+  version: 0.9.6
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -16,11 +16,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-29 00:00:00 Z
+date: 2012-02-22 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
+  type: :runtime
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -30,40 +30,42 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
   version_requirements: *id001
+  name: rack
 - !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
+  type: :development
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 49
         segments: 
-        - 2
-        - 2
-        version: "2.2"
-  type: :development
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   version_requirements: *id002
+  name: rake
 - !ruby/object:Gem::Dependency 
-  name: autotest
   prerelease: false
+  type: :development
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 13
         segments: 
-        - 0
-        version: "0"
-  type: :development
+        - 2
+        - 7
+        version: "2.7"
   version_requirements: *id003
+  name: rspec
 - !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
+  type: :development
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -75,11 +77,11 @@ dependencies:
         - 9
         - 9
         version: 0.9.9
-  type: :development
   version_requirements: *id004
+  name: mocha
 - !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
+  type: :development
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
@@ -91,8 +93,38 @@ dependencies:
         - 4
         - 0
         version: 1.4.0
-  type: :development
   version_requirements: *id005
+  name: webmock
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  version_requirements: *id006
+  name: autotest
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  type: :development
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 43
+        segments: 
+        - 4
+        - 5
+        - 0
+        version: 4.5.0
+  version_requirements: *id007
+  name: ZenTest
 description: HTTPI provides a common interface for Ruby HTTP libraries.
 email: me@rubiii.com
 executables: []
@@ -102,7 +134,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .autotest
 - .gitignore
 - .rspec
 - .travis.yml
@@ -111,7 +142,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- autotest/discover.rb
 - httpi.gemspec
 - lib/httpi.rb
 - lib/httpi/adapter.rb
@@ -174,7 +204,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: httpi
-rubygems_version: 1.8.5
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Interface for Ruby HTTP libraries

data/.autotest

@@ -1,5 +0,0 @@
-Autotest.add_hook(:initialize) do |at|
-  at.clear_mappings
-  at.add_mapping(%r%^spec/httpi/.*_spec.rb$%) { |filename, _| filename }
-  at.add_mapping(%r%^lib/(.*)\.rb$%) { |_, m| ["spec/#{m[1]}_spec.rb"] }
-end

data/autotest/discover.rb

@@ -1 +0,0 @@
-Autotest.add_discovery { "rspec2" }