savon 0.9.2 → 0.9.3

data/savon.gemspec

@@ -10,20 +10,21 @@ Gem::Specification.new do |s|
   s.email       = "me@rubiii.com"
   s.homepage    = "http://savonrb.com"
   s.summary     = "Heavy metal Ruby SOAP client"
-  s.description = "Savon is the heavy metal Ruby SOAP client"
+  s.description = "Ruby's heavy metal SOAP client"
 
   s.rubyforge_project = s.name
 
   s.add_dependency "builder",  ">= 2.1.2"
-  s.add_dependency "nori",     ">= 0.2.0"
-  s.add_dependency "httpi",    ">= 0.7.8"
+  s.add_dependency "nori",     "~> 1.0"
+  s.add_dependency "httpi",    "~> 0.9"
   s.add_dependency "gyoku",    ">= 0.4.0"
   s.add_dependency "nokogiri", ">= 1.4.0"
 
-  s.add_development_dependency "rspec",   "~> 2.4.0"
-  s.add_development_dependency "autotest"
+  s.add_development_dependency "rake",    "~> 0.8.7"
+  s.add_development_dependency "rspec",   "~> 2.5.0"
   s.add_development_dependency "mocha",   "~> 0.9.8"
   s.add_development_dependency "timecop", "~> 0.3.5"
+  s.add_development_dependency "autotest"
 
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"

data/spec/savon/core_ext/string_spec.rb

@@ -3,8 +3,30 @@ require "spec_helper"
 describe String do
 
   describe "snakecase" do
-    it "converts a lowerCamelCase String to snakecase" do
-      "lowerCamelCase".snakecase.should == "lower_camel_case"
+    it "lowercases one word CamelCase" do
+      "Merb".snakecase.should == "merb"
+    end
+
+    it "makes one underscore snakecase two word CamelCase" do
+      "MerbCore".snakecase.should == "merb_core"
+    end
+
+    it "handles CamelCase with more than 2 words" do
+      "SoYouWantContributeToMerbCore".snakecase.should == "so_you_want_contribute_to_merb_core"
+    end
+
+    it "handles CamelCase with more than 2 capital letter in a row" do
+      "CNN".snakecase.should == "cnn"
+      "CNNNews".snakecase.should == "cnn_news"
+      "HeadlineCNNNews".snakecase.should == "headline_cnn_news"
+    end
+
+    it "does NOT change one word lowercase" do
+      "merb".snakecase.should == "merb"
+    end
+
+    it "leaves snake_case as is" do
+      "merb_core".snakecase.should == "merb_core"
     end
 
     it "converts period characters to underscores" do
@@ -25,33 +47,4 @@ describe String do
     end
   end
 
-  describe "strip_namespace" do
-    it "strips the namespace from a namespaced String" do
-      "ns:customer".strip_namespace.should == "customer"
-    end
-
-    it "returns the original String for a String without namespace" do
-      "customer".strip_namespace.should == "customer"
-    end
-  end
-
-  describe "map_soap_response" do
-    it "returns a DateTime Object for Strings matching the xs:dateTime format" do
-      "2012-03-22T16:22:33".map_soap_response.should ==
-        DateTime.new(2012, 03, 22, 16, 22, 33)
-    end
-
-    it "returns true for Strings matching 'true'" do
-      "true".map_soap_response.should be_true
-    end
-
-    it "returns false for Strings matching 'false'" do
-      "false".map_soap_response.should be_false
-    end
-
-    it "defaults to return the original value" do
-      "whatever".map_soap_response.should == "whatever"
-    end
-  end
-
 end

data/spec/savon/soap/request_spec.rb

@@ -10,25 +10,33 @@ describe Savon::SOAP::Request do
     content_type[2].should == "application/soap+xml;charset=UTF-8"
   end
 
+  describe ".execute" do
+    it "executes a SOAP request and returns the response" do
+      HTTPI.expects(:post).returns(HTTPI::Response.new 200, {}, Fixture.response(:authentication))
+      response = Savon::SOAP::Request.execute HTTPI::Request.new, soap
+      response.should be_a(Savon::SOAP::Response)
+    end
+  end
+
   describe ".new" do
-    it "should use the SOAP endpoint for the request" do
+    it "uses the SOAP endpoint for the request" do
       request.request.url.should == URI(soap.endpoint)
     end
 
-    it "should set the SOAP body for the request" do
+    it "sets the SOAP body for the request" do
       request.request.body.should == soap.to_xml
     end
 
-    it "should set the 'Content-Type' header for SOAP 1.1" do
+    it "sets the 'Content-Type' header for SOAP 1.1" do
       request.request.headers["Content-Type"].should == Savon::SOAP::Request::ContentType[1]
     end
 
-    it "should set the 'Content-Type' header for SOAP 1.2" do
+    it "sets the 'Content-Type' header for SOAP 1.2" do
       soap.version = 2
       request.request.headers["Content-Type"].should == Savon::SOAP::Request::ContentType[2]
     end
 
-    it "should not set the 'Content-Type' header if it's already specified" do
+    it "does not set the 'Content-Type' header if it's already specified" do
       headers = { "Content-Type" => "text/plain" }
       request = Savon::SOAP::Request.new HTTPI::Request.new(:headers => headers), soap
       request.request.headers["Content-Type"].should == headers["Content-Type"]
@@ -36,7 +44,7 @@ describe Savon::SOAP::Request do
   end
 
   describe "#response" do
-    it "should execute an HTTP POST request and return a Savon::SOAP::Response" do
+    it "executes an HTTP POST request and returns a Savon::SOAP::Response" do
       HTTPI.expects(:post).returns(HTTPI::Response.new 200, {}, Fixture.response(:authentication))
       request.response.should be_a(Savon::SOAP::Response)
     end

data/spec/savon/soap/response_spec.rb

@@ -116,6 +116,13 @@ describe Savon::SOAP::Response do
     end
   end
 
+  describe "#[]" do
+    it "should return the SOAP response body as a Hash" do
+      soap_response[:authenticate_response][:return].should ==
+        Fixture.response_hash(:authentication)[:authenticate_response][:return]
+    end
+  end
+
   describe "#header" do
     it "should return the SOAP response header as a Hash" do
       response = soap_response :body => Fixture.response(:header)
@@ -123,31 +130,54 @@ describe Savon::SOAP::Response do
     end
   end
 
-  describe "#[]" do
-    it "should return the SOAP response body as a Hash" do
-      soap_response[:authenticate_response][:return].should ==
-        Fixture.response_hash(:authentication)[:authenticate_response][:return]
-    end
-  end
+  %w(body to_hash).each do |method|
+    describe "##{method}" do
+      it "should return the SOAP response body as a Hash" do
+        soap_response.send(method)[:authenticate_response][:return].should ==
+          Fixture.response_hash(:authentication)[:authenticate_response][:return]
+      end
 
-  describe "#to_hash" do
-    it "should return the SOAP response body as a Hash" do
-      soap_response.to_hash[:authenticate_response][:return].should ==
-        Fixture.response_hash(:authentication)[:authenticate_response][:return]
+      it "should return a Hash for a SOAP multiRef response" do
+        hash = soap_response(:body => Fixture.response(:multi_ref)).send(method)
+
+        hash[:list_response].should be_a(Hash)
+        hash[:multi_ref].should be_an(Array)
+      end
+
+      it "should add existing namespaced elements as an array" do
+        hash = soap_response(:body => Fixture.response(:list)).send(method)
+
+        hash[:multi_namespaced_entry_response][:history].should be_a(Hash)
+        hash[:multi_namespaced_entry_response][:history][:case].should be_an(Array)
+      end
     end
   end
 
   describe "#to_array" do
-    it "should delegate to Savon::SOAP::XML.to_array" do
-      Savon::SOAP::XML.expects(:to_array).with(soap_response.to_hash, :authenticate_response, :return)
-      soap_response.to_array :authenticate_response, :return
+    context "when the given path exists" do
+      it "should return an Array containing the path value" do
+        soap_response.to_array(:authenticate_response, :return).should ==
+          [Fixture.response_hash(:authentication)[:authenticate_response][:return]]
+      end
+    end
+
+    context "when the given path returns nil" do
+      it "should return an empty Array" do
+        soap_response.to_array(:authenticate_response, :undefined).should == []
+      end
+    end
+
+    context "when the given path does not exist at all" do
+      it "should return an empty Array" do
+        soap_response.to_array(:authenticate_response, :some, :undefined, :path).should == []
+      end
     end
   end
 
-  describe "#basic_hash" do
+  describe "#hash" do
     it "should return the complete SOAP response XML as a Hash" do
       response = soap_response :body => Fixture.response(:header)
-      response.basic_hash["soap:Envelope"]["soap:Header"]["SessionNumber"].should == "ABCD1234"
+      response.hash[:envelope][:header][:session_number].should == "ABCD1234"
     end
   end
 

data/spec/savon/soap/xml_spec.rb

@@ -3,64 +3,6 @@ require "spec_helper"
 describe Savon::SOAP::XML do
   let(:xml) { Savon::SOAP::XML.new Endpoint.soap, :authenticate, :id => 1 }
 
-  describe ".to_hash" do
-    it "should return a given SOAP response body as a Hash" do
-      hash = Savon::SOAP::XML.to_hash Fixture.response(:authentication)
-      hash[:authenticate_response][:return].should == {
-        :success => true,
-        :authentication_value => {
-          :token_hash => "AAAJxA;cIedoT;mY10ExZwG6JuKgp2OYKxow==",
-          :token => "a68d1d6379b62ff339a0e0c69ed4d9cf",
-          :client => "radclient"
-        }
-      }
-    end
-
-    it "should return a Hash for a SOAP multiRef response" do
-      hash = Savon::SOAP::XML.to_hash Fixture.response(:multi_ref)
-
-      hash[:list_response].should be_a(Hash)
-      hash[:multi_ref].should be_an(Array)
-    end
-
-    it "should add existing namespaced elements as an array" do
-      hash = Savon::SOAP::XML.to_hash Fixture.response(:list)
-
-      hash[:multi_namespaced_entry_response][:history].should be_a(Hash)
-      hash[:multi_namespaced_entry_response][:history][:case].should be_an(Array)
-    end
-  end
-
-  describe ".parse" do
-    it "should convert the given XML into a Hash" do
-      hash = Savon::SOAP::XML.parse Fixture.response(:list)
-      hash["soapenv:Envelope"]["soapenv:Body"].should be_a(Hash)
-    end
-  end
-
-  describe ".to_array" do
-    let(:response_hash) { Fixture.response_hash :authentication }
-
-    context "when the given path exists" do
-      it "should return an Array containing the path value" do
-        Savon::SOAP::XML.to_array(response_hash, :authenticate_response, :return).should ==
-          [response_hash[:authenticate_response][:return]]
-      end
-    end
-
-    context "when the given path returns nil" do
-      it "should return an empty Array" do
-        Savon::SOAP::XML.to_array(response_hash, :authenticate_response, :undefined).should == []
-      end
-    end
-
-    context "when the given path does not exist at all" do
-      it "should return an empty Array" do
-        Savon::SOAP::XML.to_array(response_hash, :authenticate_response, :some, :wrong, :path).should == []
-      end
-    end
-  end
-
   describe ".new" do
     it "should accept an endpoint, an input tag and a SOAP body" do
       xml = Savon::SOAP::XML.new Endpoint.soap, :authentication, :id => 1
@@ -116,6 +58,11 @@ describe Savon::SOAP::XML do
       xml.header = { "MySecret" => "abc" }
       xml.header.should == { "MySecret" => "abc" }
     end
+
+    it "should use the global soap_header if set" do
+      Savon.stubs(:soap_header).returns({ "MySecret" => "abc" })
+      xml.header.should == { "MySecret" => "abc" }
+    end
   end
 
   describe "#env_namespace" do

data/spec/savon/soap_spec.rb

@@ -13,9 +13,4 @@ describe Savon::SOAP do
     Savon::SOAP::Versions.should == (1..2)
   end
 
-  it "should contain a Regexp matching the xs:dateTime format" do
-    Savon::SOAP::DateTimeRegexp.should be_a(Regexp)
-    (Savon::SOAP::DateTimeRegexp === "2012-03-22T16:22:33").should be_true
-  end
-
 end

data/spec/savon/wsdl/request_spec.rb

@@ -4,8 +4,16 @@ describe Savon::WSDL::Request do
   let(:http_request) { HTTPI::Request.new :url => Endpoint.wsdl }
   let(:request) { Savon::WSDL::Request.new http_request }
 
+  describe ".execute" do
+    it "executes a WSDL request and returns the response" do
+      response = HTTPI::Response.new 200, {}, Fixture.response(:authentication)
+      HTTPI.expects(:get).with(http_request).returns(response)
+      Savon::WSDL::Request.execute(http_request).should == response
+    end
+  end
+
   describe "#response" do
-    it "execute an HTTP GET request and return the HTTPI::Response" do
+    it "executes an HTTP GET request and returns the HTTPI::Response" do
       response = HTTPI::Response.new 200, {}, Fixture.response(:authentication)
       HTTPI.expects(:get).with(http_request).returns(response)
       request.response.should == response

data/spec/savon/wsse_spec.rb

@@ -151,7 +151,8 @@ describe Savon::WSSE do
       end
 
       it "should contain a wsu:Created tag" do
-        wsse.to_xml.should match(/<wsu:Created>#{Savon::SOAP::DateTimeRegexp}.+<\/wsu:Created>/)
+        datetime_regexp = /\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}/
+        wsse.to_xml.should match(/<wsu:Created>#{datetime_regexp}.+<\/wsu:Created>/)
       end
 
       it "should contain the PasswordDigest type attribute" do
@@ -163,7 +164,7 @@ describe Savon::WSSE do
       before { wsse.timestamp = true }
 
       it "should contain a wsse:Timestamp node" do
-        wsse.to_xml.should include('<wsse:Timestamp wsu:Id="Timestamp-1" ' +
+        wsse.to_xml.should include('<wsu:Timestamp wsu:Id="Timestamp-1" ' +
           'xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd">')
       end
 

data/spec/spec_helper.rb

@@ -5,10 +5,11 @@ RSpec.configure do |config|
   config.mock_with :mocha
 end
 
-require "savon"
-
-# Disable logging for specs.
-Savon.log = false
+# Disable logging and deprecations for specs.
+Savon.configure do |config|
+  config.log = false
+  config.deprecate = false
+end
 
 require "support/endpoint"
 require "support/fixture"

data/spec/support/fixture.rb

@@ -10,13 +10,11 @@ class Fixture
 
     def response_hash(fixture)
       @response_hash ||= {}
-      @response_hash[fixture] ||= Savon::SOAP::XML.to_hash response(fixture)
+      @response_hash[fixture] ||= Nori.parse(response(fixture))[:envelope][:body]
     end
 
     TYPES.each do |type, ext|
-      define_method type do |fixture|
-        self[type, fixture]
-      end
+      define_method(type) { |fixture| self[type, fixture] }
     end
 
   private
@@ -29,7 +27,7 @@ class Fixture
     def read_file(type, fixture)
       path = File.expand_path "../../fixtures/#{type}/#{fixture}.#{TYPES[type]}", __FILE__
       raise ArgumentError, "Unable to load: #{path}" unless File.exist? path
-      
+
       File.read path
     end
 

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 63
   prerelease: 
-  segments: 
-  - 0
-  - 9
-  - 2
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-30 00:00:00 +02:00
-default_executable: 
+date: 2011-06-29 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: builder
@@ -26,11 +20,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 1
-        - 2
         version: 2.1.2
   type: :runtime
   version_requirements: *id001
@@ -40,14 +29,9 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 0
-        - 2
-        - 0
-        version: 0.2.0
+        version: "1.0"
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -56,14 +40,9 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 0
-        - 7
-        - 8
-        version: 0.7.8
+        version: "0.9"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -74,11 +53,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 4
-        - 0
         version: 0.4.0
   type: :runtime
   version_requirements: *id004
@@ -90,42 +64,29 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 4
-        - 0
         version: 1.4.0
   type: :runtime
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 31
-        segments: 
-        - 2
-        - 4
-        - 0
-        version: 2.4.0
+        version: 0.8.7
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: autotest
+  name: rspec
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+        version: 2.5.0
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
@@ -136,11 +97,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 43
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :development
   version_requirements: *id008
@@ -152,15 +108,21 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
-        segments: 
-        - 0
-        - 3
-        - 5
         version: 0.3.5
   type: :development
   version_requirements: *id009
-description: Savon is the heavy metal Ruby SOAP client
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id010
+description: Ruby's heavy metal SOAP client
 email: me@rubiii.com
 executables: []
 
@@ -180,7 +142,6 @@ files:
 - Rakefile
 - lib/savon.rb
 - lib/savon/client.rb
-- lib/savon/core_ext/hash.rb
 - lib/savon/core_ext/object.rb
 - lib/savon/core_ext/string.rb
 - lib/savon/core_ext/time.rb
@@ -213,7 +174,6 @@ files:
 - spec/fixtures/wsdl/soap12.xml
 - spec/fixtures/wsdl/two_bindings.xml
 - spec/savon/client_spec.rb
-- spec/savon/core_ext/hash_spec.rb
 - spec/savon/core_ext/object_spec.rb
 - spec/savon/core_ext/string_spec.rb
 - spec/savon/core_ext/time_spec.rb
@@ -231,7 +191,6 @@ files:
 - spec/spec_helper.rb
 - spec/support/endpoint.rb
 - spec/support/fixture.rb
-has_rdoc: true
 homepage: http://savonrb.com
 licenses: []
 
@@ -245,23 +204,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: savon
-rubygems_version: 1.4.2
+rubygems_version: 1.8.4
 signing_key: 
 specification_version: 3
 summary: Heavy metal Ruby SOAP client