index-tanked 0.1.11 → 0.1.12

data/lib/index-tanked/active_record_defaults/class_methods.rb

@@ -26,6 +26,12 @@ module IndexTanked
         count
       end
 
+      def delete_doc_ids_from_index_tank(doc_ids)
+        doc_ids.each do |doc_id|
+          delete_from_index_tank(doc_id)
+        end
+      end
+
     end
   end
 end

data/lib/index-tanked/active_record_defaults/instance_methods.rb

@@ -5,10 +5,25 @@ module IndexTanked
         @index_tanked ||= InstanceCompanion.new(self)
       end
 
-      def add_to_index_tank
-        self.class.add_to_index_tank(index_tanked.doc_id, index_tanked.data)
+      def add_to_index_tank(fallback=true)
+        self.class.add_to_index_tank(index_tanked.doc_id, index_tanked.data, fallback)
         ancestor = self.class._ancestors_to_index.first
-        self.becomes(ancestor).add_to_index_tank if ancestor
+        self.becomes(ancestor).add_to_index_tank(fallback) if ancestor
+      end
+
+      def add_to_index_tank_after_save(fallback=true)
+        if index_tanked.dependencies_changed?
+          add_to_index_tank(fallback)
+        end
+      end
+
+      def delete_from_index_tank_after_destroy
+        doc_ids = []
+        doc_ids << index_tanked.doc_id
+        self.class._ancestors_to_index.each do |ancestor|
+          doc_ids << becomes(ancestor).index_tanked.doc_id
+        end
+        self.class.delete_doc_ids_from_index_tank(doc_ids.compact)
       end
     end
   end

data/lib/index-tanked/class_methods.rb

@@ -19,7 +19,7 @@ module IndexTanked
         else
           IndexTanked::Configuration.timeout
         end
-        if timeout
+        if timeout && fallback
           IndexTanked::Timer.timeout(timeout, TimeoutExceededError) do
             sleep(timeout + 1) if $testing_index_tanked_timeout
             @index_tanked.index.document(doc_id).add(*data)
@@ -51,7 +51,7 @@ module IndexTanked
         else
           IndexTanked::Configuration.timeout
         end
-        if timeout
+        if timeout  && fallback
           IndexTanked::Timer.timeout(timeout, TimeoutExceededError) do
             sleep(timeout + 1) if $testing_index_tanked_timeout
             @index_tanked.index.document(doc_id).delete

data/lib/index-tanked/index_tanked.rb

@@ -27,20 +27,9 @@ module IndexTanked
           a != self && a != ActiveRecord::Base && a.ancestors.include?(ActiveRecord::Base) && !a.abstract_class?
         }
 
-        after_save do |instance|
-          if instance.index_tanked.dependencies_changed?
-            instance.add_to_index_tank
-          end
-        end
+        after_save :add_to_index_tank_after_save
 
-        after_destroy do |instance|
-          doc_id = instance.index_tanked.doc_id
-          instance.class.delete_from_index_tank(doc_id)
-          instance.class._ancestors_to_index.each do |ancestor|
-            doc_id = instance.index_tanked.doc_id
-            instance.becomes(ancestor).delete_from_index_tank(doc_id)
-          end
-        end
+        after_destroy :delete_from_index_tank_after_destroy
       end
     end
   end

data/lib/index-tanked/version.rb

@@ -1,3 +1,3 @@
 module IndexTanked
-  GEM_VERSION = '0.1.11'
+  GEM_VERSION = '0.1.12'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: false
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Adam Kittelson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-24 00:00:00 -05:00
+date: 2011-03-29 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency