smacks-savon 0.0.7 → 0.0.8

data/README.rdoc

@@ -9,12 +9,12 @@ service method to receive.
 
 == Install
 
-  $ gem install smacks-savon --s http://gems.github.com
+  $ gem install smacks-savon -s http://gems.github.com
 
 == Dependencies
 
   hpricot 0.6.164 (also available for JRuby)
-  smacks-apricoteatsgorilla >= 0.3.31
+  smacks-apricoteatsgorilla >= 0.3.5
 
 == How to use
 

data/lib/savon/mash.rb

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

data/lib/savon/response.rb

@@ -32,11 +32,13 @@ module Savon
   #
   #   # response as a Mash starting at a custom root node (via XPath)
   #   response.to_mash("//user/email")
-  #
-  # ===
   class Response
 
-    attr_reader :fault, :fault_code
+    # The HTTP/SOAP fault.
+    attr_reader :fault
+
+    # The HTTP/SOAP fault code.
+    attr_reader :fault_code
 
     # Initializer to set the SOAP response.
     #
@@ -55,7 +57,7 @@ module Savon
 
     # Returns true if the request was not successful, false otherwise.
     def fault?
-      !@fault.nil?
+      !@fault_code.nil?
     end
 
     # Returns the SOAP response message as a Hash. Call with XPath expession
@@ -90,11 +92,10 @@ module Savon
 
   private
 
-    # Checks for and stores HTTP and SOAP-Fault errors.
+    # Checks for and stores HTTP and SOAP fault errors.
     def validate
       if @response.code.to_i >= 300
-        @fault = @response.message
-        @fault_code = @response.code
+        @fault, @fault_code = @response.message, @response.code
       else
         fault = to_hash("//soap:Fault")
         @fault = fault[:faultstring] unless fault.nil?

data/lib/savon/service.rb

@@ -40,6 +40,9 @@ 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
 
@@ -58,15 +61,35 @@ 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}" => namespaced_options]
+        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
       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
 
@@ -87,26 +110,17 @@ module Savon
       end
     end
 
-    # 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]
+    # 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
         end
       end
-      options
     end
 
     # Intercepts calls to SOAP service methods.
@@ -116,8 +130,7 @@ module Savon
     # * +method+ - The SOAP service method to call.
     # * +options+ - Hash of options for the service method to receive.
     def method_missing(method, options = {})
-      @action = method.to_s
-      @options = options
+      @action, @options = method.to_s, options
       validate_action
       call_service
     end

data/lib/savon/wsdl.rb

@@ -24,8 +24,7 @@ module Savon
     # * +uri+ - The URI to access.
     # * +http+ - The Net::HTTP connection instance to use.
     def initialize(uri, http)
-      @uri = uri
-      @http = http
+      @uri, @http = uri, http
       get_wsdl
 
       parse_namespace_uri
@@ -44,6 +43,10 @@ module Savon
     def get_wsdl
       @response = @http.get("#{@uri.path}?#{@uri.query}")
       @doc = Hpricot.XML(@response.body)
+
+      if !@doc.at("//wsdl:definitions")
+        raise ArgumentError, "Unable to find WSDL at given endpoint URI."
+      end
     end
 
     # Parses the WSDL to find and store the namespace URI.

data/{tests → test}/savon/wsdl_test.rb

@@ -41,4 +41,12 @@ 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.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Daniel Harrington
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.3.31
+        version: 0.3.8
     version: 
 description: Savon is a lightweight SOAP client.
 email: 
@@ -46,6 +46,7 @@ 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: 
@@ -74,11 +75,11 @@ signing_key:
 specification_version: 2
 summary: Savon is a lightweight SOAP client.
 test_files: 
-- tests/savon_test.rb
-- tests/helper.rb
-- tests/factories/wsdl.rb
-- tests/fixtures/soap_response.rb
-- tests/savon/service_test.rb
-- tests/savon/response_test.rb
-- tests/savon/wsdl_test.rb
-- tests/savon/mash_test.rb
+- test/savon_test.rb
+- test/helper.rb
+- test/factories/wsdl.rb
+- test/fixtures/soap_response.rb
+- test/savon/service_test.rb
+- test/savon/response_test.rb
+- test/savon/wsdl_test.rb
+- test/savon/mash_test.rb