manticore 0.5.4-java → 0.5.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40995659e9b7257957446803d3e19d4ff633fa58
-  data.tar.gz: 351c5343d32e1944663d5c796bc221ef3b2453b6
+  metadata.gz: 111c250ba25bbaa0452c9bee6bd1ad09b589a007
+  data.tar.gz: a6dac53321a576076f418e47729a90bdfd85504e
 SHA512:
-  metadata.gz: 025f7f1769aa67b0edb3bb567be722df970d827d6060802c992b09f24672cc839f74f3a2e7a37aa5cb76ec2ce1e7437dc47c667f2be8b89c666040ed68c1e563
-  data.tar.gz: 861b575e15e8a10a6f072495472e693541c7576e172e665320b807a190f50ed95279cb77c92bf2ecd1ce77a2cc433d85132f18d2c8a36452eb8607d6690b90a1
+  metadata.gz: e20565e5b7a754d475c894eca5a4d718fcea9848e47dea4bb836747fd12cf166486faf4d0604a9eb72addf319833f0c8a54bec45e5c099315b361e5cda251695
+  data.tar.gz: 7ef91033ae1aff1dffea2ba44816e0665d76c951267a4832f5175cb25b732fece0a656a39c13dc09ac5c847fe3e7a6b129dd35d2370d6365981d060f42c4fe6f

data/.travis.yml

@@ -1,12 +1,19 @@
 language: ruby
 sudo: false
+cache:
+  - bundler
+  - directories:
+    - $HOME/.m2
 rvm:
   - jruby-1.7
-  - jruby-9.0.0.0
+  - jruby-9.0.5.0
 jdk:
   - oraclejdk8
   - oraclejdk7
   - openjdk7
+before_install:
+  - gem install ruby-maven
+  - bundle install
 matrix:
   include:
     - rvm: jruby-head

data/CHANGELOG.md

@@ -1,6 +1,20 @@
 ## v0.5
 
-### v0.5.2 (pending)
+### v0.5.6 (pending)
+
+### v0.5.5
+
+* Marked Executor threads as daemon threads, so they won't impede host process shutdown
+
+### v0.5.4
+
+* Fixed a memory leak caused by at_exit hooks, which would cause allocated HttpClient resources to remain in scope even if a Client instance was collected
+
+### v0.5.3
+
+* Reduce the stale connection check default time to 2000ms for consistency with the HttpClient defaults
+
+### v0.5.2
 
 * Added Client#close to shut down the connection pool.
 

data/Gemfile

@@ -3,10 +3,12 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in manticore.gemspec
 gemspec
 
-gem "net-http-server", "~> 0.2"
-gem "rspec", "~> 3.0"
-gem "rspec-its"
-gem "httpclient", "~> 2.3"
-gem "rack", "~> 1.5"
-gem "rake-compiler"
-gem "gserver"
+group :development, :test do
+  gem "net-http-server", "~> 0.2"
+  gem "rspec", "~> 3.0"
+  gem "rspec-its"
+  gem "httpclient", "~> 2.3"
+  gem "rack", "~> 1.5"
+  gem "rake-compiler"
+  gem "gserver"
+end

data/lib/manticore/client.rb

@@ -1,5 +1,6 @@
 require 'thread'
 require 'base64'
+require 'weakref'
 
 module Manticore
   # @!macro [new] http_method_shared
@@ -89,6 +90,18 @@ module Manticore
     java_import "org.manticore.HttpDeleteWithEntity"
     java_import "org.apache.http.auth.UsernamePasswordCredentials"
 
+    # This is a class rather than a proc because the proc holds a closure around
+    # the instance of the Client that creates it.
+    class ExecutorThreadFactory
+      include ::Java::JavaUtilConcurrent::ThreadFactory
+
+      def newThread(runnable)
+        thread = Executors.defaultThreadFactory.newThread(runnable)
+        thread.daemon = true
+        return thread
+      end
+    end
+
     include ProxiesInterface
 
     # The default maximum pool size for requests
@@ -207,6 +220,7 @@ module Manticore
 
       builder.set_default_request_config request_config.build
       @client = builder.build
+      finalize @client, :close
       @options = options
       @async_requests = []
       @stubs = {}
@@ -353,7 +367,7 @@ module Manticore
     # a proc to avoid creating a closure that would maintain a reference to this client, which
     # would prevent the client from being cleaned up.
     def finalize(object, args)
-      @finalizers << [object, Array(args)]
+      @finalizers << [WeakRef.new(object), Array(args)]
     end
 
     def url_as_regex(url)
@@ -396,7 +410,7 @@ module Manticore
 
     def create_executor_if_needed
       return @executor if @executor
-      @executor = Executors.new_cached_thread_pool
+      @executor = Executors.new_cached_thread_pool(ExecutorThreadFactory.new)
       finalize @executor, :shutdown
     end
 

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

data/lib/manticore_jars.rb

@@ -1,8 +1,8 @@
 # this is a generated file, to avoid over-writing it just delete this comment
 require 'jar_dependencies'
 
-require_jar( 'org.apache.httpcomponents', 'httpclient', '4.5' )
 require_jar( 'org.apache.httpcomponents', 'httpcore', '4.4.1' )
 require_jar( 'commons-codec', 'commons-codec', '1.9' )
 require_jar( 'commons-logging', 'commons-logging', '1.2' )
 require_jar( 'org.apache.httpcomponents', 'httpmime', '4.5' )
+require_jar( 'org.apache.httpcomponents', 'httpclient', '4.5' )

data/manticore.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency 'ruby-maven', '~> 3.3'
 
   spec.add_runtime_dependency "jar-dependencies"
   spec.requirements << "jar org.apache.httpcomponents:httpclient, 4.5"

data/spec/manticore/client_proxy_spec.rb

@@ -13,32 +13,23 @@ describe Manticore::Client do
       end
 
       context "for synchronous requests" do
-        it "responds only stub the next subsequent response" do
+        it "stubs the request" do
           stub = client.respond_with(body: "body", code: 200)
 
           stub.get(local_server) do |response|
             expect(response).to be_a Manticore::StubbedResponse
           end
-
-          stub.get(local_server) do |response|
-            expect(response).to be_a Manticore::Response
-          end
         end
       end
 
-      context "for synchronous requests" do
-        it "responds only stub the next subsequent response" do
+      context "for asynchronous requests" do
+        it "stubs all response made through the proxy" do
           stub = client.respond_with(body: "body", code: 200)
 
-          stub.async.get(local_server).on_success do |response|
-            expect(response).to be_a Manticore::StubbedResponse
-          end
-
-          stub.async.get(local_server).on_success do |response|
-            expect(response).to be_a Manticore::Response
-          end
+          stub.async.get(local_server)
+          stub.async.get(local_server)
 
-          client.execute!
+          expect( client.execute!.map(&:class) ).to eq [Manticore::StubbedResponse, Manticore::StubbedResponse]
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: java
 authors:
 - Chris Heald
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-03-14 00:00:00.000000000 Z
+date: 2016-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
+  name: ruby-maven
+  prerelease: false
+  type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements: