rambling-trie 0.1.0 → 0.2.0

data/lib/children_hash_deferer.rb

@@ -0,0 +1,20 @@
+module Rambling
+  module ChildrenHashDeferer
+    def [](key)
+      @children[key]
+    end
+
+    def []=(key, value)
+      @children[key] = value
+    end
+
+    def delete(key)
+      @children.delete(key)
+    end
+
+    def has_key?(key)
+      @children.has_key?(key)
+    end
+  end
+end
+

data/lib/rambling-trie.rb

@@ -1,4 +1,6 @@
 require File.join(File.dirname(__FILE__), 'invalid_trie_operation.rb')
+require File.join(File.dirname(__FILE__), 'children_hash_deferer.rb')
+require File.join(File.dirname(__FILE__), 'trie_compressor.rb')
 require File.join(File.dirname(__FILE__), 'trie_node.rb')
 require File.join(File.dirname(__FILE__), 'trie.rb')
 

data/lib/trie.rb

@@ -7,10 +7,21 @@ module Rambling
       add_all_nodes if filename
     end
 
+    def compress!
+      @is_compressed = true
+      super
+    end
+
+    def compressed?
+      @is_compressed
+    end
+
     private
     def add_all_nodes
       File.open(@filename) do |file|
-        file.readlines.each { |word| add_branch_from(word.chomp) }
+        while word = file.gets
+          add_branch_from(word.chomp)
+        end
       end
     end
   end

data/lib/trie_compressor.rb

@@ -0,0 +1,26 @@
+module Rambling
+  module TrieCompressor
+    def compress!
+      if @children.size == 1 and not terminal?
+        transfer_ownership_from(@children.values.first)
+        compress!
+      end
+
+      @children.values.each { |node| node.compress! }
+
+      self
+    end
+
+    private
+
+    def transfer_ownership_from(child)
+      @parent.delete(@letter) unless @parent.nil?
+      @letter = (@letter.to_s + child.letter.to_s).to_sym
+      @parent[@letter] = self unless @parent.nil?
+
+      @children = child.children
+      @is_terminal = child.terminal?
+      @children.values.each { |node| node.parent = self }
+    end
+  end
+end

data/lib/trie_node.rb

@@ -1,21 +1,22 @@
 module Rambling
   class TrieNode
-    attr_reader :letter, :children
+    include ChildrenHashDeferer
+    include TrieCompressor
+
+    attr_reader :letter, :children, :parent
 
     def initialize(word, parent = nil)
       @letter = nil
-      @word = ''
       @parent = parent
       @is_terminal = false
       @children = {}
 
       unless word.nil?
-        @letter = word.slice!(0)
+        letter = word.slice!(0)
+        @letter = letter.to_sym unless letter.nil?
         @is_terminal = word.empty?
-        @word = get_parent_letter_string if terminal?
         add_branch_from(word)
       end
-
     end
 
     def terminal=(terminal)
@@ -26,22 +27,9 @@ module Rambling
       @is_terminal
     end
 
-    def [](key)
-      @children[key]
-    end
-
-    def has_key?(key)
-      @children.has_key?(key)
-    end
-
-    def as_word
-      raise InvalidTrieOperation.new() unless @letter.nil? or terminal?
-      @word
-    end
-
     def add_branch_from(word)
       unless word.empty?
-        first_letter = word.slice(0)
+        first_letter = word.slice(0).to_sym
 
         if @children.has_key?(first_letter)
           word.slice!(0)
@@ -54,27 +42,42 @@ module Rambling
 
     def has_branch_for?(word)
       return true if word.empty?
-      passes_condition(word) { |node, sliced_word| node.has_branch_for?(sliced_word) }
+      branch_exists_and(word) { |node, sliced_word| node.has_branch_for?(sliced_word) }
+    end
+
+    def as_word
+      raise InvalidTrieOperation.new() unless @letter.nil? or terminal?
+      get_letter_string
     end
 
     def is_word?(word)
       return true if word.empty? and terminal?
-      passes_condition(word) { |node, sliced_word| node.is_word?(sliced_word) }
+      branch_exists_and(word) { |node, sliced_word| node.is_word?(sliced_word) }
     end
 
     protected
-    def get_parent_letter_string
+    def get_letter_string
       if @parent.nil?
-        @letter or ''
+        @letter.to_s or ''
       else
-        @parent.get_parent_letter_string + @letter
+        @parent.get_letter_string + @letter.to_s
       end
     end
 
+    def parent=(parent)
+      @parent = parent
+    end
+
     private
-    def passes_condition(word, &block)
+
+    def branch_exists_and(word, &block)
       first_letter = word.slice!(0)
-      return block.call(@children[first_letter], word) if @children.has_key?(first_letter)
+
+      unless first_letter.nil?
+        first_letter = first_letter.to_sym
+        return block.call(@children[first_letter], word) if @children.has_key?(first_letter)
+      end
+
       false
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -17,9 +17,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ./lib/children_hash_deferer.rb
 - ./lib/invalid_trie_operation.rb
 - ./lib/rambling-trie.rb
 - ./lib/trie.rb
+- ./lib/trie_compressor.rb
 - ./lib/trie_node.rb
 homepage: http://rubygems.org/gems/rambling-trie
 licenses: []