savon 0.8.0.beta.4 → 0.8.0

data/spec/savon/soap/request_spec.rb

@@ -37,7 +37,7 @@ describe Savon::SOAP::Request do
 
   describe "#response" do
     it "should execute an HTTP POST request and return a Savon::SOAP::Response" do
-      HTTPI.expects(:post).returns(HTTPI::Response.new 200, {}, ResponseFixture.authentication)
+      HTTPI.expects(:post).returns(HTTPI::Response.new 200, {}, Fixture.response(:authentication))
       request.response.should be_a(Savon::SOAP::Response)
     end
   end

data/spec/savon/soap/response_spec.rb

@@ -119,7 +119,7 @@ describe Savon::SOAP::Response do
   describe "#to_hash" do
     it "should return the SOAP response body as a Hash" do
       soap_response.to_hash[:authenticate_response][:return].should ==
-        ResponseFixture.authentication(:to_hash)
+        Fixture.response_hash(:authentication)[:authenticate_response][:return]
     end
   end
 
@@ -128,7 +128,8 @@ describe Savon::SOAP::Response do
 
     context "when the given path exists" do
       it "should return an Array containing the path value" do
-        response.to_array(:authenticate_response, :return).should == [ResponseFixture.authentication(:to_hash)]
+        response.to_array(:authenticate_response, :return).should ==
+          [Fixture.response_hash(:authentication)[:authenticate_response][:return]]
       end
     end
 
@@ -147,7 +148,7 @@ describe Savon::SOAP::Response do
 
   describe "#to_xml" do
     it "should return the raw SOAP response body" do
-      soap_response.to_xml.should == ResponseFixture.authentication
+      soap_response.to_xml.should == Fixture.response(:authentication)
     end
   end
 
@@ -158,14 +159,14 @@ describe Savon::SOAP::Response do
   end
 
   def soap_response(options = {})
-    defaults = { :code => 200, :headers => {}, :body => ResponseFixture.authentication }
+    defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
     
     Savon::SOAP::Response.new HTTPI::Response.new(response[:code], response[:headers], response[:body])
   end
 
   def soap_fault_response
-    soap_response :body => ResponseFixture.soap_fault
+    soap_response :body => Fixture.response(:soap_fault)
   end
 
   def http_error_response

data/spec/savon/soap/xml_spec.rb

@@ -5,20 +5,26 @@ describe Savon::SOAP::XML do
 
   describe ".to_hash" do
     it "should return a given SOAP response body as a Hash" do
-      hash = Savon::SOAP::XML.to_hash ResponseFixture.authentication
-      hash[:authenticate_response][:return].should ==
-        ResponseFixture.authentication(:to_hash)
+      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 ResponseFixture.multi_ref
+      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 ResponseFixture.list
+      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)
@@ -82,6 +88,17 @@ describe Savon::SOAP::XML do
     end
   end
 
+  describe "#env_namespace" do
+    it "should default to :env" do
+      xml.env_namespace.should == :env
+    end
+
+    it "should set the SOAP envelope namespace" do
+      xml.env_namespace = :soapenv
+      xml.env_namespace.should == :soapenv
+    end
+  end
+
   describe "#namespaces" do
     it "should default to a Hash containing the namespace for SOAP 1.1" do
       xml.namespaces.should == { "xmlns:env" => "http://schemas.xmlsoap.org/soap/envelope/" }
@@ -137,6 +154,10 @@ describe Savon::SOAP::XML do
         xml.to_xml.should match(/^<\?xml version="1.0" encoding="UTF-8"\?>/)
       end
 
+      it "should use default SOAP envelope namespace" do
+        xml.to_xml.should include("<env:Envelope", "<env:Body")
+      end
+
       it "should add the xsd namespace" do
         uri = "http://www.w3.org/2001/XMLSchema"
         xml.to_xml.should match(/<env:Envelope (.*)xmlns:xsd="#{uri}"(.*)>/)
@@ -198,6 +219,13 @@ describe Savon::SOAP::XML do
       end
     end
 
+    context "with the SOAP envelope namespace set to an empty String" do
+      it "should not add a namespace to SOAP envelope tags" do
+        xml.env_namespace = ""
+        xml.to_xml.should include("<Envelope", "<Body")
+      end
+    end
+
     context "using the #namespace and #namespace_identifier" do
       it "should contain the specified namespace" do
         xml.namespace_identifier = :wsdl

data/spec/savon/wsdl/document_spec.rb

@@ -51,7 +51,7 @@ describe Savon::WSDL::Document do
 
     describe "#document" do
       it "should return the raw WSDL document" do
-        wsdl.document.should == WSDLFixture.load
+        wsdl.document.should == Fixture.wsdl(:authentication)
       end
 
       it "should be memoized" do
@@ -64,7 +64,7 @@ describe Savon::WSDL::Document do
     let(:wsdl) { Savon::WSDL::Document.new HTTPI::Request.new, Endpoint.wsdl }
 
     before do
-      response = HTTPI::Response.new(200, {}, WSDLFixture.load)
+      response = HTTPI::Response.new(200, {}, Fixture.wsdl(:authentication))
       HTTPI.stubs(:get).returns(response)
     end
 
@@ -73,7 +73,7 @@ describe Savon::WSDL::Document do
 
   context "with a local document" do
     let(:wsdl) do
-      wsdl = "spec/fixtures/wsdl/xml/authentication.xml"
+      wsdl = "spec/fixtures/wsdl/authentication.xml"
       Savon::WSDL::Document.new HTTPI::Request.new, wsdl
     end
 

data/spec/savon/wsdl/parser_spec.rb

@@ -71,7 +71,7 @@ describe Savon::WSDL::Parser do
 
   def new_parser(fixture)
     parser = Savon::WSDL::Parser.new
-    REXML::Document.parse_stream WSDLFixture.load(fixture), parser
+    REXML::Document.parse_stream Fixture[:wsdl, fixture], parser
     parser
   end
 

data/spec/savon/wsdl/request_spec.rb

@@ -6,7 +6,7 @@ describe Savon::WSDL::Request do
 
   describe "#response" do
     it "execute an HTTP GET request and return the HTTPI::Response" do
-      response = HTTPI::Response.new 200, {}, ResponseFixture.authentication
+      response = HTTPI::Response.new 200, {}, Fixture.response(:authentication)
       HTTPI.expects(:get).with(http_request).returns(response)
       request.response.should == response
     end

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
-require "rspec"
-require "mocha"
-
-spec = File.expand_path("..", __FILE__)
-$:.unshift spec unless $:.include? spec
+require "bundler"
+Bundler.require :default, :development
 
 RSpec.configure do |config|
   config.mock_with :mocha
@@ -13,8 +10,5 @@ require "savon"
 # Disable logging for specs.
 Savon.log = false
 
-# Requires fixtures.
-Dir[File.expand_path("../fixtures/**/*.rb", __FILE__)].each { |file| require file }
-
-# Requires supporting files.
 require "support/endpoint"
+require "support/fixture"

data/spec/support/fixture.rb

@@ -0,0 +1,37 @@
+class Fixture
+
+  TYPES = { :gzip => "gz", :response => "xml", :wsdl => "xml" }
+
+  class << self
+
+    def [](type, fixture)
+      fixtures(type)[fixture] ||= read_file type, fixture
+    end
+
+    def response_hash(fixture)
+      @response_hash ||= {}
+      @response_hash[fixture] ||= Savon::SOAP::XML.to_hash response(fixture)
+    end
+
+    TYPES.each do |type, ext|
+      define_method type do |fixture|
+        self[type, fixture]
+      end
+    end
+
+  private
+
+    def fixtures(type)
+      @fixtures ||= {}
+      @fixtures[type] ||= {}
+    end
+
+    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
+
+  end
+end

metadata

@@ -1,15 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 62196267
-  prerelease: true
+  hash: 63
+  prerelease: false
   segments: 
   - 0
   - 8
   - 0
-  - beta
-  - 4
-  version: 0.8.0.beta.4
+  version: 0.8.0
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -17,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-26 00:00:00 +01:00
+date: 2010-12-20 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -60,18 +58,34 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
+        hash: 11
         segments: 
         - 0
         - 7
-        - 1
-        version: 0.7.1
+        - 4
+        version: 0.7.4
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: gyoku
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 0
+        - 1
+        - 0
+        version: 0.1.0
+  type: :runtime
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -83,11 +97,25 @@ dependencies:
         - 0
         version: 2.0.0
   type: :development
-  version_requirements: *id004
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: autotest
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -99,7 +127,7 @@ dependencies:
         - 7
         version: 0.9.7
   type: :development
-  version_requirements: *id005
+  version_requirements: *id007
 description: Savon is the heavy metal Ruby SOAP client.
 email: me@rubiii.com
 executables: []
@@ -120,12 +148,9 @@ files:
 - autotest/discover.rb
 - lib/savon.rb
 - lib/savon/client.rb
-- lib/savon/core_ext/array.rb
-- lib/savon/core_ext/datetime.rb
 - lib/savon/core_ext/hash.rb
 - lib/savon/core_ext/object.rb
 - lib/savon/core_ext/string.rb
-- lib/savon/core_ext/symbol.rb
 - lib/savon/error.rb
 - lib/savon/global.rb
 - lib/savon/http/error.rb
@@ -140,28 +165,21 @@ files:
 - lib/savon/wsdl/request.rb
 - lib/savon/wsse.rb
 - savon.gemspec
-- spec/fixtures/gzip/gzip_response_fixture.rb
 - spec/fixtures/gzip/message.gz
-- spec/fixtures/response/response_fixture.rb
-- spec/fixtures/response/xml/another_soap_fault.xml
-- spec/fixtures/response/xml/authentication.xml
-- spec/fixtures/response/xml/list.xml
-- spec/fixtures/response/xml/multi_ref.xml
-- spec/fixtures/response/xml/soap_fault.xml
-- spec/fixtures/response/xml/soap_fault12.xml
-- spec/fixtures/wsdl/wsdl_fixture.rb
-- spec/fixtures/wsdl/wsdl_fixture.yml
-- spec/fixtures/wsdl/xml/authentication.xml
-- spec/fixtures/wsdl/xml/geotrust.xml
-- spec/fixtures/wsdl/xml/namespaced_actions.xml
-- spec/fixtures/wsdl/xml/no_namespace.xml
+- spec/fixtures/response/another_soap_fault.xml
+- spec/fixtures/response/authentication.xml
+- spec/fixtures/response/list.xml
+- spec/fixtures/response/multi_ref.xml
+- spec/fixtures/response/soap_fault.xml
+- spec/fixtures/response/soap_fault12.xml
+- spec/fixtures/wsdl/authentication.xml
+- spec/fixtures/wsdl/geotrust.xml
+- spec/fixtures/wsdl/namespaced_actions.xml
+- spec/fixtures/wsdl/no_namespace.xml
 - spec/savon/client_spec.rb
-- spec/savon/core_ext/array_spec.rb
-- spec/savon/core_ext/datetime_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/symbol_spec.rb
 - spec/savon/http/error_spec.rb
 - spec/savon/savon_spec.rb
 - spec/savon/soap/fault_spec.rb
@@ -175,6 +193,7 @@ files:
 - spec/savon/wsse_spec.rb
 - spec/spec_helper.rb
 - spec/support/endpoint.rb
+- spec/support/fixture.rb
 has_rdoc: true
 homepage: http://github.com/rubiii/savon
 licenses: []
@@ -196,14 +215,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version 
-      hash: 25
+      hash: 3
       segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+      - 0
+      version: "0"
 requirements: []
 
 rubyforge_project: savon

data/lib/savon/core_ext/array.rb

@@ -1,45 +0,0 @@
-require "builder"
-
-require "savon/core_ext/object"
-require "savon/core_ext/string"
-require "savon/core_ext/hash"
-require "savon/core_ext/datetime"
-
-module Savon
-  module CoreExt
-    module Array
-
-      # Translates the Array into SOAP compatible XML. See: Hash.to_soap_xml.
-      def to_soap_xml(key, escape_xml = true, attributes = {})
-        xml = Builder::XmlMarkup.new
-        
-        each_with_index do |item, index|
-          attrs = tag_attributes attributes, index
-          case item
-            when ::Hash   then xml.tag!(key, attrs) { xml << item.to_soap_xml }
-            when NilClass then xml.tag!(key, "xsi:nil" => "true")
-            else               xml.tag!(key, attrs) { xml << (escape_xml ? item.to_soap_value : item.to_soap_value!) }
-          end
-        end
-        
-        xml.target!
-      end
-
-    private
-
-      # Takes a Hash of +attributes+ and the +index+ for which to return attributes
-      # for duplicate tags.
-      def tag_attributes(attributes, index)
-        return {} if attributes.empty?
-        
-        attributes.inject({}) do |hash, (key, value)|
-          value = value[index] if value.kind_of? ::Array
-          hash.merge key => value
-        end
-      end
-
-    end
-  end
-end
-
-Array.send :include, Savon::CoreExt::Array