http_client 0.5.4-java → 0.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51242d89a295db59baa72ae7451e6f22f710e514
-  data.tar.gz: 6647cd9d91a05ac67eacef9c7d9a505b032b541b
+  metadata.gz: 403b72483fce3976cad0e4c0580d64fbfc01b22d
+  data.tar.gz: e55edf2579bd90611d0f841fc1cfc2fc47fc30cf
 SHA512:
-  metadata.gz: fb597cf32d364c50622813ad3b33c440c492ab5a2f48424af36ee59beedeced1532bee104a12271d8862a78d0e56f93bd63170d8074f0ed607f750c2c228c222
-  data.tar.gz: 4c2e75839a88e01cb06045c6c989eeef925bc898396f1e6d9d8dbc7aa12f0cfad83d95e755e7f439b61a5e08305d61c4b4bf3fd0c59e762c2d25d59fce0c11a9
+  metadata.gz: e2f9f19f8ee7755a6076321631bd6704a8064c8c9bb62205c5a633495939f4fecbf7c6f46b74ee9a714a96d4d611bb0e83372044db2c8c6e6502e2376801e184
+  data.tar.gz: f6dbd3ff72d6df7bfc0717ed0d65743880187586425e7f204717d1c100a8e9a75a7676a118170347079a62461ccff24a0f626a8714061154aebaf0dc47380415

data/http_client.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "http_client"
-  s.version = "0.5.4"
+  s.version = "0.6"
   s.date = "2013-11-08"
   s.summary = "HTTP client for JRuby"
   s.description = "This library wraps the Apache HTTPClient (4.3) in a simple fashion. The library is intended to be used in a multithreaded environment."

data/lib/http_client.rb

@@ -6,6 +6,8 @@ require "java"
 %w[httpcore-4.3 httpclient-4.3.1 httpmime-4.3.1 commons-logging-1.1.3].each do |jar|
   require File.expand_path("../../vendor/#{jar}.jar", __FILE__)
 end
+require "http_client/response"
+require "http_client/connection_cleaner"
 
 class HttpClient
   import org.apache.http.impl.client.HttpClients
@@ -36,49 +38,15 @@ class HttpClient
   class Timeout < Error; end
   class IOError < Error; end
 
-  class Response
-    attr_reader :status, :body, :headers
-
-    def initialize(closeable_response)
-      @status = closeable_response.status_line.status_code
-      @headers = closeable_response.get_all_headers.inject({}) do |headers, header|
-        headers[header.name] = header.value
-        headers
-      end
-      @body = read_body(closeable_response)
-    end
-
-    def success?
-      @status >= 200 && @status <= 206
-    end
-
-    def json_body(options = {})
-      @json_body ||= JSON.parse(body, options)
-    end
-
-  private
-
-    def read_body(closeable_response)
-      return "" unless entity = closeable_response.entity
-      return "" unless entity.is_chunked? || entity.content_length > 0
-      if content_encoding = entity.content_encoding
-        entity = case content_encoding.value
-          when "gzip", "x-gzip" then
-            GzipDecompressingEntity.new(entity)
-          when "deflate" then
-            DeflateDecompressingEntity.new(entity)
-          else
-            entity
-        end
-      end
-      EntityUtils.to_string(entity, "UTF-8")
-    end
+  @lock = Mutex.new
+  def self.connection_cleaner
+    @lock.synchronize { @connection_cleaner ||= ConnectionCleaner.new }
   end
 
-  attr_reader :client, :max_retries, :response_class, :default_request_options
+  attr_reader :client, :config
 
-  def initialize(options = {})
-    options = {
+  def initialize(config = {})
+    @config = {
       :use_connection_pool => false,
       :max_connections => 20,
       :max_connections_per_route => nil,
@@ -87,14 +55,13 @@ class HttpClient
       :connection_request_timeout => 100,
       :connect_timeout => 1000,
       :socket_timeout => 2000,
+      :max_idle => 5,
+      :use_connection_cleaner => true,
       :default_request_options => {}
-    }.merge(options)
-    @request_config = create_request_config(options)
-    @connection_manager = create_connection_manager(options)
+    }.merge(config)
+    @request_config = create_request_config
+    @connection_manager = create_connection_manager
     @client = HttpClients.create_minimal(@connection_manager)
-    @max_retries = options[:max_retries]
-    @response_class = options[:response_class]
-    @default_request_options = options[:default_request_options]
   end
 
   def get(uri, options = {})
@@ -140,7 +107,7 @@ class HttpClient
   end
 
   def pool_stats
-    raise "#{self.class.name}#pool_stats is supported only when using a connection pool" unless @connection_manager.is_a?(PoolingHttpClientConnectionManager)
+    return unless @connection_manager.is_a?(PoolingHttpClientConnectionManager)
     total_stats = @connection_manager.total_stats
     Hash(
       :idle => total_stats.available,
@@ -150,7 +117,7 @@ class HttpClient
     )
   end
 
-  def cleanup_connections(max_idle = 5)
+  def cleanup_connections(max_idle = config[:max_idle])
     @connection_manager.close_idle_connections(max_idle, TimeUnit::SECONDS)
   end
 
@@ -161,10 +128,10 @@ class HttpClient
 private
 
   def execute(request)
-    retries = max_retries
+    retries = config[:max_retries]
     begin
       closeable_response = client.execute(request)
-      response_class.new(closeable_response)
+      config[:response_class].new(closeable_response)
     rescue ConnectTimeoutException, SocketTimeoutException => e
       retry if (retries -= 1) > 0
       raise Timeout, "#{e.message}"
@@ -181,7 +148,7 @@ private
   def create_request(method_class, uri, options)
     request = method_class.new(uri)
     request.config = @request_config
-    options = default_request_options.merge(options)
+    options = config[:default_request_options].merge(options)
     set_basic_auth(request, options[:basic_auth])
     options[:headers].each do |name, value|
       request.set_header(name.to_s.gsub("_", "-"), value)
@@ -209,23 +176,26 @@ private
     end
   end
 
-  def create_request_config(options)
-    config = RequestConfig.custom
-    config.set_stale_connection_check_enabled(true)
-    config.set_connection_request_timeout(options[:connection_request_timeout])
-    config.set_connect_timeout(options[:connect_timeout])
-    config.set_socket_timeout(options[:socket_timeout])
-    config.build
+  def create_request_config
+    request_config = RequestConfig.custom
+    request_config.set_stale_connection_check_enabled(true)
+    request_config.set_connection_request_timeout(config[:connection_request_timeout])
+    request_config.set_connect_timeout(config[:connect_timeout])
+    request_config.set_socket_timeout(config[:socket_timeout])
+    request_config.build
   end
 
-  def create_connection_manager(options)
-    options[:use_connection_pool] ? create_pooling_connection_manager(options) : BasicHttpClientConnectionManager.new
+  def create_connection_manager
+    config[:use_connection_pool] ? create_pooling_connection_manager : BasicHttpClientConnectionManager.new
   end
 
-  def create_pooling_connection_manager(options)
+  def create_pooling_connection_manager
     connection_manager = PoolingHttpClientConnectionManager.new
-    connection_manager.max_total = options[:max_connections]
-    connection_manager.default_max_per_route = options[:max_connections_per_route] || options[:max_connections]
+    connection_manager.max_total = config[:max_connections]
+    connection_manager.default_max_per_route = config[:max_connections_per_route] || config[:max_connections]
+    connection_manager.max_total = config[:max_connections]
+    connection_manager.default_max_per_route = config[:max_connections_per_route] || config[:max_connections]
+    self.class.connection_cleaner.register(self) if config[:use_connection_cleaner]
     connection_manager
   end
 

data/lib/http_client/connection_cleaner.rb

@@ -0,0 +1,44 @@
+require "weakref"
+
+class HttpClient
+
+  class ConnectionCleaner
+
+    attr_reader :min_idle
+
+    def initialize
+      @lock = Mutex.new
+      @references = []
+      @thread = Thread.new { work until @shutdown }
+      @min_idle = 5
+      @shutdown = false
+    end
+
+    def register(client)
+      @lock.synchronize do
+        @min_idle = [@min_idle, [1, client.config[:max_idle]].max].min
+        @references.push(WeakRef.new(client))
+      end
+    end
+
+    def work
+      sleep min_idle
+      @lock.synchronize do
+        @references = @references.map do |client|
+          begin
+            client.cleanup_connections
+            client
+          rescue
+            nil
+          end
+        end.compact
+      end
+    end
+
+    def shutdown
+      @shutdown = true
+    end
+
+  end
+
+end

data/lib/http_client/response.rb

@@ -0,0 +1,42 @@
+class HttpClient
+
+  class Response
+    attr_reader :status, :body, :headers
+
+    def initialize(closeable_response)
+      @status = closeable_response.status_line.status_code
+      @headers = closeable_response.all_headers.inject({}) do |headers, header|
+        headers[header.name] = header.value
+        headers
+      end
+      @body = read_body(closeable_response)
+    end
+
+    def success?
+      status >= 200 && status <= 206
+    end
+
+    def json_body(options = {})
+      @json_body ||= JSON.parse(body, options)
+    end
+
+  private
+
+    def read_body(closeable_response)
+      return "" unless entity = closeable_response.entity
+      return "" unless entity.is_chunked? || entity.content_length > 0
+      if content_encoding = entity.content_encoding
+        entity = case content_encoding.value
+          when "gzip", "x-gzip" then
+            GzipDecompressingEntity.new(entity)
+          when "deflate" then
+            DeflateDecompressingEntity.new(entity)
+          else
+            entity
+        end
+      end
+      EntityUtils.to_string(entity, "UTF-8")
+    end
+  end
+
+end

data/test/http_client_test.rb

@@ -6,7 +6,9 @@ require "minitest/pride"
 require "minitest/autorun"
 require "json"
 
-require File.expand_path("../../lib/http_client", __FILE__)
+# Rubygems would do this for us when loading the gem
+$LOAD_PATH.unshift(File.expand_path("../../lib", __FILE__))
+require "http_client"
 
 def Hash(h); h; end
 
@@ -86,7 +88,7 @@ class HttpClientTest < Minitest::Test
 end
 
 # # Content-Type precedence
-# 
+#
 # client.post("http://httpbin.org/post",
 #   :headers => {
 #     :content_type => "application/xml"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: http_client
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: '0.6'
 platform: java
 authors:
 - Lukas Rieder
@@ -22,12 +22,12 @@ files:
 - LICENSE
 - README.md
 - lib/http_client.rb
+- lib/http_client/connection_cleaner.rb
+- lib/http_client/response.rb
 - test/http_client_test.rb
 - vendor/commons-logging-1.1.3.jar
-- vendor/httpasyncclient-4.0.jar
 - vendor/httpclient-4.3.1.jar
 - vendor/httpcore-4.3.jar
-- vendor/httpcore-nio-4.3.jar
 - vendor/httpmime-4.3.1.jar
 homepage: https://github.com/Overbryd/http_client
 licenses: