jruby-httpclient 0.2.1-java → 0.3.0-java

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/jruby-httpclient.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-httpclient}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
   s.platform = Gem::Platform.new([nil, "java", nil])
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
@@ -35,6 +35,8 @@ Gem::Specification.new do |s|
     "test/http_client/test_basic_client_operations.rb",
     "test/http_client/test_client_headers.rb",
     "test/http_client/test_client_parameters.rb",
+    "test/http_client/test_cookies.rb",
+    "test/http_client/test_redirect.rb",
     "test/http_client/test_request_entity.rb",
     "test/http_test_server.rb",
     "vendor/commons-codec-1.4.jar",

data/lib/http_client/client.rb

@@ -26,6 +26,8 @@ module HTTP
         setter_name = "#{parameter_name}="
         self.send(setter_name, parameter_value) if self.respond_to?(setter_name)
       end
+
+      @client = DefaultHttpClient.new(params)
     end
 
     # Request Methods
@@ -47,13 +49,13 @@ module HTTP
     end
 
     def execute(request)
-      client = DefaultHttpClient.new(params)
-
-      request.make_native_request(client, @encoding, @response_handler)
+      request.make_native_request(@client, @encoding, @response_handler)
     rescue SocketTimeoutException
       raise Timeout::Error, "timed out after #{so_timeout} ms"
-    ensure
-      client.connection_manager.shutdown
+    end
+
+    def shutdown
+      @client.connection_manager.shutdown
     end
   end
 end

data/lib/http_client/methods.rb

@@ -1,3 +1,5 @@
+require 'cgi'
+
 module HTTP
   class Request
     def self.create_type(&native_request_factory)
@@ -42,15 +44,17 @@ module HTTP
 
         def parse_uri
           uri = URI.parse(@uri)
-          [uri.scheme, uri.host, uri.port, uri.path]
+          [uri.scheme, uri.host, uri.port, uri.path, uri.query]
         rescue URI::InvalidURIError
-          [nil, nil, nil, @uri]
+          [nil, nil, nil, @uri, nil]
         end
 
         private
         define_method(:create_native_request) do |encoding|
-          params = @params.collect { |key, value| BasicNameValuePair.new(key.to_s, value.to_s) }
-          scheme, host, port, path = parse_uri
+          scheme, host, port, path, query = parse_uri
+          query_params = CGI.parse(query || "").merge(@params)
+
+          params = query_params.collect { |key, value| BasicNameValuePair.new(key.to_s, value.to_s) }
           request = native_request_factory.call(scheme, host, port, path, params, encoding)
 
           @headers.each { |name, value| request.add_header(name.to_s, value.to_s) }

data/lib/http_client/parameters.rb

@@ -7,6 +7,7 @@ module HTTP
   CookieSpecPNames = org.apache.http.cookie.params.CookieSpecPNames
   AuthPNames = org.apache.http.auth.params.AuthPNames
   ClientPNames = org.apache.http.client.params.ClientPNames
+  CookiePolicy = org.apache.http.client.params.CookiePolicy
 
   module Parameters
     CLIENT_PARAMETERS = {

data/test/http_client/test_basic_auth.rb

@@ -13,4 +13,8 @@ class BasicAuthTest < Test::Unit::TestCase
   def setup
     @client = HTTP::Client.new(:default_host => "http://localhost:8080")
   end
+
+  def teardown
+    @client.shutdown
+  end
 end

data/test/http_client/test_basic_client_operations.rb

@@ -49,7 +49,23 @@ class TestBasicClientOperations < Test::Unit::TestCase
     assert_equal("put", result)
   end
 
+  def test_get_can_take_parameters_in_url
+    result = @client.get("http://localhost:8080/echo?content=bar")
+
+    assert_equal("bar", result)
+  end
+
+  def test_get_url_parameters_take_precedence_over_optional_parameters
+    result = @client.get("http://localhost:8080/echo?content=bar", :content => "zed")
+
+    assert_equal("bar", result)
+  end
+
   def setup
     @client = HTTP::Client.new(:default_host => "http://localhost:8080")
   end
+
+  def teardown
+    @client.shutdown
+  end
 end

data/test/http_client/test_client_headers.rb

@@ -53,4 +53,8 @@ class TestClientHeaders < Test::Unit::TestCase
   def setup
     @client = HTTP::Client.new(:default_host => "http://localhost:8080")
   end
+
+  def teardown
+    @client.shutdown
+  end
 end

data/test/http_client/test_cookies.rb

@@ -0,0 +1,18 @@
+require 'helper'
+
+class CookieTest < Test::Unit::TestCase
+  def test_cookies_can_be_remembered
+    @client.get("/set_cookie", :cookie => "nom nom nom")
+    result = @client.get("/echo_cookie")
+
+    assert_equal("nom nom nom", result)
+  end
+
+  def setup
+    @client = HTTP::Client.new(:default_host => "http://localhost:8080", :cookie_policy => HTTP::CookiePolicy::BROWSER_COMPATIBILITY)
+  end
+
+  def teardown
+    @client.shutdown
+  end
+end

data/test/http_client/test_redirect.rb

@@ -0,0 +1,17 @@
+require 'helper'
+
+class RedirectTest < Test::Unit::TestCase
+  def test_get_redirect
+    result = @client.get("/redirect", :content => "foo")
+
+    assert_equal("foo", result)
+  end
+
+  def setup
+    @client = HTTP::Client.new(:default_host => "http://localhost:8080", :handle_redirects => true)
+  end
+
+  def teardown
+    @client.shutdown
+  end
+end

data/test/http_client/test_request_entity.rb

@@ -20,4 +20,8 @@ class RequestEntityTest < Test::Unit::TestCase
   def setup
     @client = HTTP::Client.new(:default_host => "http://localhost:8080")
   end
+
+  def teardown
+    @client.shutdown
+  end
 end

data/test/http_test_server.rb

@@ -8,9 +8,32 @@ module HTTP
       SERVER.mount('/echo_header', HeaderEchoServlet)
       SERVER.mount('/protected', ProtectedServlet)
       SERVER.mount('/body', BodyServlet)
+      SERVER.mount('/redirect', RedirectServlet)
+      SERVER.mount('/set_cookie', SetCookieServlet)
+      SERVER.mount('/echo_cookie', EchoCookieServlet)
       Thread.new { SERVER.start }
     end
 
+    class SetCookieServlet < WEBrick::HTTPServlet::AbstractServlet
+      def do_GET(request, response)
+        response.cookies << WEBrick::Cookie.new("test_cookie", request.query['cookie'])
+      end
+    end
+
+    class EchoCookieServlet < WEBrick::HTTPServlet::AbstractServlet
+      def do_GET(request, response)
+        puts request.cookies.length
+        cookie = request.cookies.find { |c| c.name == "test_cookie" }
+        response.body = cookie.value
+      end
+    end
+
+    class RedirectServlet < WEBrick::HTTPServlet::AbstractServlet
+      def do_GET(request, response)
+        response.set_redirect(WEBrick::HTTPStatus::MovedPermanently, "/echo?content=#{request.query['content']}")
+      end
+    end
+
     class BodyServlet < WEBrick::HTTPServlet::AbstractServlet
       def do_POST(request, response)
         response.status = 200

metadata

@@ -2,7 +2,7 @@
 name: jruby-httpclient
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.1
+  version: 0.3.0
 platform: java
 authors: 
   - Adam Esterline
@@ -73,6 +73,8 @@ files:
   - test/http_client/test_basic_client_operations.rb
   - test/http_client/test_client_headers.rb
   - test/http_client/test_client_parameters.rb
+  - test/http_client/test_cookies.rb
+  - test/http_client/test_redirect.rb
   - test/http_client/test_request_entity.rb
   - test/http_test_server.rb
   - vendor/commons-codec-1.4.jar