index-tanked 0.1.7 → 0.1.8

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

@@ -13,7 +13,8 @@ module IndexTanked
       end
 
       def add_fields_to_query(query, options={})
-        [super, "model:#{@model.name}"].compact.join(" ")
+        return nil if super.nil?
+        [super, "model:#{@model.name}"].compact.join(" ").strip
       end
 
       def doc_id

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

@@ -17,7 +17,7 @@ module IndexTanked
         find_in_batches(options) do |instances|
           documents = instances.map { |instance| instance.index_tanked.document_for_batch_addition }
           count += documents.size
-          index_tanked.retry_on_error do
+          index_tanked.retry_on_error(:times => 5, :delay_multiplier => 2) do
             index_tanked.index.batch_insert(documents)
           end
         end

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

@@ -2,7 +2,7 @@ module IndexTanked
   module ActiveRecordDefaults
     class SearchResult < SearchResult
 
-      attr_reader :model
+      attr_reader :model, :missing_ids
 
       def initialize(query, index, model, options={})
         super(query, index, options)
@@ -14,7 +14,17 @@ module IndexTanked
       end
 
       def records(options={})
-        @model.find(ids, options)
+        base = @model
+        base = base.scoped(:conditions => {:id => ids})
+        records_found = base.all(options)
+        @missing_ids = ids - records_found.map(&:id)
+        begin
+          if Configuration.missing_activerecord_ids_handler
+            Configuration.missing_activerecord_ids_handler.call(@model, @missing_ids)
+          end
+        ensure
+          return records_found
+        end
       end
 
       def paginate(options={})

data/lib/index-tanked/class_companion.rb

@@ -51,7 +51,8 @@ module IndexTanked
     end
 
     def add_fields_to_query(query, options={})
-      [query, options[:fields] && options[:fields].to_a.join(":")].compact.join(" ")
+      return nil if query.blank? && options[:fields].blank?
+      [query, options[:fields] && options[:fields].to_a.join(":")].compact.join(" ").strip
     end
 
   end

data/lib/index-tanked/configuration.rb

@@ -3,7 +3,8 @@ module IndexTanked
 
     class << self
       attr_accessor :url, :index, :search_availability, :index_availability,
-                    :add_to_index_fallback, :delete_from_index_fallback, :timeout
+                    :add_to_index_fallback, :delete_from_index_fallback, :timeout,
+                    :missing_activerecord_ids_handler
 
       def search_available?
         if search_availability.is_a? Proc

data/lib/index-tanked/search_result.rb

@@ -47,6 +47,7 @@ module IndexTanked
         begin
           raise SearchingDisabledError, "index tank search is disabled in configuration" unless IndexTanked::Configuration.search_available?
           raise IndexTanked::SearchError, "No or invalid index has been provided" unless @index.is_a? IndexTank::Index
+          raise IndexTanked::SearchError, "No query provided" if @query.nil?
           @raw_result ||= @index.search(@query, @options.merge(:start => pager.offset, :len => pager.per_page))
         rescue StandardError => e
           raise if e.is_a? IndexTankedError

data/lib/index-tanked/version.rb

@@ -1,3 +1,3 @@
 module IndexTanked
-  GEM_VERSION = '0.1.7'
+  GEM_VERSION = '0.1.8'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - Adam Kittelson