mongoid-haystack 1.4.1 → 1.4.2

data/lib/mongoid-haystack.rb

@@ -2,7 +2,7 @@
 #
   module Mongoid
     module Haystack
-      const_set(:Version, '1.4.1') unless const_defined?(:Version)
+      const_set(:Version, '1.4.2') unless const_defined?(:Version)
 
       class << Haystack
         def version
@@ -11,7 +11,7 @@
 
         def dependencies
           {
-            'mongoid'       => [ 'mongoid'       , '~> 3.0' ] ,
+            'mongoid'       => [ 'mongoid'       , '~> 3.1' ] ,
             'moped'         => [ 'moped'         , '~> 1.3' ] ,
             'origin'        => [ 'origin'        , '~> 1.0' ] ,
             'map'           => [ 'map'           , '~> 6.2' ] ,

data/lib/mongoid-haystack/token.rb

@@ -3,6 +3,8 @@ module Mongoid
     class Token
       include Mongoid::Document
 
+      class Error < ::StandardError; end
+
       class << Token
         def values_for(*args)
           Haystack.tokens_for(*args)
@@ -15,21 +17,59 @@ module Mongoid
           values.flatten!
           values.compact!
 
-        # ensure that a token exists for each value seen
+        # try very hard to create tokens efficently in bulk
         #
-          existing = where(:value.in => values)
-          missing = values - existing.map(&:value)
+          missing = []
+          
+          42.times do
+            existing = where(:value.in => values)
+            missing = values - existing.map(&:value)
+
+            docs = missing.map{|value| {:_id => Token.next_hex_id, :value => value}}
+
+            unless docs.empty?
+              collection = mongo_session.with(:safe => false)[collection_name]
+              collection.insert(docs, [:continue_on_error])
+            else
+              break
+            end
+          end
 
-          docs = missing.map{|value| {:_id => Token.next_hex_id, :value => value}}
-          unless docs.empty?
-            collection = mongo_session.with(:safe => false)[collection_name]
-            collection.insert(docs, [:continue_on_error])
+        # fill in gaps individually iff needed... (another process may be racing to create tokens)
+        #
+          42.times do
+            existing = where(:value.in => values)
+            missing = values - existing.map(&:value)
+
+            unless missing.empty?
+              missing.each do |value|
+                begin
+                  Token.new.tap do |t|
+                    t.id = Token.next_hex_id
+                    t.value = value
+                    t.save!
+                  end
+                rescue Object
+                  next
+                end
+              end
+            else
+              break
+            end
           end
 
         # new we should have one token per uniq value
         #
           tokens = where(:value.in => values).to_a
 
+        # sigh - go boom if we failed to ensure the creation of all required
+        # tokens...
+        #
+          missing = values - tokens.map(&:value)
+          unless missing.size == 0
+            raise(Error, "missing tokens (#{ missing.inspect })")
+          end
+
         # batch update the counts on the tokens by the number of times each
         # value was seen in the list
         #
@@ -42,12 +82,6 @@ module Mongoid
           values.each do |value|
             token = token_index[value]
 
-            unless token
-              token = Token.create!(:value => value)
-              value_index[value] ||= []
-              value_index[value].push(value)
-            end
-
             count = value_index[value].size
             counts[count] ||= []
             counts[count].push(token.id)
@@ -81,7 +115,7 @@ module Mongoid
 
       field(:_id, :type => String, :default => proc{ Token.next_hex_id })
       field(:value, :type => String)
-      field(:count, :type => Integer, :default => 0)
+      field(:count, :type => Integer)
 
       index({:value => 1}, {:unique => true})
       index({:count => 1})

data/mongoid-haystack.gemspec

@@ -3,7 +3,7 @@
 
 Gem::Specification::new do |spec|
   spec.name = "mongoid-haystack"
-  spec.version = "1.4.1"
+  spec.version = "1.4.2"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "mongoid-haystack"
   spec.description = "a mongoid 3 zero-config, zero-integration, POLS pure mongo fulltext solution"
@@ -58,7 +58,7 @@ Gem::Specification::new do |spec|
   spec.test_files = nil
 
   
-    spec.add_dependency(*["mongoid", "~> 3.0"])
+    spec.add_dependency(*["mongoid", "~> 3.1"])
   
     spec.add_dependency(*["moped", "~> 1.3"])
   

data/test/mongoid-haystack_test.rb

@@ -96,6 +96,7 @@ Testing Mongoid::Haystack do
 
     assert{ Mongoid::Haystack.index(A) }
 
+
     assert{ Mongoid::Haystack::Token.count == 3 }
     assert{ Mongoid::Haystack::Token.all.map(&:value).sort == %w( cat dog dogs ) }
     assert{ Mongoid::Haystack::Token.total == 4 }
@@ -296,11 +297,15 @@ Testing Mongoid::Haystack do
       end
     end
 
+    k.destroy_all
+
     n = 10
 
-    n.times do
+    n.times do |i|
       k.create!(:title => 'the cats and dogs', :body => 'now now is is the the time time for for all all good good men women')
+      assert{ Mongoid::Haystack.search('cat').count == (i + 1) }
     end
+    assert{ Mongoid::Haystack.search('cat').count == n }
 
     n.times do
       k.create!(:title => 'a b c abc xyz abc xyz b', :body => 'pdq pdq pdq xyz teh ngr am')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mongoid-haystack
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-05 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mongoid
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
 - !ruby/object:Gem::Dependency
   name: moped
   requirement: !ruby/object:Gem::Requirement