rambling-trie 0.3.3 → 0.3.4

data/README.markdown

@@ -61,7 +61,7 @@ trie.has_branch_for? 'partial_word'
 ### Compression
 
 By default, the Rambling Trie works as a Standard Trie.
-You can obtain a Compressed Trie from the Standard one, by using the compression feature.
+Starting from version 0.1.0, you can obtain a Compressed Trie from the Standard one, by using the compression feature.
 Just call the `compress!` method on the `Rambling::Trie` instance:
 
 ``` ruby
@@ -69,10 +69,11 @@ trie.compress!
 ```
 
 This will reduce the amount of Trie nodes by eliminating the redundant ones, which are the only-child non-terminal nodes.
-This will also make the Trie faster to traverse.
+
+Starting from version 0.3.2, the `has_branch_for?` and `is_word?` methods work as expected on a compressed trie.
 
 __Note that the `compress!` method acts over the `Rambling::Trie` instance it belongs to.__
-__Also, words added after compression will create new nodes and re-compression is not supported.__
+__Also, adding words after compression is not supported.__
 
 You can find out if a `Rambling::Trie` instance is compressed by calling the `compressed?` method:
 
@@ -82,7 +83,7 @@ trie.compressed?
 
 ## Further Documentation
 
-You can find further API documentation on the autogenerated [RubyDoc.info](http://rubydoc.info/gems/rambling-trie/0.3.3/Rambling)
+You can find further API documentation on the autogenerated [RubyDoc.info](http://rubydoc.info/gems/rambling-trie)
 
 ## Compatible Ruby and Rails versions
 

data/lib/rambling-trie.rb

@@ -1,8 +1,12 @@
-require File.join(File.dirname(__FILE__), 'rambling.rb')
-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_branches.rb')
-require File.join(File.dirname(__FILE__), 'trie_node.rb')
-require File.join(File.dirname(__FILE__), 'trie.rb')
-require File.join(File.dirname(__FILE__), 'rambling-trie', 'version.rb')
+[
+  'rambling',
+  'invalid_trie_operation',
+  'children_hash_deferer',
+  'trie_compressor',
+  'trie_branches',
+  'trie_node',
+  'trie',
+  'rambling-trie/version'
+].each do |file|
+  require File.join File.dirname(__FILE__), file
+end

data/lib/rambling-trie/tasks/gem.rb

@@ -1,16 +1,16 @@
 namespace :gem do
+  desc 'Build the rambling-trie gem'
   task :build do
-    desc 'Build the rambling-trie gem'
     system 'gem build rambling-trie.gemspec'
   end
 
+  desc 'Push the latest version of the rambling-trie gem'
   task release: :build do
-    desc 'Push the latest version of the rambling-trie gem'
     system "gem push rambling-trie-#{Rambling::Trie::VERSION}.gem"
   end
 
+  desc 'Output the current rambling-trie version'
   task :version do
-    desc 'Output the current rambling-trie version'
     puts "rambling-trie #{Rambling::Trie::VERSION}"
   end
 end

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

@@ -36,12 +36,14 @@ namespace :performance do
     File.join(File.dirname(__FILE__), '..', '..', '..', *filename)
   end
 
+  desc 'Generate performance report'
   task :report do
     puts 'Generating performance report...'
     generate_report
   end
 
   namespace :report do
+    desc 'Generate performance report and append result to reports/performance'
     task :save do
       puts 'Generating performance report...'
       generate_report(get_path('reports', 'performance'))
@@ -49,13 +51,14 @@ namespace :performance do
     end
   end
 
+  desc 'Generate application profiling reports'
   task :profile do
     puts 'Generating profiling reports...'
 
     rambling_trie = Rambling::Trie.new(get_path('assets', 'dictionaries', 'words_with_friends.txt'))
     words = ['hi', 'help', 'beautiful', 'impressionism', 'anthropological']
-    methods = [:has_branch_for?]#, :is_word?]
-    tries = [lambda {rambling_trie.compress!}]#lambda {rambling_trie}, lambda {rambling_trie.compress!}]
+    methods = [:has_branch_for?, :is_word?]
+    tries = [lambda {rambling_trie.clone}, lambda {rambling_trie.clone.compress!}]
 
     methods.each do |method|
       tries.each do |trie_generator|
@@ -75,5 +78,6 @@ namespace :performance do
     puts 'Done'
   end
 
+  desc 'Generate profiling and performance reports'
   task all: [:profile, :report]
 end

data/lib/rambling-trie/version.rb

@@ -1,8 +1,6 @@
 module Rambling
-  class Trie
-    unless defined?(Rambling::Trie::VERSION)
-      # Current version of the rambling-trie.
-      VERSION = '0.3.3'
-    end
+  unless defined?(Rambling::Trie::VERSION)
+    # Current version of the rambling-trie.
+    Rambling::Trie.const_set(:VERSION, '0.3.4')
   end
 end

data/lib/trie_branches.rb

@@ -49,9 +49,11 @@ module Rambling
         return @children[sym_key].has_compressed_branch_for?(chars) if key.length == first_letter.length
 
         while not chars.empty?
-          first_letter += chars.slice!(0)
+          char = chars.slice!(0)
 
-          break unless key.start_with?(first_letter)
+          break unless key[first_letter.length] == char
+
+          first_letter += char
           return true if chars.empty?
           return @children[sym_key].has_compressed_branch_for?(chars) if key.length == first_letter.length
         end

data/lib/trie_node.rb

@@ -56,9 +56,5 @@ module Rambling
     def parent=(parent)
       @parent = parent
     end
-
-    def terminal=(terminal)
-      @is_terminal = terminal
-    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rambling-trie
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-13 00:00:00.000000000 Z
+date: 2012-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &17006080 !ruby/object:Gem::Requirement
+  requirement: &18848840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *17006080
+  version_requirements: *18848840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &17018000 !ruby/object:Gem::Requirement
+  requirement: &18866100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *17018000
+  version_requirements: *18866100
 - !ruby/object:Gem::Dependency
   name: ruby-prof
-  requirement: &17031020 !ruby/object:Gem::Requirement
+  requirement: &18865120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.10.8
   type: :development
   prerelease: false
-  version_requirements: *17031020
+  version_requirements: *18865120
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &16618180 !ruby/object:Gem::Requirement
+  requirement: &18864100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.7.5
   type: :development
   prerelease: false
-  version_requirements: *16618180
+  version_requirements: *18864100
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &16616900 !ruby/object:Gem::Requirement
+  requirement: &18862620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: 2.1.0
   type: :development
   prerelease: false
-  version_requirements: *16616900
+  version_requirements: *18862620
 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.
@@ -74,17 +74,28 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ./lib/children_hash_deferer.rb
-- ./lib/invalid_trie_operation.rb
-- ./lib/rambling-trie/tasks/gem.rb
-- ./lib/rambling-trie/tasks/performance.rb
-- ./lib/rambling-trie/version.rb
-- ./lib/rambling-trie.rb
-- ./lib/rambling.rb
-- ./lib/trie.rb
-- ./lib/trie_branches.rb
-- ./lib/trie_compressor.rb
-- ./lib/trie_node.rb
+- !binary |-
+  Li9saWIvY2hpbGRyZW5faGFzaF9kZWZlcmVyLnJi
+- !binary |-
+  Li9saWIvaW52YWxpZF90cmllX29wZXJhdGlvbi5yYg==
+- !binary |-
+  Li9saWIvcmFtYmxpbmctdHJpZS90YXNrcy9nZW0ucmI=
+- !binary |-
+  Li9saWIvcmFtYmxpbmctdHJpZS90YXNrcy9wZXJmb3JtYW5jZS5yYg==
+- !binary |-
+  Li9saWIvcmFtYmxpbmctdHJpZS92ZXJzaW9uLnJi
+- !binary |-
+  Li9saWIvcmFtYmxpbmctdHJpZS5yYg==
+- !binary |-
+  Li9saWIvcmFtYmxpbmcucmI=
+- !binary |-
+  Li9saWIvdHJpZS5yYg==
+- !binary |-
+  Li9saWIvdHJpZV9icmFuY2hlcy5yYg==
+- !binary |-
+  Li9saWIvdHJpZV9jb21wcmVzc29yLnJi
+- !binary |-
+  Li9saWIvdHJpZV9ub2RlLnJi
 - LICENSE
 - README.markdown
 homepage: http://github.com/ramblinglabs/rambling-trie
@@ -107,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A custom implementation of the trie data structure.