savon 2.11.0 → 2.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0909b11e5dac2bc60b3e2e15f8bf614dff389309
-  data.tar.gz: bbf115546c00147d8703abada768abd1fa5b1abe
+  metadata.gz: ee16983ffafe63866c9a55e2f87082982882442b
+  data.tar.gz: 031a0b620818fa9242fa6df79d716dc2d5fb0795
 SHA512:
-  metadata.gz: ae80080f90960964cf8f71f017193bf454fa5027f6607076942c9144c2cc2bfd1d7ea4d8afcc3013e1fc4a1170588b8693a654f6c0a8d714c61777aa5b48fe37
-  data.tar.gz: f05c5afce92f799b1cf96c019f51e7cb224f6364e4c82677cfdffd9b1a49de149879c0099b0f535b50257fd8e83b188e62e36e9bb6bfb7bf3a6f45aa8236ad7d
+  metadata.gz: 32d112e59f45ec6b6f1c65f54c33030c99ae2e2c931ce476d0c62cceb7715d62772164b0f7e182ab691a8b47d8cfeb7c83140986743f3e134e91040d099905a6
+  data.tar.gz: 0d73626cde6c3ccec91b090f0d30cb1f6031b5fdc88834e1874719f0e269ae62c5a4e9402e863a45e7fb64c176b58f6ff8bb5296a2e13d1ddd28bb1133c9af0d

data/.travis.yml

@@ -1,10 +1,19 @@
 # https://github.com/travis-ci/travis-ci/wiki/.travis.yml-options
 language: "ruby"
+sudo: false
+before_install:
+  - gem install bundler
 script: "bundle exec rake --trace"
 rvm:
-  - 2.0
-  - 2.1
-  - 2.2
+  - 2.0.0
+  - 2.1.8
+  - 2.2.4
+  - 2.3.0
   - jruby
+  - rbx-2
+matrix:
+  allow_failures:
+    - rvm: rbx-2
+  fast_finish: true
 notifications:
   irc: "irc.freenode.org#savon"

data/CHANGELOG.md

@@ -1,3 +1,16 @@
+# 2.11.2 (2017-08-03)
+* Fix: [#676](https://github.com/savonrb/savon/pull/676) Fixes handling of `content!` and `attributes!`
+* Fix: [#800](https://github.com/savonrb/savon/pull/800) Fix exception calling `SOAPFault#to_s` when http.body is empty
+* Fix: [#757](https://github.com/savonrb/savon/pull/757) Logging: Use filter without automatic pretty printing
+* Fix: [#771](https://github.com/savonrb/savon/pull/771) Restore support for cookies when using custom headers
+* Feature: [#744](https://github.com/savonrb/savon/pull/744) Add support for rpc encoded wsdl
+* Feature: [#742](https://github.com/savonrb/savon/pull/742) Add support for local request headers
+* Feature: [#704](https://github.com/savonrb/savon/pull/704) Add possibility to pass attribute delete_namespace_attributes to Nori
+
+# 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

@@ -1,19 +1,13 @@
 source 'https://rubygems.org'
 gemspec
 
-gem "httpclient", "~> 2.3.4"
+gem "httpclient", "~> 2.7.1"
 
 gem "simplecov", :require => false
 gem "coveralls", :require => false
-gem "uuid"
 
 platform :rbx do
-  gem 'json'
   gem 'racc'
   gem 'rubysl'
   gem 'rubinius-coverage'
 end
-
-platform :jruby do
-  gem 'json'
-end

data/README.md

@@ -5,10 +5,10 @@ Heavy metal SOAP client
 [Documentation](http://savonrb.com) | [RDoc](http://rubydoc.info/gems/savon) |
 [Mailing list](https://groups.google.com/forum/#!forum/savonrb) | [Twitter](http://twitter.com/savonrb)
 
-[![Build Status](https://secure.travis-ci.org/savonrb/savon.png?branch=master)](http://travis-ci.org/savonrb/savon)
-[![Gem Version](https://badge.fury.io/rb/savon.png)](http://badge.fury.io/rb/savon)
-[![Code Climate](https://codeclimate.com/github/savonrb/savon.png)](https://codeclimate.com/github/savonrb/savon)
-[![Coverage Status](https://coveralls.io/repos/savonrb/savon/badge.png?branch=version2)](https://coveralls.io/r/savonrb/savon)
+[![Build Status](https://secure.travis-ci.org/savonrb/savon.svg?branch=master)](http://travis-ci.org/savonrb/savon)
+[![Gem Version](https://badge.fury.io/rb/savon.svg)](http://badge.fury.io/rb/savon)
+[![Code Climate](https://codeclimate.com/github/savonrb/savon.svg)](https://codeclimate.com/github/savonrb/savon)
+[![Coverage Status](https://coveralls.io/repos/savonrb/savon/badge.svg?branch=version2)](https://coveralls.io/r/savonrb/savon)
 
 
 ## Version 2
@@ -22,7 +22,7 @@ $ gem install savon
 or add it to your Gemfile like this:
 
 ```
-gem 'savon', '~> 2.10.0'
+gem 'savon', '~> 2.11.1'
 ```
 
 ## Usage example

data/lib/savon/builder.rb

@@ -36,18 +36,18 @@ module Savon
     end
 
     def build_document
-      xml = tag(builder, :Envelope, namespaces_with_globals) do |xml|
+      xml_result = tag(builder, :Envelope, namespaces_with_globals) do |xml|
         tag(xml, :Header, header_attributes) { xml << header.to_s } unless header.empty?
         if @globals[:no_message_tag]
           tag(xml, :Body, body_attributes) { xml << message.to_s }
         else
-          tag(xml, :Body, body_attributes) { xml.tag!(*namespaced_message_tag) { xml << message.to_s } }
+          tag(xml, :Body, body_attributes) { xml.tag!(*namespaced_message_tag) { xml << body_message } }
         end
       end
 
       # if we have a signature sign the document
       if @signature
-        @signature.document = xml
+        @signature.document = xml_result
 
         2.times do
           @header = nil
@@ -61,10 +61,10 @@ module Savon
           end
         end
 
-        xml = @signature.document
+        xml_result = @signature.document
       end
 
-      xml
+      xml_result
     end
 
     def header_attributes
@@ -141,6 +141,7 @@ module Savon
 
     def namespaced_message_tag
       tag_name = message_tag
+      return [tag_name] if @wsdl.document? and @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
       if namespace_identifier == nil
         [tag_name, message_attributes]
       elsif @used_namespaces[[tag_name.to_s]]
@@ -150,8 +151,25 @@ module Savon
       end
     end
 
+    def serialized_message_tag
+      [:wsdl, @wsdl.soap_input(@operation_name.to_sym).keys.first, {}]
+    end
+
+    def serialized_messages
+      messages = ""
+      message_tag = serialized_message_tag[1]
+      @wsdl.soap_input(@operation_name.to_sym)[message_tag].each_pair do |message, type|
+        break if @locals[:message].nil?
+        message_locals = @locals[:message][message.snakecase.to_sym]
+        message_content = Message.new(message_tag, namespace_identifier, @types, @used_namespaces, message_locals, :unqualified, @globals[:convert_request_keys_to], @globals[:unwrap]).to_s
+        messages << "<#{message} xsi:type=\"#{type.join(':')}\">#{message_content}</#{message}>"
+      end
+      messages
+    end
+
     def message_tag
-      message_tag = @locals[:message_tag]
+      message_tag = @wsdl.soap_input(@operation_name.to_sym).keys.first if @wsdl.document? and @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
+      message_tag ||= @locals[:message_tag]
       message_tag ||= @wsdl.soap_input(@operation_name.to_sym) if @wsdl.document?
       message_tag ||= Gyoku.xml_tag(@operation_name, :key_converter => @globals[:convert_request_keys_to])
 
@@ -162,6 +180,14 @@ module Savon
       @locals[:attributes] || {}
     end
 
+    def body_message
+      if @wsdl.document? and @wsdl.soap_input(@operation_name.to_sym).is_a?(Hash)
+        serialized_messages
+      else
+        message.to_s
+      end
+    end
+
     def message
       element_form_default = @globals[:element_form_default] || @wsdl.element_form_default
       # TODO: clean this up! [dh, 2012-12-17]

data/lib/savon/client.rb

@@ -21,7 +21,7 @@ module Savon
       build_wsdl_document
     end
 
-    attr_reader :globals
+    attr_reader :globals, :wsdl
 
     def operations
       raise_missing_wsdl_error! unless @wsdl.document?
@@ -60,7 +60,6 @@ module Savon
       @wsdl.document    = @globals[:wsdl]        if @globals.include? :wsdl
       @wsdl.endpoint    = @globals[:endpoint]    if @globals.include? :endpoint
       @wsdl.namespace   = @globals[:namespace]   if @globals.include? :namespace
-      @wsdl.servicename = @globals[:servicename] if @globals.include? :servicename
       @wsdl.adapter     = @globals[:adapter]     if @globals.include? :adapter
 
       @wsdl.request = WSDLRequest.new(@globals).build

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/log_message.rb

@@ -45,7 +45,7 @@ module Savon
     end
 
     def nokogiri_options
-      @pretty_print ? { :indent => 2 } : {}
+      @pretty_print ? { :indent => 2 } : { :save_with => Nokogiri::XML::Node::SaveOptions::AS_XML }
     end
 
   end

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

@@ -100,7 +100,8 @@ module Savon
 
       request = SOAPRequest.new(@globals).build(
         :soap_action => soap_action,
-        :cookies     => @locals[:cookies]
+        :cookies     => @locals[:cookies],
+        :headers     => @locals[:headers]
       )
 
       request.url = endpoint
@@ -126,7 +127,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

@@ -73,23 +73,25 @@ module Savon
       @option_type = :global
 
       defaults = {
-        :encoding                  => "UTF-8",
-        :soap_version              => 1,
-        :namespaces                => {},
-        :logger                    => Logger.new($stdout),
-        :log                       => false,
-        :filters                   => [],
-        :pretty_print_xml          => false,
-        :raise_errors              => true,
-        :strip_namespaces          => true,
-        :convert_response_tags_to  => lambda { |tag| tag.snakecase.to_sym},
-        :convert_attributes_to     => lambda { |k,v| [k,v] },
-        :multipart                 => false,
-        :adapter                   => nil,
-        :use_wsa_headers           => false,
-        :no_message_tag            => false,
-        :follow_redirects          => false,
-        :unwrap                    => false
+        :encoding                    => "UTF-8",
+        :soap_version                => 1,
+        :namespaces                  => {},
+        :logger                      => Logger.new($stdout),
+        :log                         => false,
+        :filters                     => [],
+        :pretty_print_xml            => false,
+        :raise_errors                => true,
+        :strip_namespaces            => true,
+        :delete_namespace_attributes => false,
+        :convert_response_tags_to    => lambda { |tag| tag.snakecase.to_sym},
+        :convert_attributes_to       => lambda { |k,v| [k,v] },
+        :multipart                   => false,
+        :adapter                     => nil,
+        :use_wsa_headers             => false,
+        :no_message_tag              => false,
+        :follow_redirects            => false,
+        :unwrap                      => false,
+        :host                        => nil
       }
 
       options = defaults.merge(options)
@@ -108,6 +110,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
@@ -282,6 +289,11 @@ module Savon
       @options[:strip_namespaces] = strip_namespaces
     end
 
+    # Instruct Nori whether to delete namespace attributes from XML nodes.
+    def delete_namespace_attributes(delete_namespace_attributes)
+      @options[:delete_namespace_attributes] = delete_namespace_attributes
+    end
+
     # Tell Gyoku how to convert Hash key Symbols to XML tags.
     # Accepts one of :lower_camelcase, :camelcase, :upcase, or :none.
     def convert_request_keys_to(converter)
@@ -400,5 +412,9 @@ module Savon
     def multipart(multipart)
       @options[:multipart] = multipart
     end
+
+    def headers(headers)
+      @options[:headers] = headers
+    end
   end
 end

data/lib/savon/qualified_message.rb

@@ -2,49 +2,50 @@ require "gyoku"
 
 module Savon
   class QualifiedMessage
-
     def initialize(types, used_namespaces, key_converter)
-      @types = types
+      @types           = types
       @used_namespaces = used_namespaces
-      @key_converter = key_converter
+      @key_converter   = key_converter
     end
 
     def to_hash(hash, path)
-      return hash unless hash
-      return hash.map { |value| to_hash(value, path) } if hash.kind_of?(Array)
-      return hash.to_s unless hash.kind_of? Hash
-
-      hash.inject({}) do |newhash, (key, value)|
-        if key == :order!
-          add_namespaces_to_values(value, path)
-          newhash.merge(key => value)
+      return unless hash
+      return hash.map { |value| to_hash(value, path) } if hash.is_a?(Array)
+      return hash.to_s unless hash.is_a?(Hash)
+
+      hash.each_with_object({}) do |(key, value), newhash|
+        case key
+        when :order!
+          newhash[key] = add_namespaces_to_values(value, path)
+        when :attributes!, :content!
+          newhash[key] = to_hash(value, path)
         else
-          translated_key = Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
-          translated_key << "!" if key[-1] == "!"
-          newpath = path + [translated_key]
-
-          if @used_namespaces[newpath]
-            newhash.merge(
-              "#{@used_namespaces[newpath]}:#{translated_key}" =>
-                to_hash(value, @types[newpath] ? [@types[newpath]] : newpath)
-            )
+          if key.to_s =~ /!$/
+            newhash[key] = value
           else
-            newhash.merge(translated_key => value)
+            translated_key  = translate_tag(key)
+            newkey          = add_namespaces_to_values(key, path).first
+            newpath         = path + [translated_key]
+            newhash[newkey] = to_hash(value, newpath)
           end
         end
+        newhash
       end
     end
 
     private
 
-    def add_namespaces_to_values(values, path)
-      values.collect! { |value|
-        camelcased_value = Gyoku.xml_tag(value, :key_converter => @key_converter)
-        namespace_path = path + [camelcased_value.to_s]
-        namespace = @used_namespaces[namespace_path]
-        "#{namespace.blank? ? '' : namespace + ":"}#{camelcased_value}"
-      }
+    def translate_tag(key)
+      Gyoku.xml_tag(key, :key_converter => @key_converter).to_s
     end
 
+    def add_namespaces_to_values(values, path)
+      Array(values).collect do |value|
+        translated_value = translate_tag(value)
+        namespace_path   = path + [translated_value]
+        namespace        = @used_namespaces[namespace_path]
+        namespace.blank? ? value : "#{namespace}:#{translated_value}"
+      end
+    end
   end
 end

data/lib/savon/request.rb

@@ -72,9 +72,9 @@ module Savon
 
     def build(options = {})
       configure_proxy
-      configure_cookies options[:cookies]
       configure_timeouts
-      configure_headers options[:soap_action]
+      configure_headers options[:soap_action], options[:headers]
+      configure_cookies options[:cookies]
       configure_ssl
       configure_auth
       configure_redirect_handling
@@ -88,8 +88,9 @@ module Savon
       @http_request.set_cookies(cookies) if cookies
     end
 
-    def configure_headers(soap_action)
+    def configure_headers(soap_action, headers)
       @http_request.headers = @globals[:headers] if @globals.include? :headers
+      @http_request.headers.merge!(headers) if headers
       @http_request.headers["SOAPAction"]   ||= %{"#{soap_action}"} if soap_action
       @http_request.headers["Content-Type"] ||= CONTENT_TYPE[@globals[:soap_version]] % @globals[:encoding]
     end

data/lib/savon/response.rb

@@ -98,11 +98,12 @@ module Savon
       return @nori if @nori
 
       nori_options = {
-        :strip_namespaces      => @globals[:strip_namespaces],
-        :convert_tags_to       => @globals[:convert_response_tags_to],
-        :convert_attributes_to => @globals[:convert_attributes_to],
-        :advanced_typecasting  => @locals[:advanced_typecasting],
-        :parser                => @locals[:response_parser]
+        :delete_namespace_attributes => @globals[:delete_namespace_attributes],
+        :strip_namespaces            => @globals[:strip_namespaces],
+        :convert_tags_to             => @globals[:convert_response_tags_to],
+        :convert_attributes_to       => @globals[:convert_attributes_to],
+        :advanced_typecasting        => @locals[:advanced_typecasting],
+        :parser                      => @locals[:response_parser]
       }
 
       non_nil_nori_options = nori_options.reject { |_, value| value.nil? }

data/lib/savon/soap_fault.rb

@@ -27,7 +27,7 @@ module Savon
 
     def to_hash
       parsed = nori.parse(xml || http.body)
-      nori.find(parsed, 'Envelope', 'Body')
+      nori.find(parsed, 'Envelope', 'Body') || {}
     end
 
     private

data/lib/savon/version.rb

@@ -1,3 +1,3 @@
 module Savon
-  VERSION = '2.11.0'
+  VERSION = '2.11.2'
 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"