rambling-trie 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b23cfe0d2b236a7970f4666f0df6a7cc4226d22
-  data.tar.gz: 5147da530a25b386fdafd9cc59ccb1c35b2a2efc
+  metadata.gz: 9db4c20b2cd932bc23376649e312e566eb43e227
+  data.tar.gz: 40e5584acca19930a92cd894e43a51dccca4d1f1
 SHA512:
-  metadata.gz: 71405a6dd24e710629d9e8cb8d307b2faa5664f029bcdedd749063d106e6706bce5fb07fb6ecbf776098668d0b5ab3826e3f3d6d9f75e96e516c2cbce07de2ab
-  data.tar.gz: 6d5a292f676c979dbf2e3b7cc25d8a932cf087c14325df539b2ccafd872083d9ca1140224eb4edbc93c4fb0e920bd7f75374ba0bbd260d911fdf057fdb5cdd0d
+  metadata.gz: f0e1a3166c876d3d3730dd439563567fbeb2108b33b908152c1a388daf2edf75cfbc250f67a7c0d00ec3dd923be3e71f770b3d3ff28bbd0ecaeadb3fe3fe162c
+  data.tar.gz: 9f0decef0f2d1dd386677a8631888b4744315ede61b5f5957fd51ebf98b845a4564ea3ada4df60590ffcc8a82a27f5904d7261bd3dc21cf7f422c184932b8781

data/lib/rambling/trie/compressed_node.rb

@@ -29,8 +29,7 @@ module Rambling
       # @param [Array] chars the characters to look for in the trie.
       # @return [Array] all the words contained in the trie that start with the specified characters.
       def scan chars
-        node = chars.empty? ? self : closest_node(chars)
-        node.to_a
+        chars.empty? ? self : closest_node(chars)
       end
 
       # Always return `true` for a raw (compressed) node.
@@ -73,7 +72,7 @@ module Rambling
         begin
           current_length += 1
 
-          if (current_key && current_key.length == current_length) || chars.empty?
+          if current_key && (current_key.length == current_length || chars.empty?)
             return children_tree[current_key.to_sym].send method, chars
           end
         end while current_key && current_key[current_length] == chars.slice!(0)

data/lib/rambling/trie/container.rb

@@ -7,11 +7,18 @@ module Rambling
       include ::Enumerable
 
       delegate [
-        :each,
-        :compressed?,
         :[],
+        :as_word,
+        :children,
+        :children_tree,
+        :compressed?,
+        :each,
+        :has_key?,
+        :inspect,
         :letter,
-        :inspect
+        :parent,
+        :size,
+        :to_s
       ] => :root
 
       # Creates a new Trie.

data/lib/rambling/trie/raw_node.rb

@@ -45,7 +45,7 @@ module Rambling
       # @param [Array] chars the characters to look for in the trie.
       # @return [Array] all the words contained in the trie that start with the specified characters.
       def scan chars
-        closest_node chars
+        chars.empty? ? self : closest_node(chars)
       end
 
       # Always return `false` for a raw (uncompressed) node.
@@ -57,18 +57,10 @@ module Rambling
       protected
 
       def closest_node chars
-        if chars.empty?
-          self
-        else
-          letter = chars.slice!(0).to_sym
-          child = children_tree[letter]
+        letter = chars.slice!(0).to_sym
+        child = children_tree[letter]
 
-          if child
-            child.closest_node chars
-          else
-            Rambling::Trie::MissingNode.new
-          end
-        end
+        child ? child.scan(chars) : Rambling::Trie::MissingNode.new
       end
 
       private

data/lib/rambling/trie/version.rb

@@ -1,6 +1,6 @@
 module Rambling
   module Trie
     # Current version of the rambling-trie.
-    VERSION = '0.9.1'
+    VERSION = '0.9.2'
   end
 end

data/reports/0.8.1/benchmark

@@ -1,3 +1,4 @@
+# Ruby 2.3.3
 
 Benchmark for rambling-trie version 0.8.1
 ==> Creation

data/reports/0.9.2/benchmark

@@ -0,0 +1,58 @@
+
+Benchmark for rambling-trie version 0.9.2
+==> Creation
+`Rambling::Trie.create`
+                                8.970000   0.200000   9.170000 (  9.283692)
+
+Benchmark for rambling-trie version 0.9.2
+==> Compression
+`compress!`
+                                1.720000   0.030000   1.750000 (  1.753067)
+                                1.660000   0.000000   1.660000 (  1.671923)
+                                1.430000   0.010000   1.440000 (  1.446879)
+                                1.240000   0.060000   1.300000 (  1.313478)
+                                1.230000   0.060000   1.290000 (  1.299892)
+
+Benchmark for rambling-trie version 0.9.2
+==> Uncompressed
+`word?`
+hi                  true        0.230000   0.000000   0.230000 (  0.233806)
+help                true        0.390000   0.000000   0.390000 (  0.388282)
+beautiful           true        0.810000   0.000000   0.810000 (  0.818193)
+impressionism       true        1.050000   0.010000   1.060000 (  1.047699)
+anthropological     true        1.150000   0.000000   1.150000 (  1.158661)
+`partial_word?`
+hi                  true        0.210000   0.000000   0.210000 (  0.212588)
+help                true        0.410000   0.000000   0.410000 (  0.409012)
+beautiful           true        0.770000   0.000000   0.770000 (  0.778091)
+impressionism       true        0.990000   0.010000   1.000000 (  0.997804)
+anthropological     true        1.140000   0.000000   1.140000 (  1.142530)
+==> Compressed
+`word?`
+hi                  true        0.240000   0.000000   0.240000 (  0.235445)
+help                true        0.390000   0.000000   0.390000 (  0.397614)
+beautiful           true        0.760000   0.000000   0.760000 (  0.757404)
+impressionism       true        1.030000   0.000000   1.030000 (  1.036627)
+anthropological     true        1.290000   0.000000   1.290000 (  1.291476)
+`partial_word?`
+hi                  true        1.070000   0.010000   1.080000 (  1.084173)
+help                true        2.170000   0.010000   2.180000 (  2.183891)
+beautiful           true        2.920000   0.000000   2.920000 (  2.941010)
+impressionism       true        4.520000   0.010000   4.530000 (  4.542043)
+anthropological     true        4.350000   0.010000   4.360000 (  4.362716)
+
+Benchmark for rambling-trie version 0.9.2
+==> Uncompressed
+`scan`
+hi                  495         2.010000   0.010000   2.020000 (  2.020800)
+help                20          6.800000   0.050000   6.850000 (  6.870425)
+beautiful           6           2.600000   0.010000   2.610000 (  2.618016)
+impressionism       2           2.410000   0.000000   2.410000 (  2.423997)
+anthropological     2           2.820000   0.010000   2.830000 (  2.825191)
+==> Compressed
+`scan`
+hi                  495         1.180000   0.000000   1.180000 (  1.191953)
+help                20          5.350000   0.010000   5.360000 (  5.360441)
+beautiful           6           3.190000   0.010000   3.200000 (  3.224402)
+impressionism       2           5.790000   0.040000   5.830000 (  5.892171)
+anthropological     2           5.580000   0.020000   5.600000 (  5.629519)

data/spec/lib/rambling/trie/compressed_node_spec.rb

@@ -32,4 +32,124 @@ describe Rambling::Trie::CompressedNode do
       expect { node.add 'restaurant' }.to raise_error Rambling::Trie::InvalidOperation
     end
   end
+
+  describe '#partial_word?' do
+    let(:raw_node) { Rambling::Trie::RawNode.new }
+    let(:compressor) { Rambling::Trie::Compressor.new }
+    let(:node) { compressor.compress raw_node }
+
+    context 'when the chars array is empty' do
+      it 'returns true' do
+        expect(node.partial_word? []).to be true
+      end
+    end
+
+    context 'when the chars array is not empty' do
+      context 'when the node has a tree that matches the characters' do
+        before do
+          raw_node.add 'abc'
+        end
+
+        it 'returns true' do
+          expect(node.partial_word? %w(a)).to be true
+          expect(node.partial_word? %w(a b)).to be true
+          expect(node.partial_word? %w(a b c)).to be true
+        end
+      end
+
+      context 'when the node has a tree that does not match the characters' do
+        before do
+          raw_node.add 'cba'
+        end
+
+        it 'returns false' do
+          expect(node.partial_word? %w(a)).to be false
+          expect(node.partial_word? %w(a b)).to be false
+          expect(node.partial_word? %w(a b c)).to be false
+        end
+      end
+    end
+  end
+
+  describe '#word?' do
+    let(:raw_node) { Rambling::Trie::RawNode.new }
+    let(:compressor) { Rambling::Trie::Compressor.new }
+    let(:node) { compressor.compress raw_node }
+
+    context 'when the chars array is empty' do
+      context 'when the node is terminal' do
+        before do
+          node.terminal!
+        end
+
+        it 'returns true' do
+          expect(node.word? []).to be true
+        end
+      end
+
+      context 'when the node is not terminal' do
+        it 'returns false' do
+          expect(node.word? []).to be false
+        end
+      end
+    end
+
+    context 'when the chars array is not empty' do
+      context 'when the node has a tree that matches all the characters' do
+        before do
+          raw_node.add 'abc'
+        end
+
+        it 'returns true' do
+          expect(node.word? %w(a b c)).to be true
+        end
+      end
+
+      context 'when the node has a tree that does not match all the characters' do
+        before do
+          raw_node.add 'abc'
+        end
+
+        it 'returns false' do
+          expect(node.word? %w(a)).to be false
+          expect(node.word? %w(a b)).to be false
+        end
+      end
+    end
+  end
+
+  describe '#scan' do
+    let(:raw_node) { Rambling::Trie::RawNode.new }
+    let(:compressor) { Rambling::Trie::Compressor.new }
+    let(:node) { compressor.compress raw_node }
+
+    context 'when the chars array is empty' do
+      it 'returns itself' do
+        expect(node.scan []).to eq node
+      end
+    end
+
+    context 'when the chars array is not empty' do
+      before do
+        raw_node.add 'cba'
+      end
+
+      context 'when the chars are found' do
+        it 'returns the found child' do
+          expect(node.scan %w(c)).to eq node[:cba]
+          expect(node.scan %w(c b)).to eq node[:cba]
+          expect(node.scan %w(c b a)).to eq node[:cba]
+        end
+      end
+
+      context 'when the chars are not found' do
+        it 'returns a MissingNode' do
+          expect(node.scan %w(a)).to be_a Rambling::Trie::MissingNode
+          expect(node.scan %w(a b)).to be_a Rambling::Trie::MissingNode
+          expect(node.scan %w(a b c)).to be_a Rambling::Trie::MissingNode
+          expect(node.scan %w(c b a d)).to be_a Rambling::Trie::MissingNode
+        end
+      end
+    end
+  end
 end

