Changeset 7714b02d25b8c8852538264cec4a37577d682068

Timestamp:

08/05/07 23:41:01 (17 months ago)

Author:

Mark Guzman <segfault@…>

Parents:

44461b23e49dc856ad7b26ea70d01c4b23c56e1f

Children:

353e95b8dce9775aee6b01ec373cb939d4d76baf

git-committer:

Mark Guzman <segfault@hasno.info> / 2007-08-06T03:41:01Z+0000

Message:

starting to add hpricot-like features ala (node/"xpath") and FastXml?("my doc info")

git-svn-id: svn://hasno.info/fastxml/trunk@24 b3082176-f867-4bde-be85-e3c57d66f029

Files:

• ext/fastxml.c (modified) (3 diffs)
• lib/fastxml_lib.rb (modified) (1 diff)

ext/fastxml.c

@@ -75 +75 @@
     xmlXPathInit();
     VALUE rb_mFastXml = rb_define_module( "FastXml" );
-    rb_define_const( rb_mFastXml, "VERSION", rb_str_new2( "0.1" ) );
+    //rb_define_const( rb_mFastXml, "VERSION", rb_str_new2( "0.1" ) );
     rb_cFastXmlDoc = rb_define_class_under( rb_mFastXml, "Doc", rb_cObject );        
     rb_cFastXmlNode = rb_define_class_under( rb_mFastXml, "Node", rb_cObject );
 
     /* Doc */
-    rb_include_module( rb_cFastXmlDoc, rb_mEnumerable );
+    //rb_include_module( rb_cFastXmlDoc, rb_mEnumerable );
     rb_define_method( rb_cFastXmlDoc, "initialize", fastxml_doc_initialize, 1 );
     rb_define_method( rb_cFastXmlDoc, "search", fastxml_doc_search, 1 );
@@ -91 +91 @@
     
     /* Node */
-    rb_include_module( rb_cFastXmlNode, rb_mEnumerable );
+    //rb_include_module( rb_cFastXmlNode, rb_mEnumerable );
     rb_define_method( rb_cFastXmlNode, "initialize", fastxml_node_initialize, 0 );
     rb_define_method( rb_cFastXmlNode, "search", fastxml_node_search, 1 );
@@ -105 +105 @@
         rb_define_method( rb_cFastXmlNode, "prev", fastxml_node_prev, 0 );      
         rb_define_method( rb_cFastXmlNode, "parent", fastxml_node_parent, 0 );  
+        
+        rb_require( "lib/fastxml_lib" );
 }
 

lib/fastxml_lib.rb

@@ -3 +3 @@
   VERSION = "0.1.%s" % "$Rev$".gsub(/\$Rev:\s+/, '').gsub(/\s*\$$/, '')
 end
+
+module FastXml::Common
+  def children_of_type(type)
+    self.search( "//#{type}" )
+  end
+  
+  def each_child(&blk)
+    self.children.each { |chld| yield chld }
+  end
+  
+  def /(xpath)
+    self.search( "/#{xpath.to_s}" )
+  end
+  
+  alias :to_s :display
+end
+
+class FastXml::Doc
+  include FastXml::Common
+  
+  def doc?
+    true
+  end
+  
+  def doctype?
+    nil
+  end
+end
+
+class FastXml::Node
+  include FastXml::Common
+  def doc?
+    false
+  end
+end
+
+
+def FastXml(data=nil, opts = {}, &blk)
+  FastXml::Doc.new data
+end