rambling-trie 0.5.1 → 0.5.2

data/.rspec

@@ -1 +1 @@
--c
+-c -f d

data/Guardfile

@@ -5,16 +5,5 @@ guard 'rspec', all_on_start: true, all_after_pass: false do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { "spec" }
-
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml)$})                 { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-
-  # Capybara request specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml)$})          { |m| "spec/requests/#{m[1]}_spec.rb" }
 end
 

data/Rakefile

@@ -1,6 +1,4 @@
-require 'bundler'
-Bundler::GemHelper.install_tasks
-
+require 'bundler/gem_tasks'
 require 'rspec/core/rake_task'
 require 'rambling-trie'
 require 'rambling/trie/tasks/performance'

data/lib/rambling/trie/branches.rb

@@ -31,7 +31,7 @@ module Rambling
       protected
 
       def branch_when_uncompressed?(chars)
-        chars.empty? or fulfills_uncompressed_condition?(:branch_when_uncompressed?, chars)
+        chars.empty? || fulfills_uncompressed_condition?(:branch_when_uncompressed?, chars)
       end
 
       def branch_when_compressed?(chars)
@@ -58,11 +58,11 @@ module Rambling
       end
 
       def word_when_uncompressed?(chars)
-        (chars.empty? and terminal?) or fulfills_uncompressed_condition?(:word_when_uncompressed?, chars)
+        (chars.empty? && terminal?) || fulfills_uncompressed_condition?(:word_when_uncompressed?, chars)
       end
 
       def word_when_compressed?(chars)
-        return true if chars.empty? and terminal?
+        return true if chars.empty? && terminal?
 
         first_letter = ''
         while not chars.empty?

data/lib/rambling/trie/compressor.rb

@@ -5,13 +5,13 @@ module Rambling
       # Flag for compressed tries.
       # @return [Boolean] `true` for compressed tries, `false` otherwise.
       def compressed?
-        parent and parent.compressed?
+        parent && parent.compressed?
       end
 
       # Compress the current node using redundant node elimination.
       # @return [Root, Node] the compressed node.
       def compress_tree!
-        if children.size == 1 and not terminal? and letter
+        if children.size == 1 && !terminal? && letter
           merge_with! children.values.first
           compress_tree!
         end
@@ -24,23 +24,20 @@ module Rambling
       private
 
       def merge_with!(child)
-        new_letter = (letter.to_s << child.letter.to_s).to_sym
+        delete_old_key_on_parent!
+        redefine_self! child
 
-        rehash_on_parent! letter, new_letter
-        redefine_self! new_letter, child
-
-        children.values.each { |node| node.parent = self }
+        children.each { |_, node| node.parent = self }
       end
 
-      def rehash_on_parent!(old_letter, new_letter)
+      def delete_old_key_on_parent!
         return if parent.nil?
 
-        parent.delete old_letter
-        parent[new_letter] = self
+        parent.delete letter
       end
 
-      def redefine_self!(new_letter, merged_node)
-        self.letter = new_letter
+      def redefine_self!(merged_node)
+        self.letter = letter.to_s << merged_node.letter.to_s
         self.children = merged_node.children
         self.terminal = merged_node.terminal?
       end

data/lib/rambling/trie/inspector.rb

@@ -4,7 +4,7 @@ module Rambling
     module Inspector
       # @return [String] a string representation of the current node.
       def inspect
-        "#<#{self.class.name} letter: #{letter.inspect or 'nil'}, children: #{children.keys}>"
+        "#<#{self.class.name} letter: #{letter.inspect || 'nil'}, children: #{children.keys}>"
       end
     end
   end

data/lib/rambling/trie/node.rb

@@ -27,9 +27,8 @@ module Rambling
         self.parent = parent
         self.children = {}
 
-        unless word.nil? or word.empty?
-          letter = word.slice! 0
-          self.letter = letter.to_sym if letter
+        unless word.nil? || word.empty?
+          self.letter = word.slice! 0
           self.terminal = word.empty?
           self << word
         end
@@ -45,17 +44,27 @@ module Rambling
       # @return [String] the string representation of the current node.
       # @raise [InvalidOperation] if node is not terminal or is root.
       def as_word
-        raise InvalidOperation, 'Cannot represent branch as a word' unless letter.nil? or terminal?
-        letter_string
+        raise InvalidOperation, 'Cannot represent branch as a word' if letter && !terminal?
+        to_s
+      end
+
+      # String representation of the current node.
+      # @return [String] the string representation of the current node.
+      def to_s
+        parent.to_s << letter.to_s
       end
 
       protected
 
-      attr_writer :letter, :children
+      attr_writer :children
       attr_accessor :terminal
 
-      def letter_string
-        (parent ? parent.letter_string : '') << letter.to_s
+      def letter=(letter)
+        return unless letter
+
+        letter = letter.to_sym
+        @letter = letter
+        parent[letter] = self if parent
       end
     end
   end

data/lib/rambling/trie/root.rb

@@ -13,7 +13,7 @@ module Rambling
       # Compresses the existing tree using redundant node elimination. Flags the trie as compressed.
       # @return [Root] self
       def compress!
-        self.compressed = (compressed? or !!compress_tree!)
+        self.compressed = (compressed? || !!compress_tree!)
         self
       end
 

data/lib/rambling/trie/version.rb

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

data/rambling-trie.gemspec

@@ -3,11 +3,11 @@ $:.push File.expand_path('../lib', __FILE__)
 require 'rambling/trie/version'
 
 Gem::Specification.new do |gem|
-  gem.authors = ['Rambling Labs']
-  gem.email = ['development@ramblinglabs.com']
+  gem.authors = ['Edgar Gonzalez', 'Lilibeth De La Cruz']
+  gem.email = ['edggonzalezg@gmail.com', 'lilibethdlc@gmail.com']
   gem.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.'
   gem.summary = 'A custom implementation of the trie data structure.'
-  gem.homepage = 'http://github.com/ramblinglabs/rambling-trie'
+  gem.homepage = 'http://github.com/gonzedge/rambling-trie'
   gem.date = Time.now.strftime '%Y-%m-%d'
 
   gem.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename f }

data/reports/performance

@@ -271,3 +271,31 @@ help - true                     6.340000   0.010000   6.350000 (  6.348615)
 beautiful - true                7.920000   0.000000   7.920000 (  7.920980)
 impressionism - true           10.940000   0.020000  10.960000 ( 10.953487)
 anthropological - true         10.620000   0.000000  10.620000 ( 10.623297)
+
+Report for rambling-trie version 0.5.1
+==> Uncompressed
+`word?`:
+hi - true                       1.420000   0.000000   1.420000 (  1.415907)
+help - true                     2.010000   0.010000   2.020000 (  2.017104)
+beautiful - true                3.450000   0.000000   3.450000 (  3.442239)
+impressionism - true            4.210000   0.000000   4.210000 (  4.213081)
+anthropological - true          4.680000   0.000000   4.680000 (  4.681236)
+`branch?`:
+hi - true                       1.420000   0.000000   1.420000 (  1.421655)
+help - true                     2.200000   0.000000   2.200000 (  2.203647)
+beautiful - true                3.360000   0.000000   3.360000 (  3.356781)
+impressionism - true            4.170000   0.000000   4.170000 (  4.170568)
+anthropological - true          4.590000   0.000000   4.590000 (  4.590748)
+==> Compressed
+`word?`:
+hi - true                       1.280000   0.000000   1.280000 (  1.283929)
+help - true                     1.960000   0.000000   1.960000 (  1.961445)
+beautiful - true                3.110000   0.010000   3.120000 (  3.106836)
+impressionism - true            3.970000   0.000000   3.970000 (  3.972552)
+anthropological - true          4.380000   0.000000   4.380000 (  4.379821)
+`branch?`:
+hi - true                       3.170000   0.000000   3.170000 (  3.175628)
+help - true                     6.140000   0.000000   6.140000 (  6.136943)
+beautiful - true                7.960000   0.000000   7.960000 (  7.966746)
+impressionism - true           10.820000   0.010000  10.830000 ( 10.820741)
+anthropological - true         10.600000   0.000000  10.600000 ( 10.600866)

data/spec/spec_helper.rb

@@ -3,9 +3,15 @@ SimpleCov.start do
   add_filter '/spec/'
 end
 
+require 'rspec'
 require 'rambling-trie'
 ::SPEC_ROOT = File.dirname(__FILE__)
 
 RSpec.configure do |config|
   config.order = :random
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+
+  config.expect_with :rspec do |c|
+    c.syntax = :expect
+  end
 end

metadata

@@ -1,15 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
-- Rambling Labs
+- Edgar Gonzalez
+- Lilibeth De La Cruz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-25 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -95,7 +96,8 @@ description: The Rambling Trie is a custom implementation of the Trie data struc
   with Ruby, which includes compression abilities and is designed to be very fast
   to traverse.
 email:
-- development@ramblinglabs.com
+- edggonzalezg@gmail.com
+- lilibethdlc@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -136,7 +138,7 @@ files:
 - spec/lib/rambling/trie/root_spec.rb
 - spec/lib/rambling/trie_spec.rb
 - spec/spec_helper.rb
-homepage: http://github.com/ramblinglabs/rambling-trie
+homepage: http://github.com/gonzedge/rambling-trie
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -150,7 +152,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2285345975138821646
+      hash: 4017458515202388954
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -159,7 +161,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2285345975138821646
+      hash: 4017458515202388954
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24