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

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

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

0
@@ -42,6 +42,19 @@
0
     @list.inspect.should_not be_nil
0
   end
0
   
0
+  it 'should provide a first method' do
0
+    @list.should respond_to( :first )
0
+    @list.first.should_not be_nil
0
+    @list.first.should == @list[0]
0
+    @list.first.to_s.should == @list[0].to_s
0
+  end
0
+  
0
+  it 'should provide a last method' do
0
+    @list.should respond_to( :last )
0
+    @list.last.should_not be_nil
0
+    @list.last.should == @list[-1]
0
+    @list.last.to_s.should == @list[-1].to_s
0
+  end
0
 
0
 end