dusen 0.4.9 → 0.4.10

data/dusen.gemspec

@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_dependency('activerecord')
-  s.add_dependency('edge_rider', '>=0.2.3')
+  s.add_dependency('edge_rider', '>=0.2.5')
 
 end

data/lib/dusen/active_record/search_text.rb

@@ -26,11 +26,11 @@ module Dusen
       end
 
       def self.synchronize_model(model)
+        model = model.origin_class
         invalid_index_records = for_model(model).invalid
         source_ids = invalid_index_records.collect_column(: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|
+        model.find_in_batches(:conditions => { :id => source_ids } ) do |batch|
           batch.each do |source_record|
             source_record.index_search_text
             pending_source_ids.delete(source_record.id)

data/lib/dusen/version.rb

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

data/spec/rails-2.3/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     dusen (0.4.9)
       activerecord
-      edge_rider (>= 0.2.3)
+      edge_rider (>= 0.2.5)
 
 GEM
   remote: https://rubygems.org/
@@ -21,7 +21,7 @@ GEM
     andand (1.3.3)
     columnize (0.3.6)
     database_cleaner (1.0.1)
-    edge_rider (0.2.3)
+    edge_rider (0.2.5)
       activerecord
     hoe (2.8.0)
       rake (>= 0.8.7)

data/spec/rails-3.0/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     dusen (0.4.9)
       activerecord
-      edge_rider (>= 0.2.3)
+      edge_rider (>= 0.2.5)
 
 GEM
   remote: https://rubygems.org/
@@ -41,7 +41,7 @@ GEM
     columnize (0.3.6)
     database_cleaner (1.0.1)
     diff-lcs (1.2.4)
-    edge_rider (0.2.3)
+    edge_rider (0.2.5)
       activerecord
     erubis (2.6.6)
       abstract (>= 1.0.0)

data/spec/rails-3.2/Gemfile.lock

@@ -3,7 +3,7 @@ PATH
   specs:
     dusen (0.4.9)
       activerecord
-      edge_rider (>= 0.2.3)
+      edge_rider (>= 0.2.5)
 
 GEM
   remote: https://rubygems.org/
@@ -41,7 +41,7 @@ GEM
     columnize (0.3.6)
     database_cleaner (1.0.1)
     diff-lcs (1.2.4)
-    edge_rider (0.2.3)
+    edge_rider (0.2.5)
       activerecord
     erubis (2.7.0)
     hike (1.2.2)

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

@@ -38,6 +38,16 @@ describe Dusen::ActiveRecord::SearchText do
       Dusen::ActiveRecord::SearchText.count.should be_zero
     end
 
+    it 'should not remove non-orphaned index records when called with a scope that excludes their source (bugfix)' do
+      user1 = User::WithFulltext.create!
+      user2 = User::WithFulltext.create!
+      Dusen::ActiveRecord::SearchText.count.should == 2
+      scope = Dusen::Util.append_scope_conditions(User::WithFulltext, :id => [user2.id])
+      Dusen::ActiveRecord::SearchText.synchronize_model(scope)
+      Dusen::ActiveRecord::SearchText.count.should == 2
+    end
+
   end
 
 end
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: dusen
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 4
-  - 9
-  version: 0.4.9
+  - 10
+  version: 0.4.10
 platform: ruby
 authors: 
 - Henning Koch
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2014-01-24 00:00:00 +01:00
+date: 2014-05-05 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,12 +40,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 17
+        hash: 29
         segments: 
         - 0
         - 2
-        - 3
-        version: 0.2.3
+        - 5
+        version: 0.2.5
   type: :runtime
   version_requirements: *id002
 description: Comprehensive full text search for ActiveRecord and MySQL