savon 2.7.2 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 090044c5ed3b652b05e9725efd589d989debdfe2
-  data.tar.gz: 66e3b163f648dfee8822abdf628705641fe34170
+  metadata.gz: 7adbc53fe80bb807f76d542112ff55db6da480e9
+  data.tar.gz: 0536349c41007db20291ca8e7dad28c125666066
 SHA512:
-  metadata.gz: fca34525f579049113cf5dd7f6d6ae647bec2c82d73cbd7884012a5bd85af9d6fd43653d76a20f83b181727f9c2c56e6828e5bc8a242904703fb1e00ff1da5df
-  data.tar.gz: 51d75ad87da2e6a9c0617987418eb00d36cafd27ee3ba840eb08c8034fecd12a22537e7c5fed13e127e705a6927b8a0738d986370142a705dd545804af93bea8
+  metadata.gz: 741e08c1b5fba53b3588c52e454e50bfb14eb73c6ed463fc994468e62e77720dc574fabd2506fc51f4cb1f192fd7774bc63574467579e562eba4e8a4f95eb712
+  data.tar.gz: b4c4144f0714a3f49bfcae8e304d7031bc46d396b0ee45334a84a73ebb06dcbf5036468bf784c95eb6090456ecf933e89c71c29c8a3556b3732ec9200ef7214f

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 2.8.0 (2014-11-12)
+
+* Feature : [#620](https://github.com/savonrb/savon/pull/620) add #build_request method that builds the actual XML request body, but does not submit it. Useful for debugging, possibly.
+* Fix : Loosened dependencies on Gyoku, Nori, Akami, and other Savon-dependency gems
+* Feature: [#636](https://github.com/savonrb/savon/pull/636) Set HTTPI.logger when Savon's logger is configured.
+* Feature: [#639](https://github.com/savonrb/savon/issues/639) Allow setting any SSL version that OpenSSL provides. See [the relevant HTTPI issue](https://github.com/savonrb/httpi/pull/136) for more information.
+
 # 2.7.2 (2014-09-23)
 
 Fix : Preserve false values (https://github.com/savonrb/savon/issues/321)

data/lib/savon/client.rb

@@ -41,6 +41,10 @@ module Savon
       @wsdl.service_name
     end
 
+    def build_request(operation_name, locals = {}, &block)
+      operation(operation_name).request(locals, &block)
+    end
+
     private
 
     def set_globals(globals, block)

data/lib/savon/operation.rb

@@ -55,6 +55,11 @@ module Savon
       create_response(response)
     end
 
+    def request(locals = {}, &block)
+      builder = build(locals, &block)
+      build_request(builder)
+    end
+
     private
 
     def create_response(response)

data/lib/savon/options.rb

@@ -189,6 +189,7 @@ module Savon
 
     # The logger to use. Defaults to a Savon::Logger instance.
     def logger(logger)
+      HTTPI.logger = logger
       @options[:logger] = logger
     end
 

data/lib/savon/response.rb

@@ -22,7 +22,7 @@ module Savon
     alias_method :successful?, :success?
 
     def soap_fault?
-      SOAPFault.present? @http
+      SOAPFault.present?(@http, xml)
     end
 
     def http_error?
@@ -77,7 +77,7 @@ module Savon
     private
 
     def build_soap_and_http_errors!
-      @soap_fault = SOAPFault.new(@http, nori) if soap_fault?
+      @soap_fault = SOAPFault.new(@http, nori, xml) if soap_fault?
       @http_error = HTTPError.new(@http) if http_error?
     end
 

data/lib/savon/soap_fault.rb

@@ -3,20 +3,22 @@ require "savon"
 module Savon
   class SOAPFault < Error
 
-    def self.present?(http)
-      fault_node  = http.body.include?("Fault>")
-      soap1_fault = http.body.include?("faultcode>") && http.body.include?("faultstring>")
-      soap2_fault = http.body.include?("Code>") && http.body.include?("Reason>")
+    def self.present?(http, xml = nil)
+      xml ||= http.body
+      fault_node  = xml.include?("Fault>")
+      soap1_fault = xml.include?("faultcode>") && xml.include?("faultstring>")
+      soap2_fault = xml.include?("Code>") && xml.include?("Reason>")
 
       fault_node && (soap1_fault || soap2_fault)
     end
 
-    def initialize(http, nori)
+    def initialize(http, nori, xml = nil)
+      @xml = xml
       @http = http
       @nori = nori
     end
 
-    attr_reader :http, :nori
+    attr_reader :http, :nori, :xml
 
     def to_s
       fault = nori.find(to_hash, 'Fault')
@@ -24,7 +26,7 @@ module Savon
     end
 
     def to_hash
-      parsed = nori.parse(@http.body)
+      parsed = nori.parse(xml || http.body)
       nori.find(parsed, 'Envelope', 'Body')
     end
 

data/lib/savon/version.rb

@@ -1,3 +1,3 @@
 module Savon
-  VERSION = '2.7.2'
+  VERSION = '2.8.0'
 end

data/savon.gemspec

@@ -16,11 +16,11 @@ Gem::Specification.new do |s|
   s.rubyforge_project = s.name
   s.license = 'MIT'
 
-  s.add_dependency "nori",     "~> 2.4.0"
-  s.add_dependency "httpi",    "~> 2.2.3"
-  s.add_dependency "wasabi",   "~> 3.3.0"
-  s.add_dependency "akami",    "~> 1.2.0"
-  s.add_dependency "gyoku",    "~> 1.1.0"
+  s.add_dependency "nori",     "~> 2.4"
+  s.add_dependency "httpi",    "~> 2.3"
+  s.add_dependency "wasabi",   "3.3.0"
+  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"

data/spec/savon/client_spec.rb

@@ -170,6 +170,79 @@ describe Savon::Client do
     end
   end
 
+  describe "#build_request" do
+    it "returns the request without making an actual call" do
+      expected_request = mock('request')
+      wsdl = Wasabi::Document.new('http://example.com')
+
+      operation = Savon::Operation.new(
+        :authenticate,
+        wsdl,
+        Savon::GlobalOptions.new
+      )
+      operation.expects(:request).returns(expected_request)
+
+      Savon::Operation.expects(:create).with(
+        :authenticate,
+        instance_of(Wasabi::Document),
+        instance_of(Savon::GlobalOptions)
+      ).returns(operation)
+
+      operation.expects(:call).never
+
+      client = new_client(:endpoint => @server.url(:repeat))
+      request = client.build_request(:authenticate) do
+        message(:symbol => "AAPL" )
+      end
+
+      expect(request).to eq expected_request
+    end
+
+    it "accepts a block without arguments" do
+      client = new_client(:endpoint => @server.url(:repeat))
+      request = client.build_request(:authenticate) do
+        message(:symbol => "AAPL" )
+      end
+
+      expect(request.body).
+        to include('<tns:authenticate><symbol>AAPL</symbol></tns:authenticate>')
+    end
+
+    it "accepts a block with one argument" do
+      client = new_client(:endpoint => @server.url(:repeat))
+
+      # supports instance variables!
+      @instance_variable = { :symbol => "AAPL" }
+
+      request = client.build_request(:authenticate) do |locals|
+        locals.message(@instance_variable)
+      end
+
+      expect(request.body).
+        to include("<tns:authenticate><symbol>AAPL</symbol></tns:authenticate>")
+    end
+
+    it "accepts argument for the message tag" do
+      client = new_client(:endpoint => @server.url(:repeat))
+      request = client.build_request(:authenticate, :attributes => { "ID" => "ABC321" })
+
+      expect(request.body).
+        to include("<tns:authenticate ID=\"ABC321\"></tns:authenticate>")
+    end
+
+    it "raises when the operation name is not a symbol" do
+      expect { new_client.build_request("not a symbol") }.to raise_error
+    end
+
+    it "raises when given an unknown option via the Hash syntax" do
+      expect { new_client.build_request(:authenticate, :invalid_local_option => true) }.to raise_error
+    end
+
+    it "raises when given an unknown option via the block syntax" do
+      expect { new_client.build_request(:authenticate) { another_invalid_local_option true } }.to raise_error
+    end
+  end
+
   def new_http_response(options = {})
     defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options

data/spec/savon/operation_spec.rb

@@ -192,6 +192,15 @@ describe Savon::Operation do
     end
   end
 
+  describe "#request" do
+    it "returns the request" do
+      operation = new_operation(:verify_address, wsdl, globals)
+      request = operation.request
+
+      expect(request.body).to include('<tns:VerifyAddress></tns:VerifyAddress>')
+    end
+  end
+
   def with_multipart_mocked
     multipart_response = Class.new { def initialize(*args); end }
     multipart_mock = Module.new

data/spec/savon/options_spec.rb

@@ -325,6 +325,15 @@ describe "Options" do
 
       expect(logger).to eq(custom_logger)
     end
+
+    it "sets the logger of HTTPI as well" do
+      custom_logger = Logger.new($stdout)
+
+      client = new_client(:logger => custom_logger, :log => true)
+
+      expect(HTTPI.logger).to be custom_logger
+    end
+
   end
 
   context "global :log_level" do
@@ -502,6 +511,7 @@ describe "Options" do
 
         # 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|
@@ -521,6 +531,7 @@ describe "Options" do
 
         # 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|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.7.2
+  version: 2.8.0
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -16,40 +16,40 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.4.0
+        version: '2.4'
 - !ruby/object:Gem::Dependency
   name: httpi
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.3
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: wasabi
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
         version: 3.3.0
 - !ruby/object:Gem::Dependency
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: gyoku
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.0
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: uuid
   requirement: !ruby/object:Gem::Requirement