savon 2.11.0 → 2.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0909b11e5dac2bc60b3e2e15f8bf614dff389309
-  data.tar.gz: bbf115546c00147d8703abada768abd1fa5b1abe
+  metadata.gz: 504295cfd93728423a78f8523e082e978008dfe4
+  data.tar.gz: 65168159c3236ec262c6c14fc5f177cdf110bccf
 SHA512:
-  metadata.gz: ae80080f90960964cf8f71f017193bf454fa5027f6607076942c9144c2cc2bfd1d7ea4d8afcc3013e1fc4a1170588b8693a654f6c0a8d714c61777aa5b48fe37
-  data.tar.gz: f05c5afce92f799b1cf96c019f51e7cb224f6364e4c82677cfdffd9b1a49de149879c0099b0f535b50257fd8e83b188e62e36e9bb6bfb7bf3a6f45aa8236ad7d
+  metadata.gz: efa583a756b8257abf5af2191b4b1eabd4477d4d3486e51bbc468ed9b911c04226416ad87028c7428e1bb0d47374ab8b0ad3488750e6cfc677c50c739a3fde8e
+  data.tar.gz: d4f6ac8cbd182f6fb6c3f3c8982ef1834fb852b91102b92286d7215e3ac71a040926d554330dfcf46151ef5862c542400918f35c8ec58edb049044865814d269

data/.travis.yml

@@ -6,5 +6,10 @@ rvm:
   - 2.1
   - 2.2
   - jruby
+  - rbx-2
+matrix:
+  allow_failures:
+    - rvm: rbx-2
+  fast_finish: true
 notifications:
   irc: "irc.freenode.org#savon"

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.11.1 (2015-05-27)
+
+* Replace dependency on [uuid](https://rubygems.org/gems/uuid), using SecureRandom.uuid instead.
+
 # 2.11.0 (2015-03-31)
 
 * Formally drop support for 1.8.7. 

data/Gemfile

@@ -5,7 +5,6 @@ gem "httpclient", "~> 2.3.4"
 
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "uuid"
 
 platform :rbx do
   gem 'json'

data/lib/savon/header.rb

@@ -1,6 +1,6 @@
 require "akami"
 require "gyoku"
-require "uuid"
+require "securerandom"
 
 module Savon
   class Header
@@ -61,7 +61,7 @@ module Savon
        convert_to_xml({
          'wsa:Action' => @locals[:soap_action],
          'wsa:To' => @globals[:endpoint],
-         'wsa:MessageID' => "urn:uuid:#{UUID.new.generate}",
+         'wsa:MessageID' => "urn:uuid:#{SecureRandom.uuid}",
          attributes!: {
           'wsa:MessageID' => {
             "xmlns:wsa" => "http://schemas.xmlsoap.org/ws/2004/08/addressing"

data/lib/savon/mock/expectation.rb

@@ -55,7 +55,7 @@ module Savon
 
     def verify_message!
       return if @expected[:message].eql? :any
-      unless @expected[:message] === @actual[:message]
+      unless equals_except_any(@expected[:message], @actual[:message])
         expected_message = "  with this message: #{@expected[:message].inspect}" if @expected[:message]
         expected_message ||= "  with no message."
 
@@ -63,9 +63,18 @@ module Savon
         actual_message ||= "  with no message."
 
         raise ExpectationError, "Expected a request to the #{@expected[:operation_name].inspect} operation\n#{expected_message}\n" \
-                                "Received a request to the #{@actual[:operation_name].inspect} operation\n#{actual_message}"
+        "Received a request to the #{@actual[:operation_name].inspect} operation\n#{actual_message}"
       end
     end
 
+    def equals_except_any(msg_expected, msg_real)
+      return true if msg_expected === msg_real
+      return false if (msg_expected.nil? || msg_real.nil?) # If both are nil has returned true
+      msg_expected.each do |key, expected_value|
+        next if (expected_value == :any &&  msg_real.include?(key))
+        return false if expected_value != msg_real[key]
+      end
+      return true
+    end
   end
 end

data/lib/savon/operation.rb

@@ -126,7 +126,13 @@ module Savon
     end
 
     def endpoint
-      @globals[:endpoint] || @wsdl.endpoint
+      @globals[:endpoint] || @wsdl.endpoint.tap do |url|
+        if @globals[:host]
+          host_url = URI.parse(@globals[:host])
+          url.host = host_url.host
+          url.port = host_url.port
+        end
+      end
     end
 
     def raise_expected_httpi_response!

data/lib/savon/options.rb

@@ -89,7 +89,8 @@ module Savon
         :use_wsa_headers           => false,
         :no_message_tag            => false,
         :follow_redirects          => false,
-        :unwrap                    => false
+        :unwrap                    => false,
+        :host                      => nil
       }
 
       options = defaults.merge(options)
@@ -108,6 +109,11 @@ module Savon
       @options[:wsdl] = wsdl_address
     end
 
+    # set different host for actions in WSDL
+    def host(host)
+      @options[:host] = host
+    end
+
     # SOAP endpoint.
     def endpoint(endpoint)
       @options[:endpoint] = endpoint

data/lib/savon/version.rb

@@ -1,3 +1,3 @@
 module Savon
-  VERSION = '2.11.0'
+  VERSION = '2.11.1'
 end

data/savon.gemspec

@@ -22,7 +22,6 @@ Gem::Specification.new do |s|
   s.add_dependency "wasabi",   "~> 3.4"
   s.add_dependency "akami",    "~> 1.2"
   s.add_dependency "gyoku",    "~> 1.2"
-  s.add_dependency "uuid",     "~> 2.3.7"
   s.add_dependency "builder",  ">= 2.1.2"
   s.add_dependency "nokogiri", ">= 1.4.0"
 

data/spec/savon/builder_spec.rb

@@ -83,10 +83,19 @@ describe Savon::Builder do
     end
 
     describe "#wsse_signature" do
-      let(:private_key) { "spec/fixtures/ssl/client_key.pem" }
-      let(:cert)        { "spec/fixtures/ssl/client_cert.pem" }
-      let(:signature)   { Akami::WSSE::Signature.new(Akami::WSSE::Certs.new(:cert_file => cert, :private_key_file => private_key))}
-      let(:globals)     { Savon::GlobalOptions.new(wsse_signature: signature) }
+      fixture_dir = File.join(File.dirname(__FILE__), '..', 'fixtures', 'ssl')
+
+      let(:cert)        { File.join(fixture_dir, 'client_cert.pem') }
+      let(:private_key) { File.join(fixture_dir, 'client_key.pem') }
+      let(:signature) do
+        Akami::WSSE::Signature.new(
+          Akami::WSSE::Certs.new(
+            :cert_file => cert,
+            :private_key_file => private_key
+          )
+        )
+      end
+      let(:globals) { Savon::GlobalOptions.new(wsse_signature: signature) }
 
       subject(:signed_message_nn) {Nokogiri::XML(builder.to_s).remove_namespaces!}
       subject(:signed_message) {Nokogiri::XML(builder.to_s)}

data/spec/savon/mock_spec.rb

@@ -23,6 +23,17 @@ describe "Savon's mock interface" do
     expect(response.http.body).to eq("<fixture/>")
   end
 
+  it "can verify a request with any parameters and return a fixture response" do
+    message = { :username => "luke", :password => :any }
+    savon.expects(:authenticate).with(:message => message).returns("<fixture/>")
+
+    response = new_client.call(:authenticate) do
+      message(:username => "luke", :password => "secret")
+    end
+
+    expect(response.http.body).to eq("<fixture/>")
+  end
+
   it "accepts a Hash to specify the response code, headers and body" do
     soap_fault = Fixture.response(:soap_fault)
     response = { :code => 500, :headers => { "X-Result" => "invalid" }, :body => soap_fault }

data/spec/savon/options_spec.rb

@@ -114,6 +114,15 @@ describe "Options" do
     end
   end
 
+  context "global :host" do
+    it "overrides the WSDL endpoint host" do
+      client = new_client(:wsdl => Fixture.wsdl(:no_message_tag), host: "https://example.com:8080")
+
+      request = client.build_request(:update_orders)
+      expect(request.url.to_s).to eq "https://example.com:8080/webserviceexternal/contracts.asmx"
+    end
+  end
+
   context "global :headers" do
     it "sets the HTTP headers for the next request" do
       client = new_client(:endpoint => @server.url(:inspect_request), :headers => { "X-Token" => "secret" })
@@ -578,7 +587,7 @@ describe "Options" do
         expect(request).to include("<wsse:Username>#{username}</wsse:Username>")
 
         # the nonce node
-        expect(request).to match(/<wsse:Nonce.*>.+\n<\/wsse:Nonce>/)
+        expect(request).to match(/<wsse:Nonce.*>.+\n?<\/wsse:Nonce>/)
 
         # the created node with a timestamp
         expect(request).to match(/<wsu:Created>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.*<\/wsu:Created>/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.11.1
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.2'
-- !ruby/object:Gem::Dependency
-  name: uuid
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.7
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.3.7
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -323,7 +309,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: savon
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Heavy metal SOAP client