jruby-httpclient 0.4.0-java → 1.0.0-java

data/VERSION

@@ -1 +1 @@
-0.4.0
+1.0.0

data/jruby-httpclient.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{jruby-httpclient}
-  s.version = "0.4.0"
+  s.version = "1.0.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-01}
+  s.date = %q{2011-07-10}
   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 = [
@@ -27,18 +27,22 @@ Gem::Specification.new do |s|
     "VERSION",
     "jruby-httpclient.gemspec",
     "lib/http_client.rb",
-    "lib/http_client/client.rb",
-    "lib/http_client/client_configuration.rb",
-    "lib/http_client/methods.rb",
-    "lib/http_client/response.rb",
+    "lib/http_client/jruby/client.rb",
+    "lib/http_client/jruby/client_configuration.rb",
+    "lib/http_client/jruby/methods.rb",
+    "lib/http_client/jruby/response.rb",
+    "lib/http_client/mri/client.rb",
+    "lib/http_client/mri/methods.rb",
+    "lib/http_client/mri/response.rb",
+    "lib/http_client/status.rb",
     "test/helper.rb",
+    "test/http_client/jruby/test_client_configuration.rb",
     "test/http_client/test_basic_auth.rb",
     "test/http_client/test_basic_client_operations.rb",
-    "test/http_client/test_client_configuration.rb",
     "test/http_client/test_client_headers.rb",
     "test/http_client/test_cookies.rb",
     "test/http_client/test_redirect.rb",
-    "test/http_client/test_request_entity.rb",
+    "test/http_client/test_request_body.rb",
     "test/http_client/test_response.rb",
     "test/http_client/test_server_headers.rb",
     "test/http_test_server.rb",

data/lib/http_client.rb

@@ -1,18 +1,32 @@
 HTTP_CLIENT_DIR = File.join(File.dirname(__FILE__), 'http_client')
-VENDOR_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor'))
-
 $LOAD_PATH.unshift(HTTP_CLIENT_DIR) unless $LOAD_PATH.include?(HTTP_CLIENT_DIR)
-$LOAD_PATH.unshift(VENDOR_DIR) unless $LOAD_PATH.include?(VENDOR_DIR)
 
-require 'java'
-require 'commons-logging-1.1.1'
-require 'commons-codec-1.4'
-require 'httpcore-4.1'
-require 'httpmime-4.1.1'
-require 'httpclient-4.1.1'
-require 'httpclient-cache-4.1.1'
+require 'status'
+
+if defined?(JRUBY_VERSION)
+  JRUBY_HTTP_CLIENT_DIR = File.join(HTTP_CLIENT_DIR, 'jruby')
+  VENDOR_DIR = File.expand_path(File.join(File.dirname(__FILE__), '..', 'vendor'))
+
+  $LOAD_PATH.unshift(JRUBY_HTTP_CLIENT_DIR) unless $LOAD_PATH.include?(JRUBY_HTTP_CLIENT_DIR)
+  $LOAD_PATH.unshift(VENDOR_DIR) unless $LOAD_PATH.include?(VENDOR_DIR)
+
+  require 'java'
+  require 'commons-logging-1.1.1'
+  require 'commons-codec-1.4'
+  require 'httpcore-4.1'
+  require 'httpmime-4.1.1'
+  require 'httpclient-4.1.1'
+  require 'httpclient-cache-4.1.1'
+
+  require 'client_configuration'
+else
+  MRI_HTTP_CLIENT_DIR = File.join(HTTP_CLIENT_DIR, 'mri')
+  $LOAD_PATH.unshift(MRI_HTTP_CLIENT_DIR) unless $LOAD_PATH.include?(MRI_HTTP_CLIENT_DIR)
+
+  require 'net/http'
+  require 'cgi'
+end
 
-require 'client_configuration'
-require 'response'
 require 'methods'
+require 'response'
 require 'client'

data/lib/http_client/jruby/response.rb

@@ -0,0 +1,42 @@
+module HTTP
+  class Response
+    attr_reader :headers, :cookies
+
+    def initialize(native_response, cookies)
+      @native_response = native_response
+      @headers = Headers.new(native_response)
+      @cookies = Cookies.new(cookies)
+    end
+
+    def body
+      @body ||= EntityUtils.to_string(@native_response.entity)
+    end
+
+    def status_code
+      @native_response.status_line.status_code
+    end
+  end
+
+  private
+  EntityUtils = org.apache.http.util.EntityUtils
+
+  class Headers
+    def initialize(native_response)
+      @native_response = native_response
+    end
+
+    def [](header_name)
+      @native_response.get_first_header(header_name).value
+    end
+  end
+
+  class Cookies
+    def initialize(cookies)
+      @cookies = cookies
+    end
+
+    def [](cookie_name)
+      @cookies.find {|cookie| cookie.name == cookie_name }.value
+    end
+  end
+end

data/lib/http_client/mri/client.rb

@@ -0,0 +1,51 @@
+module HTTP
+  class Client
+    def initialize(options)
+      @default_host = options[:default_host]
+      @timeout_in_seconds = options[:timeout_in_seconds]
+      @uri = URI.parse(@default_host)
+    end
+
+    def get(url, params = {})
+      execute(HTTP::Get.new(url, params)).body
+    end
+
+    def post(url, params = {})
+      execute(HTTP::Post.new(url, params)).body
+    end
+
+    def delete(url)
+      execute(HTTP::Delete.new(url)).body
+    end
+
+    def put(url)
+      execute(HTTP::Put.new(url)).body
+    end
+
+    def execute(req)
+      req.execute_native_request(self)
+    end
+
+    def execute_request(requested_host, requested_port, req)
+      host = requested_host || @uri.host
+      port = requested_port || @uri.port
+      req['Cookie'] = @cookie unless @cookie.nil?
+
+      Net::HTTP.new(host, port).start do |http|
+        http.read_timeout = @timeout_in_seconds || 30
+        response = http.request(req)
+
+        if response['location']
+          redirect_uri = URI.parse(response['location'])
+          return execute_request(redirect_uri.host, redirect_uri.port,  Net::HTTP::Get.new("#{redirect_uri.path}?#{redirect_uri.query}"))
+        end
+
+        @cookie = response['set-cookie']
+
+        response
+      end
+    end
+
+    def shutdown; end
+  end
+end

data/lib/http_client/mri/methods.rb

@@ -0,0 +1,87 @@
+module HTTP
+  class Request
+    def initialize(url, params = {})
+      @requested_uri = url
+      @params = params
+      @headers = {}
+    end
+
+    def basic_auth(username, password)
+      @username = username
+      @password = password
+    end
+
+    def add_headers(headers)
+      @headers = headers
+    end
+
+    def content_type=(content_type)
+      @content_type = content_type
+    end
+
+    def body=(body)
+      @body = body
+    end
+
+    def execute_native_request(client)
+      host, port, req = create_request
+      req.basic_auth(@username, @password)
+
+      @headers.each {|name, value| req[name.to_s] = value.to_s}
+      req.content_type = @content_type unless @content_type.nil?
+      req.body = @body unless @body.nil?
+
+      HTTP::Response.new(client.execute_request(host, port, req))
+    end
+
+    private
+
+    def parse_uri
+      request_uri = URI.parse(@requested_uri)
+
+      host = request_uri.host
+      port = request_uri.port
+      path = request_uri.path
+      query = request_uri.query
+
+      [host, port, path, query]
+    end
+  end
+
+  class Get < Request
+    def create_request
+      host, port, path, query = parse_uri
+      get = Net::HTTP::Get.new("#{path}?#{query || to_query_string(@params)}")
+      [host, port, get]
+    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
+      host, port, path, query = parse_uri
+      post = Net::HTTP::Post.new(path)
+      post.set_form_data(@params)
+      [host, port, post]
+    end
+  end
+
+  class Put < Request
+    def create_request
+      host, port, path, query = parse_uri
+      put = Net::HTTP::Put.new(path)
+      [host, port, put]
+    end
+  end
+
+  class Delete < Request
+    def create_request
+      host, port, path, query = parse_uri
+      delete = Net::HTTP::Delete.new(path)
+      [host, port, delete]
+    end
+  end
+end

data/lib/http_client/mri/response.rb

@@ -0,0 +1,22 @@
+module HTTP
+  class Response
+    attr_reader :status_code, :body
+
+    def initialize(native_response)
+      @native_response = native_response
+      @status_code = native_response.code.to_i
+      @body = native_response.body
+    end
+
+    def headers
+      @native_response
+    end
+
+    def cookies
+      native_cookies = CGI::Cookie.parse(@native_response['set-cookie'])
+      cookies = {}
+      native_cookies.each {|name, cookie| cookies[name] = cookie.value.first}
+      cookies
+    end
+  end
+end

data/lib/http_client/{response.rb → status.rb}

@@ -1,23 +1,5 @@
 module HTTP
-  class Response
-    attr_reader :headers, :cookies
-
-    def initialize(native_response, cookies)
-      @native_response = native_response
-      @headers = Headers.new(native_response)
-      @cookies = Cookies.new(cookies)
-    end
-
-    def body
-      @body ||= EntityUtils.to_string(@native_response.entity)
-    end
-
-    def status_code
-      @native_response.status_line.status_code
-    end
-  end
-
-  module Status
+   module Status
     ACCEPTED = 202
     BAD_GATEWAY = 502
     BAD_REQUEST = 400
@@ -67,27 +49,4 @@ module HTTP
     UNSUPPORTED_MEDIA_TYPE = 415
     USE_PROXY = 305
   end
-
-  private
-  EntityUtils = org.apache.http.util.EntityUtils
-
-  class Headers
-    def initialize(native_response)
-      @native_response = native_response
-    end
-
-    def [](header_name)
-      @native_response.get_first_header(header_name).value
-    end
-  end
-
-  class Cookies
-    def initialize(cookies)
-      @cookies = cookies
-    end
-
-    def [](cookie_name)
-      @cookies.find {|cookie| cookie.name == cookie_name }.value
-    end
-  end
 end

data/test/http_client/jruby/test_client_configuration.rb

@@ -0,0 +1,136 @@
+require 'helper'
+
+if defined?(JRUBY_VERSION)
+  class TestClientConfiguration < Test::Unit::TestCase
+    def test_protocol_version
+      config = HTTP::ClientConfiguration.new(:protocol_version => "HTTP 1.0")
+      assert_equal(config.protocol_version.to_s, "HTTP/1.0")
+    end
+
+    def test_strict_transfer_encodeing
+      config = HTTP::ClientConfiguration.new(:strict_transfer_encoding => true)
+      assert_equal(config.strict_transfer_encoding, true)
+    end
+
+    def test_http_element_charset
+      config = HTTP::ClientConfiguration.new(:http_element_charset => "ASCII")
+      assert_equal(config.http_element_charset, "ASCII")
+    end
+
+    def test_use_expect_continue
+      config = HTTP::ClientConfiguration.new(:use_expect_continue => true)
+      assert_equal(config.use_expect_continue, true)
+    end
+
+    def test_wait_for_continue
+      config = HTTP::ClientConfiguration.new(:wait_for_continue => true)
+      assert_equal(config.wait_for_continue, true)
+    end
+
+    def test_user_agent
+      user_agent_name = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.5; en-US; rv:1.9.0.3) Gecko/2008092414 Firefox/3.0.3"
+      config = HTTP::ClientConfiguration.new(:user_agent => user_agent_name)
+      assert_equal(config.user_agent, user_agent_name)
+    end
+
+    def test_tcp_nodelay
+      config = HTTP::ClientConfiguration.new(:tcp_nodelay => true)
+      assert_equal(config.tcp_nodelay, true)
+    end
+
+    def test_so_linger
+      config = HTTP::ClientConfiguration.new(:so_linger => 3000)
+      assert_equal(config.so_linger, 3000)
+    end
+
+    def test_so_reuseaddr
+      config = HTTP::ClientConfiguration.new(:so_reuseaddr => true)
+      assert_equal(config.so_reuseaddr, true)
+    end
+
+    def test_socket_buffer_size
+      config = HTTP::ClientConfiguration.new(:socket_buffer_size => 10000)
+      assert_equal(config.socket_buffer_size, 10000)
+    end
+
+    def test_connection_timeout
+      config = HTTP::ClientConfiguration.new(:connection_timeout => 2)
+      assert_equal(config.connection_timeout, 2)
+    end
+
+    def test_max_line_length
+      config = HTTP::ClientConfiguration.new(:max_line_length => 2)
+      assert_equal(config.max_line_length, 2)
+    end
+
+    def test_max_header_count
+      config = HTTP::ClientConfiguration.new(:max_header_count => 10)
+      assert_equal(config.max_header_count, 10)
+    end
+
+    def test_stale_connection_check
+      config = HTTP::ClientConfiguration.new(:stale_connection_check => true)
+      assert_equal(config.stale_connection_check, true)
+    end
+
+    def test_local_address
+      config = HTTP::ClientConfiguration.new(:local_address => "127.0.0.1")
+      assert_equal(config.local_address.get_host_address, "127.0.0.1")
+    end
+
+    def test_default_proxy
+      config = HTTP::ClientConfiguration.new(:default_proxy => "http://127.0.0.1:8080")
+      assert_equal(config.default_proxy.to_s, "http://127.0.0.1:8080")
+    end
+
+    def test_date_patterns
+      config = HTTP::ClientConfiguration.new(:date_patterns => ["MDy"])
+      assert(config.date_patterns.include? 'MDy')
+    end
+
+    def test_single_cookie_header
+      config = HTTP::ClientConfiguration.new(:single_cookie_header => true)
+      assert_equal(config.single_cookie_header, true)
+    end
+
+    def test_credential_charset
+      config = HTTP::ClientConfiguration.new(:credential_charset => "ASCII")
+      assert_equal(config.credential_charset, "ASCII")
+    end
+
+    def test_cookie_policy
+      config = HTTP::ClientConfiguration.new(:cookie_policy => "RFC2109")
+      assert_equal(config.cookie_policy, "RFC2109")
+    end
+
+    def test_handle_authentication
+      config = HTTP::ClientConfiguration.new(:handle_authentication => true)
+      assert_equal(config.handle_authentication, true)
+    end
+
+    def test_handle_redirects
+      config = HTTP::ClientConfiguration.new(:handle_redirects => true)
+      assert_equal(config.handle_redirects, true)
+    end
+
+    def test_max_redirects
+      config = HTTP::ClientConfiguration.new(:max_redirects => 1)
+      assert_equal(config.max_redirects, 1)
+    end
+
+    def test_allow_circular_redirects
+      config = HTTP::ClientConfiguration.new(:allow_circular_redirects => true)
+      assert_equal(config.allow_circular_redirects, true)
+    end
+
+    def test_virtual_host
+      config = HTTP::ClientConfiguration.new(:virtual_host => "http://127.0.0.1:80")
+      assert_equal(config.virtual_host.to_s, "http://127.0.0.1:80")
+    end
+
+    def test_default_host
+      config = HTTP::ClientConfiguration.new(:default_host => "http://localhost:8080")
+      assert_equal(config.default_host.to_s, "http://localhost:8080")
+    end
+  end
+end

data/test/http_client/test_basic_client_operations.rb

@@ -61,6 +61,14 @@ class TestBasicClientOperations < Test::Unit::TestCase
     assert_equal("bar", result)
   end
 
+  def test_timeout
+    client = HTTP::Client.new(:default_host => "http://localhost:8080", :timeout_in_seconds => 2)
+
+    assert_raises(Timeout::Error) do
+      client.get("/slow", :sleep => "30")
+    end
+  end
+
   def setup
     @client = HTTP::Client.new(:default_host => "http://localhost:8080")
   end

data/test/http_client/test_cookies.rb

@@ -16,7 +16,7 @@ class CookieTest < Test::Unit::TestCase
   end
 
   def setup
-    @client = HTTP::Client.new(:default_host => "http://localhost:8080", :cookie_policy => HTTP::CookiePolicy::BROWSER_COMPATIBILITY)
+    @client = HTTP::Client.new(:default_host => "http://localhost:8080")
   end
 
   def teardown

metadata

@@ -2,7 +2,7 @@
 name: jruby-httpclient
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.4.0
+  version: 1.0.0
 platform: java
 authors: 
   - Adam Esterline
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-01 00:00:00 -06:00
+date: 2011-07-10 00:00:00 -06:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -65,18 +65,22 @@ files:
   - VERSION
   - jruby-httpclient.gemspec
   - lib/http_client.rb
-  - lib/http_client/client.rb
-  - lib/http_client/client_configuration.rb
-  - lib/http_client/methods.rb
-  - lib/http_client/response.rb
+  - lib/http_client/jruby/client.rb
+  - lib/http_client/jruby/client_configuration.rb
+  - lib/http_client/jruby/methods.rb
+  - lib/http_client/jruby/response.rb
+  - lib/http_client/mri/client.rb
+  - lib/http_client/mri/methods.rb
+  - lib/http_client/mri/response.rb
+  - lib/http_client/status.rb
   - test/helper.rb
+  - test/http_client/jruby/test_client_configuration.rb
   - test/http_client/test_basic_auth.rb
   - test/http_client/test_basic_client_operations.rb
-  - test/http_client/test_client_configuration.rb
   - test/http_client/test_client_headers.rb
   - test/http_client/test_cookies.rb
   - test/http_client/test_redirect.rb
-  - test/http_client/test_request_entity.rb
+  - test/http_client/test_request_body.rb
   - test/http_client/test_response.rb
   - test/http_client/test_server_headers.rb
   - test/http_test_server.rb

data/test/http_client/test_client_configuration.rb

@@ -1,142 +0,0 @@
-require 'helper'
-
-class TestClientConfiguration < Test::Unit::TestCase
-  def test_timeout
-    client = HTTP::Client.new(:default_host => "http://localhost:8080", :timeout_in_seconds => 2)
-
-    assert_raises(Timeout::Error) do
-      client.get("/slow", :sleep => "30")
-    end
-  end
-
-  def test_protocol_version
-    config = HTTP::ClientConfiguration.new(:protocol_version => "HTTP 1.0")
-    assert_equal(config.protocol_version.to_s, "HTTP/1.0")
-  end
-
-  def test_strict_transfer_encodeing
-    config = HTTP::ClientConfiguration.new(:strict_transfer_encoding => true)
-    assert_equal(config.strict_transfer_encoding, true)
-  end
-
-  def test_http_element_charset
-    config = HTTP::ClientConfiguration.new(:http_element_charset => "ASCII")
-    assert_equal(config.http_element_charset, "ASCII")
-  end
-
-  def test_use_expect_continue
-    config = HTTP::ClientConfiguration.new(:use_expect_continue => true)
-    assert_equal(config.use_expect_continue, true)
-  end
-
-  def test_wait_for_continue
-    config = HTTP::ClientConfiguration.new(:wait_for_continue => true)
-    assert_equal(config.wait_for_continue, true)
-  end
-
-  def test_user_agent
-    user_agent_name = "Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10.5; en-US; rv:1.9.0.3) Gecko/2008092414 Firefox/3.0.3"
-    config = HTTP::ClientConfiguration.new(:user_agent => user_agent_name)
-    assert_equal(config.user_agent, user_agent_name)
-  end
-
-  def test_tcp_nodelay
-    config = HTTP::ClientConfiguration.new(:tcp_nodelay => true)
-    assert_equal(config.tcp_nodelay, true)
-  end
-
-  def test_so_linger
-    config = HTTP::ClientConfiguration.new(:so_linger => 3000)
-    assert_equal(config.so_linger, 3000)
-  end
-
-  def test_so_reuseaddr
-    config = HTTP::ClientConfiguration.new(:so_reuseaddr => true)
-    assert_equal(config.so_reuseaddr, true)
-  end
-
-  def test_socket_buffer_size
-    config = HTTP::ClientConfiguration.new(:socket_buffer_size => 10000)
-    assert_equal(config.socket_buffer_size, 10000)
-  end
-
-  def test_connection_timeout
-    config = HTTP::ClientConfiguration.new(:connection_timeout => 2)
-    assert_equal(config.connection_timeout, 2)
-  end
-
-  def test_max_line_length
-    config = HTTP::ClientConfiguration.new(:max_line_length => 2)
-    assert_equal(config.max_line_length, 2)
-  end
-
-  def test_max_header_count
-    config = HTTP::ClientConfiguration.new(:max_header_count => 10)
-    assert_equal(config.max_header_count, 10)
-  end
-
-  def test_stale_connection_check
-    config = HTTP::ClientConfiguration.new(:stale_connection_check => true)
-    assert_equal(config.stale_connection_check, true)
-  end
-
-  def test_local_address
-    config = HTTP::ClientConfiguration.new(:local_address => "127.0.0.1")
-    assert_equal(config.local_address.get_host_address, "127.0.0.1")
-  end
-
-  def test_default_proxy
-    config = HTTP::ClientConfiguration.new(:default_proxy => "http://127.0.0.1:8080")
-    assert_equal(config.default_proxy.to_s, "http://127.0.0.1:8080")
-  end
-
-  def test_date_patterns
-    config = HTTP::ClientConfiguration.new(:date_patterns => ["MDy"])
-    assert(config.date_patterns.include? 'MDy')
-  end
-
-  def test_single_cookie_header
-    config = HTTP::ClientConfiguration.new(:single_cookie_header => true)
-    assert_equal(config.single_cookie_header, true)
-  end
-
-  def test_credential_charset
-    config = HTTP::ClientConfiguration.new(:credential_charset => "ASCII")
-    assert_equal(config.credential_charset, "ASCII")
-  end
-
-  def test_cookie_policy
-    config = HTTP::ClientConfiguration.new(:cookie_policy => "RFC2109")
-    assert_equal(config.cookie_policy, "RFC2109")
-  end
-
-  def test_handle_authentication
-    config = HTTP::ClientConfiguration.new(:handle_authentication => true)
-    assert_equal(config.handle_authentication, true)
-  end
-
-  def test_handle_redirects
-    config = HTTP::ClientConfiguration.new(:handle_redirects => true)
-    assert_equal(config.handle_redirects, true)
-  end
-
-  def test_max_redirects
-    config = HTTP::ClientConfiguration.new(:max_redirects => 1)
-    assert_equal(config.max_redirects, 1)
-  end
-
-  def test_allow_circular_redirects
-    config = HTTP::ClientConfiguration.new(:allow_circular_redirects => true)
-    assert_equal(config.allow_circular_redirects, true)
-  end
-
-  def test_virtual_host
-    config = HTTP::ClientConfiguration.new(:virtual_host => "http://127.0.0.1:80")
-    assert_equal(config.virtual_host.to_s, "http://127.0.0.1:80")
-  end
-
-  def test_default_host
-    config = HTTP::ClientConfiguration.new(:default_host => "http://localhost:8080")
-    assert_equal(config.default_host.to_s, "http://localhost:8080")
-  end
-end