manticore 0.3.4-java → 0.3.5-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 353676ba5c5c9ff2a01a4df74c63e059abc55b37
-  data.tar.gz: f8ffecdb2d6f8bce9c03a2f8ebeb518329a579a8
+  metadata.gz: 43966785ec5ab6117d26f07d7aa5fe564c6b0538
+  data.tar.gz: 95adffe3048462648835d30ada93ebf66394c082
 SHA512:
-  metadata.gz: 2a0ae79dee6fc7f0420b1ad3a614c91aea0e0abd12d9a0a32c4833432e2ee0fe7ac4f2bc9e3386a9f7ca9f54f110c75fa61cddc2ca6926e7ca710cd5e341bc21
-  data.tar.gz: 2eef5cf9942d6fb7d0070bef2db25de3d24a9184d6a6e36fd5b073f5a6decff662ab37b9e83a5144f0dca4601d397d698d24cf44b5674bd0c8f4841903c9ddd2
+  metadata.gz: b7be6840389cc1ef923ce90454fe052e7e27cf35c0e85fb411efc1190e2987da9c72899588944f97a187658db013e7d111004e675fc1dc3b9fd1da5093a29ae0
+  data.tar.gz: 89a25ffe99a24568806fd2d165fe2517c13e44b12ac78f7978061d002e0b02b83f24e8935982f77a75243f2b5d9a1458ac447b4988b71ad1ec8ff23caab2fb58

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## v0.3
-### v0.3.5 (pending)
+### v0.3.6 (pending)
+
+### v0.3.5
+
+* Stubs now accept regexes for URLs in addition to strings (thanks @gmassanek)
 
 ### v0.3.4
 
@@ -68,4 +72,4 @@
 * Significant performance overhaul
 * Response handler blocks are now only yielded the Response. `#request` is available on
   the response object.
-* Patched httpclient.jar to address https://issues.apache.org/jira/browse/HTTPCLIENT-1461
+* Patched httpclient.jar to address https://issues.apache.org/jira/browse/HTTPCLIENT-1461

data/gem-public_cert.pem

@@ -1,7 +1,7 @@
 -----BEGIN CERTIFICATE-----
 MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZjaGVh
 bGQxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2NvbTAe
-Fw0xNDAzMDEyMTE4MzJaFw0xNTAzMDEyMTE4MzJaMD0xDzANBgNVBAMMBmNoZWFs
+Fw0xNTAzMDQwNTA5MjhaFw0xNjAzMDMwNTA5MjhaMD0xDzANBgNVBAMMBmNoZWFs
 ZDEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
 IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwcnX2yl+rbjUztC4V+iUJgWv
 NPxqU4bQBaL+w00wVABWr04Hjg+cEkqiJ6A0kXxZIz5uXKhhvsaO50NvHfplVcUf
@@ -11,11 +11,11 @@ wUU2ilmn7EvZhEUPOMQi01t8z8OsOGc8kF2UtU1kGCxLV7eThWqu8CdXrux5E140
 aNb4t5sAuu0f/9B646BOjiMgj1WeUlhgiAsaF5kVvLFNCxwS/xpcN3X01M2KdQID
 AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUtFVpwfEG
 78mBd2ulzsS+SlffdOcwGwYDVR0RBBQwEoEQY2hlYWxkQGdtYWlsLmNvbTAbBgNV
-HRIEFDASgRBjaGVhbGRAZ21haWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQANcBIJ
-vIk27iNu4Ic6awNRy4Rd2YchzW4DaMhfpTXxtYWgAE502OdqUTFtmihd2PmnVRIP
-xdP5K2SpbCLuLKFCZ825qp8R02JSNMdgi2d4Btl0vHSO8O3lQ1ZAOM1BZPn2+Kbn
-KsiSURg3SnDXItcoedMsS+CQdNyBSdqvpkQ5gn22dN4BSwJg5ApwEYJ9tTuTpRXt
-1KCQFe5hamoenfoHO6uUXPEs24PUHnXl8QibWCLbt1FIBpTrJYNGiMHHnB7ip+zv
-E7PWS50D9moUJ6xWcemf0qKYC87qBFh0ng73awjG9uf+13lMslqJRMtek8C92cvh
-+R9zgQlbeNjy9O1i
+HRIEFDASgRBjaGVhbGRAZ21haWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQApPK7H
+4nM6IAzpeA1fYuBsH+Z7ENr2p02ElinUVZMiUmWsFjoZqDLWDWIHJnlJCwUZjnBb
+gXpEFiKiS9XgkRmIOIb3fpD9M574vo/AyvAzvQHLCN7p86IFWQSTsAQptcPfQBL7
+8yWPlXfbX6qxnLHrkjcSnRo61v4NqU+y6x4WEX6Dp90DK3mNLgk7kQk4GhBXevnV
+4Mmxp+JAtISoamMfjldbJhCMkWaZUwDsdFzSfTXl7yg772IYZfICzD7eENPiIcmu
+cnyabLOcGIKZNxvnSfwOuCBnjgoSOyJi/n48n1s+OPB/OmPJoWmhKu2DO4sUb4+K
+/3Mhp5UWSl9SmDR1
 -----END CERTIFICATE-----

data/lib/manticore/client.rb

@@ -279,12 +279,20 @@ module Manticore
     # @param  url [String] URL to stub for
     # @param  stubs [Hash] Hash of options to return for the stubbed response
     def stub(url, stubs)
-      @stubs[url] = stubs
+      @stubs[url_as_regex(url)] = stubs
     end
 
     # Cause this client to unstubbed previously-stubbed URL
     def unstub(url)
-      @stubs.delete(url)
+      @stubs.delete(url_as_regex(url))
+    end
+
+    def url_as_regex(url)
+      if url.is_a?(String)
+        %r{^#{url}$}
+      else
+        url
+      end
     end
 
     # Wipe all currently-set stubs.
@@ -386,8 +394,10 @@ module Manticore
 
     def response_object_for(client, request, context, &block)
       request_uri = request.getURI.to_s
-      if @stubs.key?(request_uri)
-        StubbedResponse.new(client, request, context, &block).stub( @stubs[request_uri] )
+
+      match_key = @stubs.keys.find { |k| request_uri.match(k) }
+      if match_key
+        StubbedResponse.new(client, request, context, &block).stub( @stubs[match_key] )
       else
         Response.new(client, request, context, &block)
       end

data/lib/manticore/version.rb

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

data/spec/manticore/client_spec.rb

@@ -464,11 +464,27 @@ describe Manticore::Client do
       end
     end
 
-    it "stubs only the provided URLs" do
-      client.stub local_server, body: "body"
-      client.async.get(local_server).on_success {|r| r.should be_a Manticore::StubbedResponse }
-      client.async.get(local_server("/other")).on_success {|r| r.should be_a Manticore::Response }
-      client.execute!
+    context 'stubbing' do
+      it "only the provided URLs" do
+        client.stub local_server, body: "body"
+        client.async.get(local_server).on_success {|r| r.should be_a Manticore::StubbedResponse }
+        client.async.get(local_server("/other")).on_success {|r| r.should_not be_a Manticore::StubbedResponse }
+        client.execute!
+      end
+
+      it "by regex matching" do
+        client.stub %r{#{local_server("/foo")}}, body: "body"
+        client.async.get(local_server("/foo")).on_success {|r| r.should be_a Manticore::StubbedResponse }
+        client.async.get(local_server("/bar")).on_success {|r| r.should_not be_a Manticore::StubbedResponse }
+        client.execute!
+      end
+
+      it "strictly matches string stubs" do
+        client.stub local_server("/foo"), body: "body"
+        client.async.get(local_server("/foo")).on_success {|r| r.should be_a Manticore::StubbedResponse }
+        client.async.get(local_server("/other")).on_success {|r| r.should_not be_a Manticore::StubbedResponse }
+        client.execute!
+      end
     end
   end
 
@@ -593,4 +609,4 @@ describe Manticore::Client do
       pool.releaseConnection(conn, nil, 0, TimeUnit::SECONDS)
     end
   end
-end
+end

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: manticore
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
 platform: java
 authors:
 - Chris Heald
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain:
 - |
   -----BEGIN CERTIFICATE-----
   MIIDaDCCAlCgAwIBAgIBATANBgkqhkiG9w0BAQUFADA9MQ8wDQYDVQQDDAZjaGVh
   bGQxFTATBgoJkiaJk/IsZAEZFgVnbWFpbDETMBEGCgmSJomT8ixkARkWA2NvbTAe
-  Fw0xNDAzMDEyMTE4MzJaFw0xNTAzMDEyMTE4MzJaMD0xDzANBgNVBAMMBmNoZWFs
+  Fw0xNTAzMDQwNTA5MjhaFw0xNjAzMDMwNTA5MjhaMD0xDzANBgNVBAMMBmNoZWFs
   ZDEVMBMGCgmSJomT8ixkARkWBWdtYWlsMRMwEQYKCZImiZPyLGQBGRYDY29tMIIB
   IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAwcnX2yl+rbjUztC4V+iUJgWv
   NPxqU4bQBaL+w00wVABWr04Hjg+cEkqiJ6A0kXxZIz5uXKhhvsaO50NvHfplVcUf
@@ -22,53 +22,53 @@ cert_chain:
   aNb4t5sAuu0f/9B646BOjiMgj1WeUlhgiAsaF5kVvLFNCxwS/xpcN3X01M2KdQID
   AQABo3MwcTAJBgNVHRMEAjAAMAsGA1UdDwQEAwIEsDAdBgNVHQ4EFgQUtFVpwfEG
   78mBd2ulzsS+SlffdOcwGwYDVR0RBBQwEoEQY2hlYWxkQGdtYWlsLmNvbTAbBgNV
-  HRIEFDASgRBjaGVhbGRAZ21haWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQANcBIJ
-  vIk27iNu4Ic6awNRy4Rd2YchzW4DaMhfpTXxtYWgAE502OdqUTFtmihd2PmnVRIP
-  xdP5K2SpbCLuLKFCZ825qp8R02JSNMdgi2d4Btl0vHSO8O3lQ1ZAOM1BZPn2+Kbn
-  KsiSURg3SnDXItcoedMsS+CQdNyBSdqvpkQ5gn22dN4BSwJg5ApwEYJ9tTuTpRXt
-  1KCQFe5hamoenfoHO6uUXPEs24PUHnXl8QibWCLbt1FIBpTrJYNGiMHHnB7ip+zv
-  E7PWS50D9moUJ6xWcemf0qKYC87qBFh0ng73awjG9uf+13lMslqJRMtek8C92cvh
-  +R9zgQlbeNjy9O1i
+  HRIEFDASgRBjaGVhbGRAZ21haWwuY29tMA0GCSqGSIb3DQEBBQUAA4IBAQApPK7H
+  4nM6IAzpeA1fYuBsH+Z7ENr2p02ElinUVZMiUmWsFjoZqDLWDWIHJnlJCwUZjnBb
+  gXpEFiKiS9XgkRmIOIb3fpD9M574vo/AyvAzvQHLCN7p86IFWQSTsAQptcPfQBL7
+  8yWPlXfbX6qxnLHrkjcSnRo61v4NqU+y6x4WEX6Dp90DK3mNLgk7kQk4GhBXevnV
+  4Mmxp+JAtISoamMfjldbJhCMkWaZUwDsdFzSfTXl7yg772IYZfICzD7eENPiIcmu
+  cnyabLOcGIKZNxvnSfwOuCBnjgoSOyJi/n48n1s+OPB/OmPJoWmhKu2DO4sUb4+K
+  /3Mhp5UWSl9SmDR1
   -----END CERTIFICATE-----
-date: 2015-01-08 00:00:00.000000000 Z
+date: 2015-03-04 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'
-  name: addressable
-  prerelease: false
   type: :runtime
+  prerelease: false
   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'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   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'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -124,7 +124,7 @@ homepage: https://github.com/cheald/manticore
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -139,9 +139,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.4.5
+signing_key: 
 specification_version: 4
 summary: Manticore is an HTTP client built on the Apache HttpCore components
 test_files:
@@ -159,3 +159,4 @@ test_files:
 - spec/ssl/localhost.pem
 - spec/ssl/readme.md
 - spec/ssl/test_truststore
+has_rdoc: