demolisher 0.5.0 → 0.5.1

data/VERSION

@@ -1 +1 @@
-0.5.0
+0.5.1

data/demolisher.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{demolisher}
-  s.version = "0.5.0"
+  s.version = "0.5.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Geoff Garside"]
-  s.date = %q{2010-05-18}
+  s.date = %q{2010-05-26}
   s.email = %q{geoff@geoffgarside.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
@@ -33,7 +33,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{demolisher}
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Gem for extracting information from XML files, think Builder but backwards}
   s.test_files = [
     "test/demolisher_test.rb",
@@ -44,7 +44,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.3"])
     else
       s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])

data/lib/demolisher.rb

@@ -4,7 +4,8 @@ module Demolisher
   # Demolish an XML file or XML::Parser object.
   def self.demolish(file_or_xml_parser, namespace_list = nil)
     file_or_xml_parser = new_parser(file_or_xml_parser) if file_or_xml_parser.kind_of?(String)
-    node = Node.new(file_or_xml_parser.parse, namespace_list, true)
+    file_or_xml_parser = file_or_xml_parser.parse if file_or_xml_parser.kind_of?(XML::Parser)
+    node = Node.new(file_or_xml_parser, namespace_list, true)
 
     yield node if block_given?
     node
@@ -49,7 +50,7 @@ module Demolisher
     #   end
     #
     def [](attr_name)
-      @nodes.last.attributes[attr_name]
+      _current_node.attributes[attr_name]
     end
 
     # The workhorse, finds the node matching meth.
@@ -63,7 +64,7 @@ module Demolisher
     #       looks like a boolean. Otherwise return text content
     #     Otherwise return a new Node instance
     def method_missing(meth, *args, &block) # :nodoc:
-      xpath = xpath_for_element(meth.to_s, args.shift)
+      xpath = _xpath_for_element(meth.to_s, args.shift)
       return nil if xpath.empty?
 
       if block_given?
@@ -96,20 +97,24 @@ module Demolisher
 
     # Returns the current nodes contents.
     def to_s # :nodoc:
-      @nodes.last.content.strip
+      _current_node.content.strip
     end
 
-    def xpath_for_element(el_or_ns, el_for_ns = nil)
-      @nodes.last.find(element_from_symbol(el_or_ns, el_for_ns), @namespaces)
+    def _current_node
+      _is_root_node? ? @nodes.last.root : @nodes.last
+    end
+
+    def _xpath_for_element(el_or_ns, el_for_ns = nil)
+      _current_node.find(_element_from_symbol(el_or_ns, el_for_ns), @namespaces)
     end
 
     # Transforms a symbol into a XML element path.
-    def element_from_symbol(el_or_ns,el_for_ns = nil) # :nodoc:
-      "#{is_root_node? ? '/' : nil}#{el_or_ns.gsub(/[^a-z0-9_]/i, '')}#{el_for_ns && el_for_ns.inspect}"
+    def _element_from_symbol(el_or_ns,el_for_ns = nil) # :nodoc:
+      "#{_is_root_node? ? '/' : nil}#{el_or_ns.gsub(/[^a-z0-9_]/i, '')}#{el_for_ns && el_for_ns.inspect}"
     end
 
     # Indicates if the current node is the root of the XML document.
-    def is_root_node?
+    def _is_root_node?
       @nodes.size == 1
     end
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: demolisher
 version: !ruby/object:Gem::Version 
+  hash: 9
   prerelease: false
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Geoff Garside
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-18 00:00:00 +01:00
+date: 2010-05-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: libxml-ruby
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 21
         segments: 
         - 1
         - 1
@@ -63,23 +66,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: demolisher
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gem for extracting information from XML files, think Builder but backwards