demolisher 0.5.2 → 0.6.0

data/Rakefile

@@ -11,7 +11,8 @@ begin
     gem.authors = ["Geoff Garside"]
     gem.rubyforge_project = 'demolisher'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-    gem.add_dependency('libxml-ruby', '>= 1.1.3')
+    gem.add_dependency('libxml-ruby', '>=1.1.3')
+    gem.add_dependency('nokogiri', '>=1.4.2')
   end
 
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-0.5.2
+0.6.0

data/demolisher.gemspec

@@ -1,56 +1,56 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{demolisher}
-  s.version = "0.5.2"
+  s.version = "0.6.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Geoff Garside"]
-  s.date = %q{2010-06-07}
+  s.date = %q{2011-03-23}
   s.email = %q{geoff@geoffgarside.co.uk}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "demolisher.gemspec",
-     "lib/demolisher.rb",
-     "test/demolisher_test.rb",
-     "test/ns.xml",
-     "test/test.xml",
-     "test/test_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "demolisher.gemspec",
+    "lib/demolisher.rb",
+    "test/demolisher_test.rb",
+    "test/ns.xml",
+    "test/test.xml",
+    "test/test_helper.rb"
   ]
   s.homepage = %q{http://github.com/geoffgarside/demolisher}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{demolisher}
-  s.rubygems_version = %q{1.3.7}
+  s.rubygems_version = %q{1.6.2}
   s.summary = %q{Gem for extracting information from XML files, think Builder but backwards}
   s.test_files = [
     "test/demolisher_test.rb",
-     "test/test_helper.rb"
+    "test/test_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<libxml-ruby>, [">= 1.1.3"])
+      s.add_runtime_dependency(%q<nokogiri>, [">= 1.4.2"])
     else
       s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
+      s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
     end
   else
     s.add_dependency(%q<libxml-ruby>, [">= 1.1.3"])
+    s.add_dependency(%q<nokogiri>, [">= 1.4.2"])
   end
 end
 

data/lib/demolisher.rb

@@ -1,24 +1,29 @@
-require 'xml'
+require 'libxml'
+require 'nokogiri'
+require 'nokogiri/xml'
 
 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)
-    file_or_xml_parser = file_or_xml_parser.parse if file_or_xml_parser.respond_to?(:parse)
-    node = Node.new(file_or_xml_parser, namespace_list, true)
+  # @param [String,IO,#parse] thing
+  def self.demolish(thing, namespaces = nil)
+    thing = _parse(thing) unless thing.kind_of?(Nokogiri::XML::Document)
+    node = Node.new(thing, namespaces, true)
 
     yield node if block_given?
     node
   end
 
-  # ---
-  # Creates an XML::Parser from the string if its a string or the file if its a file path
-  # +++
-  def self.new_parser(string_or_filepath)
-    if File.exist?(string_or_filepath)
-      XML::Parser.file(string_or_filepath)
+  def self._exchange_libxml(thing)
+    thing = thing.parse if thing.respond_to?(:parse)
+    thing.to_s
+  end
+  def self._parse(thing)
+    if thing.kind_of?(LibXML::XML::Parser) || thing.kind_of?(LibXML::XML::Document)
+      Nokogiri::XML::Document.parse(_exchange_libxml(thing))
     else
-      XML::Parser.string(string_or_filepath)
+      # could be string data or a file name
+      thing = File.open(thing) if File.exists?(thing)
+      Nokogiri::XML::Document.parse(thing)
     end
   end
 
@@ -30,7 +35,8 @@ module Demolisher
     def initialize(xml, namespaces = nil, is_root = true)
       @nodes = [xml]
       @nodes.unshift(nil) unless is_root
-      @namespaces = namespaces
+      @namespaces = namespaces || {}
+      @namespaces.merge!(xml.collect_namespaces) if xml.respond_to?(:collect_namespaces)
     end
 
     # Access an attribute of the current node.
@@ -50,7 +56,7 @@ module Demolisher
     #   end
     #
     def [](attr_name)
-      _current_node.attributes[attr_name]
+      _current_node.attributes[attr_name].to_s
     end
 
     # The workhorse, finds the node matching meth.
@@ -73,16 +79,19 @@ module Demolisher
           case block.arity
           when 1
             yield idx
+          when 2
+            yield self.class.new(node, @namespaces, false), idx
           else
             yield
           end
           @nodes.pop
         end
+        self
       else
         node = xpath.first
 
-        if node.find('text()').length == 1
-          content = node.find('text()').first.content
+        if node.xpath('text()').length == 1
+          content = node.xpath('text()').first.content
           case meth.to_s
           when /\?$/
             !! Regexp.new(/(t(rue)?|y(es)?|1)/i).match(content)
@@ -99,13 +108,16 @@ module Demolisher
     def to_s # :nodoc:
       _current_node.content.strip
     end
+    def inspect # :nodoc:
+      "#<#{self.class} node=#{_current_node.name}>"
+    end
 
     def _current_node
-      _is_root_node? ? @nodes.last.root : @nodes.last
+      @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)
+      _current_node.xpath(_element_from_symbol(el_or_ns, el_for_ns), @namespaces)
     end
 
     # Transforms a symbol into a XML element path.

data/test/demolisher_test.rb

@@ -47,6 +47,57 @@ class DemolisherTest < Test::Unit::TestCase
         assert_equal 'randy@example.com', @person[:email]
       end
     end
+    context "shortened form" do
+      setup do
+        @people = Array.new
+        Demolisher.demolish(File.dirname(__FILE__) +'/test.xml') do |xml|
+          xml.addressbook.person do |person, idx|
+            @people << {:firstname => person.firstname, :lastname => person.lastname,
+              :active => person.active?, :email => person.contact.email, :index => idx}
+          end
+        end
+      end
+      context "first extracted person" do
+        setup do
+          @person = @people[0]
+        end
+        should "have extracted firstname" do
+          assert_equal 'Enoch', @person[:firstname]
+        end
+        should "have extracted lastname" do
+          assert_equal 'Root', @person[:lastname]
+        end
+        should "have extracted true active status" do
+          assert @person[:active]
+        end
+        should "have extracted email" do
+          assert_equal 'enoch@example.com', @person[:email]
+        end
+        should "have index 0" do
+          assert_equal 0, @person[:index]
+        end
+      end
+      context "second extracted person" do
+        setup do
+          @person = @people[1]
+        end
+        should "have extracted firstname" do
+          assert_equal 'Randy', @person[:firstname]
+        end
+        should "have extracted lastname" do
+          assert_equal 'Waterhouse', @person[:lastname]
+        end
+        should "have extracted false active status" do
+          assert !@person[:active]
+        end
+        should "have extracted email" do
+          assert_equal 'randy@example.com', @person[:email]
+        end
+        should "have index 1" do
+          assert_equal 1, @person[:index]
+        end
+      end
+    end
   end
   context "Demolished XML String" do
     setup do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: demolisher
 version: !ruby/object:Gem::Version 
-  hash: 15
-  prerelease: false
+  hash: 7
+  prerelease: 
   segments: 
   - 0
-  - 5
-  - 2
-  version: 0.5.2
+  - 6
+  - 0
+  version: 0.6.0
 platform: ruby
 authors: 
 - Geoff Garside
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-07 00:00:00 +01:00
+date: 2011-03-23 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -34,6 +34,22 @@ dependencies:
         version: 1.1.3
   type: :runtime
   version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 1
+        - 4
+        - 2
+        version: 1.4.2
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: geoff@geoffgarside.co.uk
 executables: []
@@ -45,7 +61,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -61,8 +76,8 @@ homepage: http://github.com/geoffgarside/demolisher
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -86,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: demolisher
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Gem for extracting information from XML files, think Builder but backwards

data/.gitignore

@@ -1,5 +0,0 @@
-*.sw?
-.DS_Store
-coverage
-rdoc
-pkg