troelskn-handsoap 0.2.5 → 0.2.6

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 6
 :major: 0
 :minor: 2

data/generators/handsoap/handsoap_generator.rb

@@ -32,9 +32,9 @@ class HandsoapGenerator < Rails::Generator::Base
       m.file_contents "app/models/#{file_name}_service.rb" do |file|
         file.write Handsoap::Compiler.compile_service(wsdl, protocol, :soap_actions)
       end
-      m.directory "tests"
-      m.directory "tests/integration"
-      m.file_contents "tests/integration/#{file_name}_service_test.rb" do |file|
+      m.directory "test"
+      m.directory "test/integration"
+      m.file_contents "test/integration/#{file_name}_service_test.rb" do |file|
         file.write Handsoap::Compiler.compile_test(wsdl, protocol)
       end
       # TODO

data/lib/handsoap/parser.rb

@@ -85,7 +85,7 @@ module Handsoap
       private :ns
 
       def protocol_from_ns(node)
-        href = node.namespace.respond_to?(:href) ? node.namespace.href : @doc.namespaces["xmlns:#{node.namespace.href}"]
+        href = node.namespace.respond_to?(:href) ? node.namespace.href : @doc.namespaces["xmlns:#{node.namespace}"]
         case href
         when "http://schemas.xmlsoap.org/wsdl/soap/"
           :soap11
@@ -100,7 +100,7 @@ module Handsoap
       private :protocol_from_ns
 
       def is_wsdl2?(node)
-        href = node.namespace.respond_to?(:href) ? node.namespace.href : @doc.namespaces["xmlns:#{node.namespace.href}"]
+        href = node.namespace.respond_to?(:href) ? node.namespace.href : @doc.namespaces["xmlns:#{node.namespace}"]
         case href
         when "http://schemas.xmlsoap.org/wsdl/"
           false

data/lib/handsoap/service.rb

@@ -11,7 +11,11 @@ require 'handsoap/xml_mason'
 module Utf8StringPatch
   def to_utf8
     # HTMLEntities.decode_entities(self.serialize(:encoding => 'UTF-8'))
-    self.serialize(:encoding => 'UTF-8').gsub('&lt;', '<').gsub('&gt;', '>').gsub('&quot;', '"').gsub('&apos;', "'").gsub('&amp;', '&')
+    if Gem.loaded_specs['nokogiri'].version >= Gem::Version.new('1.3.0')
+      self.serialize(:encoding => 'UTF-8').gsub('&lt;', '<').gsub('&gt;', '>').gsub('&quot;', '"').gsub('&apos;', "'").gsub('&amp;', '&')
+    else
+      self.serialize('UTF-8').gsub('&lt;', '<').gsub('&gt;', '>').gsub('&quot;', '"').gsub('&apos;', "'").gsub('&amp;', '&')
+    end
   end
 end
 
@@ -179,48 +183,33 @@ module Handsoap
     private
     # Helper to serialize a node into a ruby string
     def xml_to_str(node, xquery = nil)
-      begin
-        n = xquery ? node.xpath(xquery, ns).first : node
-        n.to_utf8
-      rescue Exception => ex
-        nil
-      end
+      n = xquery ? node.xpath(xquery, ns).first : node
+      return if n.nil?
+      n.to_utf8
     end
     # Helper to serialize a node into a ruby integer
     def xml_to_int(node, xquery = nil)
-      begin
-        n = xquery ? node.xpath(xquery, ns).first : node
-        n.to_s.to_i
-      rescue Exception => ex
-        nil
-      end
+      n = xquery ? node.xpath(xquery, ns).first : node
+      return if n.nil?
+      n.to_s.to_i
     end
     # Helper to serialize a node into a ruby float
     def xml_to_float(node, xquery = nil)
-      begin
-        n = xquery ? node.xpath(xquery, ns).first : node
-        n.to_s.to_f
-      rescue Exception => ex
-        nil
-      end
+      n = xquery ? node.xpath(xquery, ns).first : node
+      return if n.nil?
+      n.to_s.to_f
     end
     # Helper to serialize a node into a ruby boolean
     def xml_to_bool(node, xquery = nil)
-      begin
-        n = xquery ? node.xpath(xquery, ns).first : node
-        n.to_s == "true"
-      rescue Exception => ex
-        nil
-      end
+      n = xquery ? node.xpath(xquery, ns).first : node
+      return if n.nil?
+      n.to_s == "true"
     end
     # Helper to serialize a node into a ruby Time object
     def xml_to_date(node, xquery = nil)
-      begin
-        n = xquery ? node.xpath(xquery, ns).first : node
-        Time.iso8601(n.to_s)
-      rescue Exception => ex
-        nil
-      end
+      n = xquery ? node.xpath(xquery, ns).first : node
+      return if n.nil?
+      Time.iso8601(n.to_s)
     end
     def debug(message = nil)
       if @@logger

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: troelskn-handsoap
 version: !ruby/object:Gem::Version 
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors: 
 - Troels Knak-Nielsen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-08 00:00:00 -07:00
+date: 2009-06-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,16 +32,6 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: 0.3.2
     version: 
-- !ruby/object:Gem::Dependency 
-  name: htmlentities
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 4.0.0
-    version: 
 description: Handsoap is a library for creating SOAP clients in Ruby
 email: troelskn@gmail.com
 executables: []