jruby-httpclient 1.0.0-java → 1.1.0-java

data/Rakefile

@@ -20,7 +20,7 @@ Jeweler::Tasks.new do |gem|
   gem.summary = %Q{A thin wrapper around the Apache HttpClient}
   gem.description = %Q{An HTTP client designed for use with JRuby in a threaded environment}
   gem.email = "adam@esterlines.com"
-  gem.authors = ["Adam Esterline"]
+  gem.authors = ["Adam Esterline", "Aaron Spiegel"]
   gem.platform = Gem::Platform::JAVA
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.1.0

data/jruby-httpclient.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-httpclient}
-  s.version = "1.0.0"
+  s.version = "1.1.0"
   s.platform = Gem::Platform.new([nil, "java", nil])
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Adam Esterline"]
-  s.date = %q{2011-07-10}
+  s.authors = ["Adam Esterline", "Aaron Spiegel"]
+  s.date = %q{2012-01-01}
   s.description = %q{An HTTP client designed for use with JRuby in a threaded environment}
   s.email = %q{adam@esterlines.com}
   s.extra_rdoc_files = [

data/lib/http_client/jruby/client.rb

@@ -12,6 +12,14 @@ module HTTP
     def get(params, options = {})
       read_response(Get.new(params, options))
     end
+    
+    def head(params, options = {})
+      read_response(Head.new(params, options))
+    end
+    
+    def options(params, options = {})
+      read_response(Options.new(params, options))
+    end
 
     def post(params, options = {})
       read_response(Post.new(params, options))

data/lib/http_client/jruby/methods.rb

@@ -67,6 +67,20 @@ module HTTP
     end
   end
 
+  class Head < Request
+    def create_native_request
+      query_string = URLEncodedUtils.format(@query_params, encoding)
+      HttpHead.new(create_uri(query_string))
+    end
+  end
+
+  class Options < Request
+    def create_native_request
+      query_string = URLEncodedUtils.format(@query_params, encoding)
+      HttpOptions.new(create_uri(query_string))
+    end
+  end
+
   class Delete < Request
     def create_native_request
       HttpDelete.new(create_uri)
@@ -81,6 +95,8 @@ module HTTP
 
   private
   HttpGet = org.apache.http.client.methods.HttpGet
+  HttpHead = org.apache.http.client.methods.HttpHead
+  HttpOptions = org.apache.http.client.methods.HttpOptions
   HttpPost = org.apache.http.client.methods.HttpPost
   HttpDelete = org.apache.http.client.methods.HttpDelete
   HttpPut = org.apache.http.client.methods.HttpPut

data/lib/http_client/jruby/response.rb

@@ -9,7 +9,12 @@ module HTTP
     end
 
     def body
-      @body ||= EntityUtils.to_string(@native_response.entity)
+      # HTTP HEAD requests have no entity, nor any body
+      if @native_response.entity
+        @body ||= EntityUtils.to_string(@native_response.entity)
+      else
+        nil
+      end
     end
 
     def status_code
@@ -26,7 +31,25 @@ module HTTP
     end
 
     def [](header_name)
-      @native_response.get_first_header(header_name).value
+      @native_response.get_headers(header_name).map{|h| h.get_value}.join(", ")
+    end
+    
+    def to_s
+      @native_response.get_all_headers.map(&:to_s).join("\n")
+    end
+    
+    def to_hash
+      hash = {}
+      each do |name, value|
+        hash[name] = hash[name] ? hash[name] + ", #{value}" : value
+      end
+      hash
+    end
+    
+    def each
+      @native_response.header_iterator.each do |h|
+        yield h.get_name, h.get_value
+      end
     end
   end
 

data/lib/http_client/mri/methods.rb

@@ -59,6 +59,42 @@ module HTTP
       params_as_hash.map { |name, value| "#{URI.encode(name.to_s)}=#{URI.encode(value.to_s)}" }.join("&")
     end
   end
+  
+  class Head < Request
+    def create_request
+      host, port, path, query = parse_uri
+      head = Net::HTTP::Head.new("#{path}?#{query || to_query_string(@params)}")
+      [host, port, head]
+    end
+
+    def to_query_string(params_as_hash)
+      params_as_hash.map { |name, value| "#{URI.encode(name.to_s)}=#{URI.encode(value.to_s)}" }.join("&")
+    end
+  end
+  
+  class Options < Request
+    def create_request
+      host, port, path, query = parse_uri
+      options = Net::HTTP::Options.new("#{path}?#{query || to_query_string(@params)}")
+      [host, port, options]
+    end
+
+    def to_query_string(params_as_hash)
+      params_as_hash.map { |name, value| "#{URI.encode(name.to_s)}=#{URI.encode(value.to_s)}" }.join("&")
+    end
+  end
+
+  class Patch < Request
+    def create_request
+      host, port, path, query = parse_uri
+      patch = Net::HTTP::Patch.new("#{path}?#{query || to_query_string(@params)}")
+      [host, port, patch]
+    end
+
+    def to_query_string(params_as_hash)
+      params_as_hash.map { |name, value| "#{URI.encode(name.to_s)}=#{URI.encode(value.to_s)}" }.join("&")
+    end
+  end
 
   class Post < Request
     def create_request

data/test/http_client/test_server_headers.rb

@@ -7,6 +7,29 @@ class ServerHeadersTest < Test::Unit::TestCase
 
     assert_equal("FooBar", response.headers["Test-Header"])
   end
+  
+  def test_response_headers_to_hash
+    get = HTTP::Get.new("/set_header")
+    response = @client.execute(get)
+    response_hash = response.headers.to_hash
+    assert_equal(response_hash["Test-Header"], "FooBar")
+    assert_equal(response_hash["Content-Length"], "0")
+  end
+  
+  def test_response_headers_iteration
+    get = HTTP::Get.new("/set_header")
+    response = @client.execute(get)
+    
+    headers = values = []
+    response.headers.each do |header, value|
+      headers << header; values << value
+    end
+    
+    assert headers.include? "Test-Header"
+    assert headers.include? "Content-Length"
+    assert values.include? "FooBar"
+    assert values.include? "0"
+  end
 
   def setup
     @client = HTTP::Client.new(:default_host => "http://localhost:8080")

metadata

@@ -2,15 +2,16 @@
 name: jruby-httpclient
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.0.0
+  version: 1.1.0
 platform: java
 authors: 
   - Adam Esterline
+  - Aaron Spiegel
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-07-10 00:00:00 -06:00
+date: 2012-01-01 00:00:00 -07:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency