savon 0.9.9 → 0.9.10

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.9.9"
+  Version = "0.9.10"
 
 end

data/savon.gemspec

@@ -23,13 +23,10 @@ Gem::Specification.new do |s|
   s.add_dependency "gyoku",    ">= 0.4.0"
   s.add_dependency "nokogiri", ">= 1.4.0"
 
-  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.add_development_dependency "ZenTest", "= 4.5.0"
+  s.add_development_dependency "rake",    "~> 0.9"
+  s.add_development_dependency "rspec",   "~> 2.10"
+  s.add_development_dependency "mocha",   "~> 0.11"
+  s.add_development_dependency "timecop", "~> 0.3"
 
   s.files = `git ls-files`.split("\n")
   s.require_path = "lib"

data/spec/integration/stockquote_spec.rb

@@ -0,0 +1,14 @@
+require "spec_helper"
+
+describe "webservicex/stockquote" do
+
+  it "returns the result in a CDATA tag" do
+    client = Savon.client("http://www.webservicex.net/stockquote.asmx?WSDL")
+    response = client.request(:get_quote, :body => { :symbol => "AAPL" })
+
+    cdata = response[:get_quote_response][:get_quote_result]
+    result = Nori.parse(cdata)
+    result[:stock_quotes][:stock][:symbol].should == "AAPL"
+  end
+
+end

data/spec/savon/config_spec.rb

@@ -0,0 +1,20 @@
+require "spec_helper"
+
+describe Savon::Config do
+
+  describe "#clone" do
+    subject do
+      config = Savon::Config.new
+      config.logger = Savon::Logger.new
+      config
+    end
+
+    it "clones the logger" do
+      logger = subject.logger
+      clone = subject.clone
+
+      logger.should_not equal(clone.logger)
+    end
+  end
+
+end

data/spec/savon/logger_spec.rb

@@ -0,0 +1,51 @@
+require "spec_helper"
+
+describe Savon::Logger do
+
+  let(:logger)                  { subject }
+  let(:message)                 { "<?xml version='1.0'?><hello>world</hello>" }
+  let(:pretty_message)          { Nokogiri::XML(message) }
+  let(:filtered_message)        { Nokogiri::XML("<?xml version='1.0'?><hello>***FILTERED***</hello>") }
+
+  it "logs a given message" do
+    logger.subject.expects(logger.level).with(message)
+    logger.log(message)
+  end
+
+  it "logs a given message (pretty)" do
+    logger.subject.expects(logger.level).with(pretty_message.to_xml(:indent => 2))
+    logger.log(message, :pretty => true)
+  end
+
+  it "logs a given message (filtered)" do
+    logger.subject.expects(logger.level).with(filtered_message.to_s)
+    logger.filter << :hello
+    warn logger.log(message, :filter => true)
+  end
+
+  it "logs a given message (pretty and filtered)" do
+    logger.subject.expects(logger.level).with(filtered_message.to_xml(:indent => 2))
+    logger.filter << :hello
+    warn logger.log(message, :pretty => true, :filter => true)
+  end
+
+  it "defaults to wrap the standard Logger" do
+    logger.subject.should be_a(Logger)
+  end
+
+  it "can be configured to use a different Logger" do
+    MyLogger = Object.new
+    logger.subject = MyLogger
+    logger.subject.should == MyLogger
+  end
+
+  it "defaults to the :debug log level" do
+    logger.level.should == :debug
+  end
+
+  it "can be configured to use a different log level" do
+    logger.level = :info
+    logger.level.should == :info
+  end
+
+end

data/spec/savon/model_spec.rb

@@ -13,11 +13,11 @@ describe Savon::Model do
     end
 
     after do
-      Savon.hooks.reject! :test_hook
+      Savon.config.hooks.reject! :test_hook
     end
 
     it "can be used for pre-processing SOAP responses" do
-      Savon.hooks.define(:test_hook, :model_soap_response) do |response|
+      Savon.config.hooks.define(:test_hook, :model_soap_response) do |response|
         "hello #{response}"
       end
 
@@ -37,6 +37,15 @@ describe Savon::Model do
 
   end
 
+  describe ".config" do
+
+    it "memoizes a clone of the global config" do
+      model.config.should be_a(Savon::Config)
+      model.config.should_not equal(Savon.config)
+    end
+
+  end
+
   describe ".endpoint" do
 
     it "sets the SOAP endpoint" do

data/spec/savon/savon_spec.rb

@@ -2,105 +2,31 @@ require "spec_helper"
 
 describe Savon do
 
-  describe ".configure" do
-    around do |example|
-      Savon.reset_config!
-      example.run
-      Savon.reset_config!
-      Savon.log = false  # disable logging
-    end
-
-    describe "log" do
-      it "should default to true" do
-        Savon.log?.should be_true
-      end
-
-      it "should set whether to log HTTP requests" do
-        Savon.configure { |config| config.log = false }
-        Savon.log?.should be_false
-      end
-
-      context "when instructed to filter" do
-        before do
-          Savon.log = true
-        end
-
-        context "and no log filter set" do
-          it "should not filter the message" do
-            Savon.logger.expects(Savon.log_level).with(Fixture.response(:authentication))
-            Savon.log(Fixture.response(:authentication), :filter)
-          end
-        end
-
-        context "and multiple log filters" do
-          before do
-            Savon.configure { |config| config.log_filter = ["logType", "logTime"] }
-          end
-
-          it "should filter element values" do
-            filtered_values = /Notes Log|2010-09-21T18:22:01|2010-09-21T18:22:07/
-
-            Savon.logger.expects(Savon.log_level).with do |msg|
-              msg !~ filtered_values &&
-              msg.include?('<ns10:logTime>***FILTERED***</ns10:logTime>') &&
-              msg.include?('<ns10:logType>***FILTERED***</ns10:logType>') &&
-              msg.include?('<ns11:logTime>***FILTERED***</ns11:logTime>') &&
-              msg.include?('<ns11:logType>***FILTERED***</ns11:logType>')
-            end
-
-            Savon.log(Fixture.response(:list), :filter)
-          end
-        end
-      end
-    end
+  it "provides a shortcut for creating a new client" do
+    Savon.client("http://example.com").should be_a(Savon::Client)
+  end
 
-    describe "logger" do
-      it "should set the logger to use" do
-        MyLogger = Class.new
-        Savon.configure { |config| config.logger = MyLogger }
-        Savon.logger.should == MyLogger
-      end
+  it "memoizes the global config" do
+    Savon.config.should equal(Savon.config)
+  end
 
-      it "should default to Logger writing to STDOUT" do
-        Savon.logger.should be_a(Logger)
-      end
+  it "yields the global config to a block" do
+    Savon.configure do |config|
+      config.should equal(Savon.config)
     end
+  end
 
-    describe "log_level" do
-      it "should default to :debug" do
-        Savon.log_level.should == :debug
-      end
-
-      it "should set the log level to use" do
-        Savon.configure { |config| config.log_level = :info }
-        Savon.log_level.should == :info
-      end
+  describe ".config" do
+    it "defaults to a log facade" do
+      Savon.config.logger.should be_a(Savon::Logger)
     end
 
-    describe "raise_errors" do
-      it "should default to true" do
-        Savon.raise_errors?.should be_true
-      end
-
-      it "should not raise errors when disabled" do
-        Savon.raise_errors = false
-        Savon.raise_errors?.should be_false
-      end
+    it "defaults to raise errors" do
+      Savon.config.raise_errors.should be_true
     end
 
-    describe "soap_version" do
-      it "should default to SOAP 1.1" do
-        Savon.soap_version.should == 1
-      end
-
-      it "should return 2 if set to SOAP 1.2" do
-        Savon.soap_version = 2
-        Savon.soap_version.should == 2
-      end
-
-      it "should raise an ArgumentError in case of an invalid version" do
-        lambda { Savon.soap_version = 3 }.should raise_error(ArgumentError)
-      end
+    it "defaults to SOAP 1.1" do
+      Savon.config.soap_version.should == 1
     end
   end
 

data/spec/savon/soap/request_spec.rb

@@ -1,8 +1,10 @@
 require "spec_helper"
 
 describe Savon::SOAP::Request do
-  let(:soap_request) { Savon::SOAP::Request.new HTTPI::Request.new, soap }
-  let(:soap) { Savon::SOAP::XML.new Endpoint.soap, [nil, :get_user, {}], :id => 1 }
+  let(:soap_request) { Savon::SOAP::Request.new(config, http_request, soap) }
+  let(:http_request) { HTTPI::Request.new }
+  let(:soap)         { Savon::SOAP::XML.new config, Endpoint.soap, [nil, :get_user, {}], :id => 1 }
+  let(:config)       { Savon::Config.default }
 
   it "contains the content type for each supported SOAP version" do
     content_type = Savon::SOAP::Request::ContentType
@@ -13,7 +15,7 @@ describe Savon::SOAP::Request do
   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 = Savon::SOAP::Request.execute config, http_request, soap
       response.should be_a(Savon::SOAP::Response)
     end
   end
@@ -42,11 +44,11 @@ describe Savon::SOAP::Request do
 
     it "sets the Content-Length header for every request" do
       http = HTTPI::Request.new
-      soap_request = Savon::SOAP::Request.new(http, soap)
+      soap_request = Savon::SOAP::Request.new(config, http, soap)
       http.headers.should include("Content-Length" => "272")
 
-      soap = Savon::SOAP::XML.new Endpoint.soap, [nil, :create_user, {}], :id => 123
-      soap_request = Savon::SOAP::Request.new(http, soap)
+      soap = Savon::SOAP::XML.new config, Endpoint.soap, [nil, :create_user, {}], :id => 123
+      soap_request = Savon::SOAP::Request.new(config, http, soap)
       http.headers.should include("Content-Length" => "280")
     end
   end
@@ -56,16 +58,6 @@ describe Savon::SOAP::Request do
       HTTPI.expects(:post).returns(HTTPI::Response.new 200, {}, Fixture.response(:authentication))
       soap_request.response.should be_a(Savon::SOAP::Response)
     end
-
-    it "logs the filtered SOAP request body" do
-      HTTPI.stubs(:post).returns(HTTPI::Response.new 200, {}, "")
-
-      Savon.stubs(:log).times(2)
-      Savon.expects(:log).with(soap.to_xml, :filter)
-      Savon.stubs(:log).times(2)
-
-      soap_request.response
-    end
   end
 
 end

data/spec/savon/soap/response_spec.rb

@@ -2,15 +2,16 @@ require "spec_helper"
 
 describe Savon::SOAP::Response do
 
+  let(:config) { Savon::Config.default }
+
   describe ".new" do
     it "should raise a Savon::SOAP::Fault in case of a SOAP fault" do
       lambda { soap_fault_response }.should raise_error(Savon::SOAP::Fault)
     end
 
     it "should not raise a Savon::SOAP::Fault in case the default is turned off" do
-      Savon.raise_errors = false
+      config.raise_errors = false
       lambda { soap_fault_response }.should_not raise_error(Savon::SOAP::Fault)
-      Savon.raise_errors = true
     end
 
     it "should raise a Savon::HTTP::Error in case of an HTTP error" do
@@ -18,18 +19,13 @@ describe Savon::SOAP::Response do
     end
 
     it "should not raise a Savon::HTTP::Error in case the default is turned off" do
-      Savon.raise_errors = false
+      config.raise_errors = false
       soap_response :code => 500
-      Savon.raise_errors = true
     end
   end
 
   describe "#success?" do
