correct-horse-battery-staple 0.6.2 → 0.6.3

data.tar.gz.sig

@@ -1 +1 @@
-bv�X�߬����K[�r�O���If�����1��B��C������K��"�l1��I�գ
���h�����!2S_���m���x�����.����/`̬}���S� ��~b�J(F&��ظ@�����*�����&"�M�1��G�+RyE{ɋ��kA��I�j\Pd�Ԍ�nfޛ�����_��݃`I~�"��؋p-T�\7�*'>�\��(l���<TOBkh��E�hy5�Y5߿g�/
+�����rv��%�yl���mٽ�?�g�
o�����=^�����;�v���;(6DA�%��|b�>�'RD0<��T���6�(�(m��#��6�i%p�	�L�!4su�o|�H������5d,�����[�g)O�Y�]�D�р֟�|�����k�l�

data/correct-horse-battery-staple.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name = "correct-horse-battery-staple"
-  s.version = "0.6.2.20120110212541"
+  s.version = "0.6.3.20120111134214"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Robert Sanders"]

data/lib/correct_horse_battery_staple.rb

@@ -1,7 +1,7 @@
 require 'logger'
 
 module CorrectHorseBatteryStaple
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 
   DEFAULT_CORPUS_NAME = "tvscripts"
 

data/lib/correct_horse_battery_staple/backend/isam_kd.rb

@@ -308,7 +308,6 @@ INSPECT
       end
     end
 
-    def count; size; end
     def size
       @entry_count ||= records_size / @entry_length
     end

data/lib/correct_horse_battery_staple/corpus/base.rb

@@ -39,6 +39,14 @@ class CorrectHorseBatteryStaple::Corpus::Base < CorrectHorseBatteryStaple::Corpu
   #  frequencies
   #
 
+  def count(*args, &block)
+    if args.length > 0 || block
+      super(*args, &block)
+    else
+      size
+    end 
+  end
+  
 
   def sorted_entries
     entries.sort

data/lib/correct_horse_battery_staple/corpus/isam.rb

@@ -142,7 +142,6 @@ class CorrectHorseBatteryStaple::Corpus::Isam < CorrectHorseBatteryStaple::Corpu
     end
   end
 
-  def count; size; end
   def size
     @size ||= records_size / @entry_length
   end

data/lib/correct_horse_battery_staple/corpus/redis.rb

@@ -30,12 +30,12 @@ class CorrectHorseBatteryStaple::Corpus::Redis < CorrectHorseBatteryStaple::Corp
     entries.each &block
   end
 
-  def count
-    @count ||= db.zcard(@words_key)
+  def count_all
+    @count_all ||= db.zcard(@words_key)
   end
 
   def size
-    stats[:size] || count
+    stats[:size] || count_all
   end
 
 

data/lib/correct_horse_battery_staple/memoize.rb

@@ -1,3 +1,5 @@
+require 'thread'
+
 module CorrectHorseBatteryStaple::Memoize
   def self.included(base)
     base.extend ClassMethods
@@ -9,16 +11,19 @@ module CorrectHorseBatteryStaple::Memoize
       miss_object = Object.new
       alias_method old_method, method
       define_method method do |*args, &block|
+        @_memoize_mutex ||= Mutex.new
         @_memoize_cache ||= {}
-        methcache = (@_memoize_cache[method] ||= {})
-        if block
-          raise ArgumentError, "You cannot call a memoized method with a block! #{method}"
-        end
-        value = methcache.fetch(args, miss_object)
-        if value === miss_object
-          value = methcache[args] = send(old_method, *args)
+        @_memoize_mutex.synchronize do
+          methcache = (@_memoize_cache[method] ||= {})
+          if block
+            raise ArgumentError, "You cannot call a memoized method with a block! #{method}"
+          end
+          value = methcache.fetch(args, miss_object)
+          if value === miss_object
+            value = methcache[args] = send(old_method, *args)
+          end
+          value
         end
-        value
       end
     end
   end

data/lib/correct_horse_battery_staple/word.rb

@@ -80,6 +80,8 @@ class CorrectHorseBatteryStaple::Word
     self
   end
 
+
+
   def [](attr)
     send(attr.to_s)
   end
@@ -87,4 +89,14 @@ class CorrectHorseBatteryStaple::Word
   def []=(attr, value)
     send("#{attr}=", value)
   end
+
+
+
+  def eql?(other)
+    self.word == other.word
+  end
+
+  def ==(other)
+    self.word == other.word
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: correct-horse-battery-staple
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
   prerelease: 
 platform: ruby
 authors:
@@ -54,7 +54,7 @@ date: 2012-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commander
-  requirement: &70113136017100 !ruby/object:Gem::Requirement
+  requirement: &70319122299080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -62,10 +62,10 @@ dependencies:
         version: '4.0'
   type: :runtime
   prerelease: false
-  version_requirements: *70113136017100
+  version_requirements: *70319122299080
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &70113136015960 !ruby/object:Gem::Requirement
+  requirement: &70319122297940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -73,10 +73,10 @@ dependencies:
         version: 1.5.3
   type: :runtime
   prerelease: false
-  version_requirements: *70113136015960
+  version_requirements: *70319122297940
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70113136015080 !ruby/object:Gem::Requirement
+  requirement: &70319122297020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -84,10 +84,10 @@ dependencies:
         version: 1.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113136015080
+  version_requirements: *70319122297020
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70113136014280 !ruby/object:Gem::Requirement
+  requirement: &70319122296340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -95,10 +95,10 @@ dependencies:
         version: 2.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *70113136014280
+  version_requirements: *70319122296340
 - !ruby/object:Gem::Dependency
   name: hiredis
-  requirement: &70113136013800 !ruby/object:Gem::Requirement
+  requirement: &70319122295780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -106,10 +106,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113136013800
+  version_requirements: *70319122295780
 - !ruby/object:Gem::Dependency
   name: tupalo-kdtree
-  requirement: &70113136013360 !ruby/object:Gem::Requirement
+  requirement: &70319122295280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -117,10 +117,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70113136013360
+  version_requirements: *70319122295280
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70113136012860 !ruby/object:Gem::Requirement
+  requirement: &70319122294840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -128,10 +128,10 @@ dependencies:
         version: 1.3.0
   type: :runtime
   prerelease: false
-  version_requirements: *70113136012860
+  version_requirements: *70319122294840
 - !ruby/object:Gem::Dependency
   name: rubyforge
-  requirement: &70113136012420 !ruby/object:Gem::Requirement
+  requirement: &70319122294400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -139,10 +139,10 @@ dependencies:
         version: 2.0.4
   type: :development
   prerelease: false
-  version_requirements: *70113136012420
+  version_requirements: *70319122294400
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70113136011980 !ruby/object:Gem::Requirement
+  requirement: &70319122293960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -150,7 +150,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70113136011980
+  version_requirements: *70319122293960
 description: ! "Generate a 4 word password from words of size 3-8 characters, with\nfrequencies
   in the 30th-60th percentile. This range gives a nice set\nof uncommon but not completely
   alien words.\n\n    $ chbs generate --verbose -W 3..8 -P 30..60\n    Corpus size: