Changeset 2168c40635a237e84a69b74bb34c24f230052ae9

Timestamp:

08/30/08 00:14:25 (4 months ago)

Author:

Mark Guzman <segfault@…>

Parents:

9474da7584bfc0373ae26f41223d824bbcce3baa

Children:

5f7de15c00f6f991e77caf8bd30ac9eda203035a

git-committer:

Mark Guzman <segfault@hasno.info> / 2008-08-30T00:14:25Z-0400

Message:

finally loading properly as a gem

Files:

• Rakefile (modified) (1 diff)
• ext/fastxml.c (modified) (1 diff)
• ext/fastxml_doc.c (modified) (1 diff)
• lib/fastxml/fastxml_helpers.rb (moved) (moved from lib/fastxml_helpers.rb)
• lib/fastxml/fastxml_lib.rb (moved) (moved from lib/fastxml_lib.rb)
• specs/basic_html_spec.rb (modified) (1 diff)
• specs/basic_parsing_spec.rb (modified) (1 diff)
• specs/fastxml_doc_spec.rb (modified) (1 diff)
• specs/fastxml_node_attribute_spec.rb (modified) (1 diff)
• specs/fastxml_node_spec.rb (modified) (1 diff)
• specs/fastxml_nodelist_spec.rb (modified) (1 diff)

Rakefile

@@ -49 +49 @@
   s.description = "A simple ruby interface to libxml (with hpricot-like syntax)"
   s.files = FileList["{bin,lib,ext,test_data}/**/*"].to_a
-  s.require_path = %w[ ext lib ]
+  s.require_paths = %w[ ext lib ]
+  s.extensions = [ "ext/extconf.rb" ]
   s.autorequire = short_name
   s.test_files = FileList["{specs}/**/*spec.rb"].to_a

ext/fastxml.c

@@ -59 +59 @@
         
         /* pull in the ruby side of things */
-        rb_require( "lib/fastxml_lib" );      // ruby-side methods for the FastXml classes
-        rb_require( "lib/fastxml_helpers" );  // FastXml and FastHtml methods
+        rb_require( "fastxml/fastxml_lib" );      // ruby-side methods for the FastXml classes
+        rb_require( "fastxml/fastxml_helpers" );  // FastXml and FastHtml methods
 }
 

ext/fastxml_doc.c

@@ -217 +217 @@
 }
 
+/* Returns the FastXml::Node object representing the root element of
+ * the target document
+ *
+ * call-seq:
+ *   puts doc.root.name
+ */
+VALUE fastxml_doc_root_set(VALUE self, VALUE newroot)
+{
+    VALUE dv, odv;
+    fxml_data_t *data, *node_data;
+    xmlNodePtr root, new_root;
+
+    dv = rb_iv_get( self, "@lxml_doc" );
+    Data_Get_Struct( dv, fxml_data_t, data );
+
+        odv = rb_iv_get( self, "@lxml_doc" );
+        Data_Get_Struct( odv, fxml_data_t, node_data );
+
+    root = xmlDocGetRootElement( data->doc );
+        
+        if (rb_obj_is_kind_of(newroot, rb_cFastXmlNode) == Qfalse && rb_obj_is_kind_of(newroot, rb_cString) == Qfalse)
+          rb_raise(rb_eTypeError, "must pass a FastXml::Node or String type object");
+
+        new_root = xmlDocSetRootElement( data->doc, node_data->node );
+        if (new_root == NULL)
+          return Qnil;
+        
+        return newroot;
+}
+
 /* Parse an input string/array/stringio object into a FastXml::Doc object.
  * 

specs/basic_html_spec.rb

@@ -1 +1 @@
 # encoding: utf-8
-$: << '../ext'
-$: << './ext'
+%w[ ../ext ./ext ../lib ./lib ].each { |lp| $: << lp }
 
 require 'fastxml'

specs/basic_parsing_spec.rb

@@ -1 +1 @@
 # encoding: utf-8
-$: << '../ext'
-$: << './ext'
+%w[ ../ext ./ext ../lib ./lib ].each { |lp| $: << lp }
 
 require 'fastxml'

specs/fastxml_doc_spec.rb

@@ -1 +1 @@
 # encoding: utf-8
-$: << '../ext'
-$: << './ext'
+%w[ ../ext ./ext ../lib ./lib ].each { |lp| $: << lp }
 
 require 'fastxml'

specs/fastxml_node_attribute_spec.rb

@@ -1 @@
-$: << '../ext'
-$: << './ext'
 # encoding: utf-8 # :nodoc:
+%w[ ../ext ./ext ../lib ./lib ].each { |lp| $: << lp }
 require 'fastxml'
 

specs/fastxml_node_spec.rb

@@ -1 +1 @@
 # encoding: utf-8
-$: << '../ext'
-$: << './ext'
+%w[ ../ext ./ext ../lib ./lib ].each { |lp| $: << lp }
 
 require 'fastxml'

specs/fastxml_nodelist_spec.rb

@@ -1 +1 @@
 # encoding: utf-8
-$: << '../ext'
-$: << './ext'
+%w[ ../ext ./ext ../lib ./lib ].each { |lp| $: << lp }
 
 require 'fastxml'