aurelian-ruby-ahocorasick 0.3.3 → 0.4.1

data/ext/ruby-ahocorasick.c

@@ -75,7 +75,7 @@ rb_kwt_init(VALUE self)
  * Document-method: make
  * call-seq: make
  *
- * It freezes the current KeywordTree. After this point, the tree will not accept any new entries.
+ * It freezes the current KeywordTree.
  *
  * ==== Note: This method is called internally by search
  *
@@ -93,14 +93,20 @@ rb_kwt_make(VALUE self)
   struct kwt_struct_data *kwt_data;
   KeywordTree(self, kwt_data);
 
-  ac_prep( kwt_data->tree );
-  kwt_data->is_frozen = 1;
-  return self;
+  if(kwt_data->is_frozen == 1)
+    return Qtrue;
+  
+  if(ac_prep( kwt_data->tree ) == 1) {
+    kwt_data->is_frozen = 1;
+    return Qtrue;
+  }
+
+  rb_raise(rb_eRuntimeError, "Cannot freeze the tree");
 }
 
 /*
- * Document-method: search
- * call-seq: search
+ * Document-method: find_all
+ * call-seq: find_all
  *
  * Search the current tree.
  *
@@ -142,7 +148,8 @@ rb_kwt_find_all(int argc, VALUE *argv, VALUE self)
   KeywordTree(self, kwt_data);
   // freeze the tree, if not already
   if(kwt_data->is_frozen == 0) {
-    ac_prep( kwt_data->tree );
+    if(ac_prep( kwt_data->tree ) == 0) 
+      rb_raise(rb_eRuntimeError, "Cannot freeze the tree");
     kwt_data->is_frozen = 1;
   }
   // prepare the return value
@@ -165,7 +172,8 @@ rb_kwt_find_all(int argc, VALUE *argv, VALUE self)
     rb_ary_push( v_results, v_result );
     free(result);
   }
-  // TODO: maybe the Tree can be re-opened to add new items to dictionary
+  // reopen the tree
+  kwt_data->is_frozen= 0;
   return v_results;
 }
 

data/spec/ahocorasick_spec.rb

@@ -170,6 +170,13 @@ describe KeywordTree do
       lambda{kwt << "foo"}.should raise_error(RuntimeError)
     end
 
+    it "should work to add entries on the tree after a search" do
+      kwt= KeywordTree.from_file File.dirname(__FILE__) + "/data/dict0.txt"
+      kwt.find_all("foo-bar not found")
+      kwt.add_string("not found")
+      kwt.find_all("foo-bar not found").size.should == 1
+    end
+
   end
 
   describe "Benchmarks. Loading from a file" do
@@ -187,7 +194,7 @@ describe KeywordTree do
       load_time= Time.now
       results= k.find_all( File.read( File.dirname(__FILE__) + "/data/melville-moby_dick.txt" ) )
       puts "\n%d words re-loaded in %s seconds.\nGot %d results in %s seconds" % [k.size, (load_time - start), results.size, (Time.now-load_time)]
-      (Time.now-load_time).should < 1.2
+      (Time.now-load_time).should < 1.3
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: aurelian-ruby-ahocorasick
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors: 
 - Aurelian Oancea