data/spec/lib/rambling/trie/container_spec.rb

@@ -152,12 +152,22 @@ describe Rambling::Trie::Container do
   describe 'delegates and aliases' do
     before do
       allow(root).to receive_messages(
-        word?: nil,
-        partial_word?: nil,
-        scan: nil,
+        :[] => nil,
         add: nil,
+        as_word: nil,
+        children: nil,
+        children_tree: nil,
+        compressed?: nil,
         each: nil,
-        compressed?: nil
+        has_key?: nil,
+        inspect: nil,
+        letter: nil,
+        parent: nil,
+        partial_word?: nil,
+        scan: nil,
+        size: nil,
+        to_s: nil,
+        word?: nil,
       )
     end
 
@@ -181,15 +191,65 @@ describe Rambling::Trie::Container do
       expect(root).to have_received(:add).with 'words'
     end
 
-    it 'delegates `#each` to the root node' do
-      container.each
-      expect(root).to have_received :each
+    it 'delegates `#[]` to the root node' do
+      container.[]
+      expect(root).to have_received :[]
+    end
+
+    it 'delegates `#as_word` to the root node' do
+      container.as_word
+      expect(root).to have_received :as_word
+    end
+
+    it 'delegates `#children` to the root node' do
+      container.children
+      expect(root).to have_received :children
+    end
+
+    it 'delegates `#children_tree` to the root node' do
+      container.children_tree
+      expect(root).to have_received :children_tree
     end
 
     it 'delegates `#compressed?` to the root node' do
       container.compressed?
       expect(root).to have_received :compressed?
     end
+
+    it 'delegates `#each` to the root node' do
+      container.each
+      expect(root).to have_received :each
+    end
+
+    it 'delegates `#has_key?` to the root node' do
+      container.has_key?
+      expect(root).to have_received :has_key?
+    end
+
+    it 'delegates `#inspect` to the root node' do
+      container.inspect
+      expect(root).to have_received :inspect
+    end
+
+    it 'delegates `#letter` to the root node' do
+      container.letter
+      expect(root).to have_received :letter
+    end
+
+    it 'delegates `#parent` to the root node' do
+      container.parent
+      expect(root).to have_received :parent
+    end
+
+    it 'delegates `#size` to the root node' do
+      container.size
+      expect(root).to have_received :size
+    end
+
+    it 'delegates `#to_s` to the root node' do
+      container.to_s
+      expect(root).to have_received :to_s
+    end
   end
 
   describe '#compress!' do

data/spec/lib/rambling/trie/raw_node_spec.rb

@@ -316,6 +316,37 @@ describe Rambling::Trie::RawNode do
     end
   end
 
+  describe '#scan' do
+    context 'when the chars array is empty' do
+      it 'returns itself' do
+        expect(node.scan []).to eq node
+      end
+    end
+
+    context 'when the chars array is not empty' do
+      before do
+        node.add 'cba'
+      end
+
+      context 'when the chars are found' do
+        it 'returns the found child' do
+          expect(node.scan %w(c)).to eq node[:c]
+          expect(node.scan %w(c b)).to eq node[:c][:b]
+          expect(node.scan %w(c b a)).to eq node[:c][:b][:a]
+        end
+      end
+
+      context 'when the chars are not found' do
+        it 'returns a MissingNode' do
+          expect(node.scan %w(a)).to be_a Rambling::Trie::MissingNode
+          expect(node.scan %w(a b)).to be_a Rambling::Trie::MissingNode
+          expect(node.scan %w(a b c)).to be_a Rambling::Trie::MissingNode
+          expect(node.scan %w(c b a d)).to be_a Rambling::Trie::MissingNode
+        end
+      end
+    end
+  end
+
   describe '#as_word' do
     let(:node) { Rambling::Trie::RawNode.new }
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Edgar Gonzalez
@@ -173,6 +173,7 @@ files:
 - reports/0.8.1/benchmark
 - reports/0.9.0/benchmark
 - reports/0.9.1/benchmark
+- reports/0.9.2/benchmark
 - spec/assets/test_words.txt
 - spec/integration/rambling/trie_spec.rb
 - spec/lib/rambling/trie/compressed_node_spec.rb
@@ -205,7 +206,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: A custom implementation of the trie data structure.