rambling-trie 0.6.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bcea070921c804471c9ddc8d4bbd60bbc700f071
-  data.tar.gz: cff59d6c2a69c99c91993860a0fabf8a20e9f719
+  metadata.gz: 6379fbb202c3257cad63367006a150b801b69649
+  data.tar.gz: 9b4b9f07ec20f5e7a2aef641d06501a03cc20195
 SHA512:
-  metadata.gz: a0dfdfdf111e29f29730595480ff88a9d056a405b8ef6f0427101c209560c755ab160bb52a59ddd932284dd2dae1b201a43c1c392fac90c7d2406bdb293178e0
-  data.tar.gz: 5efd160643a5a2e165b5b159b6887636bf6a5573acdd20156d55511139e62ad085a92f30049ae30035fddd483593d9b0c360d670a2034939391537b8e65dd9df
+  metadata.gz: 043f1af6cd0b8390585e44b73e63101810f5506198e0ee5adbbe8708b394c8a0bc3db5ce3bdfae4e5fbcb9c1b6692cebf25f5412df2d74926352119690aed573
+  data.tar.gz: 7de76f2ad5e324e1a500bd2f33a80ade73a9c7a1488062ce4ea01fa982dad33955dd724c469ad1f7eeb4c49e69c1e91fc46e62270eaa65b44db5cb288ccc4362

data/.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

data/.travis.yml

@@ -1,5 +1,10 @@
 language: ruby
 rvm:
+  - 2.1.5
+  - 2.1.4
+  - 2.1.3
+  - 2.1.2
+  - 2.1.1
+  - 2.1.0
   - 2.0.0
   - 1.9.3
-  - 1.9.2

data/Gemfile

@@ -2,10 +2,12 @@ source 'https://rubygems.org'
 
 gemspec
 
+gem 'coveralls', require: false
+
 group :test do
   gem 'rake'
   gem 'guard-rspec'
   gem 'rb-fsevent'
   gem 'rb-inotify'
-  gem 'simplecov', require: false
+  gem 'simplecov', '~> 0.9.1', require: false
 end

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012-2013 Edgar Gonzalez
+Copyright (c) 2012-2014 Edgar Gonzalez
 
 MIT License
 

data/README.markdown

@@ -1,4 +1,6 @@
-# Rambling Trie [![Build Status](https://secure.travis-ci.org/gonzedge/rambling-trie.png)](http://travis-ci.org/gonzedge/rambling-trie) [![Dependency Status](https://gemnasium.com/gonzedge/rambling-trie.png)](https://gemnasium.com/gonzedge/rambling-trie) [![Code Climate](https://codeclimate.com/github/gonzedge/rambling-trie.png)](https://codeclimate.com/github/gonzedge/rambling-trie)
+# Rambling Trie
+
+[![Gem Version][badge_fury_badge]][badge_fury_link] [![Dependency Status][gemnasium_badge]][gemnasium_link] [![Build Status][travis_ci_badge]][travis_ci_link] [![Code Climate][code_climate_badge]][code_climage_link] [![Coverage Status][coveralls_badge]][coveralls_link]
 
 The Rambling Trie is a custom implementation of the Trie data structure with Ruby, which includes compression abilities and is designed to be very fast to traverse.
 
@@ -8,17 +10,18 @@ The Rambling Trie is a custom implementation of the Trie data structure with Rub
 
 You will need:
 
-* Ruby 1.9.2 or up
+* Ruby 1.9.3 or up
 * RubyGems
 
-See [RVM](http://beginrescueend.com) or [rbenv](https://github.com/sstephenson/rbenv) for more information on how to manage Ruby versions.
+See [RVM][rvm] or [rbenv][rbenv] for more information on how to manage Ruby versions.
 
 ### Installation
 
 You can either install it manually with:
 
-<pre><code>gem install rambling-trie
-</code></pre>
+``` bash
+gem install rambling-trie
+```
 
 Or, include it in your `Gemfile` and bundle it:
 
@@ -143,23 +146,17 @@ trie.any? { |word| word.include? 'x' }
 
 ## Further Documentation
 
-You can find further API documentation on the autogenerated [rambling-trie gem RubyDoc.info page](http://rubydoc.info/gems/rambling-trie) or if you want edge documentation, you can go the [GitHub project RubyDoc.info page](http://rubydoc.info/github/gonzedge/rambling-trie).
+You can find further API documentation on the autogenerated [rambling-trie gem RubyDoc.info page][rubydoc] or if you want edge documentation, you can go the [GitHub project RubyDoc.info page][rubydoc_github].
 
 ## Compatible Ruby and Rails versions
 
 The Rambling Trie has been tested with the following Ruby versions:
 
+* 2.1.x
 * 2.0.0
 * 1.9.3
-* 1.9.2
-
-And the following Rails versions:
-
-* 3.2.x
-* 3.1.x
 
-It's possible that Rails 3.0.x is supported, but there is no guarantee.
-Ruby 1.8.7 is not supported.
+Ruby 1.8.7 and 1.9.2 are not supported.
 
 ## Contributing to Rambling Trie
 
@@ -168,7 +165,7 @@ Also, be sure to add tests for any feature you may develop or bug you may fix.
 
 ## License and copyright
 
-Copyright (c) 2012-2013 Edgar Gonzalez
+Copyright (c) 2012-2014 Edgar Gonzalez
 
 MIT License
 
@@ -178,3 +175,17 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+[badge_fury_badge]: https://badge.fury.io/rb/rambling-trie.svg
+[badge_fury_link]: https://badge.fury.io/rb/rambling-trie
+[code_climate_badge]: https://codeclimate.com/github/gonzedge/rambling-trie.png
+[code_climage_link]: https://codeclimate.com/github/gonzedge/rambling-trie
+[coveralls_badge]: https://coveralls.io/repos/gonzedge/rambling-trie/badge.png
+[coveralls_link]: https://coveralls.io/r/gonzedge/rambling-trie
+[gemnasium_badge]: https://gemnasium.com/gonzedge/rambling-trie.svg
+[gemnasium_link]: https://gemnasium.com/gonzedge/rambling-trie
+[travis_ci_badge]: https://secure.travis-ci.org/gonzedge/rambling-trie.svg
+[travis_ci_link]: https://travis-ci.org/gonzedge/rambling-trie
+[rvm]: https://rvm.io
+[rbenv]: https://github.com/sstephenson/rbenv
+[rubydoc]: http://rubydoc.info/gems/rambling-trie
+[rubydoc_github]: http://rubydoc.info/github/gonzedge/rambling-trie

data/lib/rambling/trie.rb

@@ -14,7 +14,7 @@ module Rambling
       # @param [String, nil] filepath the file to load the words from.
       # @return [Root] the trie just created.
       # @yield [Root] the trie just created.
-      def create(filepath = nil, reader = PlainTextReader.new)
+      def create filepath = nil, reader = PlainTextReader.new
         Root.new do |root|
           reader.each_word(filepath) { |word| root << word } if filepath
           yield root if block_given?

data/lib/rambling/trie/branches.rb

@@ -7,7 +7,7 @@ module Rambling
       # @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)
+      def add word
         raise InvalidOperation, 'Cannot add branch to compressed trie' if compressed?
         if word.empty?
           self.terminal = true
@@ -16,19 +16,26 @@ module Rambling
         end
       end
 
-      alias_method :<<, :add
+      # 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)
+      def partial_word_when_uncompressed? chars
         chars.empty? || fulfills_uncompressed_condition?(:partial_word_when_uncompressed?, chars)
       end
 
-      def partial_word_when_compressed?(chars)
+      def partial_word_when_compressed? chars
         chars.empty? || compressed_trie_has_partial_word?(chars)
       end
 
-      def word_when_uncompressed?(chars)
+      def word_when_uncompressed? chars
         if chars.empty?
           terminal?
         else
@@ -36,7 +43,7 @@ module Rambling
         end
       end
 
-      def word_when_compressed?(chars)
+      def word_when_compressed? chars
         if chars.empty?
           terminal?
         else
@@ -46,7 +53,7 @@ module Rambling
 
       private
 
-      def add_to_children_tree(word)
+      def add_to_children_tree word
         first_letter = word.slice(0).to_sym
 
         if children_tree.has_key? first_letter
@@ -59,7 +66,7 @@ module Rambling
         end
       end
 
-      def compressed_trie_has_partial_word?(chars)
+      def compressed_trie_has_partial_word? chars
         current_length = 0
         current_key, current_key_string = current_key chars.slice!(0)
 
@@ -67,26 +74,26 @@ module Rambling
           current_length += 1
 
           if current_key_string.length == current_length || chars.empty?
-            return children_tree[current_key].partial_word_when_compressed?(chars)
+            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)
+      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
+          return children_tree[current_key].word_when_compressed? chars if children_tree.has_key? current_key
         end
 
         false
       end
 
-      def current_key(letter)
+      def current_key letter
         current_key_string = current_key = nil
 
         children_tree.keys.each do |key|
@@ -101,7 +108,7 @@ module Rambling
         [current_key, current_key_string]
       end
 
-      def fulfills_uncompressed_condition?(method, chars)
+      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

data/lib/rambling/trie/compressor.rb

@@ -27,7 +27,7 @@ module Rambling
         !(root? || terminal?) && children_tree.size == 1
       end
 
-      def merge_with!(child)
+      def merge_with! child
         delete_old_key_on_parent!
         redefine_self! child
 
@@ -35,12 +35,10 @@ module Rambling
       end
 
       def delete_old_key_on_parent!
-        return if parent.nil?
-
-        parent.delete letter
+        parent.delete letter if parent
       end
 
-      def redefine_self!(merged_node)
+      def redefine_self! merged_node
         self.letter = letter.to_s << merged_node.letter.to_s
         self.children_tree = merged_node.children_tree
         self.terminal = merged_node.terminal?

data/lib/rambling/trie/enumerable.rb

@@ -7,7 +7,7 @@ module Rambling
       alias_method :size, :count
 
       # Calls block once for each of the words contained in the trie. If no block given, an Enumerator is returned.
-      def each(&block)
+      def each &block
         enumerator = Enumerator.new do |words|
           words << as_word if terminal?
           children.each { |child| child.each { |word| words << word } }

data/lib/rambling/trie/invalid_operation.rb

@@ -2,7 +2,7 @@ module Rambling
   module Trie
     # Raised when trying to execute an invalid operation on a Trie data structure.
     class InvalidOperation < Exception
-      def initialize(message = nil)
+      def initialize message = nil
         super
       end
     end

data/lib/rambling/trie/node.rb

@@ -26,7 +26,7 @@ module Rambling
       # Creates a new Node.
       # @param [String, nil] word the word from which to create this Node and his branch.
       # @param [Node, nil] parent the parent of this node.
-      def initialize(word = nil, parent = nil)
+      def initialize word = nil, parent = nil
         self.parent = parent
         self.children_tree = {}
 
@@ -74,12 +74,11 @@ module Rambling
       attr_writer :children_tree
       attr_accessor :terminal
 
-      def letter=(letter)
-        return unless letter
-
-        letter = letter.to_sym
-        @letter = letter
-        parent[letter] = self if parent
+      def letter= new_letter
+        if new_letter
+          @letter = new_letter.to_sym
+          parent[letter] = self if parent
+        end
       end
     end
   end

data/lib/rambling/trie/plain_text_reader.rb

@@ -5,17 +5,17 @@ module Rambling
       # Yields each word read from a .txt file
       # @param [String] filepath the full path of the file to load the words from.
       # @yield [String] Each line read from the file.
-      def each_word(filepath)
+      def each_word filepath
         each_line(filepath) { |line| yield line.chomp }
       end
 
       private
 
-      def each_line(filepath)
+      def each_line filepath
         open(filepath) { |file| file.each_line { |line| yield line } }
       end
 
-      def open(filepath)
+      def open filepath
         File.open(filepath) { |file| yield file }
       end
     end

data/lib/rambling/trie/root.rb

@@ -16,22 +16,14 @@ module Rambling
       # @raise [InvalidOperation] if the trie is already compressed.
       # @see Branches#add
       # @note Avoids clearing the contents of the word variable.
-      def add(word)
+      def add word
         super word.clone
       end
 
-      alias_method :<<, :add
-
-      # @deprecated Use `#partial_word?` instead.
-      def branch?(word = '')
-        warn 'The `#branch?` method will be deprecated, please use `#partial_word?` instead.'
-        partial_word? word
-      end
-
       # Compresses the existing tree using redundant node elimination. Flags the trie as compressed.
       # @return [Root] self
       def compress!
-        self.compressed = (compressed? || !!compress_tree!)
+        self.compressed = compressed? || !!compress_tree!
         self
       end
 
@@ -44,7 +36,7 @@ module Rambling
       # Checks if a path for a word or partial word exists in the trie.
       # @param [String] word the word or partial word to look for in the trie.
       # @return [Boolean] `true` if the word or partial word is found, `false` otherwise.
-      def partial_word?(word = '')
+      def partial_word? word = ''
         is? :partial_word, word
       end
 
@@ -59,7 +51,7 @@ module Rambling
       # Checks if a whole word exists in the trie.
       # @param [String] word the word to look for in the trie.
       # @return [Boolean] `true` only if the word is found and the last character corresponds to a terminal node.
-      def word?(word = '')
+      def word? word = ''
         is? :word, word
       end
 
@@ -69,7 +61,7 @@ module Rambling
 
       attr_accessor :compressed
 
-      def is?(method, word)
+      def is? method, word
         method = compressed? ? "#{method}_when_compressed?" : "#{method}_when_uncompressed?"
         send method, word.chars.to_a
       end

data/lib/rambling/trie/tasks/performance.rb

@@ -1,7 +1,7 @@
 require 'benchmark'
 
 namespace :performance do
-  def report(name, trie, output)
+  def report name, trie, output
     words = %w(hi help beautiful impressionism anthropological)
     methods = [:word?, :partial_word?]
 
@@ -9,13 +9,13 @@ namespace :performance do
     methods.each do |method|
       output.puts "`#{method}`:"
       words.each do |word|
-        output.print "#{word} - #{trie.send(method, word)}".ljust 30
+        output.print "#{word} - #{trie.send method, word}".ljust 30
         output.puts Benchmark.measure { 200_000.times { trie.send method, word }}
       end
     end
   end
 
-  def generate_report(filename = nil)
+  def generate_report filename = nil
     output = filename.nil? ? $stdout : File.open(filename, 'a+')
 
     output.puts "\nReport for rambling-trie version #{Rambling::Trie::VERSION}"
@@ -39,7 +39,7 @@ namespace :performance do
     output.close
   end
 
-  def path(*filename)
+  def path *filename
     File.join File.dirname(__FILE__), '..', '..', '..', '..', *filename
   end
 

data/lib/rambling/trie/version.rb

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

data/rambling-trie.gemspec

@@ -16,12 +16,13 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.name = 'rambling-trie'
+  gem.license = 'MIT'
   gem.version = Rambling::Trie::VERSION
   gem.platform = Gem::Platform::RUBY
 
-  gem.add_development_dependency 'rspec', '>=2.12.0'
-  gem.add_development_dependency 'rake', '>=10.0.0.1'
-  gem.add_development_dependency 'ruby-prof', '>=0.11.2'
-  gem.add_development_dependency 'yard', '>=0.8.3'
-  gem.add_development_dependency 'redcarpet', '>=2.2.2'
+  gem.add_development_dependency 'rspec', '~> 3.1'
+  gem.add_development_dependency 'rake', '~> 10.4'
+  gem.add_development_dependency 'ruby-prof', '~> 0.15.2'
+  gem.add_development_dependency 'yard', '~> 0.8.7'
+  gem.add_development_dependency 'redcarpet', '~> 3.2.1'
 end

data/spec/integration/rambling/trie_spec.rb

@@ -2,18 +2,18 @@ require 'spec_helper'
 
 describe Rambling::Trie do
   describe 'when a filepath is provided' do
-    let(:filepath) { File.join(::SPEC_ROOT, 'assets', 'test_words.txt') }
+    let(:filepath) { File.join ::SPEC_ROOT, 'assets', 'test_words.txt' }
     let(:words) { File.readlines(filepath).map &:chomp }
     subject { Rambling::Trie.create filepath }
 
     it 'contains all the words from the file' do
-      words.each { |word| expect(subject).to include(word) }
+      words.each { |word| expect(subject).to include word }
     end
 
     describe 'and the trie is compressed' do
       it 'still contains all the words from the file' do
         subject.compress!
-        words.each { |word| expect(subject).to include(word) }
+        words.each { |word| expect(subject).to include word }
       end
     end
   end

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

@@ -12,7 +12,7 @@ module Rambling
           end
 
           it 'does not increment the child count' do
-            expect(node).to have(1).children
+            expect(node.children.size).to eq 1
           end
 
           it 'marks it as terminal' do
@@ -32,17 +32,16 @@ module Rambling
           end
 
           it 'does not increment any child count' do
-            expect(node).to have(1).children
-            expect(node[:a]).to have(1).children
-            expect(node[:a][:c]).to have(1).children
-            expect(node[:a][:c][:k]).to have(0).children
+            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 }
-        let(:word) { 'word' }
 
         it 'delegates to #add' do
           expect((node << 'a').letter).to eq :a

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

@@ -28,8 +28,8 @@ module Rambling
       end
 
       it 'includes the core Enumerable module' do
-        expect(root.all? { |word| words.include? word }).to be_true
-        expect(root.any? { |word| word.start_with? 's' }).to be_true
+        expect(root.all? { |word| words.include? word }).to be true
+        expect(root.any? { |word| word.start_with? 's' }).to be true
         expect(root.to_a).to match_array words
       end
     end

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

@@ -13,8 +13,8 @@ module Rambling
 
       describe '#inspect' do
         it 'returns a pretty printed version of the node' do
-          expect(root.inspect).to eq("#<Rambling::Trie::Root letter: nil, children: [:o, :t, :w]>")
-          expect(node.inspect).to eq("#<Rambling::Trie::Node letter: :o, children: [:n]>")
+          expect(root.inspect).to eq "#<Rambling::Trie::Root letter: nil, children: [:o, :t, :w]>"
+          expect(node.inspect).to eq "#<Rambling::Trie::Node letter: :o, children: [:n]>"
         end
       end
     end

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

@@ -4,31 +4,31 @@ module Rambling
   module Trie
     describe Node do
       it 'delegates `#[]` to its children tree' do
-        subject.children_tree.should_receive(:[]).with(:key).and_return('value')
+        expect(subject.children_tree).to receive(:[]).with(:key).and_return('value')
         expect(subject[:key]).to eq 'value'
       end
 
       it 'delegates `#[]=` to its children tree' do
-        subject.children_tree.should_receive(:[]=).with(:key, 'value')
+        expect(subject.children_tree).to receive(:[]=).with(:key, 'value')
         subject[:key] = 'value'
       end
 
       it 'delegates `#delete` to its children tree' do
-        subject.children_tree.should_receive(:delete).with(:key).and_return('value')
+        expect(subject.children_tree).to receive(:delete).with(:key).and_return('value')
         expect(subject.delete :key).to eq 'value'
       end
 
       it 'delegates `#has_key?` to its children tree' do
-        subject.children_tree.should_receive(:has_key?).with(:present_key).and_return(true)
+        expect(subject.children_tree).to receive(:has_key?).with(:present_key).and_return(true)
         expect(subject).to have_key(:present_key)
 
-        subject.children_tree.should_receive(:has_key?).with(:absent_key).and_return(false)
+        expect(subject.children_tree).to receive(:has_key?).with(:absent_key).and_return(false)
         expect(subject).not_to have_key(:absent_key)
       end
 
       it 'delegates `#children` to its children tree values' do
-        children = [double('child 1'), double('child 2')]
-        subject.children_tree.should_receive(:values).and_return(children)
+        children = [double(:child_1), double(:child_2)]
+        expect(subject.children_tree).to receive(:values).and_return(children)
         expect(subject.children).to eq children
       end
 
@@ -47,7 +47,7 @@ module Rambling
           end
 
           it 'includes no children' do
-            expect(subject).to have(0).children
+            expect(subject.children.size).to eq 0
           end
 
           it 'is not a terminal node' do
@@ -71,7 +71,7 @@ module Rambling
           end
 
           it 'includes no children' do
-            expect(subject).to have(0).children
+            expect(subject.children.size).to eq 0
           end
 
           it 'is not a terminal node' do
@@ -95,7 +95,7 @@ module Rambling
           end
 
           it 'includes no children' do
-            expect(subject).to have(0).children
+            expect(subject.children.size).to eq 0
           end
 
           it 'is a terminal node' do
@@ -111,7 +111,7 @@ module Rambling
           end
 
           it 'includes one child' do
-            expect(subject).to have(1).children
+            expect(subject.children.size).to eq 1
           end
 
           it 'includes a child with the expected letter' do
@@ -200,12 +200,12 @@ module Rambling
       end
 
       describe '#compressed?' do
-        let(:root) { double 'Root' }
+        let(:root) { double :root }
         subject { Node.new '', root }
 
         context 'parent is compressed' do
           before do
-            root.stub(:compressed?).and_return true
+            allow(root).to receive(:compressed?).and_return true
           end
 
           it 'returns true' do
@@ -215,7 +215,7 @@ module Rambling
 
         context 'parent is not compressed' do
           before do
-            root.stub(:compressed?).and_return false
+            allow(root).to receive(:compressed?).and_return false
           end
 
           it 'returns false' do

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

@@ -10,7 +10,7 @@ module Rambling
         it 'yields every word yielded by the file' do
           yielded_words = []
           subject.each_word(filepath) { |word| yielded_words << word }
-          expect(yielded_words).to eq(words)
+          expect(yielded_words).to eq words
         end
       end
     end

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

@@ -11,7 +11,7 @@ module Rambling
 
       describe '.new' do
         it 'has no children' do
-          expect(subject).to have(0).children
+          expect(subject.children.size).to eq 0
         end
 
         it 'has no letter' do
@@ -42,8 +42,8 @@ module Rambling
           end
 
           it 'executes the block' do
-            expect(subject).to have(1).children
-            expect(subject.word? 'test').to be_true
+            expect(subject.children.size).to eq 1
+            expect(subject.word? 'test').to be true
           end
         end
       end
@@ -82,7 +82,7 @@ module Rambling
 
           it 'compresses into a single node without children' do
             expect(subject[:all].letter).to eq :all
-            expect(subject[:all]).to have(0).children
+            expect(subject[:all].children.size).to eq 0
             expect(subject[:all]).to be_terminal
             expect(subject[:all]).to be_compressed
           end
@@ -97,13 +97,13 @@ module Rambling
 
           it 'compresses into corresponding three nodes' do
             expect(subject[:a].letter).to eq :a
-            expect(subject[:a]).to have(2).children
+            expect(subject[:a].children.size).to eq 2
 
             expect(subject[:a][:ll].letter).to eq :ll
             expect(subject[:a][:sk].letter).to eq :sk
 
-            expect(subject[:a][:ll]).to have(0).children
-            expect(subject[:a][:sk]).to have(0).children
+            expect(subject[:a][:ll].children.size).to eq 0
+            expect(subject[:a][:sk].children.size).to eq 0
 
             expect(subject[:a][:ll]).to be_terminal
             expect(subject[:a][:sk]).to be_terminal
@@ -120,19 +120,19 @@ module Rambling
           subject.compress!
 
           expect(subject[:re].letter).to eq :re
-          expect(subject[:re]).to have(2).children
+          expect(subject[:re].children.size).to eq 2
 
           expect(subject[:re][:pa].letter).to eq :pa
           expect(subject[:re][:st].letter).to eq :st
 
-          expect(subject[:re][:pa]).to have(2).children
-          expect(subject[:re][:st]).to have(0).children
+          expect(subject[:re][:pa].children.size).to eq 2
+          expect(subject[:re][:st].children.size).to eq 0
 
           expect(subject[:re][:pa][:y].letter).to eq :y
           expect(subject[:re][:pa][:int].letter).to eq :int
 
-          expect(subject[:re][:pa][:y]).to have(0).children
-          expect(subject[:re][:pa][:int]).to have(0).children
+          expect(subject[:re][:pa][:y].children.size).to eq 0
+          expect(subject[:re][:pa][:int].children.size).to eq 0
 
           expect(subject[:re][:pa][:y].parent).to eq subject[:re][:pa]
           expect(subject[:re][:pa][:int].parent).to eq subject[:re][:pa]
@@ -174,8 +174,8 @@ module Rambling
           end
 
           it 'matches the whole word' do
-            expect(subject.word? 'hello').to be_true
-            expect(subject.word? 'high').to be_true
+            expect(subject.word? 'hello').to be true
+            expect(subject.word? 'high').to be true
           end
 
           it 'is aliased as #include?' do
@@ -189,8 +189,8 @@ module Rambling
             end
 
             it 'matches the whole word' do
-              expect(subject.word? 'hello').to be_true
-              expect(subject.word? 'high').to be_true
+              expect(subject.word? 'hello').to be true
+              expect(subject.word? 'high').to be true
             end
           end
         end
@@ -201,7 +201,7 @@ module Rambling
           end
 
           it 'does not match the whole word' do
-            expect(subject.word? 'halt').to be_false
+            expect(subject.word? 'halt').to be false
           end
 
           it 'is aliased as #include?' do
@@ -214,7 +214,7 @@ module Rambling
             end
 
             it 'does not match the whole word' do
-              expect(subject.word? 'halt').to be_false
+              expect(subject.word? 'halt').to be false
             end
           end
         end
@@ -224,16 +224,8 @@ module Rambling
         it 'is aliased as #match?' do
           subject << 'hello'
           subject << 'high'
-          expect(subject.match? 'hel').to be_true
-          expect(subject.match? 'hig').to be_true
-        end
-
-        it 'is aliased as #branch?, but with a warning' do
-          subject << 'hello'
-          subject << 'high'
-          subject.should_receive(:warn).with('The `#branch?` method will be deprecated, please use `#partial_word?` instead.').twice
-          expect(subject.branch? 'hel').to be_true
-          expect(subject.branch? 'hig').to be_true
+          expect(subject.match? 'hel').to be true
+          expect(subject.match? 'hig').to be true
         end
 
         context 'word is contained' do
@@ -243,8 +235,8 @@ module Rambling
           end
 
           it 'matches part of the word' do
-            expect(subject.partial_word? 'hell').to be_true
-            expect(subject.partial_word? 'hig').to be_true
+            expect(subject.partial_word? 'hell').to be true
+            expect(subject.partial_word? 'hig').to be true
           end
 
           context 'and the root has been compressed' do
@@ -253,13 +245,13 @@ module Rambling
             end
 
             it 'matches part of the word' do
-              expect(subject.partial_word? 'h').to be_true
-              expect(subject.partial_word? 'he').to be_true
-              expect(subject.partial_word? 'hell').to be_true
-              expect(subject.partial_word? 'hello').to be_true
-              expect(subject.partial_word? 'hi').to be_true
-              expect(subject.partial_word? 'hig').to be_true
-              expect(subject.partial_word? 'high').to be_true
+              expect(subject.partial_word? 'h').to be true
+              expect(subject.partial_word? 'he').to be true
+              expect(subject.partial_word? 'hell').to be true
+              expect(subject.partial_word? 'hello').to be true
+              expect(subject.partial_word? 'hi').to be true
+              expect(subject.partial_word? 'hig').to be true
+              expect(subject.partial_word? 'high').to be true
             end
           end
         end
@@ -270,8 +262,8 @@ module Rambling
           end
 
           it 'does not match any part of the word' do
-            expect(subject.partial_word? 'ha').to be_false
-            expect(subject.partial_word? 'hal').to be_false
+            expect(subject.partial_word? 'ha').to be false
+            expect(subject.partial_word? 'hal').to be false
           end
 
           context 'and the root has been compressed' do
@@ -280,8 +272,8 @@ module Rambling
             end
 
             it 'does not match any part of the word' do
-              expect(subject.partial_word? 'ha').to be_false
-              expect(subject.partial_word? 'hal').to be_false
+              expect(subject.partial_word? 'ha').to be false
+              expect(subject.partial_word? 'hal').to be false
             end
           end
         end

data/spec/lib/rambling/trie_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 module Rambling
   describe Trie do
     describe '.create' do
-      let(:root) { double Trie::Root }
+      let(:root) { double :root }
 
-      before { Trie::Root.stub(:new).and_yield(root).and_return(root) }
+      before { allow(Trie::Root).to receive(:new).and_yield(root).and_return root }
 
       it 'returns a new instance of the trie root node' do
         expect(Trie.create).to eq root
@@ -21,16 +21,17 @@ module Rambling
 
       context 'with a filepath' do
         let(:filepath) { 'test_words.txt' }
-        let(:reader) { double(Trie::PlainTextReader) }
+        let(:reader) { double :reader }
         let(:words) { %w(a couple of test words over here) }
 
         before do
-          yielder = reader.stub(:each_word)
-          words.each { |word| yielder = yielder.and_yield(word) }
+          receive_and_yield = receive(:each_word)
+          words.inject(receive_and_yield) { |yielder, word| yielder.and_yield word }
+          allow(reader).to receive_and_yield
         end
 
         it 'loads every word' do
-          words.each { |word| root.should_receive(:<<).with(word) }
+          words.each { |word| expect(root).to receive(:<<).with(word) }
 
           Trie.create filepath, reader
         end

data/spec/spec_helper.rb

@@ -1,19 +1,21 @@
 require 'simplecov'
+require 'coveralls'
+
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
+  SimpleCov::Formatter::HTMLFormatter,
+  Coveralls::SimpleCov::Formatter
+]
+
 SimpleCov.start do
   add_filter '/spec/'
 end
 
 require 'rspec'
 require 'rambling-trie'
-::SPEC_ROOT = File.dirname(__FILE__)
+::SPEC_ROOT = File.dirname __FILE__
 
 RSpec.configure do |config|
   config.order = :random
-  config.treat_symbols_as_metadata_keys_with_true_values = true
   config.run_all_when_everything_filtered = true
-  config.filter_run :focus
-
-  config.expect_with :rspec do |c|
-    c.syntax = :expect
-  end
+  config.raise_errors_for_deprecations!
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors:
 - Edgar Gonzalez
@@ -9,78 +9,78 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-24 00:00:00.000000000 Z
+date: 2014-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.12.0
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0.1
+        version: '10.4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.0.0.1
+        version: '10.4'
 - !ruby/object:Gem::Dependency
   name: ruby-prof
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.15.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.2
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.2.2
+        version: 3.2.1
 description: The Rambling Trie is a custom implementation of the Trie data structure
   with Ruby, which includes compression abilities and is designed to be very fast
   to traverse.
@@ -91,9 +91,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".coveralls.yml"
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - Guardfile
 - LICENSE
@@ -126,7 +127,8 @@ files:
 - spec/lib/rambling/trie_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/gonzedge/rambling-trie
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -134,17 +136,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A custom implementation of the trie data structure.