geoffgarside-demolisher 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/demolisher.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{demolisher}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Geoff Garside"]
-  s.date = %q{2009-06-07}
+  s.date = %q{2009-06-09}
   s.email = %q{geoff@geoffgarside.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",

data/lib/demolisher.rb

@@ -44,11 +44,18 @@ module Demolisher
           @nodes.pop
         end
       else
-        case meth.to_s
-        when /\?$/
-          !! Regexp.new(/(t(rue)?|y(es)?|1)/i).match(xpath.first.content.strip)
+        node = xpath.first
+
+        if node.find('text()').length == 1
+          content = node.find('text()').first.content
+          case meth.to_s
+          when /\?$/
+            !! Regexp.new(/(t(rue)?|y(es)?|1)/i).match(content)
+          else
+            content
+          end
         else
-          self.class.new(xpath.first, false)
+          self.class.new(node, false)
         end
       end
     end

data/test/demolisher_test.rb

@@ -7,8 +7,8 @@ class DemolisherTest < Test::Unit::TestCase
       Demolisher.demolish(File.dirname(__FILE__) +'/test.xml') do |xml|
         xml.addressbook do
           xml.person do
-            @people << {:firstname => xml.firstname.to_s, :lastname => xml.lastname.to_s,
-              :active => xml.active?, :email => xml.contact.email.to_s}
+            @people << {:firstname => xml.firstname, :lastname => xml.lastname,
+              :active => xml.active?, :email => xml.contact.email}
           end
         end
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: geoffgarside-demolisher
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Geoff Garside
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-07 00:00:00 -07:00
+date: 2009-06-09 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency