fast_trie 0.3.7 → 0.4.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 --- 
 :major: 0
-:minor: 3
+:minor: 4
 :build: 
-:patch: 7
+:patch: 0

data/ext/trie/trie.c

@@ -19,6 +19,54 @@ static VALUE rb_trie_alloc(VALUE klass) {
 	return obj;
 }
 
+void raise_ioerror(const char * message) {
+    VALUE rb_eIOError = rb_const_get(rb_cObject, rb_intern("IOError"));
+    rb_raise(rb_eIOError, message);
+}
+
+/*
+ * call-seq:
+ *   read(filename_base) -> Trie
+ *
+ * Returns a new trie with data as read from disk.
+ */
+static VALUE rb_trie_read(VALUE self, VALUE filename_base) {
+  VALUE da_filename = rb_str_dup(filename_base);
+  rb_str_concat(da_filename, rb_str_new2(".da"));
+  StringValue(da_filename);
+    
+  VALUE tail_filename = rb_str_dup(filename_base);
+  rb_str_concat(tail_filename, rb_str_new2(".tail"));
+  StringValue(tail_filename);
+
+  Trie *trie = trie_new();
+
+  VALUE obj;
+  obj = Data_Wrap_Struct(self, 0, trie_free, trie);
+
+  DArray *old_da = trie->da;
+  Tail *old_tail = trie->tail;
+
+  FILE *da_file = fopen(RSTRING_PTR(da_filename), "r");
+  if (da_file == NULL)
+    raise_ioerror("Error reading .da file.");
+
+  trie->da = da_read(da_file);
+  fclose(da_file);
+
+  FILE *tail_file = fopen(RSTRING_PTR(tail_filename), "r");
+  if (tail_file == NULL)
+    raise_ioerror("Error reading .tail file.");
+
+  trie->tail = tail_read(tail_file);
+  fclose(tail_file);
+
+  da_free(old_da);
+  tail_free(old_tail);
+
+  return obj;
+}
+
 /*
  * call-seq:
  *   has_key?(key) -> true/false
@@ -446,10 +494,47 @@ static VALUE rb_trie_node_leaf(VALUE self) {
     return trie_state_is_leaf(state) ? Qtrue : Qnil;
 }
 
+/*
+ * call-seq:
+ *   save(filename_base) -> true
+ *
+ * Saves the trie data to two files, filename_base.da and filename_base.tail.
+ * Returns true if saving was successful.
+ */
+static VALUE rb_trie_save(VALUE self, VALUE filename_base) {
+  VALUE da_filename = rb_str_dup(filename_base);
+  rb_str_concat(da_filename, rb_str_new2(".da"));
+  StringValue(da_filename);
+    
+  VALUE tail_filename = rb_str_dup(filename_base);
+  rb_str_concat(tail_filename, rb_str_new2(".tail"));
+  StringValue(tail_filename);
+
+  Trie *trie;
+  Data_Get_Struct(self, Trie, trie);
+
+  FILE *da_file = fopen(RSTRING_PTR(da_filename), "w");
+  if (da_file == NULL)
+    raise_ioerror("Error opening .da file for writing.");
+  if (da_write(trie->da, da_file) != 0)
+    raise_ioerror("Error writing DArray data.");
+  fclose(da_file);
+
+  FILE *tail_file = fopen(RSTRING_PTR(tail_filename), "w");
+  if (tail_file == NULL)
+    raise_ioerror("Error opening .tail file for writing.");
+  if (tail_write(trie->tail, tail_file) != 0)
+    raise_ioerror("Error writing Tail data.");
+  fclose(tail_file);
+
+  return Qtrue;
+}
+
  
 void Init_trie() {
     cTrie = rb_define_class("Trie", rb_cObject);
     rb_define_alloc_func(cTrie, rb_trie_alloc);
+    rb_define_module_function(cTrie, "read", rb_trie_read, 1);
     rb_define_method(cTrie, "has_key?", rb_trie_has_key, 1);
     rb_define_method(cTrie, "get", rb_trie_get, 1);
     rb_define_method(cTrie, "add", rb_trie_add, -2);
@@ -457,10 +542,11 @@ void Init_trie() {
     rb_define_method(cTrie, "children", rb_trie_children, 1);
     rb_define_method(cTrie, "children_with_values", rb_trie_children_with_values, 1);
     rb_define_method(cTrie, "root", rb_trie_root, 0);
+    rb_define_method(cTrie, "save", rb_trie_save, 1);
 
     cTrieNode = rb_define_class("TrieNode", rb_cObject);
     rb_define_alloc_func(cTrieNode, rb_trie_node_alloc);
-	rb_define_method(cTrieNode, "initialize_copy", rb_trie_node_initialize_copy, 1);
+    rb_define_method(cTrieNode, "initialize_copy", rb_trie_node_initialize_copy, 1);
     rb_define_method(cTrieNode, "state", rb_trie_node_get_state, 0);
     rb_define_method(cTrieNode, "full_state", rb_trie_node_get_full_state, 0);
     rb_define_method(cTrieNode, "walk!", rb_trie_node_walk_bang, 1);

data/spec/trie_spec.rb

@@ -8,12 +8,6 @@ describe Trie do
     @trie.add('frederico')
   end
   
-  #describe :path do
-  #  it 'returns the correct path' do
-  #    @trie.path.should == TRIE_PATH
-  #  end
-  #end
-
   describe :has_key? do
     it 'returns true for words in the trie' do
       @trie.has_key?('rocket').should be_true
@@ -144,15 +138,37 @@ describe Trie do
     end
   end
 
-  #describe :save do
-  #  it 'saves the trie to disk such that another trie can be spawned which will read succesfully' do
-  #    @trie.add('omgwtf',123)
-  #    @trie.save
-  #
-  #    trie2 = Trie.new(TRIE_PATH)
-  #    trie2.get('omgwtf').should == 123
-  #  end
-  #end
+  describe 'save/read' do
+    let(:filename_base) do
+      dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'tmp'))
+      FileUtils.mkdir_p(dir)
+      File.join(dir, 'trie')
+    end
+    
+    context 'when I save the populated trie to disk' do
+      before(:each) do
+        @trie.add('omgwtflolbbq', 123)
+        @trie.save(filename_base)
+      end
+      
+      it 'should contain the same data when reading from disk' do
+        trie2 = Trie.read(filename_base)
+        trie2.get('omgwtflolbbq').should == 123
+      end
+    end
+  end
+  
+  describe :read do
+    context 'when the files to read from do not exist' do
+      let(:filename_base) do
+        "phantasy/file/path/that/does/not/exist"
+      end
+      
+      it 'should raise an error when attempting a read' do
+        lambda { Trie.read(filename_base) }.should raise_error(IOError)
+      end
+    end
+  end
 end
 
 describe TrieNode do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: fast_trie
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 15
   prerelease: false
   segments: 
   - 0
-  - 3
-  - 7
-  version: 0.3.7
+  - 4
+  - 0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-09-21 00:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -31,6 +31,12 @@ extra_rdoc_files:
 files: 
 - README.textile
 - VERSION.yml
+- ext/darray.o
+- ext/fileutils.o
+- ext/tail.o
+- ext/trie-private.o
+- ext/trie.bundle
+- ext/trie.o
 - ext/trie/darray.c
 - ext/trie/darray.h
 - ext/trie/extconf.rb