manticore 0.3.6-java → 0.4.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6318aab0fbc27d86f181429c393c9d4e984738e
-  data.tar.gz: f4f55510384f05eab14ca8ba3f701264fc89ddef
+  metadata.gz: 19e1191d64f814d4e5eeac2a74ea1cb9ec964451
+  data.tar.gz: 973396d996c2d9bb26491fe88e8566ee27809304
 SHA512:
-  metadata.gz: 5168f1c0805a6b982756b6c136d019582a0c23adee517472fd6b9ab84d2657071e5eadfcaf08e5ad85e50c825e2e3083926b417d7c83ef0d63d2e2f8ea5836d2
-  data.tar.gz: 4693c3b2df44572cbfa0bb5a986400dc3e021717cd19d71b87795ef8da46ec2721f13d4ab82e9ed3c6b55ad2136b6f2908dde17e01ca4e110ac960ebb4698b1e
+  metadata.gz: 0dbfd05b0f5a02a31cde7696dac20baacfa9c981ae0c054d91fd203d2165d3fb42bf3add0363a7b49cb1a91e4c9047911be823c0409238783d8b19acad078088
+  data.tar.gz: 6eeeded09429d4275256cc81a70e8e12314f70ca7d7c9276160d2c0f982323aa23d3658315dec7dac64b11fed97e5d402fdb728d23224d8f7330ac08f06dfd70

data/CHANGELOG.md

@@ -1,6 +1,13 @@
-## v0.3
+## v0.4.1 (pending)
+
+### v0.4.0
 
-## v0.3.7 (pending)
+* Proxy authentication is now supported
+* Client#execute! no longer propagates exceptions; these should be handled in `on_failure`.
+* Client#http and AsyncProxy now properly accept #delete
+* Response#on_complete now receives the request as an argument
+
+## v0.3
 
 ### v0.3.6
 

data/lib/manticore/client.rb

@@ -76,6 +76,7 @@ module Manticore
     java_import "javax.net.ssl.SSLContext"
     java_import "java.security.KeyStore"
     java_import "org.manticore.HttpGetWithEntity"
+    java_import "org.apache.http.auth.UsernamePasswordCredentials"
 
     include ProxiesInterface
 
@@ -121,7 +122,8 @@ module Manticore
     # @option options [boolean]         expect_continue            (false)     Enable support for HTTP 100
     # @option options [boolean]         stale_check                (false)     Enable support for stale connection checking. Adds overhead.
     # @option options [String]          proxy                                    Proxy host in form: http://proxy.org:1234
-    # @option options [Hash]            proxy                                    Proxy host in form: {host: 'proxy.org'[, port: 80[, scheme: 'http']]}
+    # @option options [Hash]            proxy                                    Proxy host in form: {host: 'proxy.org'[, port: 80[, scheme: 'http'[, user: 'username@host', password: 'password']]]}
+    # @option options [Hash]            proxy                                    Proxy host in form: {url:  'http://proxy.org:1234'[, user: 'username@host', password: 'password']]]}
     # @option options [URI]             proxy                                    Proxy host as a URI object
     # @option options [Boolean/Fixnum]  keepalive                  (true)      Whether to allow connections to be reused. Defaults to true. If an integer,
     #                                                                          then connections will be kept alive for this long when Connection: keep-alive
@@ -257,7 +259,7 @@ module Manticore
       request HttpPatch, url, options, &block
     end
 
-    %w(get put head post options patch).each do |func|
+    %w(get put head post delete options patch).each do |func|
       define_method "#{func}!" do |url, options, &block|
         send(func, url, options, &block).call
       end
@@ -269,7 +271,7 @@ module Manticore
     # @macro http_request_exceptions
     def http(method, url, options = {}, &block)
       case method.to_s.downcase
-      when *%w(get put head post options patch)
+      when *%w(get put head post delete options patch)
         send method, url, options, &block
       else
         raise "Invalid method: #{method}"
@@ -288,14 +290,6 @@ module Manticore
       @stubs.delete(url_as_regex(url))
     end
 
-    def url_as_regex(url)
-      if url.is_a?(String)
-        %r{^#{Regexp.escape url}$}
-      else
-        url
-      end
-    end
-
     # Wipe all currently-set stubs.
     def clear_stubs!
       @stubs.clear
@@ -316,7 +310,13 @@ module Manticore
       method = executor.java_method(:submit, [java.util.concurrent.Callable.java_class])
       result = @async_requests.map {|r| method.call r }
       @async_requests.clear
-      result.map(&:get)
+      result.map do |future|
+        begin
+          future.get
+        rescue Java::JavaUtilConcurrent::ExecutionException => e
+          # These exceptions should be handled in on_failure blocks.
+        end
+      end
     end
 
     # Get at the underlying ExecutorService used to invoke asynchronous calls.
@@ -327,6 +327,14 @@ module Manticore
 
     protected
 
+    def url_as_regex(url)
+      if url.is_a?(String)
+        %r{^#{Regexp.escape url}$}
+      else
+        url
+      end
+    end
+
     def client_builder
       HttpClientBuilder.create
     end
@@ -434,11 +442,13 @@ module Manticore
         end
       end
 
+      req_options = @options.merge(options)
       if options.key?(:proxy) || options.key?(:connect_timeout) || options.key?(:socket_timeout) || options.key?(:max_redirects) || options.key?(:follow_redirects)
         config = RequestConfig.custom()
-        req_options = @options.merge(options)
 
-        config.set_proxy get_proxy_host(req_options[:proxy])                       if req_options[:proxy]
+        if req_options[:proxy]
+          config.set_proxy get_proxy_host(req_options[:proxy])
+        end
         config.set_max_redirects req_options[:max_redirects]                       if req_options[:max_redirects]
         config.set_redirects_enabled !!req_options[:follow_redirects]              if req_options.fetch(:follow_redirects, nil) != nil
         config.set_connect_timeout req_options[:connect_timeout] * 1000            if req_options[:connect_timeout]
@@ -452,7 +462,8 @@ module Manticore
       end
 
       context = HttpClientContext.new
-      auth_from_options(options, context) if options.key? :auth
+      proxy_user = req_options[:proxy].is_a?(Hash) && (req_options[:proxy][:user] || req_options[:proxy][:username])
+      auth_from_options(req_options, context) if req_options.key?(:auth) || proxy_user
 
       if @use_cookies == :per_request
         store = BasicCookieStore.new
@@ -473,7 +484,11 @@ module Manticore
           get_proxy_host uri
         end
       elsif opt.is_a? Hash
-        HttpHost.new(opt[:host], (opt[:port] || 80).to_i, opt[:scheme] || "http")
+        if opt.key?(:url)
+          get_proxy_host URI.parse(opt[:url])
+        elsif opt.key?(:host)
+          HttpHost.new(opt[:host], (opt[:port] || 80).to_i, opt[:scheme] || "http")
+        end
       elsif opt.is_a? URI
         opt.scheme ||= "http"
         opt.port ||= 80
@@ -482,11 +497,20 @@ module Manticore
     end
 
     def auth_from_options(options, context)
-      if options[:auth]
+      proxy = options.fetch(:proxy, {})
+      if options[:auth] || proxy[:user] || proxy[:username]
         provider = BasicCredentialsProvider.new
-        username = options[:auth][:user] || options[:auth][:username]
-        password = options[:auth][:pass] || options[:auth][:password]
-        provider.set_credentials AuthScope::ANY, UsernamePasswordCredentials.new(username, password)
+        if options[:auth]
+          username = options[:auth][:user] || options[:auth][:username]
+          password = options[:auth][:pass] || options[:auth][:password]
+          provider.set_credentials AuthScope::ANY, UsernamePasswordCredentials.new(username, password)
+        end
+
+        if proxy[:user] || proxy[:username]
+          username = proxy[:user] || proxy[:username]
+          password = proxy[:pass] || proxy[:password]
+          provider.set_credentials AuthScope.new(get_proxy_host(proxy)), UsernamePasswordCredentials.new(username, password)
+        end
         context.set_credentials_provider(provider)
       end
     end

data/lib/manticore/client/proxies.rb

@@ -24,7 +24,7 @@ module Manticore
     end
 
     class AsyncProxy < BaseProxy
-      %w(get put head post options patch).each do |func|
+      %w(get put head post delete options patch).each do |func|
         define_method func do |url, options = {}, &block|
           @client.send(func, url, options.merge(async: true), &block)
         end
@@ -37,7 +37,7 @@ module Manticore
         @stubs = stubs
       end
 
-      %w(get put head post options patch).each do |func|
+      %w(get put head post delete options patch).each do |func|
         define_method func do |url, options = {}, &block|
           @client.stub(url, @stubs)
           @client.send(func, url, options, &block).complete { @client.unstub url }
@@ -46,7 +46,7 @@ module Manticore
     end
 
     class BackgroundProxy < BaseProxy
-      %w(get put head post options patch).each do |func|
+      %w(get put head post delete options patch).each do |func|
         define_method func do |url, options = {}, &block|
           request = @client.send(func, url, options.merge(async: true), &block)
           @client.executor.java_method(:submit, [java.util.concurrent.Callable.java_class]).call request

data/lib/manticore/response.rb

@@ -39,7 +39,7 @@ module Manticore
     end
 
     # Implementation of Callable#call
-    # Used by Manticore::Client to invoke the request tied to this response. Users should never call this directly.
+    # Used by Manticore::Client to invoke the request tied to this response.
     def call
       raise "Already called" if @called
       @called = true
@@ -60,6 +60,7 @@ module Manticore
       @exception = ex
       @handlers[:failure].call ex
       execute_complete
+      nil
     end
 
     def fire_and_forget
@@ -226,7 +227,7 @@ module Manticore
     end
 
     def execute_complete
-      @handlers[:complete].each &:call
+      @handlers[:complete].each {|h| h.call(self) }
     end
   end
 end

data/lib/manticore/version.rb

@@ -1,3 +1,3 @@
 module Manticore
-  VERSION = "0.3.6"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.4.0
 platform: java
 authors:
 - Chris Heald
@@ -30,7 +30,7 @@ cert_chain:
   cnyabLOcGIKZNxvnSfwOuCBnjgoSOyJi/n48n1s+OPB/OmPJoWmhKu2DO4sUb4+K
   /3Mhp5UWSl9SmDR1
   -----END CERTIFICATE-----
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement