savon 2.11.2 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ee16983ffafe63866c9a55e2f87082982882442b
-  data.tar.gz: 031a0b620818fa9242fa6df79d716dc2d5fb0795
+  metadata.gz: 5f5d529eeeacffdb613697c1e822ae8f66f48405
+  data.tar.gz: 107dbcdf6bf87cffefafeb4216eee8e3b1a8c06f
 SHA512:
-  metadata.gz: 32d112e59f45ec6b6f1c65f54c33030c99ae2e2c931ce476d0c62cceb7715d62772164b0f7e182ab691a8b47d8cfeb7c83140986743f3e134e91040d099905a6
-  data.tar.gz: 0d73626cde6c3ccec91b090f0d30cb1f6031b5fdc88834e1874719f0e269ae62c5a4e9402e863a45e7fb64c176b58f6ff8bb5296a2e13d1ddd28bb1133c9af0d
+  metadata.gz: 49c798231744f066396510436f9eed0a272bb7f189c43395ae54a3bf3a09d012acdd3231fb03cb6d94703d83134fe50f53cfa731f62ec156f05edb2580c45988
+  data.tar.gz: 65dde0f62c985730aaf4d77c2414dccd04187979d3173c4419cbb6fd1c2feaa0cc79fac7a67b54b45ef66fa03e862f91b1204c76b3429d806c8ef1f06cd5ff10

data/.travis.yml

@@ -5,11 +5,10 @@ before_install:
   - gem install bundler
 script: "bundle exec rake --trace"
 rvm:
-  - 2.0.0
-  - 2.1.8
   - 2.2.4
   - 2.3.0
-  - jruby
+  - 2.4.1
+  - jruby-9.1.15.0
   - rbx-2
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 2.12.0 (2018-01-16)
+
+* Drop support for ruby 2.1 and below.
+* Fix: [#822](https://github.com/savonrb/savon/pull/822) Raise correct error when SOAP envelope only contains a string
+* Fix: [#833](https://github.com/savonrb/savon/pull/833) Fixes boolean handling regression introduced in 2.11.2
+* Feature: [#794](https://github.com/savonrb/savon/pull/794), add global option ssl_ciphers.
+* Feature: [#753](https://github.com/savonrb/savon/pull/753) Add headers configuration to WSDLRequest#build
+* Feature: [#812](https://github.com/savonrb/savon/pull/812) Allow `proxy` option to be `nil`.
+* Feature: [#838](https://github.com/savonrb/savon/pull/838) Added ssl_ca_path and ssl_cert_store to globals
+* Feature: [#794](https://github.com/savonrb/savon/pull/794) Add global option ssl_ciphers
+
+
 # 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

data/README.md

@@ -22,7 +22,7 @@ $ gem install savon
 or add it to your Gemfile like this:
 
 ```
-gem 'savon', '~> 2.11.1'
+gem 'savon', '~> 2.12.0'
 ```
 
 ## Usage example
@@ -46,6 +46,19 @@ response.body
 For more examples, you should check out the
 [integration tests](https://github.com/savonrb/savon/tree/version2/spec/integration).
 
+## Ruby version support
+* 2.12.x - MRI 2.2, 2.3, 2.4
+* 2.11.x - MRI 2.0, 2.1, 2.2, and 2.3
+
+If you are running MRI 1.8.7, try the 2.6.x branch.
+
+## Running tests
+
+```bash
+$ bundle install
+$ bundle exec rspec
+```
+
 ## FAQ
 
 * URI::InvalidURIError -- if you see this error, then it is likely that the http client you are using cannot parse the URI for your WSDL. Try `gem install httpclient` or add it to your `Gemfile`.

data/lib/savon/options.rb

@@ -137,7 +137,7 @@ module Savon
 
     # Proxy server to use for all requests.
     def proxy(proxy)
-      @options[:proxy] = proxy
+      @options[:proxy] = proxy unless proxy.nil?
     end
 
     # A Hash of HTTP headers.
@@ -268,6 +268,19 @@ module Savon
       @options[:ssl_ca_cert] = cert
     end
 
+    def ssl_ciphers(ciphers)
+      @options[:ssl_ciphers] = ciphers
+    end
+
+    # Sets the ca cert path.
+    def ssl_ca_cert_path(path)
+      @options[:ssl_ca_cert_path] = path
+    end
+
+    # Sets the ssl cert store.
+    def ssl_cert_store(store)
+      @options[:ssl_cert_store] = store
+    end
 
     # HTTP basic auth credentials.
     def basic_auth(*credentials)

data/lib/savon/qualified_message.rb

@@ -9,7 +9,7 @@ module Savon
     end
 
     def to_hash(hash, path)
-      return unless hash
+      return hash unless hash
       return hash.map { |value| to_hash(value, path) } if hash.is_a?(Array)
       return hash.to_s unless hash.is_a?(Hash)
 

data/lib/savon/request.rb

@@ -26,13 +26,16 @@ module Savon
     def configure_ssl
       @http_request.auth.ssl.ssl_version   = @globals[:ssl_version]       if @globals.include? :ssl_version
       @http_request.auth.ssl.verify_mode   = @globals[:ssl_verify_mode]   if @globals.include? :ssl_verify_mode
+      @http_request.auth.ssl.ciphers       = @globals[:ssl_ciphers]       if @globals.include? :ssl_ciphers
 
       @http_request.auth.ssl.cert_key_file = @globals[:ssl_cert_key_file] if @globals.include? :ssl_cert_key_file
-      @http_request.auth.ssl.cert_key      = @globals[:ssl_cert_key] if @globals.include? :ssl_cert_key
+      @http_request.auth.ssl.cert_key      = @globals[:ssl_cert_key]      if @globals.include? :ssl_cert_key
       @http_request.auth.ssl.cert_file     = @globals[:ssl_cert_file]     if @globals.include? :ssl_cert_file
-      @http_request.auth.ssl.cert          = @globals[:ssl_cert]     if @globals.include? :ssl_cert
+      @http_request.auth.ssl.cert          = @globals[:ssl_cert]          if @globals.include? :ssl_cert
       @http_request.auth.ssl.ca_cert_file  = @globals[:ssl_ca_cert_file]  if @globals.include? :ssl_ca_cert_file
-      @http_request.auth.ssl.ca_cert       = @globals[:ssl_ca_cert]  if @globals.include? :ssl_ca_cert
+      @http_request.auth.ssl.ca_cert_path  = @globals[:ssl_ca_cert_path]  if @globals.include? :ssl_ca_cert_path
+      @http_request.auth.ssl.ca_cert       = @globals[:ssl_ca_cert]       if @globals.include? :ssl_ca_cert
+      @http_request.auth.ssl.cert_store    = @globals[:ssl_cert_store]    if @globals.include? :ssl_cert_store
 
       @http_request.auth.ssl.cert_key_password = @globals[:ssl_cert_key_password] if @globals.include? :ssl_cert_key_password
     end
@@ -55,12 +58,19 @@ module Savon
     def build
       configure_proxy
       configure_timeouts
+      configure_headers
       configure_ssl
       configure_auth
       configure_redirect_handling
 
       @http_request
     end
+
+    private
+
+    def configure_headers
+      @http_request.headers = @globals[:headers] if @globals.include? :headers
+    end
   end
 
   class SOAPRequest < HTTPRequest

data/lib/savon/response.rb

@@ -69,7 +69,7 @@ module Savon
 
     def find(*path)
       envelope = nori.find(hash, 'Envelope')
-      raise_invalid_response_error! unless envelope
+      raise_invalid_response_error! unless envelope.is_a?(Hash)
 
       nori.find(envelope, *path)
     end

data/lib/savon/soap_fault.rb

@@ -1,5 +1,3 @@
-require "savon"
-
 module Savon
   class SOAPFault < Error
 

data/lib/savon/version.rb

@@ -1,3 +1,3 @@
 module Savon
-  VERSION = '2.11.2'
+  VERSION = '2.12.0'
 end

data/savon.gemspec

@@ -23,10 +23,10 @@ Gem::Specification.new do |s|
   s.add_dependency "akami",    "~> 1.2"
   s.add_dependency "gyoku",    "~> 1.2"
   s.add_dependency "builder",  ">= 2.1.2"
-  s.add_dependency "nokogiri", ">= 1.4.0"
+  s.add_dependency "nokogiri", ">= 1.8.1"
 
   s.add_development_dependency "rack"
-  s.add_development_dependency "puma",  "2.0.0.b4"
+  s.add_development_dependency "puma",  "~> 3.0"
 
   s.add_development_dependency "rake",  "~> 10.1"
   s.add_development_dependency "rspec", "~> 2.14"

data/spec/fixtures/response/no_body.xml

@@ -0,0 +1 @@
+<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/">Text</soap:Envelope>

data/spec/integration/centra_spec.rb

@@ -2,14 +2,16 @@ require 'spec_helper'
 
 module LogInterceptor
   @@intercepted_request = ""
-  def self.debug(message)
+  def self.debug(message = nil)
+    message ||= yield if block_given?
+
     # save only the first XMLly message
     if message.include? "xml version"
       @@intercepted_request = message if @@intercepted_request == ""
     end
   end
 
-  def self.info(message)
+  def self.info(message = nil)
   end
 
   def self.get_intercepted_request
@@ -27,6 +29,7 @@ describe 'Correct translation of attributes to XML' do
 
     client = Savon.client(
       :wsdl => "http://mt205.sabameeting.com/CWS/CWS.asmx?WSDL",
+      :log => true,
       :logger => LogInterceptor
     )
 
@@ -48,14 +51,12 @@ describe 'Correct translation of attributes to XML' do
 
     client = Savon.client(
       :wsdl => "http://mt205.sabameeting.com/CWS/CWS.asmx?WSDL",
+      :log => true,
       :logger => LogInterceptor
     )
 
     response = nil
-    begin
-      response = call_and_fail_gracefully(client, :add_new_user, :message => { :user => {}, :attributes! => { :user => { :userID => "test" } } })
-    rescue
-    end
+    response = call_and_fail_gracefully(client, :add_new_user, :message => { :user => {}, :attributes! => { :user => { :userID => "test" } } })
 
     xml_doc = Nokogiri::XML(LogInterceptor.get_intercepted_request)
     xml_doc.remove_namespaces!

data/spec/integration/support/application.rb

@@ -1,4 +1,4 @@
-require "rack/builder"
+require "rack"
 require "json"
 
 class IntegrationServer

data/spec/savon/options_spec.rb

@@ -389,18 +389,27 @@ describe "Options" do
 
   context "global :ssl_version" do
     it "sets the SSL version to use" do
-      HTTPI::Auth::SSL.any_instance.expects(:ssl_version=).with(:SSLv3).twice
+      HTTPI::Auth::SSL.any_instance.expects(:ssl_version=).with(:TLSv1).twice
 
-      client = new_client(:endpoint => @server.url, :ssl_version => :SSLv3)
+      client = new_client(:endpoint => @server.url, :ssl_version => :TLSv1)
       client.call(:authenticate)
     end
   end
 
   context "global :ssl_verify_mode" do
     it "sets the verify mode to use" do
-      HTTPI::Auth::SSL.any_instance.expects(:verify_mode=).with(:none).twice
+      HTTPI::Auth::SSL.any_instance.expects(:verify_mode=).with(:peer).twice
 
-      client = new_client(:endpoint => @server.url, :ssl_verify_mode => :none)
+      client = new_client(:endpoint => @server.url, :ssl_verify_mode => :peer)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_ciphers" do
+    it "sets the ciphers to use" do
+      HTTPI::Auth::SSL.any_instance.expects(:ciphers=).with(:none).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_ciphers => :none)
       client.call(:authenticate)
     end
   end
@@ -469,6 +478,26 @@ describe "Options" do
     end
   end
 
+  context "global :ssl_ca_cert_path" do
+    it "sets the ca cert path to use" do
+      ca_cert_path = "../../fixtures/ssl"
+      HTTPI::Auth::SSL.any_instance.expects(:ca_cert_path=).with(ca_cert_path).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_ca_cert_path => ca_cert_path)
+      client.call(:authenticate)
+    end
+  end
+
+  context "global :ssl_ca_cert_store" do
+    it "sets the cert store to use" do
+      cert_store = OpenSSL::X509::Store.new
+      HTTPI::Auth::SSL.any_instance.expects(:cert_store=).with(cert_store).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_cert_store => cert_store)
+      client.call(:authenticate)
+    end
+  end
+
   context "global :ssl_ca_cert" do
     it "sets the ca cert file to use" do
       ca_cert = File.open(File.expand_path("../../fixtures/ssl/client_cert.pem", __FILE__)).read

data/spec/savon/qualified_message_spec.rb

@@ -62,6 +62,39 @@ module Savon
         expect(resulting_hash).to eq good_result
         expect(xml).to eq good_xml
       end
+
+      it "properly handles boolean false" do
+        used_namespaces = {
+          %w(tns Foo) => 'ns'
+        }
+
+        hash = {
+          :foo => {
+            :falsey => {
+              :@attr1 => false,
+              :content! => false
+            }
+          }
+        }
+
+        good_result = {
+          "ns:Foo" => {
+            :falsey => {
+              :@attr1 => false,
+              :content! => false
+            }
+          }
+        }
+
+        good_xml = %(<ns:Foo><Falsey attr1="false">false</Falsey></ns:Foo>)
+
+        message = described_class.new(types, used_namespaces, key_converter)
+        resulting_hash = message.to_hash(hash, ['tns'])
+        xml = Gyoku.xml(resulting_hash, key_converter: key_converter)
+
+        expect(resulting_hash).to eq good_result
+        expect(xml).to eq good_xml
+      end
     end
 
   end

data/spec/savon/request_spec.rb

@@ -5,6 +5,7 @@ describe Savon::WSDLRequest do
 
   let(:globals)      { Savon::GlobalOptions.new }
   let(:http_request) { HTTPI::Request.new }
+  let(:ciphers)      { OpenSSL::Cipher.ciphers }
 
   def new_wsdl_request
     Savon::WSDLRequest.new(globals, http_request)
@@ -16,6 +17,20 @@ describe Savon::WSDLRequest do
       expect(wsdl_request.build).to be_an(HTTPI::Request)
     end
 
+    describe "headers" do
+      it "are set when specified" do
+        globals.headers("Proxy-Authorization" => "Basic auth")
+        configured_http_request = new_wsdl_request.build
+
+        expect(configured_http_request.headers["Proxy-Authorization"]).to eq("Basic auth")
+      end
+
+      it "are not set otherwise" do
+        configured_http_request = new_wsdl_request.build
+        expect(configured_http_request.headers).to_not include("Proxy-Authorization")
+      end
+    end
+
     describe "proxy" do
       it "is set when specified" do
         globals.proxy("http://proxy.example.com")
@@ -60,8 +75,8 @@ describe Savon::WSDLRequest do
 
     describe "ssl version" do
       it "is set when specified" do
-        globals.ssl_version(:SSLv3)
-        http_request.auth.ssl.expects(:ssl_version=).with(:SSLv3)
+        globals.ssl_version(:TLSv1)
+        http_request.auth.ssl.expects(:ssl_version=).with(:TLSv1)
 
         new_wsdl_request.build
       end
@@ -74,8 +89,8 @@ describe Savon::WSDLRequest do
 
     describe "ssl verify mode" do
       it "is set when specified" do
-        globals.ssl_verify_mode(:none)
-        http_request.auth.ssl.expects(:verify_mode=).with(:none)
+        globals.ssl_verify_mode(:peer)
+        http_request.auth.ssl.expects(:verify_mode=).with(:peer)
 
         new_wsdl_request.build
       end
@@ -86,6 +101,20 @@ describe Savon::WSDLRequest do
       end
     end
 
+    describe "ssl ciphers" do
+      it "is set when specified" do
+        globals.ssl_ciphers(ciphers)
+        http_request.auth.ssl.expects(:ciphers=).with(ciphers)
+
+        new_wsdl_request.build
+      end
+
+      it "is not set otherwise" do
+        http_request.auth.ssl.expects(:ciphers=).never
+        new_wsdl_request.build
+      end
+    end
+
     describe "ssl cert key file" do
       it "is set when specified" do
         cert_key = File.expand_path("../../fixtures/ssl/client_key.pem", __FILE__)
@@ -232,6 +261,7 @@ describe Savon::SOAPRequest do
 
   let(:globals)      { Savon::GlobalOptions.new }
   let(:http_request) { HTTPI::Request.new }
+  let(:ciphers)      { OpenSSL::Cipher.ciphers }
 
   def new_soap_request
     Savon::SOAPRequest.new(globals, http_request)
@@ -364,8 +394,8 @@ describe Savon::SOAPRequest do
 
     describe "ssl version" do
       it "is set when specified" do
-        globals.ssl_version(:SSLv3)
-        http_request.auth.ssl.expects(:ssl_version=).with(:SSLv3)
+        globals.ssl_version(:TLSv1)
+        http_request.auth.ssl.expects(:ssl_version=).with(:TLSv1)
 
         new_soap_request.build
       end
@@ -378,8 +408,8 @@ describe Savon::SOAPRequest do
 
     describe "ssl verify mode" do
       it "is set when specified" do
-        globals.ssl_verify_mode(:none)
-        http_request.auth.ssl.expects(:verify_mode=).with(:none)
+        globals.ssl_verify_mode(:peer)
+        http_request.auth.ssl.expects(:verify_mode=).with(:peer)
 
         new_soap_request.build
       end
@@ -390,6 +420,20 @@ describe Savon::SOAPRequest do
       end
     end
 
+    describe "ssl ciphers" do
+      it "is set when specified" do
+        globals.ssl_ciphers(ciphers)
+        http_request.auth.ssl.expects(:ciphers=).with(ciphers)
+
+        new_soap_request.build
+      end
+
+      it "is not set otherwise" do
+        http_request.auth.ssl.expects(:ciphers=).never
+        new_soap_request.build
+      end
+    end
+
     describe "ssl cert key file" do
       it "is set when specified" do
         cert_key = File.expand_path("../../fixtures/ssl/client_key.pem", __FILE__)

data/spec/savon/response_spec.rb

@@ -235,6 +235,11 @@ describe Savon::Response do
       expect(result).to be_a(Hash)
       expect(result.keys).to include(:authentication_value)
     end
+
+    it 'fails correctly when envelope contains only string' do
+      response = soap_response({ :body => Fixture.response(:no_body) })
+      expect { response.find('Body') }.to raise_error Savon::InvalidResponseError
+    end
   end
 
   describe "#http" do

data/spec/support/integration.rb

@@ -3,7 +3,7 @@ module SpecSupport
   def call_and_fail_gracefully(client, *args, &block)
     client.call(*args, &block)
   rescue Savon::SOAPFault => e
-    pending e.message
+    puts e.message
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.11.2
+  version: 2.12.0
 platform: ruby
 authors:
 - Daniel Harrington
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-03 00:00:00.000000000 Z
+date: 2018-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nori
@@ -100,14 +100,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.8.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.4.0
+        version: 1.8.1
 - !ruby/object:Gem::Dependency
   name: rack
   requirement: !ruby/object:Gem::Requirement
@@ -126,16 +126,16 @@ dependencies:
   name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.b4
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.0.b4
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -237,6 +237,7 @@ files:
 - spec/fixtures/response/header.xml
 - spec/fixtures/response/list.xml
 - spec/fixtures/response/multi_ref.xml
+- spec/fixtures/response/no_body.xml
 - spec/fixtures/response/soap_fault.xml
 - spec/fixtures/response/soap_fault12.xml
 - spec/fixtures/response/soap_fault_funky.xml
@@ -311,7 +312,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: savon
-rubygems_version: 2.6.12
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Heavy metal SOAP client