savon 0.6.2 → 0.6.3

data/CHANGELOG

@@ -1,33 +1,32 @@
+== 0.6.3 (2009-12-11)
+  * Removing 2 ruby deprecation warnings for parenthesized arguments. (Dave Woodward <dave@futuremint.com>)
+  * Much faster XPath expressions for parsing the WSDL document.
+  * Added global and per request options for disabling Savon::WSDL.
+
 == 0.6.2 (2009-12-06)
-* 1 minor improvement
   * Support for changing the name of the SOAP input node.
   * Added a CHANGELOG.
 
 == 0.6.1 (2009-12-06)
-* 1 minor patch
   * Fixed a problem with WSSE credentials, where every request contained a WSSE authentication header.
 
 == 0.6.0 (2009-12-06)
-* 3 major improvements
   * method_missing now yields the SOAP and WSSE objects to a given block.
   * The response_process (which previously was a block passed to method_missing) was replaced by the Savon::Response object.
   * Improved SOAP action handling (another problem that came up with Issue #1).
 
 == 0.5.3 (2009-11-30)
-* 1 minor patch
   * Fix for Issue #2 (NoMethodError: undefined method `invalid!' for Savon::WSDL)
 
 == 0.5.2 (2009-11-30)
-* 1 minor patch
   * Patch for Issue #1 (Calls fail if api methods have periods in them)
 
 == 0.5.1 (2009-11-29)
-* 3 improvements
   * Optimized default response process.
   * Added WSSE settings via defaults.
   * Added SOAP fault and HTTP error handling.
-  * Documentation
-  * Specs
+  * Improved documentation
+  * Added specs
 
 == 0.5.0 (2009-11-29)
-* Complete rewrite.
+  * Complete rewrite.

data/VERSION

@@ -1 +1 @@
-0.6.2
+0.6.3

data/lib/savon/client.rb

@@ -6,14 +6,27 @@ module Savon
   # with SOAP services and XML.
   class Client
 
+    # Defines whether to use Savon::WSDL.
+    @wsdl = true
+
+    class << self
+      # Accessor for whether to use Savon::WSDL.
+      attr_accessor :wsdl
+    end
+
     # Expects a SOAP +endpoint+ String.
     def initialize(endpoint)
       @request = Request.new endpoint
       @wsdl = WSDL.new @request
     end
 
-    # Returns the Savon::WSDL.
-    attr_reader :wsdl
+    # Accessor for Savon::WSDL.
+    attr_accessor :wsdl
+
+    # Returns whether to use Savon::WSDL.
+    def wsdl?
+      self.class.wsdl && @wsdl
+    end
 
     # Returns +true+ for available methods and SOAP actions.
     def respond_to?(method)
@@ -25,7 +38,7 @@ module Savon
 
     # Dispatches requests to SOAP actions matching a given +method+ name.
     def method_missing(method, *args, &block) #:doc:
-      super unless @wsdl.respond_to? method
+      super if wsdl? && !@wsdl.respond_to?(method)
 
       setup method, &block
       dispatch method
@@ -34,12 +47,12 @@ module Savon
     # Expects a SOAP action and sets up Savon::SOAP and Savon::WSSE.
     # Yields them to a given +block+ in case one was given.
     def setup(soap_action, &block)
-      @soap = SOAP.new @wsdl.soap_actions[soap_action]
+      @soap = SOAP.new(wsdl? ? @wsdl.soap_actions[soap_action] : nil)
       @wsse = WSSE.new
 
       yield_parameters &block if block
 
-      @soap.namespaces["xmlns:wsdl"] = @wsdl.namespace_uri
+      @soap.namespaces["xmlns:wsdl"] ||= @wsdl.namespace_uri if wsdl?
       @soap.wsse = @wsse
     end
 

data/lib/savon/core_ext/string.rb

@@ -33,7 +33,7 @@ class String
 
   # Translates SOAP response values to more convenient Ruby Objects.
   def map_soap_response
-    return DateTime.parse self if Savon::SOAPDateTimeRegexp === self
+    return DateTime.parse( self ) if Savon::SOAPDateTimeRegexp === self
     return true if self.strip.downcase == "true"
     return false if self.strip.downcase == "false"
     self

data/lib/savon/request.rb

@@ -67,7 +67,7 @@ module Savon
     # Logs the SOAP request.
     def log_request
       log "SOAP request: #{@endpoint}"
-      log http_header.map { |key, value| "#{key}: #{value}" }.join ", "
+      log http_header.map { |key, value| "#{key}: #{value}" }.join( ", " )
       log @soap.to_xml
     end
 

data/lib/savon/response.rb

@@ -100,7 +100,7 @@ module Savon
     def handle_http_error
       if @response.code.to_i >= 300
         @http_error = "#{@response.message} (#{@response.code})"
-        @http_error += ": #{@response.body}" unless @response.body.empty?
+        @http_error << ": #{@response.body}" unless @response.body.empty?
         raise Savon::HTTPError, http_error if self.class.raise_errors?
       end
     end

data/lib/savon/soap.rb

@@ -29,10 +29,10 @@ module Savon
 
     end
 
-    # Expects an +action_map+ containing the name of the SOAP action and input.
-    def initialize(action_map)
-      @action = action_map[:name]
-      @input = action_map[:input]
+    # Expects a Hash containing the name of the SOAP action and input.
+    def initialize(action = nil)
+      @action = action.kind_of?(Hash) ? action[:name] : ""
+      @input = action.kind_of?(Hash) ? action[:input] : ""
     end
 
     # Sets the WSSE options.
@@ -87,7 +87,7 @@ module Savon
             xml << (header.to_soap_xml rescue header.to_s) + wsse_header
           end
           xml.env(:Body) do
-            xml.wsdl(@input.to_sym) do
+            xml.tag!(:wsdl, *input_array) do
               xml << (@body.to_soap_xml rescue @body.to_s)
             end
           end
@@ -98,6 +98,15 @@ module Savon
 
   private
 
+    # Returns an Array of SOAP input names to append to the :wsdl namespace.
+    # Defaults to use the name of the SOAP action and may be an empty Array
+    # in case the specified SOAP input seems invalid.
+    def input_array
+      return [@input.to_sym] if @input && !@input.empty?
+      return [@action.to_sym] if @action && !@action.empty?
+      []
+    end
+
     # Returns the WSSE header or an empty String in case WSSE was not set.
     def wsse_header
       return "" unless @wsse.respond_to? :header

data/lib/savon/wsdl.rb

@@ -12,7 +12,7 @@ module Savon
 
     # Returns the namespace URI from the WSDL.
     def namespace_uri
-      @namespace_uri ||= parse_namespace_uri
+      @namespace_uri ||= document.root.attributes["targetNamespace"] || ""
     end
 
     # Returns a Hash of available SOAP actions mapped to snake_case (keys)
@@ -51,19 +51,13 @@ module Savon
       @document ||= REXML::Document.new wsdl_response.body
     end
 
-    # Parses the WSDL for the namespace URI.
-    def parse_namespace_uri
-      definitions = document.elements["//wsdl:definitions"]
-      definitions.attributes["targetNamespace"] if definitions
-    end
-
     # Parses the WSDL for available SOAP actions and inputs. Returns a Hash
     # containing the SOAP action inputs and corresponding SOAP actions.
     def parse_soap_operations
-      wsdl_binding = document.elements["//wsdl:binding"]
+      wsdl_binding = document.elements["wsdl:definitions/wsdl:binding"]
       return {} unless wsdl_binding
 
-      wsdl_binding.elements.inject("//wsdl:operation", {}) do |hash, operation|
+      wsdl_binding.elements.inject("wsdl:operation", {}) do |hash, operation|
         action = operation.elements["*:operation"].attributes["soapAction"] || ""
         action = operation.attributes["name"] if action.empty?
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: savon
 version: !ruby/object:Gem::Version 
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-06 00:00:00 +01:00
+date: 2009-12-11 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -143,20 +143,20 @@ signing_key:
 specification_version: 3
 summary: Heavy metal Ruby SOAP client library
 test_files: 
-- spec/fixtures/user_fixture.rb
-- spec/http_stubs.rb
+- spec/spec_helper.rb
+- spec/savon/response_spec.rb
+- spec/savon/savon_spec.rb
+- spec/savon/wsdl_spec.rb
+- spec/savon/request_spec.rb
 - spec/savon/client_spec.rb
-- spec/savon/core_ext/datetime_spec.rb
+- spec/savon/soap_spec.rb
+- spec/savon/core_ext/symbol_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/core_ext/datetime_spec.rb
+- spec/savon/core_ext/object_spec.rb
 - spec/savon/core_ext/uri_spec.rb
-- spec/savon/request_spec.rb
-- spec/savon/response_spec.rb
-- spec/savon/savon_spec.rb
-- spec/savon/soap_spec.rb
-- spec/savon/wsdl_spec.rb
 - spec/savon/wsse_spec.rb
-- spec/spec_helper.rb
 - spec/spec_helper_methods.rb
+- spec/http_stubs.rb
+- spec/fixtures/user_fixture.rb