tyler-trie 0.1.3 → 0.2.0

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-patch: 3
+patch: 0
 major: 0
-minor: 1
+minor: 2

data/ext/trie/trie.c

@@ -4,6 +4,8 @@
 #include <stdio.h>
 #include <string.h>
 
+VALUE cTrie, cTrieNode;
+
 static TrieChar* stringToTrieChar(VALUE string) {
     return (TrieChar*) RSTRING(string)->ptr;
 }
@@ -206,15 +208,111 @@ static VALUE trie_walk_to_terminal(VALUE self, VALUE args) {
 	iterator++;
     }
 
+    sb_trie_state_free(state);
+
     return Qnil;
 }
 
 static VALUE trie_get_path(VALUE self) {
     return rb_iv_get(self, "@path");
 }
- 
-VALUE cTrie;
 
+static void trie_node_free(SBTrieState *state) {
+    if(state)
+	sb_trie_state_free(state);
+}
+
+static VALUE trie_node_alloc(VALUE klass) {
+    SBTrieState *state;
+    VALUE obj;
+    
+    obj = Data_Wrap_Struct(klass, 0, trie_node_free, state);
+
+    return obj;
+}
+
+static VALUE trie_root(VALUE self) {
+    SBTrie *sb_trie;
+    Data_Get_Struct(self, SBTrie, sb_trie);
+
+    VALUE trie_node = trie_node_alloc(cTrieNode);
+
+    // replace the pretend SBTrieState created in TrieNode's alloc with a real one
+    RDATA(trie_node)->data = sb_trie_root(sb_trie);
+    
+    rb_iv_set(trie_node, "@state", Qnil);
+    rb_iv_set(trie_node, "@full_state", rb_str_new2(""));
+    return trie_node;
+}
+
+static VALUE trie_node_get_state(VALUE self) {
+    return rb_iv_get(self, "@state");
+}
+static VALUE trie_node_get_full_state(VALUE self) {
+    return rb_iv_get(self, "@full_state");
+}
+
+static VALUE trie_node_walk_bang(VALUE self, VALUE rchar) {
+    SBTrieState *state;
+    Data_Get_Struct(self, SBTrieState, state);
+
+    if(RSTRING(rchar)->len != 1)
+	return Qnil;
+
+    char ch = RSTRING(rchar)->ptr[0];
+    int result = sb_trie_state_walk(state, (TrieChar)ch);
+    
+    if(result) {
+	rb_iv_set(self, "@state", rchar);
+	VALUE full_state = rb_iv_get(self, "@full_state");
+	rb_str_append(full_state, rchar);
+	rb_iv_set(self, "@full_state", full_state);
+	return self;
+    } else
+	return Qnil;
+}
+
+static VALUE trie_node_value(VALUE self) {
+    SBTrieState *state, *dup;
+    Data_Get_Struct(self, SBTrieState, state);
+    
+    dup = sb_trie_state_clone(state);
+
+    sb_trie_state_walk(dup, (TrieChar)'\0');
+    TrieData trie_data = sb_trie_state_get_data(dup);
+    sb_trie_state_free(dup);
+
+    return TRIE_DATA_ERROR == trie_data ? Qnil : INT2FIX(trie_data);
+}
+
+static VALUE trie_node_terminal(VALUE self) {
+    SBTrieState *state;
+    Data_Get_Struct(self, SBTrieState, state);
+    
+    return sb_trie_state_is_terminal(state) ? Qtrue : Qnil;
+}
+
+static VALUE trie_node_leaf(VALUE self) {
+    SBTrieState *state;
+    Data_Get_Struct(self, SBTrieState, state);
+    
+    return sb_trie_state_is_leaf(state) ? Qtrue : Qnil;
+}
+
+static VALUE trie_node_clone(VALUE self) {
+    SBTrieState *state;
+    Data_Get_Struct(self, SBTrieState, state);
+    
+    VALUE new_node = trie_node_alloc(cTrieNode);
+    RDATA(new_node)->data = sb_trie_state_clone(state);
+    
+    rb_iv_set(new_node, "@state", rb_iv_get(self, "@state"));
+    rb_iv_set(new_node, "@full_state", rb_iv_get(self, "@full_state"));
+
+    return new_node;
+}
+
+ 
 void Init_trie() {
     cTrie = rb_define_class("Trie", rb_cObject);
     rb_define_alloc_func(cTrie, trie_alloc);
@@ -227,4 +325,15 @@ void Init_trie() {
     rb_define_method(cTrie, "close", trie_close, 0);
     rb_define_method(cTrie, "children", trie_children, 1);
     rb_define_method(cTrie, "walk_to_terminal", trie_walk_to_terminal, -2);
+    rb_define_method(cTrie, "root", trie_root, 0);
+
+    cTrieNode = rb_define_class("TrieNode", rb_cObject);
+    rb_define_alloc_func(cTrieNode, trie_node_alloc);
+    rb_define_method(cTrieNode, "state", trie_node_get_state, 0);
+    rb_define_method(cTrieNode, "full_state", trie_node_get_full_state, 0);
+    rb_define_method(cTrieNode, "walk!", trie_node_walk_bang, 1);
+    rb_define_method(cTrieNode, "value", trie_node_value, 0);
+    rb_define_method(cTrieNode, "terminal?", trie_node_terminal, 0);
+    rb_define_method(cTrieNode, "leaf?", trie_node_leaf, 0);
+    rb_define_method(cTrieNode, "clone", trie_node_clone, 0);
 }

data/spec/trie_spec.rb

@@ -99,4 +99,119 @@ describe Trie do
       @trie.walk_to_terminal('anderson',true).should == ['and', 15]
     end
   end
+
+  describe :root do
+    it 'returns a TrieNode' do
+      @trie.root.should be_an_instance_of(TrieNode)
+    end
+
+    it 'returns a different TrieNode each time' do
+      @trie.root.should_not == @trie.root
+    end
+  end
+end
+
+describe TrieNode do
+  before :each do
+    @trie = Trie.new(TRIE_PATH);
+    @trie.add('rocket',1)
+    @trie.add('rock',2)
+    @trie.add('frederico',3)
+    @node = @trie.root
+  end
+  
+  after :each do
+    @trie.close
+    File.delete('spec/test-trie/trie.br')
+    File.delete('spec/test-trie/trie.tl')
+    File.delete('spec/test-trie/trie.sbm')
+  end
+
+  describe :state do
+    it 'returns the most recent state character' do
+      @node.walk!('r')
+      @node.state.should == 'r'
+      @node.walk!('o')
+      @node.state.should == 'o'
+    end
+
+    it 'is nil when no walk has occurred' do
+      @node.state.should == nil
+    end
+  end
+
+  describe :full_state do
+    it 'returns the current string' do
+      @node.walk!('r').walk!('o').walk!('c')
+      @node.full_state.should == 'roc'
+    end
+
+    it 'is a blank string when no walk has occurred' do
+      @node.full_state.should == ''
+    end
+  end
+  
+  describe :walk! do
+    it 'returns the updated object when the walk succeeds' do
+      other = @node.walk!('r')
+      other.should == @node
+    end
+
+    it 'returns nil when the walk fails' do
+      @node.walk!('q').should be_nil
+    end
+  end
+
+  describe :value do
+    it 'returns nil when the node is not terminal' do
+      @node.walk!('r')
+      @node.value.should be_nil
+    end
+
+    it 'returns a value when the node is terminal' do
+      @node.walk!('r').walk!('o').walk!('c').walk!('k')
+      @node.value.should == 2
+    end
+  end
+
+  describe :terminal? do
+    it 'returns true when the node is a word end' do
+      @node.walk!('r').walk!('o').walk!('c').walk!('k')
+      @node.should be_terminal
+    end
+
+    it 'returns nil when the node is not a word end' do
+      @node.walk!('r').walk!('o').walk!('c')
+      @node.should_not be_terminal
+    end
+  end
+
+  describe :leaf? do
+    it 'returns true when this is the end of a branch of the trie' do
+      @node.walk!('r').walk!('o').walk!('c').walk!('k').walk!('e').walk!('t')
+      @node.should be_leaf
+    end
+
+    it 'returns nil when there are more splits on this branch' do
+      @node.walk!('r').walk!('o').walk!('c').walk!('k')
+      @node.should_not be_leaf
+    end
+  end
+
+  describe :clone do
+    it 'creates a new instance of this node which is not this node' do
+      new_node = @node.clone
+      new_node.should_not == @node
+    end
+
+    it 'matches the state of the current node' do
+      new_node = @node.clone
+      new_node.state.should == @node.state
+    end
+
+    it 'matches the full_state of the current node' do
+      new_node = @node.clone
+      new_node.full_state.should == @node.full_state
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tyler-trie
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tyler McMullen
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-09 00:00:00 -07:00
+date: 2009-03-10 00:00:00 -07:00
 default_executable: 
 dependencies: []