smacks-savon 0.0.8 → 0.0.75

data/README.rdoc

@@ -9,7 +9,7 @@ service method to receive.
 
 == Install
 
-  $ gem install smacks-savon -s http://gems.github.com
+  $ gem install smacks-savon --s http://gems.github.com
 
 == Dependencies
 

data/lib/savon/service.rb

@@ -40,9 +40,6 @@ module Savon
   #   response.to_mash("//user/email")
   class Service
 
-    # The logger to use.
-    @@logger = nil
-
     # The Net::HTTP connection instance to use.
     attr_writer :http
 
@@ -61,35 +58,15 @@ module Savon
       @wsdl
     end
 
-    # Sets the logger to use.
-    def self.logger=(logger)
-      @@logger = logger
-    end
-
   private
 
     # Prepares and processes the SOAP request. Returns a Savon::Response object.
     def call_service
       headers = { "Content-Type" => "text/xml; charset=utf-8", "SOAPAction" => @action }
-
-      ApricotEatsGorilla.setup do |s|
-        s.nodes_to_namespace = wsdl.choice_elements
-        s.node_namespace = "wsdl"
-      end
       body = ApricotEatsGorilla.soap_envelope("wsdl" => wsdl.namespace_uri) do
-        ApricotEatsGorilla["wsdl:#{@action}" => @options]
-      end
-
-      debug do |logger|
-        logger.info "Request; #{@uri}"
-        logger.info headers.map { |key, value| "#{key}: #{value}" }.join("\n")
-        logger.info body
+        ApricotEatsGorilla["wsdl:#{@action}" => namespaced_options]
       end
       response = @http.request_post(@uri.path, body, headers)
-      debug do |logger|
-        logger.info "Response (Status #{response.code}):"
-        logger.info response.body
-      end
       Savon::Response.new(response)
     end
 
@@ -110,17 +87,26 @@ module Savon
       end
     end
 
-    # Debug method. Outputs a given +message+ to the defined @@logger or
-    # yields the @@logger to a +block+ in case one was given.
-    def debug(message = nil)
-      if @@logger
-        if message
-          @@logger.info(message)
-        end
-        if block_given?
-          yield @@logger
+    # Checks if there were any choice elements found in the WSDL and namespaces
+    # the corresponding keys from the passed in Hash of options.
+    def namespaced_options
+      return @options if wsdl.choice_elements.empty?
+
+      options = {}
+      @options.each do |key, value|
+        key = "wsdl:#{key}" if wsdl.choice_elements.include? key.to_s
+
+        current = options[key]
+        case current
+        when Array
+          options[key] << value
+        when nil
+          options[key] = value
+        else
+          options[key] = [current.dup, value]
         end
       end
+      options
     end
 
     # Intercepts calls to SOAP service methods.

data/test/savon/wsdl_test.rb

@@ -41,12 +41,4 @@ class SavonWsdlTest < Test::Unit::TestCase
     end
   end
 
-  context "Savon::Wsdl with an invalid (non-WSDL) response" do
-    should "raise an ArgumentError" do
-      assert_raise ArgumentError do
-        Savon::Wsdl.new(some_uri, http_mock("Non-WSDL response"))
-      end
-    end
-  end
-
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: smacks-savon
 version: !ruby/object:Gem::Version 
-  version: 0.0.8
+  version: 0.0.75
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.8
+        version: 0.3.5
     version: 
 description: Savon is a lightweight SOAP client.
 email: 
@@ -46,7 +46,6 @@ files:
 - lib/savon/service.rb
 - lib/savon/wsdl.rb
 - lib/savon/response.rb
-- lib/savon/mash.rb
 has_rdoc: true
 homepage: http://github.com/smacks/savon
 post_install_message: 

data/lib/savon/mash.rb

@@ -1,61 +0,0 @@
-module Savon
-
-  # Savon::Mash converts a given Hash into an Object.
-  class Mash
-
-    # Loops through a given +hash+, stores each value in an instance variable
-    # and creates getter and setter methods.
-    #
-    # === Parameters
-    #
-    # * +hash+ - The Hash to convert.
-    def initialize(hash)
-      hash.each do |key,value|
-        value = Savon::Mash.new(value) if value.is_a? Hash
-
-        if value.is_a? Array
-          value = value.map do |item|
-            if item.is_a?(Hash) then Savon::Mash.new(item) else item end
-          end
-        end
-
-        set_instance_variable key, value
-        define_reader key
-        define_writer key
-      end
-    end
-
-  private
-
-    # Sets and instance variable with a given +name+ and +value+.
-    #
-    # === Parameters
-    #
-    # * +name+ - Name of the instance variable.
-    # * +value+ - Value of the instance variable.
-    def set_instance_variable(name, value)
-      self.instance_variable_set("@#{name}", value)
-    end
-
-    # Defines a reader method for a given instance +variable+.
-    #
-    # === Parameters
-    #
-    # * +variable+ - Name of the instance variable.
-    def define_reader(variable)
-      method = proc { self.instance_variable_get("@#{variable}") }
-      self.class.send(:define_method, variable, method)
-    end
-
-    # Defines a writer method for a given instance +variable+.
-    #
-    # === Parameters
-    #
-    # * +variable+ - Name of the instance variable.
-    def define_writer(variable)
-      method = proc { |value| self.instance_variable_set("@#{variable}", value) }
-      self.class.send(:define_method, "#{variable}=", method)
-    end
-
-  end
-end