lib/tanker.rb in tanker-0.3.0 vs lib/tanker.rb in tanker-0.5.0

@@ -1,34 +1,48 @@
 require "rubygems"
 require "bundler"
-require 'indextank_client'
 
+Bundler.setup :default
+
+require 'indextank_client'
 require 'tanker/configuration'
+require 'tanker/utilities'
 require 'will_paginate/collection'
 
-Bundler.setup :default
 
+if defined? Rails
+  require 'tanker/railtie'
+end
+
 module Tanker
 
   class NotConfigured < StandardError; end
   class NoBlockGiven < StandardError; end
 
   autoload :Configuration, 'tanker/configuration'
-
   extend Configuration
 
   class << self
+    attr_reader :included_in
+
+    def api
+      @api ||= IndexTank::ApiClient.new(Tanker.configuration[:url])
+    end
+
     def included(klass)
+      @included_in ||= []
+      @included_in << klass
+      @included_in.uniq!
+
       klass.instance_variable_set('@tanker_configuration', configuration)
       klass.instance_variable_set('@tanker_indexes', [])
       klass.send :include, InstanceMethods
       klass.extend ClassMethods
 
       class << klass
         define_method(:per_page) { 10 } unless respond_to?(:per_page)
       end
-
     end
   end
 
   # these are the class methods added when Tanker is included
   module ClassMethods
@@ -46,19 +60,16 @@
 
     def indexes(field)
       @tanker_indexes << field
     end
 
-    def api
-      @api ||= IndexTank::ApiClient.new(Tanker.configuration[:url])
-    end
-
     def index
-      @index ||= api.get_index(self.index_name)
+      @index ||= Tanker.api.get_index(self.index_name)
     end
 
     def search_tank(query, options = {})
+      ids      = []
       page     = options.delete(:page) || 1
       per_page = options.delete(:per_page) || self.per_page
 
       # transform fields in query
       if options.has_key? :conditions
@@ -70,38 +81,38 @@
       query = "__any:(#{query.to_s}) __type:#{self.name}"
       options = { :start => page - 1, :len => per_page }.merge(options)
 
       results = index.search(query, options)
 
-      unless results[:results].empty?
-        ids = results[:results].map{|res| res[:docid].split(" ", 2)}
+      unless results["results"].empty?
+        ids = results["results"].map{|res| res["docid"].split(" ", 2)[1]}
       else
         return nil
       end
 
-
       @entries = WillPaginate::Collection.create(page, per_page) do |pager|
         result = self.find(ids)
         # inject the result array into the paginated collection:
         pager.replace(result)
 
         unless pager.total_entries
           # the pager didn't manage to guess the total count, do it manually
-          pager.total_entries = results[:matches]
+          pager.total_entries = results["matches"]
         end
       end
     end
 
   end
 
-  # these are the instace methods included que
+  # these are the instance methods included
   module InstanceMethods
 
     def tanker_indexes
       self.class.tanker_indexes
     end
 
+    # update a create instance from index tank
     def update_tank_indexes
       data = {}
 
       tanker_indexes.each do |field|
         val = self.instance_eval(field.to_s)
@@ -112,15 +123,17 @@
       data[:__type] = self.class.name
 
       self.class.index.add_document(it_doc_id, data)
     end
 
+    # delete instance from index tank
     def delete_tank_indexes
       self.class.index.delete_document(it_doc_id)
     end
 
+    # create a unique index based on the model name and unique id
     def it_doc_id
       self.class.name + ' ' + self.id.to_s
     end
-
   end
 end
+