lib/tanker.rb in tanker-1.1.2 vs lib/tanker.rb in tanker-1.1.3

@@ -7,11 +7,10 @@
   puts "Tanker: #{e.message}"
 end
 require 'indextank_client'
 require 'tanker/configuration'
 require 'tanker/utilities'
-require 'will_paginate/collection'
 
 if defined? Rails
   begin
     require 'tanker/railtie'
   rescue LoadError
@@ -26,11 +25,11 @@
   class NoIndexName < StandardError; end
 
   autoload :Configuration, 'tanker/configuration'
   extend Configuration
 
-  autoload :KaminariPaginatedArray, 'tanker/paginated_array'
+  autoload :Pagination, 'tanker/pagination'
 
   class << self
     attr_reader :included_in
 
     def api
@@ -99,41 +98,41 @@
         end
       end
 
       # fetch values from index tank or just the type and id to instace results localy
       options[:fetch]   =  "__type,__id"
-      options[:fetch]   += ",#{fetch.join(',')}" if fetch 
+      options[:fetch]   += ",#{fetch.join(',')}" if fetch
       options[:snippet] = snippets.join(',') if snippets
-      
+
       search_on_fields = models.map{|model| model.tanker_config.indexes.map{|arr| arr[0]}.uniq}.flatten.uniq.join(":(#{query.to_s}) OR ")
-      query = "#{search_on_fields}:(#{query.to_s}) __type:(#{models.map(&:name).map {|name| "\"#{name.split('::').join(' ')}\"" }.join(' OR ')})"
 
+      query = "#{search_on_fields}:(#{query.to_s}) OR __any:(#{query.to_s}) __type:(#{models.map(&:name).map {|name| "\"#{name.split('::').join(' ')}\"" }.join(' OR ')})"
       options = { :start => paginate[:per_page] * (paginate[:page] - 1), :len => paginate[:per_page] }.merge(options) if paginate
       results = index.search(query, options)
-      
+
       instantiated_results = if (fetch || snippets)
         instantiate_results_from_results(results, fetch, snippets)
       else
         instantiate_results_from_db(results)
       end
-      paginate === false ? instantiated_results : paginate_results(instantiated_results, paginate, results['matches'])
+      paginate === false ? instantiated_results : Pagination.create(instantiated_results, results['matches'], paginate)
     end
 
     protected
 
-      def instantiate_results_from_db(index_result) 
+      def instantiate_results_from_db(index_result)
         results = index_result['results']
         return [] if results.empty?
 
         id_map = results.inject({}) do |acc, result|
           model = result["__type"]
           id = constantize(model).tanker_parse_doc_id(result)
           acc[model] ||= []
           acc[model] << id
           acc
         end
-        
+
         id_map.each do |klass, ids|
           # replace the id list with an eager-loaded list of records for this model
           id_map[klass] = constantize(klass).find(ids)
         end
         # return them in order
@@ -141,30 +140,14 @@
           model, id = result["__type"], result["__id"]
           id_map[model].detect {|record| id == record.id.to_s }
         end
       end
 
-      def paginate_results(results, pagination_options, total_hits)
-        case Tanker.configuration[:pagination_backend]
-        when :will_paginate
-          WillPaginate::Collection.create(pagination_options[:page],
-                                          pagination_options[:per_page],
-                                          total_hits) { |pager| pager.replace results }
-        when :kaminari
-          Tanker::KaminariPaginatedArray.new(results,
-                                             pagination_options[:per_page],
-                                             pagination_options[:page]-1,
-                                             total_hits)
-        else
-          raise(BadConfiguration, "Unknown pagination backend")
-        end
-      end
-
       def instantiate_results_from_results(index_result, fetch = false, snippets = false)
         results = index_result['results']
         return [] if results.empty?
-        instances = []   
+        instances = []
         id_map = results.inject({}) do |acc, result|
           model = result["__type"]
           instance = constantize(model).new()
           result.each do |key, value|
             case key
@@ -364,13 +347,12 @@
       data
     end
 
     #dynamically create a snippet read attribute (method)
     def create_snippet_attribute(key, value)
-      # the method name should something_snippet not snippet_something as the api returns it
-      self.class.send(:define_method,  "#{key.match(/snippet_(\w+)/)[1]}_snippet") do
-        value
-      end
+      # method name should something_snippet not snippet_something as the api returns it
+      method_name = "#{key.match(/snippet_(\w+)/)[1]}_snippet"
+      (class << self; self end).send(:define_method, method_name) { value }
     end
 
     def tanker_index_options
       options = {}