dusen 0.4.0 → 0.4.1

data/lib/dusen/active_record/base_ext.rb

@@ -21,7 +21,7 @@ module Dusen
         end
 
         def index_search_texts
-          Dusen::ActiveRecord::SearchText.rewrite_all_invalid(self)
+          Dusen::ActiveRecord::SearchText.synchronize_model(self)
         end
 
         def search_text(&text)

data/lib/dusen/active_record/search_text.rb

@@ -1,3 +1,5 @@
+require 'set'
+
 module Dusen
   module ActiveRecord
     class SearchText < ::ActiveRecord::Base
@@ -22,14 +24,25 @@ module Dusen
         scoped(:conditions => { :stale => true })
       end
 
-      def self.rewrite_all_invalid(model)
+      def self.synchronize_model(model)
         invalid_index_records = for_model(model).invalid
-        ids = Util.collect_column(invalid_index_records, :source_id)
-        Util.append_scope_conditions(model, :id => ids).each(&:index_search_text)
+        source_ids = Util.collect_column(invalid_index_records, :source_id)
+        pending_source_ids = Set.new(source_ids)
+        source_records = Util.append_scope_conditions(model, :id => source_ids)
+        source_records.find_in_batches do |batch|
+          batch.each do |source_record|
+            source_record.index_search_text
+            pending_source_ids.delete(source_record.id)
+          end
+        end
+        if pending_source_ids.present?
+          invalid_index_records.delete_all(:source_id => pending_source_ids.to_a)
+        end
+        true
       end
 
       def self.match(model, words)
-        rewrite_all_invalid(model) if model.search_text?
+        synchronize_model(model) if model.search_text?
         Dusen::Util.append_scope_conditions(
           model,
           :id => matching_source_ids(model, words)

data/lib/dusen/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Dusen
-  VERSION = '0.4.0'
+  VERSION = '0.4.1'
 end

data/spec/shared/spec/dusen/active_record/base_ext_spec.rb

@@ -12,6 +12,14 @@ shared_examples_for 'model with search syntax' do
       subject.search('Abraham').to_a.should == [match]
     end
 
+    it 'should not find stale text after fields were updated (bugfix)' do
+      match = subject.create!(:name => 'Abraham')
+      no_match = subject.create!(:name => 'Elizabath')
+      match.update_attributes!(:name => 'Johnny')
+      subject.search('Abraham').to_a.should be_empty
+      subject.search('Johnny').to_a.should == [match]
+    end
+
     it 'should AND multiple words' do
       match = subject.create!(:name => 'Abraham Lincoln')
       no_match = subject.create!(:name => 'Abraham')
@@ -84,14 +92,31 @@ describe ActiveRecord::Base do
     it 'should be shadowed by a Dusen::ActiveRecord::SearchText, which is created, updated and destroyed with the record' do
       user = User::WithFulltext.create!(:name => 'name', :email => 'email', :city => 'city')
       User::WithFulltext.index_search_texts
-      Dusen::ActiveRecord::SearchText.all.collect(&:words).should == ['name email city']
+
+      search_texts = Dusen::ActiveRecord::SearchText.all
+      search_texts.size.should == 1
+      search_texts[0].words.should == 'name email city'
+      search_texts[0].should_not be_stale
+
       user.reload
       user.update_attributes!(:email => 'changed_email')
+
+      search_texts = Dusen::ActiveRecord::SearchText.all
+      search_texts.size.should == 1
+      search_texts[0].words.should == 'name email city'
+      search_texts[0].should be_stale
+
       User::WithFulltext.index_search_texts
-      Dusen::ActiveRecord::SearchText.all.collect(&:words).should == ['name changed_email city']
+
+      search_texts = Dusen::ActiveRecord::SearchText.all
+      search_texts.size.should == 1
+      search_texts[0].words.should == 'name changed_email city'
+      search_texts[0].should_not be_stale
+
       user.destroy
-      User::WithFulltext.index_search_texts
-      Dusen::ActiveRecord::SearchText.count.should be_zero
+
+      search_texts = Dusen::ActiveRecord::SearchText.all
+      search_texts.size.should be_zero
     end
 
     describe 'indexing fields from associated records' do

data/spec/shared/spec/dusen/active_record/search_text_spec.rb

@@ -20,4 +20,24 @@ describe Dusen::ActiveRecord::SearchText do
 
   end
 
+  describe '.synchronize_model' do
+
+    it 'should refresh stale index records' do
+      user = User::WithFulltext.create!(:name => 'Abraham')
+      user.search_text_record.should be_stale
+      Dusen::ActiveRecord::SearchText.synchronize_model(User::WithFulltext)
+      user.search_text_record(true).should_not be_stale
+    end
+
+    it 'should remove index records that no longer map to a model record' do
+      user = User::WithFulltext.create!
+      Dusen::ActiveRecord::SearchText.count.should == 1
+      User::WithFulltext.delete_all
+      Dusen::ActiveRecord::SearchText.count.should == 1
+      Dusen::ActiveRecord::SearchText.synchronize_model(User::WithFulltext)
+      Dusen::ActiveRecord::SearchText.count.should be_zero
+    end
+
+  end
+
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dusen
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: 
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-12-17 00:00:00 +01:00
+date: 2013-01-03 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency