manticore 0.3.5-java → 0.3.6-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43966785ec5ab6117d26f07d7aa5fe564c6b0538
-  data.tar.gz: 95adffe3048462648835d30ada93ebf66394c082
+  metadata.gz: c6318aab0fbc27d86f181429c393c9d4e984738e
+  data.tar.gz: f4f55510384f05eab14ca8ba3f701264fc89ddef
 SHA512:
-  metadata.gz: b7be6840389cc1ef923ce90454fe052e7e27cf35c0e85fb411efc1190e2987da9c72899588944f97a187658db013e7d111004e675fc1dc3b9fd1da5093a29ae0
-  data.tar.gz: 89a25ffe99a24568806fd2d165fe2517c13e44b12ac78f7978061d002e0b02b83f24e8935982f77a75243f2b5d9a1458ac447b4988b71ad1ec8ff23caab2fb58
+  metadata.gz: 5168f1c0805a6b982756b6c136d019582a0c23adee517472fd6b9ab84d2657071e5eadfcaf08e5ad85e50c825e2e3083926b417d7c83ef0d63d2e2f8ea5836d2
+  data.tar.gz: 4693c3b2df44572cbfa0bb5a986400dc3e021717cd19d71b87795ef8da46ec2721f13d4ab82e9ed3c6b55ad2136b6f2908dde17e01ca4e110ac960ebb4698b1e

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## v0.3
-### v0.3.6 (pending)
+
+## v0.3.7 (pending)
+
+### v0.3.6
+
+* GET requests may now accept bodies much like POST requests. Fixes interactions with Elasticsearch.
 
 ### v0.3.5
 
@@ -22,15 +27,15 @@
 ### v0.3.2
 * :ignore_ssl_validation is now deprecated. It has been replaced with :ssl, which takes a hash of options. These include:
 
-      :verify               - :strict (default), :browser, :none -- Specify hostname verification behaviors.
-      :protocols            - An array of protocols to accept
-      :cipher_suites        - An array of cipher suites to accept
-      :truststore           - Path to a keytool trust store, for specifying custom trusted certificate signers
-      :truststore_password  - Password for the file specified in `:truststore`
-      :truststore_type      - Specify the trust store type (JKS, PKCS12)
-      :keystore             - Path to a keytool trust store, for specifying client authentication certificates
-      :keystore_password    - Password for the file specified in `:keystore`
-      :keystore_type        - Specify the key store type (JKS, PKCS12)
+        :verify               - :strict (default), :browser, :none -- Specify hostname verification behaviors.
+        :protocols            - An array of protocols to accept
+        :cipher_suites        - An array of cipher suites to accept
+        :truststore           - Path to a keytool trust store, for specifying custom trusted certificate signers
+        :truststore_password  - Password for the file specified in `:truststore`
+        :truststore_type      - Specify the trust store type (JKS, PKCS12)
+        :keystore             - Path to a keytool trust store, for specifying client authentication certificates
+        :keystore_password    - Password for the file specified in `:keystore`
+        :keystore_type        - Specify the key store type (JKS, PKCS12)
 
   (thanks @torrancew)
 

data/Rakefile

@@ -12,7 +12,8 @@ require 'rake/javaextensiontask'
 # Dependency jars for the Kerrigan ext build
 jars = [
   "#{ENV['MY_RUBY_HOME']}/lib/jruby.jar",
-  "lib/jar/httpcore-4.3.1.jar"
+  "lib/jar/httpcore-4.3.3.jar",
+  "lib/jar/httpclient-4.3.6.jar"
 ]
 Rake::JavaExtensionTask.new do |ext|
   ext.name = "manticore-ext"

data/ext/manticore/org/manticore/HttpGetWithEntity.java

@@ -0,0 +1,21 @@
+package org.manticore;
+
+import java.net.URI;
+import org.apache.http.client.methods.HttpPost;
+
+public class HttpGetWithEntity extends HttpPost {
+    public final static String METHOD_NAME = "GET";
+
+    public HttpGetWithEntity(URI url) {
+        super(url);
+    }
+
+    public HttpGetWithEntity(String url) {
+        super(url);
+    }
+
+    @Override
+    public String getMethod() {
+        return METHOD_NAME;
+    }
+}

data/ext/manticore/org/manticore/Manticore.java

@@ -21,7 +21,7 @@ import org.jcodings.Encoding;
 
 public class Manticore implements Library {
 
-  public void load(final Ruby ruby, boolean _) {
+  public void load(final Ruby ruby, boolean _dummy) {
     RubyModule manticore = ruby.defineModule("Manticore");
     RubyClass converter = ruby.defineClassUnder("EntityConverter", ruby.getObject(), new ObjectAllocator() {
         public IRubyObject allocate(Ruby ruby, RubyClass rc) {

data/lib/manticore/client.rb

@@ -75,6 +75,7 @@ module Manticore
     java_import "org.apache.http.HttpHost"
     java_import "javax.net.ssl.SSLContext"
     java_import "java.security.KeyStore"
+    java_import "org.manticore.HttpGetWithEntity"
 
     include ProxiesInterface
 
@@ -217,7 +218,7 @@ module Manticore
     # Perform a HTTP GET request
     # @macro http_method_shared_sync
     def get(url, options = {}, &block)
-      request HttpGet, url, options, &block
+      request HttpGetWithEntity, url, options, &block
     end
 
     # Perform a HTTP PUT request
@@ -289,7 +290,7 @@ module Manticore
 
     def url_as_regex(url)
       if url.is_a?(String)
-        %r{^#{url}$}
+        %r{^#{Regexp.escape url}$}
       else
         url
       end
@@ -423,7 +424,7 @@ module Manticore
       req = klass.new uri_from_url_and_options(url, options).to_s
 
       if ( options[:params] || options[:body] || options[:entity]) &&
-         ( req.instance_of?(HttpPost) || req.instance_of?(HttpPatch) || req.instance_of?(HttpPut) )
+         ( req.instance_of?(HttpPost) || req.instance_of?(HttpPatch) || req.instance_of?(HttpPut) || req.instance_of?(HttpGetWithEntity))
         if options[:params]
           req.set_entity hash_to_entity(options[:params])
         elsif options[:body]

data/lib/manticore/stubbed_response.rb

@@ -56,11 +56,13 @@ module Manticore
     #
     # @return [String] The final URL
     def final_url
+      call_once
       @headers["location"]
     end
 
     # Returns the stubbed body of this response.
     def body
+      call_once
       @body
     end
     alias_method :read_body, :body
@@ -68,6 +70,7 @@ module Manticore
     # Returns the stubbed cookies of this response. This is the union of cookies from the `:cookies`
     # option key and any `set-cookie` headers passed.
     def cookies
+      call_once
       @cookies
     end
 
@@ -87,5 +90,9 @@ module Manticore
       @handlers[:success].call(self)
       self
     end
+
+    def call_once
+      call unless @called
+    end
   end
 end

data/lib/manticore/version.rb

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

data/spec/manticore/client_spec.rb

@@ -316,11 +316,14 @@ describe Manticore::Client do
       JSON.load(response.body)["method"].should == "GET"
     end
 
-    context "with a query" do
-      it "should work" do
-        response = client.get local_server, query: {foo: "bar"}
-        CGI.parse(JSON.load(response.body)["uri"]["query"])["foo"].should == ["bar"]
-      end
+    it "send a query" do
+      response = client.get local_server, query: {foo: "bar"}
+      CGI.parse(JSON.load(response.body)["uri"]["query"])["foo"].should == ["bar"]
+    end
+
+    it "should send a body" do
+      response = client.get(local_server, body: "This is a post body")
+      JSON.load(response.body)["body"].should == "This is a post body"
     end
   end
 
@@ -485,6 +488,21 @@ describe Manticore::Client do
         client.async.get(local_server("/other")).on_success {|r| r.should_not be_a Manticore::StubbedResponse }
         client.execute!
       end
+
+      it "matches stubs with query strings" do
+        url = "http://google.com?k=v"
+        client.stub(url, body: "response body", code: 200)
+        client.get(url) do |response|
+          expect(response.body).to eq("response body")
+        end
+      end
+
+      it "persists the stub for non-block calls" do
+        url = "http://google.com"
+        client.stub(url, body: "response body", code: 200)
+        response = client.get(url)
+        expect(response.body).to eq("response body")
+      end
     end
   end
 

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.3.6
 platform: java
 authors:
 - Chris Heald
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -30,45 +30,45 @@ cert_chain:
   cnyabLOcGIKZNxvnSfwOuCBnjgoSOyJi/n48n1s+OPB/OmPJoWmhKu2DO4sUb4+K
   /3Mhp5UWSl9SmDR1
   -----END CERTIFICATE-----
-date: 2015-03-04 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: addressable
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
-  type: :runtime
+  name: addressable
   prerelease: false
+  type: :runtime
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  name: bundler
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
+  name: rake
   prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -89,6 +89,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- ext/manticore/org/manticore/HttpGetWithEntity.java
 - ext/manticore/org/manticore/Manticore.java
 - gem-public_cert.pem
 - lib/jar/commons-codec-1.6.jar
@@ -124,7 +125,7 @@ homepage: https://github.com/cheald/manticore
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +140,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
+rubyforge_project:
 rubygems_version: 2.4.5
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Manticore is an HTTP client built on the Apache HttpCore components
 test_files:
@@ -159,4 +160,3 @@ test_files:
 - spec/ssl/localhost.pem
 - spec/ssl/readme.md
 - spec/ssl/test_truststore
-has_rdoc: