troelskn-handsoap 0.3.0 → 0.3.1

data/VERSION.yml

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

data/lib/handsoap/xml_query_front.rb

@@ -62,6 +62,36 @@ module Handsoap
       end
     end
 
+    # NodeSelection is a wrapper around Array, that implicitly delegates BaseDriver methods to the first element.
+    #
+    # It makes mapping code prettier, since you often need to access the first element of a selection.
+    class NodeSelection < Array
+      def to_i
+        self.first.to_i if self.any?
+      end
+      def to_f
+        self.first.to_f if self.any?
+      end
+      def to_boolean
+        self.first.to_boolean if self.any?
+      end
+      def to_date
+        self.first.to_date if self.any?
+      end
+      def node_name
+        self.first.node_name if self.any?
+      end
+      def xpath(expression, ns = nil)
+        self.first.xpath(expression, ns)
+      end
+      def to_s
+        self.first.to_s if self.any?
+      end
+      def to_xml
+        self.first.to_xml if self.any?
+      end
+    end
+
     # Wraps the underlying (native) xml driver, and provides a uniform interface.
     module BaseDriver
       def initialize(element, namespaces = {})
@@ -142,9 +172,17 @@ module Handsoap
       def to_xml
         raise NotImplementedError.new
       end
-      # Alias for +xpath+
+      # Calls +xpath+ and wraps the result in a +NodeSelection+.
       def /(expression)
-        self.xpath(expression)
+        NodeSelection.new self.xpath(expression)
+      end
+      # Returns the attribute value of the underlying element.
+      #
+      # Shortcut for:
+      #
+      #     (node/"@attribute_name").to_s
+      def [](attribute_name)
+        raise NotImplementedError.new
       end
     end
 
@@ -162,6 +200,10 @@ module Handsoap
         assert_prefixes!(expression, ns)
         @element.find(expression, ns.map{|k,v| "#{k}:#{v}" }).to_a.map{|node| LibXMLDriver.new(node, ns) }
       end
+      def [](attribute_name)
+        raise ArgumentError.new unless attribute_name.kind_of? String
+        @element[attribute_name]
+      end
       def to_xml
         @element.to_s
       end
@@ -188,6 +230,10 @@ module Handsoap
         assert_prefixes!(expression, ns)
         REXML::XPath.match(@element, expression, ns).map{|node| REXMLDriver.new(node, ns) }
       end
+      def [](attribute_name)
+        raise ArgumentError.new unless attribute_name.kind_of? String
+        @element.attributes[attribute_name]
+      end
       def to_xml
         require 'rexml/formatters/pretty'
         formatter = REXML::Formatters::Pretty.new
@@ -225,6 +271,10 @@ module Handsoap
         assert_prefixes!(expression, ns)
         @element.xpath(expression, ns).map{|node| NokogiriDriver.new(node, ns) }
       end
+      def [](attribute_name)
+        raise ArgumentError.new unless attribute_name.kind_of? String
+        @element[attribute_name]
+      end
       def to_xml
         @element.serialize(NokogiriDriver.serialize_args)
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: troelskn-handsoap
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - Troels Knak-Nielsen