mongoid-haystack 1.3.0 → 1.4.0

data/article

@@ -7,7 +7,7 @@ a good one allows modular methods to be composed into compound ones without
 fugly code contortions - keeping code nice and readable.
 
 although many people spend time considering carefully their method names and
-argument lists, few people stop to consider the role of the block on their
+argument lists, but few people stop to consider the role of the block on their
 methods and how it affects reusability.
 
 that's unfortunate since fully groking the block is what unleashes the

data/lib/mongoid-haystack.rb

@@ -2,7 +2,7 @@
 #
   module Mongoid
     module Haystack
-      const_set(:Version, '1.3.0') unless const_defined?(:Version)
+      const_set(:Version, '1.4.0') unless const_defined?(:Version)
 
       class << Haystack
         def version
@@ -11,13 +11,14 @@
 
         def dependencies
           {
-            'mongoid'       => [ 'mongoid'       , '~> 3.0' ] , 
-            'moped'         => [ 'moped'         , '~> 1.3' ] , 
-            'origin'        => [ 'origin'        , '~> 1.0' ] , 
-            'map'           => [ 'map'           , '~> 6.2' ] , 
-            'fattr'         => [ 'fattr'         , '~> 2.2' ] , 
-            'coerce'        => [ 'coerce'        , '~> 0.0' ] , 
-            'unicode_utils' => [ 'unicode_utils' , '~> 1.4' ] , 
+            'mongoid'       => [ 'mongoid'       , '~> 3.0' ] ,
+            'moped'         => [ 'moped'         , '~> 1.3' ] ,
+            'origin'        => [ 'origin'        , '~> 1.0' ] ,
+            'map'           => [ 'map'           , '~> 6.2' ] ,
+            'fattr'         => [ 'fattr'         , '~> 2.2' ] ,
+            'coerce'        => [ 'coerce'        , '~> 0.0' ] ,
+            'unicode_utils' => [ 'unicode_utils' , '~> 1.4' ] ,
+            'threadify'     => [ 'threadify'     , '~> 1.3' ] ,
           }
         end
 

data/lib/mongoid-haystack/search.rb

@@ -14,9 +14,21 @@ module Mongoid
           results = Haystack.search(*args, &block)
         end
 
-        def search_index_all!
-          all.each do |doc|
+        def search_index_all!(*args, &block)
+          options = Map.options_for!(args)
+          models = args.shift
+          
+          unless models
+            models = where(:haystack_index => nil)
+          end
+
+          threads = options[:threads] || 16
+
+          models.all.each do |doc|
             Mongoid::Haystack::Index.remove(doc)
+          end
+
+          models.all.each do |doc|
             Mongoid::Haystack::Index.add(doc)
           end
         end
@@ -208,7 +220,9 @@ module Mongoid
     end
 
     def search_tokens_for(search)
-      values = Token.values_for(search.to_s)
+      #values = Token.values_for(search.to_s)
+      #values = Util.phrases_for(search).map{|phrase| Util.stems_for(phrase)}.flatten
+      values = Util.search_for(search)
       tokens = []
 
       Token.where(:value.in => values).each do |token|
@@ -216,6 +230,8 @@ module Mongoid
         tokens[index] = token
       end
 
+      tokens.compact!
+
       total = Token.total.to_f
 
       rarity = {}

data/lib/mongoid-haystack/stemming.rb

@@ -4,8 +4,7 @@ module Mongoid
   module Haystack
     module Stemming
       def stem(*args, &block)
-        string = args.join(' ')
-        words = Util.words_for(*args)
+        words = args.join(' ').strip.split(/\s+/)
         list = []
 
         words.each do |word|

data/lib/mongoid-haystack/token.rb

@@ -80,7 +80,11 @@ module Mongoid
       index({:count => 1})
 
       def frequency(n_tokens = Token.total.value.to_f)
-        (count / n_tokens).round(2)
+        if n_tokens.zero?
+          Float::Infinity
+        else
+          (count / n_tokens).round(2)
+        end
       end
 
       def frequency_bin(n_tokens = Token.total.value.to_f)
@@ -92,7 +96,11 @@ module Mongoid
       end
 
       def rarity_bin(n_tokens = Token.total.value.to_f)
-        (rarity(n_tokens) * 10).truncate
+        if n_tokens.zero?
+          Float::Infinity
+        else
+          (rarity(n_tokens) * 10).truncate
+        end
       end
     end
   end

data/lib/mongoid-haystack/util.rb

@@ -160,6 +160,10 @@ module Mongoid
         Stemming.stem(*args, &block)
       end
 
+      def search_for(*args, &block)
+        phrases_for(*args).map{|phrase| [phrase, stems_for(phrase)]}.flatten.compact.uniq
+      end
+
       def stopword?(word)
         word = UnicodeUtils.nfkd(word.to_s.strip.downcase)
         word.empty? or Stemming::Stopwords.stopword?(word)

data/mongoid-haystack.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-haystack"
-  spec.version = "1.3.0"
+  spec.version = "1.4.0"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "mongoid-haystack"
   spec.description = "a mongoid 3 zero-config, zero-integration, POLS pure mongo fulltext solution"
@@ -72,6 +72,8 @@ Gem::Specification::new do |spec|
   
     spec.add_dependency(*["unicode_utils", "~> 1.4"])
   
+    spec.add_dependency(*["threadify", "~> 1.3"])
+  
 
   spec.extensions.push(*[])
 

data/test/mongoid-haystack_test.rb

@@ -45,12 +45,13 @@ Testing Mongoid::Haystack do
     d = A.create!(:content => 'dog dog dog cat')
     
     assert{ Mongoid::Haystack.index(A) }
+    Mongoid::Haystack.search('cat dog').map(&:model) == [d, c, b, a] 
     assert{ Mongoid::Haystack.search('cat dog').map(&:model) == [d, c, b, a] }
   end
 
 ##
 #
-  testing 'that word specificity affects the sort' do
+  testing 'that word specificity affects the search' do
     a = A.create!(:content => 'cat@dog.com')
     b = A.create!(:content => 'dogs')
     c = A.create!(:content => 'dog')
@@ -59,7 +60,7 @@ Testing Mongoid::Haystack do
 
     assert{ Mongoid::Haystack.index(A) }
 
-    assert{ Mongoid::Haystack.search('cat@dog.com').map(&:model) == [a, e, d, c, b] }
+    assert{ Mongoid::Haystack.search('cat@dog.com').map(&:model) == [a] }
     assert{ Mongoid::Haystack.search('cat').map(&:model) == [e, d, a] }
     assert{ Mongoid::Haystack.search('cats').map(&:model) == [d, e, a] }
     assert{ Mongoid::Haystack.search('dog').map(&:model) == [c, b, a] }
@@ -392,9 +393,9 @@ Testing Mongoid::Haystack do
   test '.stems_for' do
     {
       ' cats and dogs ' => %w( cat dog ),
-      ' cats!and?dogs ' => %w( cat dog ),
+      ' cats!and?dogs ' => %w( cats!and?dog ),
       ' fishing and hunting ' => %w( fish hunt ),
-      ' fishing-and-hunting ' => %w( fish hunt ),
+      ' fishing-and-hunting ' => %w( fishing-and-hunt ),
     }.each do |src, dst|
       assert{ Mongoid::Haystack::stems_for(src) == dst }
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-haystack
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-04 00:00:00.000000000 Z
+date: 2013-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -123,6 +123,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.4'
+- !ruby/object:Gem::Dependency
+  name: threadify
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
 description: a mongoid 3 zero-config, zero-integration, POLS pure mongo fulltext solution
 email: ara.t.howard@gmail.com
 executables: []