handsoap 1.3.0 → 1.4.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Zjg4MmMzOTQ1YWMzZWEwMDQwMDBiYmY2MjM1M2NiMGQxMGM2YTBkMQ==
+    YjVlMDlmZDhmYWQ2NWFhNzc2ZDYzODRjNjM2YWJlZjlhZDY2ODc5Zg==
   data.tar.gz: !binary |-
-    ODdhNDYwNmM5N2I0ZWEzZmVjNTNhMDNmN2M4NTgzYTk2ODZhODI3OQ==
+    NWIxMzA5MDM5Yjg2ZGVmZjEyNjk0NmY0YzZiNmI2MTU2NDJhNTFhNA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NGRhNmU4ZThlYTljY2E2NjE1NGJlOWVjZTcxOTVjZjRmM2M4NTZmYmM4MzRj
-    OWYzM2ZjZDllZmE2N2U2M2EzMzRiMzQwYjQ4OWMxNDRkMzdlOGQyY2NhYmZh
-    ZGQ1MjZmNzNkODVjMWE4MWEzNWE4ZTkxMDA5MjIzOWVjMDM4MTc=
+    N2RlNzkyMzVlOTZlYzczNzEyYjc5MDcyM2EyMmMyODc0NmNkM2M2Y2NiNmNm
+    OWNkM2ViNmYwMjQwNjBiNzdkYWIyZGZmMThiNjUyZjA4MDYxOGU4OTY4NWFl
+    MTFjOGU4M2VkMjM3NTc5ZmE1NzZiNGQ5NGY4ZDEyNDU5N2E4N2M=
   data.tar.gz: !binary |-
-    NjI5MTY2Nzk2N2RjM2M2MTU4MjU1ODIzNDJjM2YyYmJmYmYyZjZmNDA4ZWFj
-    ZTQ3OWYyOGZjMGE0MjI0YzZlYzM5OGIyOTExZjViODE4ZDMxNGNmNmRlZGVk
-    ZTkwMGFmMjc4NTQ5YjUyYTc3OTFkYjdlNDU3ODkwNDYxYzAyZDc=
+    MmRlN2IyMDBkZDMzMjI2OTZhMzI0NWMwYTc2ODkxZWZlNmI5MjJiZGRmOTNm
+    ZmI1Y2FhNTRmYjc0MDYyNGVlOTI5ZmU1NjdiNDM1ZmZjMTEzOTE5ZjFhMDU4
+    Zjk2M2M5ZmE0OThiZGMwNzM3MjgxMDQ3MmRhMzBlNGZmNGEzODY=

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 1
-:minor: 3
+:minor: 4
 :patch: 0
 :build: 

data/lib/handsoap/service.rb

@@ -7,6 +7,14 @@ require 'handsoap/deferred'
 
 module Handsoap
 
+  def self.store_raw_response=(boolean)
+    @store_raw_response = boolean
+  end
+
+  def self.store_raw_response?
+    !!@store_raw_response
+  end
+
   def self.http_driver
     @http_driver || (self.http_driver = :curb)
   end
@@ -24,28 +32,28 @@ module Handsoap
   def self.xml_query_driver=(driver)
     @xml_query_driver = Handsoap::XmlQueryFront.load_driver!(driver)
   end
-    
+
   # Sets the timeout
   def self.timeout=(timeout)
     @timeout = timeout
   end
 
   # fetches the timeout
-  # the default timeout is set to 60seconds  
+  # the default timeout is set to 60seconds
   def self.timeout
     @timeout || (self.timeout = 60)
   end
-  
+
   # Tell Handsoap to follow redirects
   def self.follow_redirects!
     @follow_redirects = true
   end
-  
+
   # Check whether Handsoap should follow redirects
   def self.follow_redirects?
     @follow_redirects || false
   end
-  
+
   # Sets the max number of redirects
   def self.max_redirects=(max_redirects)
     @max_redirects = max_redirects
@@ -60,51 +68,51 @@ module Handsoap
   # Wraps SOAP errors in a standard class.
   class Fault < StandardError
     attr_reader :code, :reason, :details
-    
+
     def initialize(code, reason, details)
       @code = code
       @reason = reason
       @details = details
     end
-    
+
     def to_s
       "Handsoap::Fault { :code => '#{@code}', :reason => '#{@reason}' }"
     end
-    
+
     def self.from_xml(node, options = { :namespace => nil })
       if not options[:namespace]
         raise "Missing option :namespace"
       end
-      
+
       ns = { 'env' => options[:namespace] }
-      
+
       # tries to find SOAP1.2 fault code
       fault_code = node.xpath("./env:Code/env:Value", ns).to_s
-      
+
       # if no SOAP1.2 fault code was found, try the SOAP1.1 way
       unless fault_code
         fault_code = node.xpath('./faultcode', ns).to_s
-        
+
         # if fault_code is blank, add the namespace and try again
         unless fault_code
           fault_code = node.xpath("//env:faultcode", ns).to_s
         end
       end
-      
+
       # tries to find SOAP1.2 reason
       reason = node.xpath("./env:Reason/env:Text[1]", ns).to_s
-      
+
       # if no SOAP1.2 faultstring was found, try the SOAP1.1 way
       unless reason
         reason = node.xpath('./faultstring', ns).to_s
-        
+
         # if reason is blank, add the namespace and try again
         unless reason
           reason = node.xpath("//env:faultstring", ns).to_s
         end
       end
-      
-      details = node.xpath('./detail/*', ns)  
+
+      details = node.xpath('./detail/*', ns)
       self.new(fault_code, reason, details)
     end
   end
@@ -118,11 +126,15 @@ module Handsoap
   end
 
   class SoapResponse
-    attr_reader :document, :http_response
-    def initialize(document, http_response)
+
+    attr_reader :document, :http_response, :raw_xml
+
+    def initialize(document, http_response, raw_xml=nil)
       @document = document
       @http_response = http_response
+      @raw_xml = raw_xml
     end
+
     def method_missing(method, *args, &block)
       if @document.respond_to?(method)
         @document.__send__ method, *args, &block
@@ -130,6 +142,7 @@ module Handsoap
         super
       end
     end
+
   end
 
   class AsyncDispatch
@@ -228,7 +241,7 @@ module Handsoap
           if options[:soap_header]
             iterate_hash_array(header, options[:soap_header])
           end
-          
+
           if options[:soap_body]
             action_hash = { action => options[:soap_body] }
             iterate_hash_array(body, action_hash)
@@ -244,7 +257,7 @@ module Handsoap
           "Content-Type" => "#{self.request_content_type}; charset=UTF-8"
         }
         headers["SOAPAction"] = options[:soap_action] unless options[:soap_action].nil?
-        on_before_dispatch
+        on_before_dispatch(doc)
         request = make_http_request(self.uri, doc.to_s, headers, options[:http_options])
         response = http_driver_instance.send_http_request(request)
         parse_http_response(response)
@@ -281,8 +294,17 @@ module Handsoap
         elsif options[:soap_action] == :none
           options[:soap_action] = nil
         end
-        doc = make_envelope do |body|
-          body.add action
+        doc = make_envelope do |body,header|
+          if options[:soap_header]
+            iterate_hash_array(header, options[:soap_header])
+          end
+
+          if options[:soap_body]
+            action_hash = { action => options[:soap_body] }
+            iterate_hash_array(body, action_hash)
+          else
+            body.add(action)
+          end
         end
         dispatcher.request_block.call doc.find(action)
         # ready to dispatch
@@ -290,7 +312,7 @@ module Handsoap
           "Content-Type" => "#{self.request_content_type}; charset=UTF-8"
         }
         headers["SOAPAction"] = options[:soap_action] unless options[:soap_action].nil?
-        on_before_dispatch
+        on_before_dispatch(doc)
         request = make_http_request(self.uri, doc.to_s, headers)
         driver = self.http_driver_instance
         if driver.respond_to? :send_http_request_async
@@ -352,7 +374,7 @@ module Handsoap
     # Hook that is called before the message is dispatched.
     #
     # You can override this to provide filtering and logging.
-    def on_before_dispatch
+    def on_before_dispatch(doc)
     end
     # Hook that is called after the http_client is created.
     #
@@ -408,7 +430,7 @@ module Handsoap
         request.set_client_cert_files(http_options[:client_cert_file], http_options[:client_cert_key_file]) if http_options[:client_cert_file] && http_options[:client_cert_key_file]
         request.set_ssl_verify_mode(http_options[:ssl_verify_mode]) if http_options[:ssl_verify_mode]
       end
-      
+
       headers.each do |key, value|
         request.add_header(key, value)
       end
@@ -425,10 +447,11 @@ module Handsoap
     def parse_http_response(response)
       debug do |logger|
         logger.puts(response.inspect do |body|
-          Handsoap.pretty_format_envelope(body).chomp
+          Handsoap.pretty_format_envelope(body.force_encoding('utf-8')).chomp
         end)
       end
-      xml_document = parse_soap_response_document(response.primary_part.body)
+      raw_xml_document = response.primary_part.body.force_encoding('utf-8')
+      xml_document = parse_soap_response_document(raw_xml_document)
       soap_fault = parse_soap_fault(xml_document)
       # Is the response a soap-fault?
       unless soap_fault.nil?
@@ -444,7 +467,9 @@ module Handsoap
       end
       # Everything seems in order.
       on_response_document(xml_document)
-      return SoapResponse.new(xml_document, response)
+      args = [xml_document, response]
+      args << raw_xml_document if Handsoap.store_raw_response?
+      return SoapResponse.new(*args)
     end
 
     # Creates a standard SOAP envelope and yields the +Body+ element.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: handsoap
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Troels Knak-Nielsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-11 00:00:00.000000000 Z
+date: 2013-11-06 00:00:00.000000000 Z
 dependencies: []
 description: Handsoap is a library for creating SOAP clients in Ruby
 email: