savon 0.8.0.beta.4 → 0.8.0

data/lib/savon/core_ext/object.rb

@@ -1,5 +1,3 @@
-require "savon/core_ext/datetime"
-
 module Savon
   module CoreExt
     module Object
@@ -9,14 +7,6 @@ module Savon
         respond_to?(:empty?) ? empty? : !self
       end unless defined? blank?
 
-      # Returns the Object as a SOAP request compliant value.
-      def to_soap_value
-        return to_s unless respond_to? :to_datetime
-        to_datetime.to_soap_value
-      end
-
-      alias_method :to_soap_value!, :to_soap_value
-
     end
   end
 end

data/lib/savon/core_ext/string.rb

@@ -1,5 +1,3 @@
-require "cgi"
-
 require "savon/soap"
 
 module Savon
@@ -52,21 +50,6 @@ module Savon
         self
       end
 
-      # Returns the Object as a SOAP request compliant key.
-      def to_soap_key
-        self[-1, 1] == "!" ? chop : self
-      end
-
-      # Returns the String as a SOAP value. Escapes special characters for XML.
-      def to_soap_value
-        CGI.escapeHTML self
-      end
-
-      # Convert the String into a SOAP value without escaping special characters.
-      def to_soap_value!
-        self
-      end
-
     end
   end
 end

data/lib/savon/soap/xml.rb

@@ -1,5 +1,7 @@
 require "builder"
 require "crack/xml"
+require "gyoku"
+
 require "savon/soap"
 require "savon/core_ext/hash"
 
@@ -54,12 +56,23 @@ module Savon
         @header ||= {}
       end
 
+      # Sets the SOAP envelope namespace.
+      attr_writer :env_namespace
+
+      # Returns the SOAP envelope namespace. Defaults to :env.
+      def env_namespace
+        @env_namespace ||= :env
+      end
+
       # Sets the +namespaces+ Hash.
       attr_writer :namespaces
 
-      # Returns the +namespaces+. Defaults to a Hash containing the <tt>xmlns:env</tt> namespace.
+      # Returns the +namespaces+. Defaults to a Hash containing the SOAP envelope namespace.
       def namespaces
-        @namespaces ||= { "xmlns:env" => SOAP::Namespace[version] }
+        @namespaces ||= begin
+          key = env_namespace.blank? ? "xmlns" : "xmlns:#{env_namespace}"
+          { key => SOAP::Namespace[version] }
+        end
       end
 
       # Sets the default namespace identifier.
@@ -76,7 +89,7 @@ module Savon
       # Accessor for the <tt>Savon::WSSE</tt> object.
       attr_accessor :wsse
 
-      # Accessor for the SOAP +body+. Expected to be a Hash that can be translated to XML via Hash.to_soap_xml
+      # Accessor for the SOAP +body+. Expected to be a Hash that can be translated to XML via Gyoku.xml
       # or any other Object responding to to_s.
       attr_accessor :body
 
@@ -90,9 +103,9 @@ module Savon
 
       # Returns the XML for a SOAP request.
       def to_xml
-        @xml ||= builder.env :Envelope, complete_namespaces do |xml|
-          xml.env(:Header) { xml << header_for_xml } unless header_for_xml.empty?
-          xml.env(:Body) { xml.tag!(*input) { xml << body_to_xml } }
+        @xml ||= tag(builder, :Envelope, complete_namespaces) do |xml|
+          tag(xml, :Header) { xml << header_for_xml } unless header_for_xml.empty?
+          tag(xml, :Body) { xml.tag!(*input) { xml << body_to_xml } }
         end
       end
 
@@ -105,6 +118,13 @@ module Savon
         builder
       end
 
+      # Expects a builder +xml+ instance, a tag +name+ and accepts optional +namespaces+
+      # and a block to create an XML tag.
+      def tag(xml, name, namespaces = {}, &block)
+        return xml.tag! name, namespaces, &block if env_namespace.blank?
+        xml.tag! env_namespace, name, namespaces, &block
+      end
+
       # Returns the complete Hash of namespaces.
       def complete_namespaces
         defaults = SchemaTypes.dup
@@ -114,7 +134,7 @@ module Savon
 
       # Returns the SOAP header as an XML String.
       def header_for_xml
-        @header_for_xml ||= header.to_soap_xml + wsse_header
+        @header_for_xml ||= Gyoku.xml(header) + wsse_header
       end
 
       # Returns the WSSE header or an empty String in case WSSE was not set.
@@ -124,7 +144,7 @@ module Savon
 
       # Returns the SOAP body as an XML String.
       def body_to_xml
-        body.respond_to?(:to_soap_xml) ? body.to_soap_xml : body.to_s
+        body.kind_of?(Hash) ? Gyoku.xml(body) : body.to_s
       end
 
     end

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.8.0.beta.4"
+  Version = "0.8.0"
 
 end

data/savon.gemspec

@@ -16,9 +16,11 @@ Gem::Specification.new do |s|
 
   s.add_dependency "builder", "~> 2.1.2"
   s.add_dependency "crack", "~> 0.1.8"
-  s.add_dependency "httpi", ">= 0.7.1"
+  s.add_dependency "httpi", ">= 0.7.4"
+  s.add_dependency "gyoku", ">= 0.1.0"
 
   s.add_development_dependency "rspec", "~> 2.0.0"
+  s.add_development_dependency "autotest"
   s.add_development_dependency "mocha", "~> 0.9.7"
 
   s.files = `git ls-files`.split("\n")

data/spec/savon/client_spec.rb

@@ -64,7 +64,7 @@ describe Savon::Client do
 
   describe "#request" do
     before do
-      HTTPI.stubs(:get).returns(new_response(:body => WSDLFixture.load))
+      HTTPI.stubs(:get).returns(new_response(:body => Fixture.wsdl(:authentication)))
       HTTPI.stubs(:post).returns(new_response)
     end
 
@@ -189,7 +189,7 @@ describe Savon::Client do
 
   context "with a remote WSDL document" do
     let(:client) { Savon::Client.new { wsdl.document = Endpoint.wsdl } }
-    before { HTTPI.expects(:get).returns(new_response(:body => WSDLFixture.load)) }
+    before { HTTPI.expects(:get).returns(new_response(:body => Fixture.wsdl(:authentication))) }
 
     it "should return a list of available SOAP actions" do
       client.wsdl.soap_actions.should == [:authenticate]
@@ -208,12 +208,12 @@ describe Savon::Client do
       response = client.request(:authenticate)
       
       response.should be_a(Savon::SOAP::Response)
-      response.to_xml.should == ResponseFixture.authentication
+      response.to_xml.should == Fixture.response(:authentication)
     end
   end
 
   context "with a local WSDL document" do
-    let(:client) { Savon::Client.new { wsdl.document = "spec/fixtures/wsdl/xml/authentication.xml" } } 
+    let(:client) { Savon::Client.new { wsdl.document = "spec/fixtures/wsdl/authentication.xml" } } 
 
     before { HTTPI.expects(:get).never }
 
@@ -234,7 +234,7 @@ describe Savon::Client do
       response = client.request(:authenticate)
       
       response.should be_a(Savon::SOAP::Response)
-      response.to_xml.should == ResponseFixture.authentication
+      response.to_xml.should == Fixture.response(:authentication)
     end
   end
 
@@ -265,7 +265,7 @@ describe Savon::Client do
       response = client.request(:authenticate)
       
       response.should be_a(Savon::SOAP::Response)
-      response.to_xml.should == ResponseFixture.authentication
+      response.to_xml.should == Fixture.response(:authentication)
     end
   end
 
@@ -277,7 +277,7 @@ describe Savon::Client do
       end
     end
 
-    before { HTTPI::expects(:post).returns(new_response(:code => 500, :body => ResponseFixture.soap_fault)) }
+    before { HTTPI::expects(:post).returns(new_response(:code => 500, :body => Fixture.response(:soap_fault))) }
 
     it "should raise a Savon::SOAP::Fault" do
       lambda { client.request :authenticate }.should raise_error(Savon::SOAP::Fault)
@@ -300,7 +300,7 @@ describe Savon::Client do
   end
 
   def new_response(options = {})
-    defaults = { :code => 200, :headers => {}, :body => ResponseFixture.authentication }
+    defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
     
     HTTPI::Response.new response[:code], response[:headers], response[:body]

data/spec/savon/core_ext/hash_spec.rb

@@ -14,132 +14,6 @@ describe Hash do
     end
   end
 
-  describe "to_soap_xml" do
-    describe "should return SOAP request compatible XML" do
-      it "for a simple Hash" do
-        hash, result = { :some => "user" }, "<some>user</some>"
-        hash.to_soap_xml.should == result
-      end
-
-      it "for a nested Hash" do
-        hash, result = { :some => { :new => "user" } }, "<some><new>user</new></some>"
-        hash.to_soap_xml.should == result
-      end
-
-      it "for a Hash with multiple keys" do
-        hash = { :all => "users", :before => "whatever" }
-        hash.to_soap_xml.should include("<all>users</all>", "<before>whatever</before>")
-      end
-
-      it "for a Hash containing an Array" do
-        hash, result = { :some => ["user", "gorilla"] }, "<some>user</some><some>gorilla</some>"
-        hash.to_soap_xml.should == result
-      end
-
-      it "for a Hash containing an Array of Hashes" do
-        hash = { :some => [{ :new => "user" }, { :old => "gorilla" }] }
-        result = "<some><new>user</new></some><some><old>gorilla</old></some>"
-
-        hash.to_soap_xml.should == result
-      end
-    end
-
-    it "should convert Hash key Symbols to lowerCamelCase" do
-      hash, result = { :find_or_create => "user" }, "<findOrCreate>user</findOrCreate>"
-      hash.to_soap_xml.should == result
-    end
-
-    it "should not convert Hash key Strings" do
-      hash, result = { "find_or_create" => "user" }, "<find_or_create>user</find_or_create>"
-      hash.to_soap_xml.should == result
-    end
-
-    it "should convert DateTime objects to xs:dateTime compliant Strings" do
-      hash = { :before => DateTime.new(2012, 03, 22, 16, 22, 33) }
-      result = "<before>2012-03-22T16:22:33+00:00</before>"
-
-      hash.to_soap_xml.should == result
-    end
-
-    it "should convert Objects responding to to_datetime to xs:dateTime compliant Strings" do
-      singleton = Object.new
-      def singleton.to_datetime
-        DateTime.new(2012, 03, 22, 16, 22, 33)
-      end
-
-      hash, result = { :before => singleton }, "<before>2012-03-22T16:22:33+00:00</before>"
-      hash.to_soap_xml.should == result
-    end
-
-    it "should call to_s on Strings even if they respond to to_datetime" do
-      object = "gorilla"
-      object.expects(:to_datetime).never
-
-      hash, result = { :name => object }, "<name>gorilla</name>"
-      hash.to_soap_xml.should == result
-    end
-
-    it "should properly serialize nil values" do
-      { :some => nil }.to_soap_xml.should == '<some xsi:nil="true"/>'
-    end
-
-    it "should call to_s on any other Object" do
-      [666, true, false].each do |object|
-        { :some => object }.to_soap_xml.should == "<some>#{object}</some>"
-      end
-    end
-
-    it "should default to escape special characters" do
-      result = { :some => { :nested => "<tag />" }, :tag => "<tag />" }.to_soap_xml
-      result.should include("<tag>&lt;tag /&gt;</tag>")
-      result.should include("<some><nested>&lt;tag /&gt;</nested></some>")
-    end
-
-    it "should not escape special characters for keys marked with an exclamation mark" do
-      result = { :some => { :nested! => "<tag />" }, :tag! => "<tag />" }.to_soap_xml
-      result.should include("<tag><tag /></tag>")
-      result.should include("<some><nested><tag /></nested></some>")
-    end
-
-    it "should preserve the order of Hash keys and values specified through :order!" do
-      hash = { :find_user => { :name => "Lucy", :id => 666, :order! => [:id, :name] } }
-      result = "<findUser><id>666</id><name>Lucy</name></findUser>"
-      hash.to_soap_xml.should == result
-
-      hash = { :find_user => { :mname => "in the", :lname => "Sky", :fname => "Lucy", :order! => [:fname, :mname, :lname] } }
-      result = "<findUser><fname>Lucy</fname><mname>in the</mname><lname>Sky</lname></findUser>"
-      hash.to_soap_xml.should == result
-    end
-
-    it "should raise an error if the :order! Array does not match the Hash keys" do
-      hash = { :name => "Lucy", :id => 666, :order! => [:name] }
-      lambda { hash.to_soap_xml }.should raise_error(ArgumentError)
-
-      hash = { :by_name => { :name => "Lucy", :lname => "Sky", :order! => [:mname, :name] } }
-      lambda { hash.to_soap_xml }.should raise_error(ArgumentError)
-    end
-
-    it "should add attributes to Hash keys specified through :attributes!" do
-      hash = { :find_user => { :person => "Lucy", :attributes! => { :person => { :id => 666 } } } }
-      result = '<findUser><person id="666">Lucy</person></findUser>'
-      hash.to_soap_xml.should == result
-
-      hash = { :find_user => { :person => "Lucy", :attributes! => { :person => { :id => 666, :city => "Hamburg" } } } }
-      soap_xml = hash.to_soap_xml
-      soap_xml.should include('id="666"', 'city="Hamburg"')
-    end
-
-    it "should add attributes to duplicate Hash keys specified through :attributes!" do
-      hash = { :find_user => { :person => ["Lucy", "Anna"], :attributes! => { :person => { :id => [1, 3] } } } }
-      result = '<findUser><person id="1">Lucy</person><person id="3">Anna</person></findUser>'
-      hash.to_soap_xml.should == result
-      
-      hash = { :find_user => { :person => ["Lucy", "Anna"], :attributes! => { :person => { :active => "true" } } } }
-      result = '<findUser><person active="true">Lucy</person><person active="true">Anna</person></findUser>'
-      hash.to_soap_xml.should == result
-    end
-  end
-
   describe "map_soap_response" do
     it "should convert Hash key Strings to snake_case Symbols" do
       soap_response = { "userResponse" => { "accountStatus" => "active" } }

data/spec/savon/core_ext/object_spec.rb

@@ -16,19 +16,4 @@ describe Object do
     end
   end
 
-  describe "to_soap_value" do
-    it "returns an xs:dateTime compliant String for Objects responding to to_datetime" do
-      singleton = Object.new
-      def singleton.to_datetime
-        DateTime.new(2012, 03, 22, 16, 22, 33)
-      end
-
-      singleton.to_soap_value.should == "2012-03-22T16:22:33+00:00"
-    end
-
-    it "calls to_s unless the Object responds to to_datetime" do
-      "value".to_soap_value.should == "value".to_s
-    end
-  end
-
 end

data/spec/savon/core_ext/string_spec.rb

@@ -62,26 +62,4 @@ describe String do
     end
   end
 
-  describe "to_soap_key" do
-    it "removes exclamation marks from the end of the String" do
-      "value".to_soap_key.should == "value"
-      "value!".to_soap_key.should == "value"
-    end
-  end
-
-  describe "to_soap_value" do
-    it "should return the String value and escape special characters" do
-      "string".to_soap_value.should == "string"
-      "<tag>".to_soap_value.should == "&lt;tag&gt;"
-      "at&t".to_soap_value.should == "at&amp;t"
-      '"quotes"'.to_soap_value.should == "&quot;quotes&quot;"
-    end
-  end
-
-  describe "to_soap_value!" do
-    it "should just return the String value without escaping special characters" do
-      "<tag>".to_soap_value!.should == "<tag>"
-    end
-  end
-
 end

data/spec/savon/http/error_spec.rb

@@ -43,7 +43,7 @@ describe Savon::HTTP::Error do
   end
 
   def new_response(options = {})
-    defaults = { :code => 200, :headers => {}, :body => ResponseFixture.authentication }
+    defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
     
     HTTPI::Response.new response[:code], response[:headers], response[:body]

data/spec/savon/soap/fault_spec.rb

@@ -1,9 +1,9 @@
 require "spec_helper"
 
 describe Savon::SOAP::Fault do
-  let(:soap_fault) { Savon::SOAP::Fault.new new_response(:body => ResponseFixture.soap_fault) }
-  let(:soap_fault2) { Savon::SOAP::Fault.new new_response(:body => ResponseFixture.soap_fault12) }
-  let(:another_soap_fault) { Savon::SOAP::Fault.new new_response(:body => ResponseFixture.another_soap_fault) }
+  let(:soap_fault) { Savon::SOAP::Fault.new new_response(:body => Fixture.response(:soap_fault)) }
+  let(:soap_fault2) { Savon::SOAP::Fault.new new_response(:body => Fixture.response(:soap_fault12)) }
+  let(:another_soap_fault) { Savon::SOAP::Fault.new new_response(:body => Fixture.response(:another_soap_fault)) }
   let(:no_fault) { Savon::SOAP::Fault.new new_response }
 
   it "should be a Savon::Error" do
@@ -80,7 +80,7 @@ describe Savon::SOAP::Fault do
   end
 
   def new_response(options = {})
-    defaults = { :code => 200, :headers => {}, :body => ResponseFixture.authentication }
+    defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
     
     HTTPI::Response.new response[:code], response[:headers], response[:body]