-    around do |example|
-      Savon.raise_errors = false
-      example.run
-      Savon.raise_errors = true
-    end
+    before { config.raise_errors = false }
 
     it "should return true if the request was successful" do
       soap_response.should be_a_success
@@ -45,11 +41,7 @@ describe Savon::SOAP::Response do
   end
 
   describe "#soap_fault?" do
-    around do |example|
-      Savon.raise_errors = false
-      example.run
-      Savon.raise_errors = true
-    end
+    before { config.raise_errors = false }
 
     it "should not return true in case the response seems to be ok" do
       soap_response.soap_fault?.should be_false
@@ -61,11 +53,7 @@ describe Savon::SOAP::Response do
   end
 
   describe "#soap_fault" do
-    around do |example|
-      Savon.raise_errors = false
-      example.run
-      Savon.raise_errors = true
-    end
+    before { config.raise_errors = false }
 
     it "should return a Savon::SOAP::Fault" do
       soap_fault_response.soap_fault.should be_a(Savon::SOAP::Fault)
@@ -81,11 +69,7 @@ describe Savon::SOAP::Response do
   end
 
   describe "#http_error?" do
-    around do |example|
-      Savon.raise_errors = false
-      example.run
-      Savon.raise_errors = true
-    end
+    before { config.raise_errors = false }
 
     it "should not return true in case the response seems to be ok" do
       soap_response.http_error?.should_not be_true
@@ -97,11 +81,7 @@ describe Savon::SOAP::Response do
   end
 
   describe "#http_error" do
-    around do |example|
-      Savon.raise_errors = false
-      example.run
-      Savon.raise_errors = true
-    end
+    before { config.raise_errors = false }
 
     it "should return a Savon::HTTP::Error" do
       http_error_response.http_error.should be_a(Savon::HTTP::Error)
@@ -217,8 +197,9 @@ describe Savon::SOAP::Response do
   def soap_response(options = {})
     defaults = { :code => 200, :headers => {}, :body => Fixture.response(:authentication) }
     response = defaults.merge options
+    http_response = HTTPI::Response.new(response[:code], response[:headers], response[:body])
 
-    Savon::SOAP::Response.new HTTPI::Response.new(response[:code], response[:headers], response[:body])
+    Savon::SOAP::Response.new(config, http_response)
   end
 
   def soap_fault_response
@@ -230,10 +211,11 @@ describe Savon::SOAP::Response do
   end
 
   def invalid_soap_response(options={})
-    defaults = { :code => 200, :headers => {}, :body => "I'm not SOAP" } 
+    defaults = { :code => 200, :headers => {}, :body => "I'm not SOAP" }
     response = defaults.merge options
+    http_response = HTTPI::Response.new(response[:code], response[:headers], response[:body])
 
-    Savon::SOAP::Response.new HTTPI::Response.new(response[:code], response[:headers], response[:body])
+    Savon::SOAP::Response.new(config, http_response)
   end
 
 end

data/spec/savon/soap/xml_spec.rb

@@ -1,11 +1,12 @@
 require "spec_helper"
 
 describe Savon::SOAP::XML do
-  let(:xml) { Savon::SOAP::XML.new Endpoint.soap, [nil, :authenticate, {}], :id => 1 }
+  let(:xml) { Savon::SOAP::XML.new(config, Endpoint.soap, [nil, :authenticate, {}], :id => 1) }
+  let(:config) { Savon::Config.default }
 
   describe ".new" do
     it "should accept an endpoint, an input tag and a SOAP body" do
-      xml = Savon::SOAP::XML.new Endpoint.soap, [nil, :authentication, {}], :id => 1
+      xml = Savon::SOAP::XML.new(config, Endpoint.soap, [nil, :authentication, {}], :id => 1)
 
       xml.endpoint.should == Endpoint.soap
       xml.input.should == [nil, :authentication, {}]
@@ -33,10 +34,8 @@ describe Savon::SOAP::XML do
     end
 
     it "should default to the global default" do
-      Savon.soap_version = 2
+      config.soap_version = 2
       xml.version.should == 2
-
-      reset_soap_version
     end
 
     it "should set the SOAP version to use" do
@@ -60,7 +59,7 @@ describe Savon::SOAP::XML do
     end
 
     it "should use the global soap_header if set" do
-      Savon.stubs(:soap_header).returns({ "MySecret" => "abc" })
+      config.stubs(:soap_header).returns({ "MySecret" => "abc" })
       xml.header.should == { "MySecret" => "abc" }
     end
   end
@@ -76,7 +75,7 @@ describe Savon::SOAP::XML do
     end
 
     it "should use the global env_namespace if set as the SOAP envelope namespace" do
-      Savon.stubs(:env_namespace).returns(:soapenv)
+      config.stubs(:env_namespace).returns(:soapenv)
       xml.env_namespace.should == :soapenv
     end
   end
@@ -156,8 +155,6 @@ describe Savon::SOAP::XML do
   end
 
   describe "#to_xml" do
-    after { reset_soap_version }
-
     context "by default" do
       it "should start with an XML declaration" do
         xml.to_xml.should match(/^<\?xml version="1.0" encoding="UTF-8"\?>/)
@@ -208,34 +205,42 @@ describe Savon::SOAP::XML do
     end
 
     context "with a SOAP header" do
-      it "should contain the given header" do
-        xml.header = {
-          :token => "secret",
-          :attributes! => { :token => { :xmlns => "http://example.com" } }
-        }
+      context "as a Hash" do
+        it "should contain the given header" do
+          xml.header = {
+            :token => "secret",
+            :attributes! => { :token => { :xmlns => "http://example.com" } }
+          }
+
+          xml.to_xml.should include('<env:Header><token xmlns="http://example.com">secret</token></env:Header>')
+        end
+      end
 
-        xml.to_xml.should include('<env:Header><token xmlns="http://example.com">secret</token></env:Header>')
+      context "as a String" do
+        it "should contain the given header" do
+          xml.header = %{<token xmlns="http://example.com">secret</token>}
+
+          xml.to_xml.should include('<env:Header><token xmlns="http://example.com">secret</token></env:Header>')
+        end
       end
     end
 
     context "with the global SOAP version set to 1.2" do
       it "should contain the namespace for SOAP 1.2" do
-        Savon.soap_version = 2
+        config.soap_version = 2
 
         uri = "http://www.w3.org/2003/05/soap-envelope"
         xml.to_xml.should match(/<env:Envelope (.*)xmlns:env="#{uri}"(.*)>/)
-        reset_soap_version
       end
     end
 
     context "with a global and request SOAP version" do
       it "should contain the namespace for the request SOAP version" do
-        Savon.soap_version = 2
+        config.soap_version = 2
         xml.version = 1
 
         uri = "http://schemas.xmlsoap.org/soap/envelope/"
         xml.to_xml.should match(/<env:Envelope (.*)xmlns:env="#{uri}"(.*)>/)
-        reset_soap_version
       end
     end
 
@@ -256,7 +261,7 @@ describe Savon::SOAP::XML do
 
     context "with :element_form_default set to :qualified and a :namespace" do
       let :xml do
-        Savon::SOAP::XML.new Endpoint.soap, [nil, :authenticate, {}], :user => { :id => 1, ":noNamespace" => true }
+        Savon::SOAP::XML.new(config, Endpoint.soap, [nil, :authenticate, {}], :user => { :id => 1, ":noNamespace" => true })
       end
 
       it "should namespace the default elements" do
@@ -318,9 +323,5 @@ describe Savon::SOAP::XML do
     end
   end
 
-  def reset_soap_version
-    Savon.soap_version = Savon::SOAP::DefaultVersion
-  end
-
 end