troelskn-handsoap 0.4.3 → 0.4.4

data/README.markdown

@@ -149,7 +149,7 @@ Put your service in a file under `app/models`. You should extend `Handsoap::Serv
 
 You need to provide the endpoint and the SOAP version (1.1 or 1.2). If in doubt, use version 2.
 
-A service usually has a namespace for describing the message-body ([RPC/Litteral style](http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/#N1011F)). You should set this in the `on_create_document` handler.
+A service usually has a namespace for describing the message-body ([RPC/Litteral style](http://www.ibm.com/developerworks/webservices/library/ws-whichwsdl/#N1011F)). You should set this in the `on_create_document` handler. Likewise, the response returned *from* the server will contain elements that typically are defined in a single namespace relevant to the service. You can register this in the handler `on_response_document`.
 
 A typical service looks like the following:
 
@@ -158,9 +158,15 @@ A typical service looks like the following:
 
     class Example::FooService < Handsoap::Service
       endpoint EXAMPLE_SERVICE_ENDPOINT
-      on_create_document do |doc|
-        doc.alias 'wsdl', "http://example.org/ws/spec"
+      def on_create_document(doc)
+        # register namespaces for the request
+        doc.alias 'tns', "http://example.org/ws/spec"
       end
+      def on_response_document(doc)
+        # register namespaces for the response
+        doc.add_namespace 'ns', 'http://example.org/ws/spec'
+      end
+
       # public methods
       # todo
 
@@ -198,10 +204,10 @@ You should use Ruby naming-conventions for methods names. If the method has side
 Repeat code inside the invoke-block, should be refactored out to *builders*, and the response should be parsed with a *parser*.
 
     def update_icon!(icon)
-      response = invoke("wsdl:UpdateIcon") do |message|
+      response = invoke("tns:UpdateIcon") do |message|
         build_icon!(message, icon)
       end
-      parse_icon(response.document.xpath('//icon').first)
+      parse_icon(response/"//icon").first)
     end
 
 
@@ -220,7 +226,7 @@ It's recommended that you stick to the following style/naming scheme:
 
     # xml -> icon
     def parse_icon(node)
-      { :href => node['href'], :type => node['type'] }
+      { :href => (node/"@href").to_s, :type => (node/"@type").to_s }
     end
 
 or, if you prefer, you can use a class to represent entities:
@@ -235,8 +241,8 @@ or, if you prefer, you can use a class to represent entities:
 
     # xml -> icon
     def parse_icon(node)
-      Icon.new :href => node['href'],
-               :type => node['type']
+      Icon.new :href => (node/"@href").to_s,
+               :type => (node/"@type").to_s
     end
 
 License

data/VERSION.yml

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

data/lib/handsoap/service.rb

@@ -39,13 +39,13 @@ module Handsoap
         raise "Missing option :namespace"
       end
       ns = { 'env' => options[:namespace] }
-      fault_code = node.xpath('./env:Code/env:Value/text()', ns).to_s
-      if fault_code == ""
-        fault_code = node.xpath('./faultcode/text()', ns).to_s
+      fault_code = node.xpath('./env:Code/env:Value', ns).to_s
+      unless fault_code
+        fault_code = node.xpath('./faultcode', ns).to_s
       end
-      reason = node.xpath('./env:Reason/env:Text[1]/text()', ns).to_s
-      if reason == ""
-        reason = node.xpath('./faultstring/text()', ns).to_s
+      reason = node.xpath('./env:Reason/env:Text[1]', ns).to_s
+      unless reason
+        reason = node.xpath('./faultstring', ns).to_s
       end
       details = node.xpath('./detail/*', ns)
       self.new(fault_code, reason, details)
@@ -410,7 +410,18 @@ module Handsoap
         ""
       end
 
-      parts << {:head => head, :body => body.string}
+      body.rewind
+      parts << {:head => head, :body => body.read(body.size)}
+
+      # if body.kind_of? ::StringIO
+      #   parts << {:head => head, :body => body.string}
+      # elsif body.kind_of? ::Tempfile
+      #   body.rewind
+      #   parts << {:head => head, :body => body.read(body.size)}
+      # else
+      #   raise "body must be StringIO or Tempfile"
+      # end
+
       break if buf.size == 0
       break if content_length == -1
     end

data/lib/handsoap/xml_query_front.rb

@@ -28,6 +28,7 @@ module Handsoap
         require 'rexml/document'
       elsif driver == :nokogiri
         require 'nokogiri'
+        gem('nokogiri') # work around bug in rubygems for Ruby 1.9
         if Gem.loaded_specs['nokogiri'].version < Gem::Version.new('1.3.0')
           raise "Incompatible version of Nokogiri. Please upgrade gem."
         end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: troelskn-handsoap
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Troels Knak-Nielsen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-08-05 00:00:00 -07:00
+date: 2009-08-11 00:00:00 -07:00
 default_executable: 
 dependencies: []