MRI version of jruby-httpclient

Author: aesterline

jruby-httpclient.gemspec

@@ -38,7 +38,7 @@ Gem::Specification.new do |s|
     "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",

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'

lib/http_client/client.rb renamed to lib/http_client/jruby/client.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

lib/http_client/client_configuration.rb renamed to lib/http_client/jruby/client_configuration.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

lib/http_client/methods.rb renamed to lib/http_client/jruby/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

lib/http_client/jruby/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

lib/http_client/mri/client.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 Status
     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