xpather 0.0.5 → 0.0.6

data/ext/xpather/xpather.c

@@ -40,11 +40,13 @@ VALUE search(VALUE self, VALUE xpathExpr)
 
   if (size == 1) {
     results = rb_str_new2(xmlNodeGetContent(nodes->nodeTab[0]));
-  } else {
+  } else if (size > 1) {
     for (i = 0; i < size; ++i) {
       cur = nodes->nodeTab[i];
       rb_ary_push(results, rb_str_new2(xmlNodeGetContent(cur)));
     }
+  } else {
+    return Qnil;
   }
 
   xmlXPathFreeObject(xpathObj);
@@ -53,31 +55,27 @@ VALUE search(VALUE self, VALUE xpathExpr)
   return results;
 }
 
-static VALUE initialize(VALUE self, VALUE filename)
+static VALUE initialize(VALUE self, VALUE xmlStr)
 {
-  rb_iv_set(self, "@filename", filename);
+  rb_iv_set(self, "@xml_str", xmlStr);
   return self;
 }
 
-static VALUE filename(VALUE self)
-{
-  return rb_iv_get(self, "@filename");
-}
-
-VALUE constructor(VALUE self, VALUE filename)
+VALUE constructor(VALUE self, VALUE xmlStr)
 {
   xmlDocPtr doc;
+  const char *xmlCStr = StringValueCStr(xmlStr);
   VALUE argv[1];
   VALUE t_data;
 
-  doc = xmlParseMemory(StringValueCStr(filename), strlen(StringValueCStr(filename)));
+  doc = xmlParseMemory(xmlCStr, strlen(xmlCStr));
   if (doc == NULL) {
-    fprintf(stderr, "Error: unable to parse file \"%s\"\n", StringValueCStr(filename));
-    return -1;
+    fprintf(stderr, "Error: unable to parse xml\n");
+    return Qnil;
   }
 
   t_data = Data_Wrap_Struct(self, 0, xml_free, doc);
-  argv[0] = filename;
+  argv[0] = xmlStr;
   rb_obj_call_init(t_data, 1, argv);
   return t_data;
 }
@@ -87,6 +85,5 @@ void Init_xpather(void)
   VALUE klass = rb_define_class("XPather", rb_cObject);
   rb_define_singleton_method(klass, "new", constructor, 1);
   rb_define_method(klass, "initialize", initialize, 1);
-  rb_define_method(klass, "filename", filename, 0);
   rb_define_method(klass, "search", search, 1);
 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: xpather
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors: