XmlEasy 0.0.1 → 0.0.2

data/Manifest.txt

@@ -5,4 +5,6 @@ Rakefile
 bin/xml_easy
 lib/xml_easy.rb
 test/test_xml_easy.rb
-test/test.xml
+test/xml/simple.xml
+test/xml/complex.xml
+examples/xhtml_scrape.rb

data/examples/xhtml_scrape.rb

@@ -0,0 +1,14 @@
+require 'lib/xml_easy'
+require 'open-uri'
+
+xhtml_spec =
+  open 'http://www.w3.org/TR/xhtml1/' do |f|
+    XmlEasy::Document.new f.read
+  end
+
+puts <<-EOS
+Title:
+  #{xhtml_spec.html.head.title.body}
+Subtitles:
+#{xhtml_spec.html.body_.h2.map{|h2| "  #{h2.body.strip}"}.join("\n")}
+EOS

data/lib/xml_easy.rb

@@ -5,33 +5,27 @@ require 'rexml/parsers/baseparser'
 require 'rexml/streamlistener'
 
 class Array
-  def method_missing(name, *args, &block)
-    if all? {|e| nil? or e.class == XmlEasy::Element}
-      elms = map{|e| e.send(name, *args, &block) rescue nil}.flatten.compact
-      unless block.nil?
-        elms = elms.select &block
-      end
-      elms
-    else
-      raise NoMethodError.new(name)
-    end
+  def to_element_list
+    inject(XmlEasy::ElementList.new) {|s, e| s << e}
   end
 end
 
 class HashWithIndifferentAccess < Hash
-  def get_with_indifferent_access(key)
-    self[key.to_s] || self[key.to_sym]
+  def [](key)
+    super(key.to_s) || super(key.to_sym)
   end
-  alias get_with_indifferent_access []
 
-  def set_with_indifferent_access(key, val)
-    self[key.to_s] = val
+  def []=(key, val)
+    super(key.to_s, val)
   end
-  alias set_with_indifferent_access []=
 end
 
 class XmlEasy
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
+
+  def self.read(filename=nil)
+    Document.new filename
+  end
 
   class EasyListener
     include REXML::StreamListener
@@ -41,12 +35,14 @@ class XmlEasy
     end
 
     def attlistdecl(elm_name, attrs, content); end
-    def cdata(content); end
     def comment(content); end
     def elementdecl(content); end
     def entity(content); end
     def instruction(name, inst); end
     def notationdecl(content); end
+    def doctype(name, pub_sys, long_name, uri); end
+    def entitydecl(content); end
+    def doctype_end; end
 
     def xmldecl(version, encoding, standalone)
       @doc.xml_dec = "<?xml#{
@@ -58,17 +54,6 @@ class XmlEasy
       }?>"
     end
 
-    def doctype(name, pub_sys, long_name, uri)
-      #TODO: temporary
-      @doc.doc_type = "<!DOCTYPE window [<!ENTITY nl '&#38;#10;'>]>"
-    end
-
-    def entitydecl(content)
-    end
-
-    def doctype_end
-    end
-
     def tag_start(name, attrs)
       element = Element.new name
       attrs.each{|k, v| element[k] = v.gsub('"', '&quot;').inspect}
@@ -87,6 +72,10 @@ class XmlEasy
     def text(content)
       @current.body = content
     end
+
+    def cdata(content)
+      #TODO
+    end
   end
 
   class Document
@@ -94,12 +83,27 @@ class XmlEasy
 
     def initialize(filename=nil)
       @root = Element.new
-      @filename = filename
-      if @filename =~ /^<.*$/
-        REXML::Document.parse_stream StringIO.new(filename), EasyListener.new(self)
-      else
-        REXML::Document.parse_stream File.new(filename), EasyListener.new(self) if @filename
-      end
+      io = 
+        case filename
+        when nil;     nil
+        when IO;      filename
+        when /^<.*$/; StringIO.new filename
+        else;         File.new filename
+        end
+      REXML::Document.parse_stream io, EasyListener.new(self) if io
+    end
+
+    def <<(root)
+      raise RuntimeError.new('root element must be uniq.') unless @root.children.empty?
+      root = "<#{root} />" if root.is_a? Symbol
+    end
+
+    def visit(&block)
+      @root.visit &block
+    end
+
+    def collect(&block)
+      @root.collect &block
     end
 
     def copy
@@ -131,7 +135,7 @@ class XmlEasy
       @name = name.to_sym if name
       @body = ''
       @attributes = HashWithIndifferentAccess.new
-      @children = []
+      @children = ElementList.new
     end
 
     def body=(content)
@@ -178,10 +182,6 @@ class XmlEasy
       element.parent = self
     end
 
-    def prune_children(num)
-      @children = @children[0...num]
-    end
-
     def remove
       @parent.children.delete self
     end
@@ -194,6 +194,23 @@ class XmlEasy
       @attributes.each &block
     end
 
+    def size
+      1
+    end
+
+    def each_with_index(&block)
+      [self].each_with_index &block
+    end
+
+    def visit(&block)
+      block.call self
+      @children.each{|c| c.visit &block}
+    end
+
+    def collect(&block)
+      @children.inject(block.call(self) ? [self] : []){|s, c| s << c.collect(&block)}.flatten
+    end
+
     def to_s(indent=0)
       "#{"\t" * indent}<#{@name}" +
       unless @attributes.empty?
@@ -215,16 +232,12 @@ class XmlEasy
       copied.body = @body
       copied.attributes = HashWithIndifferentAccess[@attributes]
       @children.each do |c|
-        copied << c
+        copied << c.copy
       end
       copied
     end
 
     def method_missing(name, *args, &block)
-      if name == :each_with_index
-        [self].each_with_index &block
-        return 
-      end
       children = @children.select {|c| c.name == name.to_sym}
       if children.empty?
         name = name.to_s.sub(/^(.*)_$/, '\1').to_sym
@@ -234,13 +247,50 @@ class XmlEasy
         children = children.select &block
       end
       if children.empty?
-        #puts "<#{name}> does not exist in <#{@name}>."
-        raise NameError.new(name)
+        msg = "<#{name}> does not exist in <#{@name}>."
+        puts msg if $xmleasy_debug or $debug
+        raise NameError.new(msg)
+        nil
       elsif children.size == 1
         children.first
       else
-        children
+        children.to_element_list
+      end
+    end
+  end
+
+  class NilElement < Element
+    def size
+      0
+    end
+  end
+
+  class ElementList < Array
+    def method_missing(name, *args, &block)
+      elms = []
+      errs = []
+      off_debug do
+        elms = map do |e| 
+          begin; e.send(name, *args, &block) 
+          rescue => e; errs << e and [] end
+        end.flatten
+      end
+      #puts errs.map{|e| e.message}.join("\n") if $xmleasy_debug or $debug
+
+      unless block.nil?
+        elms = elms.select &block
       end
+      elms.to_element_list
+    end
+
+    protected
+
+    def off_debug(&block)
+      org = $xmleasy_debug
+      $xmleasy_debug = false
+      block.call
+    ensure
+      $xmleasy_debug = org
     end
   end
 end

data/test/test_xml_easy.rb

@@ -2,9 +2,23 @@ require 'test/unit'
 require 'lib/xml_easy'
 
 class XmlEasyTest < Test::Unit::TestCase
-  TEST_XML = "#{File.dirname(__FILE__)}/test.xml"
+  XML_DIR = "#{File.dirname(__FILE__)}/xml"
+
   def setup
-    @xml = XmlEasy::Document.new TEST_XML
+    @xml_simple = XmlEasy::Document.new "#{XML_DIR}/simple.xml"
+    @xml_complex = XmlEasy::Document.new "#{XML_DIR}/complex.xml"
+  end
+
+  def test_copy
+    xml2 = @xml_simple.copy
+
+    @xml_simple.root_[:id] = 'original'
+    assert_equal 'original', @xml_simple.root_[:id]
+    assert_not_equal 'original', xml2.root_[:id]
+
+    @xml_simple.root_.child1[:id] = 'original'
+    assert_equal 'original', @xml_simple.root_.child1[:id]
+    assert_not_equal 'original', xml2.root_.child1[:id]
   end
 
   def test_new_doc_with_string
@@ -29,17 +43,17 @@ class XmlEasyTest < Test::Unit::TestCase
   end
 
   def test_access_to_child
-    assert_equal "<child1 />\n", @xml.root_.child1.to_s
+    assert_equal "<child1 />\n", @xml_simple.root_.child1.to_s
   end
 
   def test_insert_after
-    c1 = @xml.root_.child1
-    c2 = @xml.root_.child2
+    c1 = @xml_simple.root_.child1
+    c2 = @xml_simple.root_.child2
 
     c21 = c2.copy
     c21[:attr1] = 'val11'
     c1.parent.<< c21, :after => c2
-    assert_element <<-expected, @xml
+    assert_element <<-expected, @xml_simple
 <?xml version='1.0'?>
 
 <root>
@@ -53,13 +67,13 @@ class XmlEasyTest < Test::Unit::TestCase
   end
 
   def test_insert_before
-    c1 = @xml.root_.child1
-    c2 = @xml.root_.child2
+    c1 = @xml_simple.root_.child1
+    c2 = @xml_simple.root_.child2
 
     c22 = c2.copy
     c22[:attr1] = 'val12'
     c1.parent.<< c22, :before => c2
-    assert_element <<-expected, @xml
+    assert_element <<-expected, @xml_simple
 <?xml version='1.0'?>
 
 <root>
@@ -73,13 +87,13 @@ class XmlEasyTest < Test::Unit::TestCase
   end
 
   def test_insert_top
-    c1 = @xml.root_.child1
-    c2 = @xml.root_.child2
+    c1 = @xml_simple.root_.child1
+    c2 = @xml_simple.root_.child2
 
     c23 = c2.copy
     c23[:attr1] = 'val13'
     c1.parent.<< c23, :top
-    assert_element <<-expected, @xml
+    assert_element <<-expected, @xml_simple
 <?xml version='1.0'?>
 
 <root>
@@ -93,13 +107,13 @@ class XmlEasyTest < Test::Unit::TestCase
   end
 
   def test_insert_bottom
-    c1 = @xml.root_.child1
-    c2 = @xml.root_.child2
+    c1 = @xml_simple.root_.child1
+    c2 = @xml_simple.root_.child2
 
     c24 = c2.copy
     c24[:attr1] = 'val14'
     c1.parent.<< c24, :bottom
-    assert_element <<-expected, @xml
+    assert_element <<-expected, @xml_simple
 <?xml version='1.0'?>
 
 <root>
@@ -112,6 +126,76 @@ class XmlEasyTest < Test::Unit::TestCase
     expected
   end
 
+  def test_condition
+    xml = XmlEasy::Document.new <<-end_of_xml
+<?xml version="1.0"?>
+<root>
+	<child id="id"></child>
+	<child>
+	  <grandchild></grandchild>
+  </child>
+</root>
+    end_of_xml
+
+    $xmleasy_debug = true
+    assert_equal 2, xml.root_.child.size
+    assert_equal 1, xml.root_.child{|c| c[:id] == 'id'}.size
+    assert_equal 1, xml.root_.child_.grandchild{|c| c[:id].nil?}.size
+    assert_equal 0, xml.root_.child_.grandchild{|c| !c[:id].nil?}.size
+  end
+
+  def test_array_to_element_list
+    ary = [XmlEasy::Element.new('name')]
+    assert_equal XmlEasy::ElementList, ary.to_element_list.class
+  end
+
+  def test_construct
+    xml = XmlEasy::Document.new
+    xml << :root
+  end
+
+  def test_visit
+    xml = XmlEasy.read <<-end_of_xml
+<?xml version="1.0"?>
+<root>
+	<child id="child"></child>
+	<child>
+	  <grandchild id="grandchild"></grandchild>
+  </child>
+</root>
+    end_of_xml
+
+    res = []
+    xml.visit do |e|
+      res << e.name unless e[:id].nil?
+    end
+    assert_equal [:child, :grandchild], res
+  end
+
+  def test_collect
+    xml = XmlEasy.read <<-end_of_xml
+<?xml version="1.0"?>
+<root>
+	<child id="child"></child>
+	<child>
+	  <grandchild id="grandchild"></grandchild>
+  </child>
+</root>
+    end_of_xml
+    
+    assert_equal [:child, :grandchild], xml.collect{|e| not e[:id].nil?}.map{|e| e.name}
+  end
+
+  def test_hash_with_ia
+    hash = HashWithIndifferentAccess.new
+    hash['key1'] = :value1
+    hash[:key2] = :value2
+    assert_equal :value1, hash['key1']
+    assert_equal :value1, hash[:key1]
+    assert_equal :value2, hash['key2']
+    assert_equal :value2, hash[:key2]
+  end
+
   protected
 
   def assert_element(expected, element)

data/test/xml/complex.xml

@@ -0,0 +1 @@
+<?xml version="1.0"?>

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4
 specification_version: 1
 name: XmlEasy
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2007-12-08 00:00:00 +09:00
+  version: 0.0.2
+date: 2007-12-09 00:00:00 +09:00
 summary: handle xml easily
 require_paths: 
 - lib
@@ -36,7 +36,9 @@ files:
 - bin/xml_easy
 - lib/xml_easy.rb
 - test/test_xml_easy.rb
-- test/test.xml
+- test/xml/simple.xml
+- test/xml/complex.xml
+- examples/xhtml_scrape.rb
 test_files: 
 - test/test_xml_easy.rb
 rdoc_options: