savon 2.9.0 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85eee2aa2cf1a1c2130cf5c50c453ef5dec838c3
-  data.tar.gz: bb9aa1c1c8e3cff15b8bbb4ca24a3d8b0764814a
+  metadata.gz: 041367085f94b9a23b1dc4725ce5e776c1efdaca
+  data.tar.gz: 3920e53e9e6246063ab38a64aa7d26f31adc3dbd
 SHA512:
-  metadata.gz: 0681726a8f75c5ea133b98bdf2ac582e9af225677b643a20dbf0832cbd2458fce15a6c409d42691dbeffc97cdb15f6451dece2d60b5dcf8d2b3c4d5801de555c
-  data.tar.gz: 09cf940fcb8e9e8b669967eac9daa31f14ccfb633a1679af94aec21856be2fccd329018fc549014a7a9bded9fabb396393adf4e0c6c526c9e9c844613546f506
+  metadata.gz: 952a31b9b054f74ee5e152b3a85628b6a511e4ea5b134f0098b886940b27f23c2e23eb685241e6a79057ddfa9837dfc800adec5a8bf5e249f2d979fa2e296506
+  data.tar.gz: 02d114680d544563398f70e74d1b46f5c4c3b7a0643ab165fc354cbb84d24a5472be5a156fc55ab07014a721ef97db523b9485ac42c544d517bba0e4e9ac5c83

data/.travis.yml

@@ -4,6 +4,7 @@ script: "bundle exec rake --trace"
 rvm:
   - 2.0
   - 2.1
+  - 2.2
   - jruby
 notifications:
   irc: "irc.freenode.org#savon"

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+* 2.10.0 (2015-03-02)
+
+* Fix: This reverts a purported "fix" to operation names.
+
 # 2.9.0 (2015-01-29)
 
 * Feature: [#655] Wasabi exceptions should be rethrown as Savon errors. This should make it easier to catch errors thrown by Savon::Client.

data/lib/savon/mock/expectation.rb

@@ -54,8 +54,8 @@ module Savon
     end
 
     def verify_message!
-      return if @expected[:message] == :any
-      unless @expected[:message] == @actual[:message]
+      return if @expected[:message].eql? :any
+      unless @expected[:message] === @actual[:message]
         expected_message = "  with this message: #{@expected[:message].inspect}" if @expected[:message]
         expected_message ||= "  with no message."
 

data/lib/savon/request_logger.rb

@@ -26,14 +26,14 @@ module Savon
     private
 
     def log_request(request)
-      logger.info  "SOAP request: #{request.url}"
-      logger.info  headers_to_log(request.headers)
-      logger.debug body_to_log(request.body)
+      logger.info  { "SOAP request: #{request.url}" }
+      logger.info  { headers_to_log(request.headers) }
+      logger.debug { body_to_log(request.body) }
     end
 
     def log_response(response)
-      logger.info  "SOAP response (status #{response.code})"
-      logger.debug body_to_log(response.body)
+      logger.info  { "SOAP response (status #{response.code})" }
+      logger.debug { body_to_log(response.body) }
     end
 
     def headers_to_log(headers)

data/lib/savon/version.rb

@@ -1,3 +1,3 @@
 module Savon
-  VERSION = '2.9.0'
+  VERSION = '2.10.0'
 end

data/savon.gemspec

@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "nori",     "~> 2.4"
   s.add_dependency "httpi",    "~> 2.3"
-  s.add_dependency "wasabi",   "3.3.0"
+  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"

data/spec/savon/mock_spec.rb

@@ -127,6 +127,12 @@ describe "Savon's mock interface" do
     expect { new_client.call(:find_user) }.to_not raise_error
   end
 
+  it "matchers can be used to specify the message" do
+    savon.expects(:find_user).with(:message => include(:username)).returns("<fixture/>")
+    message = { :username => "Han Solo", password: "querty"}
+
+    expect { new_client.call(:find_user, :message => message) }.to_not raise_error
+  end
 
   it "allows code to rescue Savon::Error and still report test failures" do
     message = { :username => "luke" }

data/spec/savon/options_spec.rb

@@ -504,46 +504,39 @@ describe "Options" do
 
   context "global :filters" do
     it "filters a list of XML tags from logged SOAP messages" do
-      silence_stdout do
+      captured = mock_stdout do
         client = new_client(:endpoint => @server.url(:repeat), :log => true)
-
         client.globals[:filters] << :password
 
-        # filter out logs we're not interested in
-        client.globals[:logger].expects(:info).at_least_once
-        client.globals[:logger].expects(:debug).at_least_once
-
-        # check whether the password is filtered
-        client.globals[:logger].expects(:debug).with { |message|
-          message.include? "<password>***FILTERED***</password>"
-        }.twice
-
         message = { :username => "luke", :password => "secret" }
         client.call(:authenticate, :message => message)
       end
+
+      captured.rewind
+      messages = captured.readlines.join("\n")
+
+      expect(messages).to include("<password>***FILTERED***</password>")
     end
   end
 
   context "global :pretty_print_xml" do
     it "is a nice but expensive way to debug XML messages" do
-      silence_stdout do
-        client = new_client(:endpoint => @server.url(:repeat), :pretty_print_xml => true, :log => true)
-
-        # filter out logs we're not interested in
-        client.globals[:logger].expects(:info).at_least_once
-        client.globals[:logger].expects(:debug).at_least_once
-
-        # check whether the message is pretty printed
-        client.globals[:logger].expects(:debug).with { |message|
-          envelope    = message =~ /\n<env:Envelope/
-          body        = message =~ /\n  <env:Body>/
-          message_tag = message =~ /\n    <tns:authenticate\/>/
-
-          envelope && body && message_tag
-        }.twice
+      captured = mock_stdout do
+        client = new_client(
+          :endpoint => @server.url(:repeat),
+          :pretty_print_xml => true,
+          :log => true)
+        client.globals[:logger].formatter = proc { |*, msg| "#{msg}\n" }
 
         client.call(:authenticate)
       end
+
+      captured.rewind
+      messages = captured.readlines.join("\n")
+
+      expect(messages).to match(/\n<env:Envelope/)
+      expect(messages).to match(/\n  <env:Body/)
+      expect(messages).to match(/\n    <tns:authenticate/)
     end
   end
 

data/spec/savon/request_logger_spec.rb

@@ -0,0 +1,37 @@
+require "spec_helper"
+
+describe Savon::RequestLogger do
+
+  subject            { described_class.new(globals) }
+  let(:globals)      { Savon::GlobalOptions.new(:log => true, :pretty_print_xml => true) }
+  let(:request) {
+    stub('Request',
+         :url     => 'http://example.com',
+         :headers => [],
+         :body    => '<TestRequest />'
+        )
+  }
+
+  let(:response) {
+    stub('Response',
+         :code => 200,
+         :body => '<TestResponse />'
+        )
+  }
+
+  before(:each) {
+    globals[:logger].level = Logger::DEBUG
+  }
+
+  describe '#log_request / #log_response' do
+    it 'does not prepare log messages when no logging is needed' do
+      begin
+        globals[:logger].level = Logger::FATAL
+
+        Savon::LogMessage.expects(:new).never
+        subject.log(request) { response }
+      end
+    end
+
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.9.0
+  version: 2.10.0
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-30 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -42,16 +42,16 @@ dependencies:
   name: wasabi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: '3.4'
 - !ruby/object:Gem::Dependency
   name: akami
   requirement: !ruby/object:Gem::Requirement
@@ -293,6 +293,7 @@ files:
 - spec/savon/operation_spec.rb
 - spec/savon/options_spec.rb
 - spec/savon/qualified_message_spec.rb
+- spec/savon/request_logger_spec.rb
 - spec/savon/request_spec.rb
 - spec/savon/response_spec.rb
 - spec/savon/soap_fault_spec.rb