manticore 0.5.1-java → 0.5.2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a487a9db6a178f6e1975c732cc070cd2dd1b705e
-  data.tar.gz: 33ff881b373187b4beb1102f43cf6c3189b9d9be
+  metadata.gz: cad5f48dc039ab74b4f2b3fa2b89dd89d191e698
+  data.tar.gz: 073c3ffc96fd07f1f890dbd92941402499e78231
 SHA512:
-  metadata.gz: bd3195a6f8c6cc138bdc83c71f69ca38d17129020f4c813afeb57fa831c129d4695584148c810b17c3e282a0befcb53fe03056e6037800408ab3574bb838dc27
-  data.tar.gz: b9c6099ef28db4ee0336ed15347786ed070a9f3524fbb72a2750c4d7f7402b2cc88bdb3ae49e8f5446533bb3b09bbf0a451755503877cfe4a2bcbf161c6732aa
+  metadata.gz: 51eb9d51f07dbed5c006ced4e136790c1332aef91ed4ba0fe2325c30434b9390576ff32e7810dd21e7e809da2d97a02b644a4d2f586999e61265088f4e87b467
+  data.tar.gz: fce752a1928db522306e13b93e673cf5c6f67fd51ff83b7345ba5a3a8562992cd6274b1c383200ef304f7fa913964d4b13969f9e329490fd5d616a37ea540acc

data/CHANGELOG.md

@@ -1,8 +1,10 @@
 ## v0.5
 
-### v0.5.1 (pending)
+### v0.5.2 (pending)
 
-### v0.5.0
+* Added Client#close to shut down the connection pool.
+
+### v0.5.1
 
 * Upgrade to HTTPClient and HTTPCore 4.5
 * BREAKING CHANGE: Background request usage has changed. See [this commit](https://github.com/cheald/manticore/commit/174e2004d1865c201daf77494d50ab66527c12aa) for details.

data/lib/manticore.rb

@@ -27,6 +27,9 @@ module Manticore
   # Is something flat out malformed (bad port number?)
   class InvalidArgumentException < ManticoreException; end
 
+  # The client has been closed so it's no longer usable
+  class ClientStoppedException < ManticoreException; end
+
   # Socket breaks, etc
   class SocketException < ManticoreException; end
 

data/lib/manticore/client.rb

@@ -327,6 +327,11 @@ module Manticore
       end
     end
 
+    # Free resources associated with the CloseableHttpClient
+    def close
+      @client.close if @client
+    end
+
     # Get at the underlying ExecutorService used to invoke asynchronous calls.
     def executor
       create_executor_if_needed
@@ -590,7 +595,7 @@ module Manticore
     KEY_EXTRACTION_REGEXP = /(?:^-----BEGIN(.* )PRIVATE KEY-----\n)(.*?)(?:-----END\1PRIVATE KEY.*$)/m
     def setup_key_store(ssl_options, context)
       key_store = get_store(:keystore, ssl_options) if ssl_options.key?(:keystore)
-      keystore_password = ssl_options.fetch(:keystore_password, "").to_java.toCharArray
+      keystore_password = (ssl_options[:keystore_password] || "").to_java.toCharArray
 
       # Support OpenSSL-style bare X.509 certs with an RSA key
       # This is really dumb - we have to b64-decode the key ourselves, and we can only support PKCS8

data/lib/manticore/response.rb

@@ -61,6 +61,12 @@ module Manticore
         ex = Manticore::ResolutionFailure
       rescue Java::JavaLang::IllegalArgumentException => e
         ex = Manticore::InvalidArgumentException
+      rescue Java::JavaLang::IllegalStateException => e
+        if e.message.match(/Connection pool shut down/)
+          ex = Manticore::ClientStoppedException
+        else
+          @exception = e
+        end
       rescue Java::JavaLang::Exception => e # Handle anything we may have missed from java
         ex = Manticore::UnknownException
       rescue StandardError => e

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/manticore/client_spec.rb

@@ -602,6 +602,14 @@ describe Manticore::Client do
     end
   end
 
+  describe "#close" do
+    it "makes the client unusable" do
+      client.close
+      response = client.head(local_server)
+      expect { response.body }.to raise_error(Manticore::ClientStoppedException)
+    end
+  end
+
   describe "keepalive" do
     let(:url) { "http://www.facebook.com/" }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: java
 authors:
 - Chris Heald
@@ -30,7 +30,7 @@ cert_chain:
   cnyabLOcGIKZNxvnSfwOuCBnjgoSOyJi/n48n1s+OPB/OmPJoWmhKu2DO4sUb4+K
   /3Mhp5UWSl9SmDR1
   -----END CERTIFICATE-----
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement