jruby-httpclient 0.2.0-java → 0.2.1-java

data/Gemfile.lock

@@ -11,6 +11,7 @@ GEM
 
 PLATFORMS
   java
+  ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/jruby-httpclient.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-httpclient}
-  s.version = "0.2.0"
+  s.version = "0.2.1"
   s.platform = Gem::Platform.new([nil, "java", nil])
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=

data/lib/http_client/client.rb

@@ -19,7 +19,6 @@ module HTTP
         @response_handler = BasicResponseHandler.new
       end
 
-      @uri_builder = URIBuilder.new(nil, nil, nil, "")
       @encoding = options[:encoding] || "UTF-8"
 
       # Set options from the rest of the options-hash
@@ -50,24 +49,11 @@ module HTTP
     def execute(request)
       client = DefaultHttpClient.new(params)
 
-      request.make_native_request(client, @uri_builder, @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
   end
-
-  class URIBuilder
-    def initialize(protocol, host, port, base_path)
-      @protocol = protocol
-      @host = host
-      @port = port
-      @base_path = base_path
-    end
-
-    def create_uri(path, query_string = nil)
-      URIUtils.create_uri(@protocol, @host, @port, "#{@base_path}#{path}", query_string, nil)
-    end
-  end
 end

data/lib/http_client/methods.rb

@@ -2,8 +2,8 @@ module HTTP
   class Request
     def self.create_type(&native_request_factory)
       Class.new do
-        def initialize(path, params = {})
-          @path = path
+        def initialize(uri, params = {})
+          @uri = uri
           @params = params
           @headers = {}
         end
@@ -25,8 +25,8 @@ module HTTP
           @password = password
         end
 
-        def make_native_request(client, uri_builder, encoding, handler=nil)
-          request = create_native_request(uri_builder, encoding)
+        def make_native_request(client, encoding, handler=nil)
+          request = create_native_request(encoding)
           request.entity = StringEntity.new(@body) unless @body.nil?
 
           unless @username.nil?
@@ -40,10 +40,18 @@ module HTTP
           end
         end
 
+        def parse_uri
+          uri = URI.parse(@uri)
+          [uri.scheme, uri.host, uri.port, uri.path]
+        rescue URI::InvalidURIError
+          [nil, nil, nil, @uri]
+        end
+
         private
-        define_method(:create_native_request) do |uri_builder, encoding|
+        define_method(:create_native_request) do |encoding|
           params = @params.collect { |key, value| BasicNameValuePair.new(key.to_s, value.to_s) }
-          request = native_request_factory.call(uri_builder, @path, params, encoding)
+          scheme, host, port, path = parse_uri
+          request = native_request_factory.call(scheme, host, port, path, params, encoding)
 
           @headers.each { |name, value| request.add_header(name.to_s, value.to_s) }
 
@@ -53,24 +61,23 @@ module HTTP
     end
   end
 
-  Post = Request.create_type do |uri_builder, path, params, encoding|
-    post = HttpPost.new(uri_builder.create_uri(path))
+  Post = Request.create_type do |scheme, host, port, path, params, encoding|
+    post = HttpPost.new(URIUtils.create_uri(scheme, host, port, path, nil, nil))
     post.entity = UrlEncodedFormEntity.new(params, encoding)
     post
   end
 
-  Get = Request.create_type do |uri_builder, path, params, encoding|
+  Get = Request.create_type do |scheme, host, port, path, params, encoding|
     query_string = URLEncodedUtils.format(params, encoding)
-    get = HttpGet.new(uri_builder.create_uri(path, query_string))
-    get
+    HttpGet.new(URIUtils.create_uri(scheme, host, port, path, query_string, nil))
   end
 
-  Delete = Request.create_type do |uri_builder, path|
-    HttpDelete.new(uri_builder.create_uri(path))
+  Delete = Request.create_type do |scheme, host, port, path|
+    HttpDelete.new(URIUtils.create_uri(scheme, host, port, path, nil, nil))
   end
 
-  Put = Request.create_type do |uri_builder, path|
-    HttpPut.new(uri_builder.create_uri(path))
+  Put = Request.create_type do |scheme, host, port, path|
+    HttpPut.new(URIUtils.create_uri(scheme, host, port, path, nil, nil))
   end
 
   private
@@ -82,7 +89,6 @@ module HTTP
   URIUtils = org.apache.http.client.utils.URIUtils
   URLEncodedUtils = org.apache.http.client.utils.URLEncodedUtils
   UrlEncodedFormEntity = org.apache.http.client.entity.UrlEncodedFormEntity
-  BasicResponseHandler = org.apache.http.impl.client.BasicResponseHandler
   AuthScope = org.apache.http.auth.AuthScope
   UsernamePasswordCredentials = org.apache.http.auth.UsernamePasswordCredentials
   StringEntity = org.apache.http.entity.StringEntity

data/test/http_client/test_basic_client_operations.rb

@@ -25,6 +25,30 @@ class TestBasicClientOperations < Test::Unit::TestCase
     assert_equal("put", result)
   end
 
+  def test_can_get_full_url
+    result = @client.get("http://localhost:8080/echo", :content => "hello")
+
+    assert_equal("hello", result)
+  end
+
+  def test_can_post_full_url
+    result = @client.post("http://localhost:8080/echo", :content => "hello")
+
+    assert_equal("hello", result)
+  end
+
+  def test_can_delete_full_url
+    result = @client.delete("http://localhost:8080/echo")
+
+    assert_equal("delete", result)
+  end
+
+  def test_can_put_full_url
+    result = @client.put("http://localhost:8080/echo")
+
+    assert_equal("put", result)
+  end
+
   def setup
     @client = HTTP::Client.new(:default_host => "http://localhost:8080")
   end

metadata

@@ -2,7 +2,7 @@
 name: jruby-httpclient
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.2.0
+  version: 0.2.1
 platform: java
 authors: 
   - Adam Esterline