rubiii-savon 0.2.3 → 0.2.4

data/Rakefile

@@ -23,9 +23,9 @@ begin
   Jeweler::Tasks.new do |spec|
     spec.name = "savon"
     spec.author = "Daniel Harrington"
-    spec.email = "me@d-harrington.com"
+    spec.email = "me@rubiii.com"
     spec.homepage = "http://github.com/rubiii/savon"
-    spec.summary = "SOAP client library to enjoy."
+    spec.summary = "SOAP client library to enjoy"
     spec.description = spec.summary
 
     spec.files = FileList["[A-Z]*", "{lib,spec}/**/*.{rb,xml}"]
@@ -38,7 +38,7 @@ begin
     ]
 
     spec.add_runtime_dependency("hpricot", "0.8.241")
-    spec.add_runtime_dependency("rubiii-apricoteatsgorilla", "0.5.5")
+    spec.add_runtime_dependency("rubiii-apricoteatsgorilla", "0.5.6")
 
     spec.add_development_dependency("rspec", ">= 1.2.8")
     spec.add_development_dependency("rr", ">= 0.10.0")

data/VERSION

@@ -1 +1 @@
-0.2.3
+0.2.4

data/lib/savon/service.rb

@@ -12,10 +12,18 @@ module Savon
   #   response = proxy.find_user_by_id(:id => 123)
   class Service
 
-    # Initializer expects an +endpoint+ URI.
-    def initialize(endpoint)
+    # Supported SOAP versions.
+    SOAPVersions = [1, 2]
+
+    # Content-Types by SOAP version.
+    ContentType = { 1 => "text/xml", 2 => "application/soap+xml" }
+
+    # Initializer expects an +endpoint+ URI and takes an optional SOAP +version+.
+    def initialize(endpoint, version = 1)
       raise ArgumentError, "Invalid endpoint: #{endpoint}" unless /^http.+/ === endpoint
+      raise ArgumentError, "Invalid version: #{version}" unless SOAPVersions.include? version
       @endpoint = URI(endpoint)
+      @version = version
     end
 
     # Returns an instance of Savon::WSDL.
@@ -50,8 +58,9 @@ module Savon
     # Expects the requested +soap_action+ and +soap_body+ and builds and
     # returns the request header and body to dispatch a SOAP request.
     def build_request_parameters(soap_action, soap_body)
-      headers = { "Content-Type" => "text/xml; charset=utf-8", "SOAPAction" => soap_action }
-      body = ApricotEatsGorilla.soap_envelope(:wsdl => wsdl.namespace_uri) do
+      headers = { "Content-Type" => ContentType[@version], "SOAPAction" => soap_action }
+      namespaces = { :wsdl => wsdl.namespace_uri }
+      body = ApricotEatsGorilla.soap_envelope(namespaces, @version) do
         ApricotEatsGorilla["wsdl:#{soap_action}" => soap_body]
       end
       [headers, body]
@@ -60,7 +69,13 @@ module Savon
     # Expects a Hash containing information about a SOAP fault and raises
     # a Savon::SOAPFault.
     def raise_soap_fault(soap_fault)
-      raise SOAPFault, "#{soap_fault[:faultcode]}: #{soap_fault[:faultstring]}"
+      message = case @version
+        when 1
+          "#{soap_fault[:faultcode]}: #{soap_fault[:faultstring]}"
+        else
+          "#{soap_fault[:code][:value]}: #{soap_fault[:reason][:text]}"
+      end
+      raise SOAPFault, message
     end
 
     # Expects a Net::HTTPResponse and raises a Savon::HTTPError.

data/spec/savon/service_spec.rb

@@ -6,8 +6,15 @@ describe Savon::Service do
   # initialize
   describe "initialize" do
     it "raises an ArgumentError when called with an invalid endpoint" do
-      ["", nil, "invalid", 123].each do |arg|
-        lambda { Savon::Service.new(arg) }.should raise_error(ArgumentError)
+      ["", nil, "invalid", 123].each do |argument|
+        lambda { Savon::Service.new(argument) }.should raise_error(ArgumentError)
+      end
+    end
+
+    it "raises an ArgumentError when called with an invalid version" do
+      ["", nil, "invalid", 123].each do |argument|
+        lambda { Savon::Service.new("http://example.com", argument) }.
+          should raise_error(ArgumentError)
       end
     end
   end
@@ -42,7 +49,7 @@ describe Savon::Service do
       @service.find_user(nil, "//email").should == "thedude@example.com"
     end
 
-    it "returns nil if a given XPath does not match anything in the SOAP response" do
+    it "returns nil if a given XPath does not match anything from the SOAP response" do
       @service.find_user(nil, "//doesNotMatchAnything").should be_nil
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rubiii-savon
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 0.5.5
+        version: 0.5.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -52,8 +52,8 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.10.0
     version: 
-description: SOAP client library to enjoy.
-email: me@d-harrington.com
+description: SOAP client library to enjoy
+email: me@rubiii.com
 executables: []
 
 extensions: []
@@ -73,7 +73,7 @@ files:
 - spec/savon/service_spec.rb
 - spec/savon/wsdl_spec.rb
 - spec/spec_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://github.com/rubiii/savon
 post_install_message: 
 rdoc_options: 
@@ -103,9 +103,9 @@ requirements: []
 rubyforge_project: 
 rubygems_version: 1.2.0
 signing_key: 
-specification_version: 3
-summary: SOAP client library to enjoy.
+specification_version: 2
+summary: SOAP client library to enjoy
 test_files: 
-- spec/spec_helper.rb
 - spec/savon/service_spec.rb
 - spec/savon/wsdl_spec.rb
+- spec/spec_helper.rb