amee 2.5.0 → 2.5.1

data/lib/amee/exceptions.rb

@@ -11,7 +11,7 @@ module AMEE
     end
     def to_s
       if @last_err
-        [@msg, @last_err.message, @last_err.backtrace.first].join "\n"
+        ([@msg, @last_err.message]+@last_err.backtrace).join "\n"
       else
         super
       end

data/lib/amee/parse_helper.rb

@@ -7,24 +7,29 @@ module ParseHelper
     else
       nodes=REXML::XPath.match(doc,"#{preamble}#{xpath}")
     end
+    if nodes.is_a? String
+      return nodes
+    end
     if nodes.length==1
-      if nodes.first.respond_to?(:text)
-        return nodes.first.text
-        elsif nodes.first.respond_to?(:to_s)
-          return nodes.first.to_s
-      end
+      return node_value(nodes.first)
+    elsif nodes.length>1
+      return nodes.map{|x| node_value(x)}
+    else
+      return nil
     end
-
-    if nodes.length>1
-      if nodes.first.respond_to?(:text)
-        return nodes.map{|x| x.text}
-        elsif nodes.first.respond_to?(:to_s)
-          return nodes.map{|x| x.to_s}
-      end
+  end
+  
+  def node_value(node)
+    if node.is_a?(Nokogiri::XML::Attr) || node.is_a?(REXML::Attribute)
+      # Attributes are allowed to be an empty string
+      return node.to_s
+    elsif node.is_a?(Nokogiri::XML::Element) || node.is_a?(REXML::Element)
+      return node.text == '' ? nil : node.text
+    else
+      return node.to_s
     end
-    return nil
-    
   end
+
   def xmlpathpreamble
     ''
   end
@@ -35,4 +40,4 @@ module ParseHelper
   end
   private :x
 
-end
+end

data/lib/amee/version.rb

@@ -3,7 +3,7 @@ module AMEE
   module VERSION #:nodoc:
     MAJOR = 2
     MINOR = 5
-    TINY  = 0
+    TINY  = 1
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: amee
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 2
   - 5
-  - 0
-  version: 2.5.0
+  - 1
+  version: 2.5.1
 platform: ruby
 authors: 
 - James Smith
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-03 00:00:00 +00:00
+date: 2010-11-08 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency