index-tanked 0.1.10 → 0.1.11

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

@@ -9,7 +9,7 @@ module IndexTanked
 
       # pass in scoped with an empty hash to give the search result a representation of the current scope
       def search_index_tank(query, options={})
-        SearchResult.new(index_tanked.add_fields_to_query(query), @index_tanked.index, scoped({}), options)
+        SearchResult.new(index_tanked.add_fields_to_query(query, options), @index_tanked.index, scoped({}), options)
       end
 
       def add_all_to_index_tank(options={})

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

@@ -15,7 +15,11 @@ module IndexTanked
 
       def records(options={})
         base = @model
-        base = base.scoped(:conditions => {:id => ids})
+        if defined?(Squirrel) && base.respond_to?(:scoped_without_squirrel)
+          base = base.scoped_without_squirrel(:conditions => {:id => ids})
+        else
+          base = base.scoped(:conditions => {:id => ids})
+        end
         records_found = base.all(options)
         @missing_ids = ids - records_found.map(&:id)
         begin
@@ -43,6 +47,10 @@ module IndexTanked
         end
       end
 
+      def inspect
+        "<IndexTanked::ActiveRecordDefaults::SearchResult:#{object_id}, Query:'#{@query}'>"
+      end
+
     end
   end
 end

data/lib/index-tanked/class_methods.rb

@@ -8,7 +8,7 @@ module IndexTanked
     end
 
     def search_index_tank(query, options={})
-      SearchResult.new(index_tanked.add_fields_to_query(query), index_tanked.index, options)
+      SearchResult.new(index_tanked.add_fields_to_query(query, options), index_tanked.index, options)
     end
 
     def add_to_index_tank(doc_id, data, fallback=true)

data/lib/index-tanked/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: index-tanked
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Adam Kittelson