savon 2.7.0 → 2.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3c74bd36381fb8c14d72206e9465e7fa41f91dd8
-  data.tar.gz: 1941c3fbe15e58c3f8d4c9a92b057ded090d05e6
+  metadata.gz: 2fdfc453139cd68c26aec6d2852a4538f7ba123e
+  data.tar.gz: dccd7ad49f8d955189a17053b3f1f0157a774665
 SHA512:
-  metadata.gz: 0db7bf447424f25266cdb79a814e37f0a0260e79d92baaeff979d044df16f0f5c759457a0fdeec4cc16428f4527e596b579a2b1dccdf446fd01cde900d5003a1
-  data.tar.gz: 64421f06d8ae1482aa283b455b572ac40ca0e37e30a1da4bdd41efc146074af2c473e6538f5fbafbfecd525131fefe432fc2655733019de18af0fb02ac966b4e
+  metadata.gz: 62fbd1c16e3b5bfadd779836dd77c6ddae58c671409103991bf0bb81df2bfbdbda7ea99bc9a4600ca7d5907c9723fb99ac0413bba3e9ddd0c0500434e3b4103f
+  data.tar.gz: 86e1245e8b70b4b33bea5da46fa0df6dabdc5815ec27c499fa5e97bc5088c1f3915d44aac2db61f2e50482d8948f380634598bd7f1e038d173dc300b51be4206

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 2.7.1 (2014-09-23)
+
+* Fix : Fix a crash in builder when request headers do not contain WSA headers
+
 # 2.7.0 (2014-09-23)
 
 * Feature: Signing requests. Added wsse_signature.

data/lib/savon/builder.rb

@@ -68,7 +68,7 @@ module Savon
     end
 
     def header_attributes
-       { 'xmlns:wsa' => WSA_NAMESPACE } if @globals[:use_wsa_headers]
+      @globals[:use_wsa_headers] ? { 'xmlns:wsa' => WSA_NAMESPACE } : {}
     end
 
     def body_attributes

data/lib/savon/options.rb

@@ -157,7 +157,7 @@ module Savon
       @options[:soap_header] = header
     end
 
-    # Sets whether elements should be :qualified or unqualified.
+    # Sets whether elements should be :qualified or :unqualified.
     # If you need to use this option, please open an issue and make
     # sure to add your WSDL document for debugging.
     def element_form_default(element_form_default)
@@ -229,6 +229,11 @@ module Savon
       @options[:ssl_cert_key_file] = file
     end
 
+    # Sets the cert key to use.
+    def ssl_cert_key(key)
+      @options[:ssl_cert_key] = key
+    end
+
     # Sets the cert key password to use.
     def ssl_cert_key_password(password)
       @options[:ssl_cert_key_password] = password
@@ -239,11 +244,22 @@ module Savon
       @options[:ssl_cert_file] = file
     end
 
+    # Sets the cert to use.
+    def ssl_cert(cert)
+      @options[:ssl_cert] = cert
+    end
+
     # Sets the ca cert file to use.
     def ssl_ca_cert_file(file)
       @options[:ssl_ca_cert_file] = file
     end
 
+    # Sets the ca cert to use.
+    def ssl_ca_cert(cert)
+      @options[:ssl_ca_cert] = cert
+    end
+
+
     # HTTP basic auth credentials.
     def basic_auth(*credentials)
       @options[:basic_auth] = credentials.flatten

data/lib/savon/request.rb

@@ -28,8 +28,11 @@ module Savon
       @http_request.auth.ssl.verify_mode   = @globals[:ssl_verify_mode]   if @globals.include? :ssl_verify_mode
 
       @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_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.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.cert_key_password = @globals[:ssl_cert_key_password] if @globals.include? :ssl_cert_key_password
     end

data/lib/savon/version.rb

@@ -1,3 +1,3 @@
 module Savon
-  VERSION = '2.7.0'
+  VERSION = '2.7.1'
 end

data/spec/savon/options_spec.rb

@@ -397,6 +397,17 @@ describe "Options" do
     end
   end
 
+  context "global :ssl_cert_key" do
+    it "sets the cert key to use" do
+      cert_key = File.open(File.expand_path("../../fixtures/ssl/client_key.pem", __FILE__)).read
+      HTTPI::Auth::SSL.any_instance.expects(:cert_key=).with(cert_key).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_cert_key => cert_key)
+      client.call(:authenticate)
+    end
+  end
+
+
   context "global :ssl_cert_key_password" do
     it "sets the encrypted cert key file password to use" do
       cert_key = File.expand_path("../../fixtures/ssl/client_encrypted_key.pem", __FILE__)
@@ -420,6 +431,16 @@ describe "Options" do
     end
   end
 
+  context "global :ssl_cert" do
+    it "sets the cert to use" do
+      cert = File.open(File.expand_path("../../fixtures/ssl/client_cert.pem", __FILE__)).read
+      HTTPI::Auth::SSL.any_instance.expects(:cert=).with(cert).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_cert => cert)
+      client.call(:authenticate)
+    end
+  end
+
   context "global :ssl_ca_cert_file" do
     it "sets the ca cert file to use" do
       ca_cert = File.expand_path("../../fixtures/ssl/client_cert.pem", __FILE__)
@@ -430,6 +451,17 @@ describe "Options" do
     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
+      HTTPI::Auth::SSL.any_instance.expects(:ca_cert=).with(ca_cert).twice
+
+      client = new_client(:endpoint => @server.url, :ssl_ca_cert => ca_cert)
+      client.call(:authenticate)
+    end
+  end
+
+
   context "global :basic_auth" do
     it "sets the basic auth credentials" do
       client = new_client(:endpoint => @server.url(:basic_auth), :basic_auth => ["admin", "secret"])

data/spec/savon/request_spec.rb

@@ -135,6 +135,9 @@ describe Savon::WSDLRequest do
 
       describe "set with a valid decrypting password" do
         it "handles SSL private keys properly" do
+          if RUBY_ENGINE == 'jruby'
+            pending("find out why this fails with a null pointer exception on jruby")
+          end
           pass = "secure-password!42"
           key  = File.expand_path("../../fixtures/ssl/client_encrypted_key.pem", __FILE__)
           cert = File.expand_path("../../fixtures/ssl/client_encrypted_key_cert.pem", __FILE__)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: savon
 version: !ruby/object:Gem::Version
-  version: 2.7.0
+  version: 2.7.1
 platform: ruby
 authors:
 - Daniel Harrington