savon 0.9.11 → 0.9.14

data/CHANGELOG.md

@@ -1,3 +1,24 @@
+## 0.9.14 (2012-06-07)
+
+* Fix: [#292](https://github.com/rubiii/savon/issues/292) again
+
+## 0.9.13 (2012-06-07)
+
+* Fix: [#292](https://github.com/rubiii/savon/issues/292)
+
+## 0.9.12 (2012-06-07)
+
+* Re-added the log method setters to the new config object for backwards compatibility.
+  You should be able to configure the logger as you used to do.
+
+    ``` ruby
+    Savon.configure do |config|
+      config.log = false            # disable logging
+      config.log_level = :info      # changing the log level
+      config.logger = Rails.logger  # using the Rails logger
+    end
+    ```
+
 ## 0.9.11 (2012-06-06)
 
 * Feature: [#264](https://github.com/rubiii/savon/pull/264) - Thanks to @hoverlover, Savon and Akami now support

data/lib/savon/client.rb

@@ -91,7 +91,7 @@ module Savon
       response
     end
 
-  private
+    private
 
     # Writer for the <tt>Savon::SOAP::XML</tt> object.
     attr_writer :soap

data/lib/savon/config.rb

@@ -1,25 +1,44 @@
 require "savon/logger"
+require "savon/null_logger"
 require "savon/hooks/group"
 require "savon/soap"
 
 module Savon
-  Config = Struct.new(:logger, :pretty_print_xml, :raise_errors, :soap_version, :env_namespace, :soap_header) do
+  Config = Struct.new(:_logger, :pretty_print_xml, :raise_errors, :soap_version, :env_namespace, :soap_header) do
 
     def self.default
       config = new
-      config.logger = Logger.new
+      config._logger = Logger.new
       config.raise_errors = true
-      config.soap_version = SOAP::DefaultVersion
+      config.soap_version = SOAP::DEFAULT_VERSION
       config
     end
 
+    alias_method :logger, :_logger
+
+    def logger=(logger)
+      _logger.subject = logger
+    end
+
+    def log_level=(level)
+      _logger.level = level
+    end
+
+    def log=(log)
+      if log == true
+        self._logger = Logger.new
+      else
+        self._logger = NullLogger.new
+      end
+    end
+
     def hooks
       @hooks ||= Hooks::Group.new
     end
 
     def clone
       config = super
-      config.logger = config.logger.clone
+      config._logger = config._logger.clone
       config
     end
 

data/lib/savon/logger.rb

@@ -15,10 +15,6 @@ module Savon
       log_raw LogMessage.new(message, filter, options).to_s
     end
 
-    def log_raw(message)
-      subject.send(level, message)
-    end
-
     attr_writer :subject, :level, :filter
 
     def subject
@@ -33,5 +29,11 @@ module Savon
       @filter ||= []
     end
 
+    private
+
+    def log_raw(message)
+      subject.send(level, message)
+    end
+
   end
 end

data/lib/savon/model.rb

@@ -24,7 +24,7 @@ module Savon
       end
     end
 
-  private
+    private
 
     # Defines a class-level SOAP action method.
     def define_class_action(action)

data/lib/savon/null_logger.rb

@@ -0,0 +1,10 @@
+require "savon/logger"
+
+module Savon
+  class NullLogger < Logger
+
+    def log(*)
+    end
+
+  end
+end

data/lib/savon/soap.rb

@@ -6,13 +6,13 @@ module Savon
   module SOAP
 
     # Default SOAP version.
-    DefaultVersion = 1
+    DEFAULT_VERSION = 1
 
     # Supported SOAP versions.
-    Versions = 1..2
+    VERSIONS = 1..2
 
     # SOAP namespaces by SOAP version.
-    Namespace = {
+    NAMESPACE = {
       1 => "http://schemas.xmlsoap.org/soap/envelope/",
       2 => "http://www.w3.org/2003/05/soap-envelope"
     }

data/lib/savon/soap/fault.rb

@@ -33,7 +33,7 @@ module Savon
         @hash ||= Nori.parse(http.body)[:envelope][:body]
       end
 
-    private
+      private
 
       # Returns whether the response contains a SOAP 1.1 fault.
       def soap1_fault?

data/lib/savon/soap/invalid_response_error.rb

@@ -2,10 +2,12 @@ require "savon/error"
 
 module Savon
   module SOAP
+
     # = Savon::SOAP::InvalidResponseError
     #
     # Represents an error when the response was not a valid SOAP envelope.
     class InvalidResponseError < Error
     end
+
   end
 end

data/lib/savon/soap/request.rb

@@ -10,7 +10,7 @@ module Savon
     class Request
 
       # Content-Types by SOAP version.
-      ContentType = { 1 => "text/xml;charset=UTF-8", 2 => "application/soap+xml;charset=UTF-8" }
+      CONTENT_TYPE = { 1 => "text/xml;charset=UTF-8", 2 => "application/soap+xml;charset=UTF-8" }
 
       # Expects an <tt>HTTPI::Request</tt> and a <tt>Savon::SOAP::XML</tt> object
       # to execute a SOAP request and returns the response.
@@ -36,7 +36,7 @@ module Savon
         end
       end
 
-    private
+      private
 
       # Configures a given +http+ from the +soap+ object.
       def configure(http)
@@ -55,7 +55,7 @@ module Savon
           http.body = soap.to_xml
         end
 
-        http.headers["Content-Type"] = ContentType[soap.version]
+        http.headers["Content-Type"] = CONTENT_TYPE[soap.version]
         http.headers["Content-Length"] = soap.to_xml.bytesize.to_s
         http
       end

data/lib/savon/soap/response.rb

@@ -101,7 +101,7 @@ module Savon
         doc.xpath(path, namespaces || xml_namespaces)
       end
 
-    private
+      private
 
       def raise_errors
         raise soap_fault if soap_fault?

data/lib/savon/soap/xml.rb

@@ -20,7 +20,7 @@ module Savon
     class XML
 
       # XML Schema Type namespaces.
-      SchemaTypes = {
+      SCHEMA_TYPES = {
         "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema",
         "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance"
       }
@@ -40,7 +40,7 @@ module Savon
 
       # Sets the SOAP +version+.
       def version=(version)
-        raise ArgumentError, "Invalid SOAP version: #{version}" unless SOAP::Versions.include? version
+        raise ArgumentError, "Invalid SOAP version: #{version}" unless SOAP::VERSIONS.include? version
         @version = version
       end
 
@@ -73,7 +73,7 @@ module Savon
         @namespaces ||= begin
           key = ["xmlns"]
           key << env_namespace if env_namespace && env_namespace != ""
-          { key.join(":") => SOAP::Namespace[version] }
+          { key.join(":") => SOAP::NAMESPACE[version] }
         end
       end
 
@@ -175,7 +175,7 @@ module Savon
         end
       end
 
-    private
+      private
 
       # Returns a new <tt>Builder::XmlMarkup</tt> object.
       def builder(directive_tag = :xml, attrs = { :encoding => encoding })
@@ -196,7 +196,7 @@ module Savon
 
       # Returns the complete Hash of namespaces.
       def complete_namespaces
-        defaults = SchemaTypes.dup
+        defaults = SCHEMA_TYPES.dup
         defaults["xmlns:#{namespace_identifier}"] = namespace if namespace
         defaults.merge namespaces
       end

data/lib/savon/version.rb

@@ -1,5 +1,5 @@
 module Savon
 
-  Version = "0.9.11"
+  VERSION = "0.9.14"
 
 end

data/lib/savon/wasabi/document.rb

@@ -18,7 +18,7 @@ module Savon
       # Sets the <tt>HTTPI::Request</tt> for remote WSDL documents.
       attr_writer :request
 
-    private
+      private
 
       # Sets up and returns the <tt>HTTPI::Request</tt>.
       def request
@@ -30,7 +30,7 @@ module Savon
       # Resolves and returns the raw WSDL document.
       def resolve_document
         case document
-          when /^http[s]?:/ then 
+          when /^http[s]?:/ then
             response = HTTPI.get(request)
             if response.error?
               raise Savon::HTTP::Error.new(response)

data/savon.gemspec

@@ -6,7 +6,7 @@ require "savon/version"
 
 Gem::Specification.new do |s|
   s.name        = "savon"
-  s.version     = Savon::Version
+  s.version     = Savon::VERSION
   s.authors     = "Daniel Harrington"
   s.email       = "me@rubiii.com"
   s.homepage    = "http://savonrb.com"
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
 
   s.add_dependency "builder",  ">= 2.1.2"
   s.add_dependency "nori",     "~> 1.1"
-  s.add_dependency "httpi",    "~> 0.9"
+  s.add_dependency "httpi",    "~> 1.0"
   s.add_dependency "wasabi",   "~> 2.2"
   s.add_dependency "akami",    "~> 1.1"
   s.add_dependency "gyoku",    ">= 0.4.0"

data/spec/integration/request_spec.rb

@@ -0,0 +1,22 @@
+require "spec_helper"
+
+describe "Integration" 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
+
+  it "passes Strings as they are" do
+    client = Savon.client("http://ws.cdyne.com/emailverify/Emailvernotestemail.asmx?wsdl")
+    response = client.request(:verify_email, :body => { :email => "soap@example.com", "LicenseKey" => "?" })
+
+    response_text = response[:verify_email_response][:verify_email_result][:response_text]
+    response_text.should == "Email Domain Not Found"
+  end
+
+end

data/spec/savon/client_spec.rb

@@ -246,7 +246,7 @@ describe Savon::Client do
       HTTPI.stubs(:post).returns(new_response(:headers => { "Set-Cookie" => "second-cookie=oatmeal; Path=/; HttpOnly" }))
       client.request :nibble
 
-      client.http.headers["Cookie"].should == "some-cookie=choc-chip;second-cookie=oatmeal"
+      client.http.headers["Cookie"].split(";").should include("some-cookie=choc-chip", "second-cookie=oatmeal")
     end
 
   end

data/spec/savon/config_spec.rb

@@ -2,19 +2,37 @@ require "spec_helper"
 
 describe Savon::Config do
 
-  describe "#clone" do
-    subject do
-      config = Savon::Config.new
-      config.logger = Savon::Logger.new
-      config
-    end
+  let(:config) {
+    config = Savon::Config.new
+    config._logger = Savon::Logger.new
+    config
+  }
 
+  describe "#clone" do
     it "clones the logger" do
-      logger = subject.logger
-      clone = subject.clone
+      logger = config.logger
+      clone = config.clone
 
       logger.should_not equal(clone.logger)
     end
   end
 
+  it "allows to change the logger" do
+    logger = Logger.new("/dev/null")
+    config.logger = logger
+    config._logger.subject.should equal(logger)
+  end
+
+  it "allows to change the log level" do
+    config.log_level = :info
+    config._logger.level.should == :info
+  end
+
+  it "allows to enable/disable logging" do
+    config.log = false
+    config._logger.should be_a(Savon::NullLogger)
+    config.log = true
+    config._logger.should be_a(Savon::Logger)
+  end
+
 end

data/spec/savon/model_spec.rb

@@ -7,7 +7,6 @@ describe Savon::Model do
   end
 
   describe ":model_soap_response hook" do
-
     before(:all) do
       model.actions :get_user, "GetAllUsers"
     end
@@ -24,75 +23,57 @@ describe Savon::Model do
       model.client.stubs(:request).returns("world")  #
       model.get_user.should == "hello world"
     end
-
   end
 
   describe ".client" do
-
-    it "passes a given block to a new Savon::Client"
-
     it "memoizes the Savon::Client" do
       model.client.should equal(model.client)
     end
-
   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
       model.endpoint "http://example.com"
       model.client.wsdl.endpoint.should == "http://example.com"
     end
-
   end
 
   describe ".namespace" do
-
     it "sets the target namespace" do
       model.namespace "http://v1.example.com"
       model.client.wsdl.namespace.should == "http://v1.example.com"
     end
-
   end
 
   describe ".document" do
-
     it "sets the WSDL document" do
       model.document "http://example.com/?wsdl"
       model.client.wsdl.document.should == "http://example.com/?wsdl"
     end
-
   end
 
   describe ".headers" do
-
     it "sets the HTTP headers" do
       model.headers("Accept-Charset" => "utf-8")
       model.client.http.headers.should == { "Accept-Charset" => "utf-8" }
     end
-
   end
 
   describe ".basic_auth" do
-
     it "sets HTTP Basic auth credentials" do
       model.basic_auth "login", "password"
       model.client.http.auth.basic.should == ["login", "password"]
     end
-
   end
 
   describe ".wsse_auth" do
-
     it "sets WSSE auth credentials" do
       model.wsse_auth "login", "password", :digest
 
@@ -100,11 +81,9 @@ describe Savon::Model do
       model.client.wsse.password.should == "password"
       model.client.wsse.should be_digest
     end
-
   end
 
   describe ".actions" do
-
     before(:all) do
       model.actions :get_user, "GetAllUsers"
     end
@@ -118,7 +97,6 @@ describe Savon::Model do
     end
 
     context "(class-level)" do
-
       it "executes SOAP requests with a given body" do
         model.client.expects(:request).with(:wsdl, :get_user, :body => { :id => 1 })
         model.get_user :id => 1
@@ -131,28 +109,21 @@ describe Savon::Model do
     end
 
     context "(instance-level)" do
-
       it "delegates to the corresponding class method" do
         model.expects(:get_all_users).with(:active => true)
         model.new.get_all_users :active => true
       end
-
     end
-
   end
 
   describe "#client" do
-
     it "returns the class-level Savon::Client" do
       model.new.client.should == model.client
     end
-
   end
 
   describe "overwriting action methods" do
-
     context "(class-level)" do
-
       let(:supermodel) do
         supermodel = model.dup
         supermodel.actions :get_user
@@ -171,11 +142,9 @@ describe Savon::Model do
 
         supermodel.get_user :id => 1
       end
-
     end
 
     context "(instance-level)" do
-
       let(:supermodel) do
         supermodel = model.dup
         supermodel.actions :get_user
@@ -195,9 +164,7 @@ describe Savon::Model do
 
         supermodel.get_user :id => 1
       end
-
     end
-
   end
 
 end

data/spec/savon/soap/request_spec.rb

@@ -19,7 +19,7 @@ describe Savon::SOAP::Request do
   end
 
   it "contains the content type for each supported SOAP version" do
-    content_type = Savon::SOAP::Request::ContentType
+    content_type = Savon::SOAP::Request::CONTENT_TYPE
     content_type[1].should == "text/xml;charset=UTF-8"
     content_type[2].should == "application/soap+xml;charset=UTF-8"
   end
@@ -42,12 +42,12 @@ describe Savon::SOAP::Request do
     end
 
     it "sets the Content-Type header for SOAP 1.1" do
-      soap_request.http.headers["Content-Type"].should == Savon::SOAP::Request::ContentType[1]
+      soap_request.http.headers["Content-Type"].should == Savon::SOAP::Request::CONTENT_TYPE[1]
     end
 
     it "sets the Content-Type header for SOAP 1.2" do
       soap_xml.version = 2
-      soap_request.http.headers["Content-Type"].should == Savon::SOAP::Request::ContentType[2]
+      soap_request.http.headers["Content-Type"].should == Savon::SOAP::Request::CONTENT_TYPE[2]
     end
 
     it "sets the Content-Length header" do

data/spec/savon/soap_spec.rb

@@ -3,14 +3,14 @@ require "spec_helper"
 describe Savon::SOAP do
 
   it "should contain the SOAP namespace for each supported SOAP version" do
-    Savon::SOAP::Versions.each do |soap_version|
-      Savon::SOAP::Namespace[soap_version].should be_a(String)
-      Savon::SOAP::Namespace[soap_version].should_not be_empty
+    Savon::SOAP::VERSIONS.each do |soap_version|
+      Savon::SOAP::NAMESPACE[soap_version].should be_a(String)
+      Savon::SOAP::NAMESPACE[soap_version].should_not be_empty
     end
   end
 
   it "should contain a Rage of supported SOAP versions" do
-    Savon::SOAP::Versions.should == (1..2)
+    Savon::SOAP::VERSIONS.should == (1..2)
   end
 
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 39
   prerelease: 
   segments: 
   - 0
   - 9
-  - 11
-  version: 0.9.11
+  - 14
+  version: 0.9.14
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-06 00:00:00 Z
+date: 2012-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   version_requirements: &id001 !ruby/object:Gem::Requirement 
@@ -54,11 +54,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 25
+        hash: 15
         segments: 
+        - 1
         - 0
-        - 9
-        version: "0.9"
+        version: "1.0"
   name: httpi
   type: :runtime
   prerelease: false
@@ -214,6 +214,7 @@ files:
 - lib/savon/log_message.rb
 - lib/savon/logger.rb
 - lib/savon/model.rb
+- lib/savon/null_logger.rb
 - lib/savon/soap.rb
 - lib/savon/soap/fault.rb
 - lib/savon/soap/invalid_response_error.rb
@@ -237,7 +238,7 @@ files:
 - spec/fixtures/wsdl/multiple_namespaces.xml
 - spec/fixtures/wsdl/multiple_types.xml
 - spec/fixtures/wsdl/taxcloud.xml
-- spec/integration/stockquote_spec.rb
+- spec/integration/request_spec.rb
 - spec/savon/client_spec.rb
 - spec/savon/config_spec.rb
 - spec/savon/core_ext/string_spec.rb

data/spec/integration/stockquote_spec.rb

@@ -1,14 +0,0 @@
-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