index-tanked 0.1.3 → 0.1.4

data/lib/index-tanked.rb

@@ -1,9 +1,11 @@
-begin
-  require 'system_timer'
-  IndexTankedTimer = SystemTimer
-rescue LoadError
-  require 'timeout'
-  IndexTankedTimer = Timeout
+module IndexTanked
+  begin
+    require 'system_timer'
+    Timer = SystemTimer
+  rescue LoadError
+    require 'timeout'
+    Timer = Timeout
+  end
 end
 
 require 'indextank'

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

@@ -24,6 +24,81 @@ module IndexTanked
         lambda { |instance| "#{instance.class.name}:#{instance.id}"}
       end
 
+      def dependent_fields
+        if !@dependent_fields
+          @dependent_fields = @fields.map do |field|
+            field[2][:depends_on] || field[1]
+          end.flatten.compact.uniq
+
+          if !@dependent_fields.include?(:created_at) && model.column_names.include?("created_at")
+            @dependent_fields << :created_at
+          end
+        end
+
+        @dependent_fields
+      end
+
+      def dependent_fields_as_strings
+        @dependent_fields_as_strings ||= dependent_fields.map(&:to_s)
+      end
+
+      def dependent_fields_for_select(*additional_fields)
+        if additional_fields.empty?
+          dependent_fields_as_strings
+        else
+          (dependent_fields_as_strings + additional_fields.map(&:to_s)).uniq
+        end
+      end
+
+      def retry_on_error(options={}, &block)
+        times            = options[:times] || 3
+        delay_multiplier = options[:delay_multiplier] || 0
+        excepts          = [options[:except]].compact.flatten
+        count            = 0
+        begin
+          instance_eval(&block)
+        rescue Timeout::Error, StandardError => e
+          if excepts.include?(e.class)
+            raise e
+          else
+            retry if times == :infinity
+            count += 1
+            sleep count * delay_multiplier
+            retry if count < times
+            raise e
+          end
+        end
+      end
+
+      def field(field_name, method=field_name, options={})
+        super
+
+        field = @fields.last
+        method = field[1]
+        method_without_sugar = method.to_s.sub(/[\?=]$/, '')
+        options = field[2]
+
+        if options[:depends_on].nil? || (options[:depends_on].is_a?(Array) && options[:depends_on].empty?)
+          case method
+          when Symbol
+            if !model.column_names.include?(method_without_sugar)
+              raise MissingFieldDependencyError, "The #{field_name} field requires a dependency to be specified"
+            end
+          when Proc
+            raise MissingFieldDependencyError, "The #{field_name} field requires a dependency to be specified"
+          end
+        end
+
+        dependencies = [options[:depends_on] || method_without_sugar].flatten.compact.map(&:to_s)
+        invalid_dependencies = dependencies - model.column_names
+
+        if !invalid_dependencies.empty?
+          raise InvalidFieldDependencyError, "The following field dependencies are invalid: #{invalid_dependencies.join(', ')}"
+        end
+
+        @fields
+      end
+
     end
   end
 end

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

@@ -16,7 +16,9 @@ module IndexTanked
         find_in_batches(:batch_size => batch_size) do |instances|
           documents = instances.map { |instance| instance.index_tanked.document_for_batch_addition }
           count += documents.size
-          index_tanked.index.batch_insert(documents)
+          index_tanked.retry_on_error do
+            index_tanked.index.batch_insert(documents)
+          end
         end
         count
       end

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

@@ -1,11 +1,36 @@
 module IndexTanked
   module ActiveRecordDefaults
     class InstanceCompanion < IndexTanked::InstanceCompanion
+      if defined?(ActiveRecord::MissingAttributeError)
+        MissingAttributeError = ActiveRecord::MissingAttributeError
+      else
+        MissingAttributeError = ActiveModel::MissingAttributeError
+      end
+
+      def created_at
+        if @companion.respond_to?(:created_at)
+          @companion.created_at
+        else
+          Time.now
+        end
+      end
+
       def data
-        field_data, other_data = *super
-        field_data.merge!(:timestamp => @companion.created_at.to_i, :model => @companion.class.name)
+        begin
+          field_data, other_data = *super
+          field_data.merge!(:timestamp => created_at.to_i, :model => @companion.class.name)
+        rescue MissingAttributeError
+          @companion.reload
+          field_data, other_data = *super
+          field_data.merge!(:timestamp => created_at.to_i, :model => @companion.class.name)
+        end
         [field_data, other_data]
       end
+
+      def dependencies_changed?
+        @companion.class.index_tanked.dependent_fields.any?{|field| @companion.send("#{field}_changed?") }
+      end
+
     end
   end
 end

data/lib/index-tanked/class_methods.rb

@@ -20,7 +20,7 @@ module IndexTanked
           IndexTanked::Configuration.timeout
         end
         if timeout
-          IndexTankedTimer.timeout(timeout, TimeoutExceededError) do
+          IndexTanked::Timer.timeout(timeout, TimeoutExceededError) do
             sleep(timeout + 1) if $testing_index_tanked_timeout
             @index_tanked.index.document(doc_id).add(*data)
           end
@@ -52,7 +52,7 @@ module IndexTanked
           IndexTanked::Configuration.timeout
         end
         if timeout
-          IndexTankedTimer.timeout(timeout, TimeoutExceededError) do
+          IndexTanked::Timer.timeout(timeout, TimeoutExceededError) do
             sleep(timeout + 1) if $testing_index_tanked_timeout
             @index_tanked.index.document(doc_id).delete
           end

data/lib/index-tanked/index_tanked.rb

@@ -7,6 +7,8 @@ module IndexTanked
   class URLNotProvidedError < IndexTankedError; end
   class IndexNameNotProvidedError < IndexTankedError; end
   class TimeoutExceededError < IndexTankedError; end
+  class MissingFieldDependencyError < IndexTankedError; end
+  class InvalidFieldDependencyError < IndexTankedError; end
 
   def self.included(base)
     base.class_eval do
@@ -26,9 +28,11 @@ module IndexTanked
         }
 
         after_save do |instance|
-          instance.add_to_index_tank
-          instance.class._ancestors_to_index.each do |ancestor|
-            instance.becomes(ancestor).add_to_index_tank
+          if instance.index_tanked.dependencies_changed?
+            instance.add_to_index_tank
+            instance.class._ancestors_to_index.each do |ancestor|
+              instance.becomes(ancestor).add_to_index_tank
+            end
           end
         end
 

data/lib/index-tanked/version.rb

@@ -1,3 +1,3 @@
 module IndexTanked
-  GEM_VERSION = '0.1.3'
+  GEM_VERSION = '0.1.4'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 29
-  prerelease: 
+  hash: 19
+  prerelease: false
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Adam Kittelson
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-18 00:00:00 -05:00
+date: 2011-03-22 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -178,7 +178,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.0
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Index Tank <http://indextank.com> integration library.