fastxml 0.1.91 → 0.1.92

data/ext/fastxml.c

@@ -243,7 +243,7 @@ VALUE fastxml_xpath_search(VALUE self, VALUE raw_xpath, VALUE blk)
 	if (root->ns != NULL) { // we have a base namespace, this is going to get "interesting"
 		root_ns = (xmlChar*)root->ns->prefix;
 		if (root_ns == NULL) 
-			root_ns = (xmlChar*)"myFunkyLittleRootNsNotToBeUseByAnyoneElseIHope"; 
+			root_ns = (xmlChar*)"__myFunkyLittleRootNsNotToBeUseByAnyoneElseIHope__"; 
             // alternatives? how do other xpath processors handle root/default namespaces?
 
 		xmlXPathRegisterNs( xpath_ctx, root_ns, root->ns->href );

data/ext/fastxml_nodelist.c

@@ -40,12 +40,11 @@ VALUE fastxml_nodelist_length(VALUE self)
     dv = rb_iv_get( self, "@lxml_doc" );    
     Data_Get_Struct( dv, fxml_data_t, data );
 	
-	if (data->list_len == -1)
-	{
+	if (data->list_len == EMPTY_NODELIST) {              
 		data->list_len = 0;
-		cur = data->list;
-		while (cur != NULL)
-		{
+		
+        cur = data->list;
+		while (cur != NULL) {
 			data->list_len++;
 			cur = cur->next;
 		}
@@ -71,14 +70,26 @@ VALUE fastxml_nodelist_obj_to_ary(fxml_data_t *root)
 VALUE fastxml_nodeset_obj_to_ary(fxml_data_t *root)
 {
 	VALUE ret;
-	xmlNodePtr cur = root->xpath_obj->nodesetval->nodeTab;	
+	xmlNodePtr cur, sub = NULL;
 	int i;
-	
+
  	ret = rb_ary_new();
-    for (i = 0; i < root->list_len; i++) {
-        rb_ary_push( ret, fastxml_raw_node_to_obj( cur ) );
-		cur++;
+    if (root->xpath_obj->nodesetval->nodeTab != NULL) {
+        cur = *root->xpath_obj->nodesetval->nodeTab;	
+        for (i = 0; i < root->list_len; i++) {
+            if (cur->type != XML_ELEMENT_NODE)
+                continue;
+            
+            rb_ary_push( ret, fastxml_raw_node_to_obj( cur ) );
+            sub = cur->next;
+            while (sub != NULL) {
+                rb_ary_push( ret, fastxml_raw_node_to_obj( sub ) );
+                sub = sub->next;
+            }
+		    cur++;
+        }
     }
+    
 	
 	return ret;
 }
@@ -88,7 +99,7 @@ VALUE fastxml_nodelist_gen_list(VALUE self, fxml_data_t *data)
 	VALUE lst = rb_iv_get( self, "@list" );
 
 	if (lst == Qnil) {
-	 	if (data->xpath_obj != NULL) {
+        if (data->xpath_obj != NULL) {
 			lst = fastxml_nodeset_obj_to_ary( data );
 			rb_iv_set( self, "@list", lst );
 		} else {

data/ext/fastxml_nodelist.h

@@ -4,6 +4,10 @@
 
 #ifndef fastxml_nodelist_h
 #define fastxml_nodelist_h
+
+#define EMPTY_NODELIST -1
+#define EMPTY_NODESET -2
+
 RUBY_EXTERN VALUE fastxml_nodelist_initialize(VALUE self);
 RUBY_EXTERN VALUE fastxml_nodelist_inspect(VALUE self);
 RUBY_EXTERN VALUE fastxml_nodelist_length(VALUE self);

data/lib/fastxml_lib.rb

@@ -1,6 +1,6 @@
 # $Id$
 module FastXml
-  VERSION = "0.1.91" 
+  VERSION = "0.1.92" 
 end
 
 module FastXml::Common

data/specs/basic_parsing_spec.rb

@@ -45,4 +45,11 @@ describe FastXml::Doc, " when created" do
     doc.root.children.should_not be_nil
   end
 
+  it 'should be able to process io from open' do
+    doc = FastXml( open( "./test_data/hasno_feed.xml" ) )
+    doc.should_not be_nil
+    doc.to_s.should_not be_nil
+    doc.to_s.length.should >= 200
+  end
+
 end

data/specs/fastxml_node_spec.rb

@@ -23,7 +23,8 @@ describe FastXml::Node, ' functionality' do
     (@node/"feed").length.should >= 1
     (@node/"feed").length.should == @node.search( '/feed' ).length
   end  
-  
+
+
   it 'should provide a children accessor' do
     @node.should respond_to( :children )
     @node.children.should_not be_nil
@@ -37,6 +38,15 @@ describe FastXml::Node, ' functionality' do
   it 'should provide a to_s method' do
     @node.should respond_to( :to_s )
     @node.to_s.should_not be_nil
+    @node.to_s.length.should > 0
+  end
+
+  it 'should provide valid nodes from searches' do
+    entries = @node.search( '//entry' )
+    entries.should_not be_nil
+    entries.length.should > 0
+    entries.first.should_not be_nil
+    entries.first.to_s.should_not be_nil
   end
   
   it 'should provide an inspect method' do
@@ -107,4 +117,4 @@ describe FastXml::Node, ' functionality' do
     @node.content.should_not be_nil
     @node.content.should == "test"
   end
-end
+end

data/specs/fastxml_nodelist_spec.rb

@@ -42,5 +42,18 @@ describe FastXml::NodeList, ' functionality' do
     @list.inspect.should_not be_nil
   end
   
+  it 'should provide a first method' do
+    @list.should respond_to( :first )
+    @list.first.should_not be_nil
+    @list.first.should == @list[0]
+    @list.first.to_s.should == @list[0].to_s
+  end
+  
+  it 'should provide a last method' do
+    @list.should respond_to( :last )
+    @list.last.should_not be_nil
+    @list.last.should == @list[-1]
+    @list.last.to_s.should == @list[-1].to_s
+  end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: fastxml
 version: !ruby/object:Gem::Version 
-  version: 0.1.91
+  version: 0.1.92
 platform: ruby
 authors: 
 - Mark Guzman
@@ -9,7 +9,7 @@ autorequire: fastxml
 bindir: bin
 cert_chain: []
 
-date: 2008-05-05 00:00:00 -04:00
+date: 2008-05-12 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -51,7 +51,6 @@ extra_rdoc_files:
 files: 
 - lib/fastxml_lib.rb
 - ext/extconf.rb
-- ext/fastxml.bundle
 - ext/fastxml.c
 - ext/fastxml.h
 - ext/fastxml.o
@@ -67,7 +66,6 @@ files:
 - ext/fastxml_nodelist.c
 - ext/fastxml_nodelist.h
 - ext/fastxml_nodelist.o
-- ext/Makefile
 - ext/mkmf.log
 - test_data/cnn_main.html
 - test_data/hasno_feed.html

data/ext/Makefile

@@ -1,153 +0,0 @@
-
-SHELL = /bin/sh
-
-#### Start of system configuration section. ####
-
-srcdir = .
-topdir = /opt/local/lib/ruby/1.8/i686-darwin9.2.2
-hdrdir = $(topdir)
-VPATH = $(srcdir):$(topdir):$(hdrdir)
-prefix = $(DESTDIR)/opt/local
-exec_prefix = $(prefix)
-sitedir = $(prefix)/lib/ruby/site_ruby
-rubylibdir = $(libdir)/ruby/$(ruby_version)
-docdir = $(datarootdir)/doc/$(PACKAGE)
-dvidir = $(docdir)
-datarootdir = $(prefix)/share
-archdir = $(rubylibdir)/$(arch)
-sbindir = $(exec_prefix)/sbin
-psdir = $(docdir)
-vendordir = $(prefix)/lib/ruby/vendor_ruby
-localedir = $(datarootdir)/locale
-htmldir = $(docdir)
-datadir = $(datarootdir)
-includedir = $(prefix)/include
-infodir = $(datarootdir)/info
-sysconfdir = $(prefix)/etc
-mandir = $(DESTDIR)/opt/local/share/man
-libdir = $(exec_prefix)/lib
-sharedstatedir = $(prefix)/com
-oldincludedir = $(DESTDIR)/usr/include
-pdfdir = $(docdir)
-sitearchdir = $(sitelibdir)/$(sitearch)
-vendorarchdir = $(vendorlibdir)/$(vendorarch)
-bindir = $(exec_prefix)/bin
-localstatedir = $(prefix)/var
-vendorlibdir = $(vendordir)/$(ruby_version)
-sitelibdir = $(sitedir)/$(ruby_version)
-libexecdir = $(exec_prefix)/libexec
-
-CC = /usr/bin/gcc-4.0
-LIBRUBY = $(LIBRUBY_SO)
-LIBRUBY_A = lib$(RUBY_SO_NAME)-static.a
-LIBRUBYARG_SHARED = -l$(RUBY_SO_NAME)
-LIBRUBYARG_STATIC = -l$(RUBY_SO_NAME)-static
-
-RUBY_EXTCONF_H = 
-CFLAGS   =  -fno-common -O2  -fno-common -pipe -fno-common -Wall -I/opt/local/include/libxml2 
-INCFLAGS = -I. -I. -I/opt/local/lib/ruby/1.8/i686-darwin9.2.2 -I. -I/usr/include/libxml2
-CPPFLAGS =  -I/opt/local/include
-CXXFLAGS = $(CFLAGS) 
-DLDFLAGS = -L. -L/opt/local/lib -L/opt/local/lib -lxml2 -lz -lpthread -liconv -lm  
-LDSHARED = cc -dynamic -bundle -undefined suppress -flat_namespace
-AR = ar
-EXEEXT = 
-
-RUBY_INSTALL_NAME = ruby
-RUBY_SO_NAME = ruby
-arch = i686-darwin9.2.2
-sitearch = i686-darwin9.2.2
-vendorarch = i686-darwin9.2.2
-ruby_version = 1.8
-ruby = /opt/local/bin/ruby
-RUBY = $(ruby)
-RM = rm -f
-MAKEDIRS = mkdir -p
-INSTALL = /usr/bin/install
-INSTALL_PROG = $(INSTALL) -m 0755
-INSTALL_DATA = $(INSTALL) -m 644
-COPY = cp
-
-#### End of system configuration section. ####
-
-preload = 
-
-libpath = . $(libdir)
-LIBPATH =  -L"." -L"$(libdir)"
-DEFFILE = 
-
-CLEANFILES = mkmf.log
-DISTCLEANFILES = 
-
-extout = 
-extout_prefix = 
-target_prefix = 
-LOCAL_LIBS = 
-LIBS = $(LIBRUBYARG_SHARED) -lxslt -lxslt -lxml2 -lxml2  -lpthread -ldl -lobjc  
-SRCS = fastxml.c fastxml_attrlist.c fastxml_doc.c fastxml_node.c fastxml_nodelist.c
-OBJS = fastxml.o fastxml_attrlist.o fastxml_doc.o fastxml_node.o fastxml_nodelist.o
-TARGET = fastxml
-DLLIB = $(TARGET).bundle
-EXTSTATIC = 
-STATIC_LIB = 
-
-RUBYCOMMONDIR = $(sitedir)$(target_prefix)
-RUBYLIBDIR    = $(sitelibdir)$(target_prefix)
-RUBYARCHDIR   = $(sitearchdir)$(target_prefix)
-
-TARGET_SO     = $(DLLIB)
-CLEANLIBS     = $(TARGET).bundle $(TARGET).il? $(TARGET).tds $(TARGET).map
-CLEANOBJS     = *.o *.a *.s[ol] *.pdb *.exp *.bak
-
-all:		$(DLLIB)
-static:		$(STATIC_LIB)
-
-clean:
-		@-$(RM) $(CLEANLIBS) $(CLEANOBJS) $(CLEANFILES)
-
-distclean:	clean
-		@-$(RM) Makefile $(RUBY_EXTCONF_H) conftest.* mkmf.log
-		@-$(RM) core ruby$(EXEEXT) *~ $(DISTCLEANFILES)
-
-realclean:	distclean
-install: install-so install-rb
-
-install-so: $(RUBYARCHDIR)
-install-so: $(RUBYARCHDIR)/$(DLLIB)
-$(RUBYARCHDIR)/$(DLLIB): $(DLLIB)
-	$(INSTALL_PROG) $(DLLIB) $(RUBYARCHDIR)
-install-rb: pre-install-rb install-rb-default
-install-rb-default: pre-install-rb-default
-pre-install-rb: Makefile
-pre-install-rb-default: Makefile
-$(RUBYARCHDIR):
-	$(MAKEDIRS) $@
-
-site-install: site-install-so site-install-rb
-site-install-so: install-so
-site-install-rb: install-rb
-
-.SUFFIXES: .c .m .cc .cxx .cpp .C .o
-
-.cc.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cxx.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.cpp.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.C.o:
-	$(CXX) $(INCFLAGS) $(CPPFLAGS) $(CXXFLAGS) -c $<
-
-.c.o:
-	$(CC) $(INCFLAGS) $(CPPFLAGS) $(CFLAGS) -c $<
-
-$(DLLIB): $(OBJS)
-	@-$(RM) $@
-	$(LDSHARED) -o $@ $(OBJS) $(LIBPATH) $(DLDFLAGS) $(LOCAL_LIBS) $(LIBS)
-
-
-
-$(OBJS): ruby.h defines.h