rambling-trie 0.8.1 → 0.9.0

data/spec/lib/rambling/trie_spec.rb

@@ -1,40 +1,61 @@
 require 'spec_helper'
 
-module Rambling
-  describe Trie do
-    describe '.create' do
-      let(:root) { double :root }
+describe Rambling::Trie do
+  describe '.create' do
+    let(:container) { double :container }
+
+    before do
+      allow(Rambling::Trie::Container).to receive(:new)
+        .and_yield(container)
+        .and_return container
+    end
 
-      before { allow(Trie::Root).to receive(:new).and_yield(root).and_return root }
+    it 'returns a new instance of the trie container' do
+      expect(Rambling::Trie.create).to eq container
+    end
 
-      it 'returns a new instance of the trie root node' do
-        expect(Trie.create).to eq root
+    context 'with a block' do
+      it 'yields the new container' do
+        yielded_trie = nil
+        Rambling::Trie.create { |trie| yielded_trie = trie }
+        expect(yielded_trie).to eq container
       end
+    end
 
-      context 'with a block' do
-        it 'yields the instantiated root' do
-          yielded_trie = nil
-          Trie.create { |trie| yielded_trie = trie }
-          expect(yielded_trie).to eq root
-        end
+    context 'with a filepath' do
+      let(:filepath) { 'test_words.txt' }
+      let(:reader) { double :reader }
+      let(:words) { %w(a couple of test words over here) }
+
+      before do
+        receive_and_yield = receive(:each_word)
+        words.inject(receive_and_yield) { |yielder, word| yielder.and_yield word }
+        allow(reader).to receive_and_yield
+        allow(container).to receive :<<
       end
 
-      context 'with a filepath' do
-        let(:filepath) { 'test_words.txt' }
-        let(:reader) { double :reader }
-        let(:words) { %w(a couple of test words over here) }
+      it 'loads every word' do
+        Rambling::Trie.create filepath, reader
 
-        before do
-          receive_and_yield = receive(:each_word)
-          words.inject(receive_and_yield) { |yielder, word| yielder.and_yield word }
-          allow(reader).to receive_and_yield
+        words.each do |word|
+          expect(container).to have_received(:<<).with(word)
         end
+      end
+    end
 
-        it 'loads every word' do
-          words.each { |word| expect(root).to receive(:<<).with(word) }
+    context 'without any reader' do
+      let(:filepath) { 'test_words.txt' }
+      let(:reader) { double :reader, each_word: nil }
 
-          Trie.create filepath, reader
-        end
+      before do
+        allow(Rambling::Trie::PlainTextReader).to receive(:new)
+          .and_return reader
+      end
+
+      it 'defaults to the PlainTextReader' do
+        Rambling::Trie.create filepath, nil
+
+        expect(reader).to have_received(:each_word).with filepath
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Edgar Gonzalez
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-20 00:00:00.000000000 Z
+date: 2016-12-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -17,56 +17,84 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '12.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.5'
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.15.2
+        version: 0.16.2
+- !ruby/object:Gem::Dependency
+  name: memory_profiler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.7
+- !ruby/object:Gem::Dependency
+  name: benchmark-ips
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.7
+        version: 0.9.5
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -103,28 +131,39 @@ files:
 - assets/dictionaries/words_with_friends.txt
 - lib/rambling-trie.rb
 - lib/rambling/trie.rb
-- lib/rambling/trie/branches.rb
+- lib/rambling/trie/compressed_node.rb
+- lib/rambling/trie/compression.rb
 - lib/rambling/trie/compressor.rb
+- lib/rambling/trie/container.rb
 - lib/rambling/trie/enumerable.rb
 - lib/rambling/trie/inspector.rb
 - lib/rambling/trie/invalid_operation.rb
 - lib/rambling/trie/missing_node.rb
 - lib/rambling/trie/node.rb
 - lib/rambling/trie/plain_text_reader.rb
-- lib/rambling/trie/root.rb
+- lib/rambling/trie/raw_node.rb
 - lib/rambling/trie/tasks/gem.rb
+- lib/rambling/trie/tasks/helpers/path.rb
+- lib/rambling/trie/tasks/helpers/time.rb
 - lib/rambling/trie/tasks/performance.rb
+- lib/rambling/trie/tasks/performance/all.rb
+- lib/rambling/trie/tasks/performance/benchmark.rb
+- lib/rambling/trie/tasks/performance/directory.rb
+- lib/rambling/trie/tasks/performance/profile/call_tree.rb
+- lib/rambling/trie/tasks/performance/profile/memory.rb
 - lib/rambling/trie/version.rb
 - rambling-trie.gemspec
 - reports/performance
 - spec/assets/test_words.txt
 - spec/integration/rambling/trie_spec.rb
-- spec/lib/rambling/trie/branches_spec.rb
+- spec/lib/rambling/trie/compressed_node_spec.rb
+- spec/lib/rambling/trie/compressor_spec.rb
+- spec/lib/rambling/trie/container_spec.rb
 - spec/lib/rambling/trie/enumerable_spec.rb
 - spec/lib/rambling/trie/inspector_spec.rb
 - spec/lib/rambling/trie/node_spec.rb
 - spec/lib/rambling/trie/plain_text_reader_spec.rb
-- spec/lib/rambling/trie/root_spec.rb
+- spec/lib/rambling/trie/raw_node_spec.rb
 - spec/lib/rambling/trie_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/gonzedge/rambling-trie
@@ -154,11 +193,13 @@ summary: A custom implementation of the trie data structure.
 test_files:
 - spec/assets/test_words.txt
 - spec/integration/rambling/trie_spec.rb
-- spec/lib/rambling/trie/branches_spec.rb
+- spec/lib/rambling/trie/compressed_node_spec.rb
+- spec/lib/rambling/trie/compressor_spec.rb
+- spec/lib/rambling/trie/container_spec.rb
 - spec/lib/rambling/trie/enumerable_spec.rb
 - spec/lib/rambling/trie/inspector_spec.rb
 - spec/lib/rambling/trie/node_spec.rb
 - spec/lib/rambling/trie/plain_text_reader_spec.rb
-- spec/lib/rambling/trie/root_spec.rb
+- spec/lib/rambling/trie/raw_node_spec.rb
 - spec/lib/rambling/trie_spec.rb
 - spec/spec_helper.rb

data/lib/rambling/trie/branches.rb

@@ -1,149 +0,0 @@
-module Rambling
-  module Trie
-    # Provides the branching behavior for the Trie data structure.
-    module Branches
-      # Adds a branch to the current trie node based on the word
-      # @param [String] word the word to add the branch from.
-      # @return [Node] the just added branch's root node.
-      # @raise [InvalidOperation] if the trie is already compressed.
-      # @note This method clears the contents of the word variable.
-      def add word
-        raise InvalidOperation, 'Cannot add branch to compressed trie' if compressed?
-        if word.empty?
-          self.terminal = true
-        else
-          add_to_children_tree word
-        end
-      end
-
-      # Alias for #add
-      # @param [String] word the word to add the branch from.
-      # @return [Node] the just added branch's root node.
-      # @raise [InvalidOperation] if the trie is already compressed.
-      # @see Branches#add
-      def << word
-        add word
-      end
-
-      protected
-
-      def partial_word_when_uncompressed? chars
-        chars.empty? || fulfills_uncompressed_condition?(:partial_word_when_uncompressed?, chars)
-      end
-
-      def partial_word_when_compressed? chars
-        chars.empty? || compressed_trie_has_partial_word?(chars)
-      end
-
-      def word_when_uncompressed? chars
-        if chars.empty?
-          terminal?
-        else
-          fulfills_uncompressed_condition? :word_when_uncompressed?, chars
-        end
-      end
-
-      def word_when_compressed? chars
-        if chars.empty?
-          terminal?
-        else
-          compressed_trie_has_word? chars
-        end
-      end
-
-      def closest_node_when_uncompressed chars
-        if chars.empty?
-          self
-        else
-          first_letter_sym = chars.slice!(0).to_sym
-          if children_tree.has_key? first_letter_sym
-            children_tree[first_letter_sym].closest_node_when_uncompressed chars
-          else
-            Rambling::Trie::MissingNode.new
-          end
-        end
-      end
-
-      def closest_node_when_compressed chars
-        if chars.empty?
-          self
-        else
-          current_length = 0
-          current_key, current_key_string = current_key chars.slice!(0)
-
-          begin
-            current_length += 1
-
-            if current_key_string.length == current_length || chars.empty?
-              return children_tree[current_key].closest_node_when_compressed chars
-            end
-          end while current_key_string[current_length] == chars.slice!(0)
-
-          Rambling::Trie::MissingNode.new
-        end
-      end
-
-      private
-
-      def add_to_children_tree word
-        first_letter = word.slice(0).to_sym
-
-        if children_tree.has_key? first_letter
-          word.slice! 0
-          child = children_tree[first_letter]
-          child << word
-          child
-        else
-          children_tree[first_letter] = Node.new word, self
-        end
-      end
-
-      def compressed_trie_has_partial_word? chars
-        current_length = 0
-        current_key, current_key_string = current_key chars.slice!(0)
-
-        begin
-          current_length += 1
-
-          if current_key_string.length == current_length || chars.empty?
-            return children_tree[current_key].partial_word_when_compressed? chars
-          end
-        end while current_key_string[current_length] == chars.slice!(0)
-
-        false
-      end
-
-      def compressed_trie_has_word? chars
-        current_key_string = ''
-
-        while !chars.empty?
-          current_key_string << chars.slice!(0)
-          current_key = current_key_string.to_sym
-          return children_tree[current_key].word_when_compressed? chars if children_tree.has_key? current_key
-        end
-
-        false
-      end
-
-      def current_key letter
-        current_key_string = current_key = ''
-
-        children_tree.keys.each do |key|
-          key_string = key.to_s
-          if key_string.start_with? letter
-            current_key = key
-            current_key_string = key_string
-            break
-          end
-        end
-
-        [current_key, current_key_string]
-      end
-
-      def fulfills_uncompressed_condition? method, chars
-        first_letter_sym = chars.slice!(0).to_sym
-        children_tree.has_key?(first_letter_sym) && children_tree[first_letter_sym].send(method, chars)
-      end
-    end
-  end
-end

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

@@ -1,52 +0,0 @@
-require 'spec_helper'
-
-module Rambling
-  module Trie
-    describe Branches do
-      describe '#add' do
-        context 'new word for existing branch' do
-          let(:node) { Node.new 'back' }
-
-          before do
-            node.add 'a'
-          end
-
-          it 'does not increment the child count' do
-            expect(node.children.size).to eq 1
-          end
-
-          it 'marks it as terminal' do
-            expect(node[:a]).to be_terminal
-          end
-
-          it 'returns the added node' do
-            expect(node.add('a').letter).to eq :a
-          end
-        end
-
-        context 'old word for existing branch' do
-          let(:node) { Node.new 'back' }
-
-          before do
-            node.add 'ack'
-          end
-
-          it 'does not increment any child count' do
-            expect(node.children.size).to eq 1
-            expect(node[:a].children.size).to eq 1
-            expect(node[:a][:c].children.size).to eq 1
-            expect(node[:a][:c][:k].children.size).to eq 0
-          end
-        end
-      end
-
-      describe '#<<' do
-        let(:node) { Node.new }
-
-        it 'delegates to #add' do
-          expect((node << 'a').letter).to eq :a
-        end
-      end
-    end
-  end
-end