tanker 0.0.0 → 0.1.0

data/Gemfile.lock

@@ -29,4 +29,4 @@ PLATFORMS
 DEPENDENCIES
   jeweler
   rspec (>= 2.0.0.beta.22)
-  will_paginate
+  will_paginate (>= 2.3.15)

data/VERSION

@@ -1 +1 @@
-0.0.0
+0.1.0

data/lib/tanker.rb

@@ -48,30 +48,39 @@ module Tanker
       @tanker_indexes << field
     end
 
-  end
-
-  # these are the instace methods included que
-  module InstanceMethods
-
-    def tanker_indexes
-      self.class.tanker_indexes
-    end
-
     def api
       @api ||= IndexTank::ApiClient.new(Tanker.configuration[:url])
     end
 
     def index
-      @index ||= api.get_index(self.class.index_name)
+      @index ||= api.get_index(self.index_name)
     end
 
-    def search_tank(query, page = 1, per_page = self.class.per_page)
+    def search_tank(query, options = {})
+      page     = options.delete(:page) || 1
+      per_page = options.delete(:per_page) || self.per_page
+
+      # transform fields in query
+      if options.has_key? :conditions
+        options[:conditions].each do |field,value|
+          query += " #{field}:(#{value})"
+        end
+      end
+
+      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)}
+      else
+        return nil
+      end
 
-      results = index.search(query, :start => page, :len => per_page )
-      ids = results[:results].map{|res| res[:docid]}
 
       @entries = WillPaginate::Collection.create(page, per_page) do |pager|
-        result = self.class.find(ids)
+        result = self.find(ids)
         # inject the result array into the paginated collection:
         pager.replace(result)
 
@@ -81,16 +90,36 @@ module Tanker
         end
       end
     end
+
+  end
+
+  # these are the instace methods included que
+  module InstanceMethods
+
+    def tanker_indexes
+      self.class.tanker_indexes
+    end
+
     def update_tank_indexes
-      hash = {}
-      tanker_indexes.each do |idx|
-        hash[idx] = self.send(idx.to_s)
+      data = {}
+
+      tanker_indexes.each do |field|
+        val = self.instance_eval(field.to_s)
+        data[field.to_s] = val.to_s unless val.nil?
       end
-      index.add_document(id, hash)
+
+      data[:__any] = data.values.join " . "
+      data[:__type] = self.class.name
+
+      self.class.index.add_document(it_doc_id, data)
     end
 
     def delete_tank_indexes
-      index.delete_document(id)
+      self.class.index.delete_document(it_doc_id)
+    end
+
+    def it_doc_id
+      self.class.name + ' ' + self.id.to_s
     end
 
   end

data/spec/tanker_spec.rb

@@ -61,36 +61,30 @@ describe Tanker do
 
   describe 'tanker instance' do
     it 'should create an api instance' do
-      person = Person.new
-
-      person.api.class.should == IndexTank::ApiClient
+      Person.api.class.should == IndexTank::ApiClient
     end
 
     it 'should create a connexion to index tank' do
-      person = Person.new
-
-      person.index.class.should == IndexTank::IndexClient
+      Person.index.class.should == IndexTank::IndexClient
     end
 
     it 'should be able to perform a seach query' do
-      person = Person.new
-
-      person.index.should_receive(:search).and_return(
+      Person.index.should_receive(:search).and_return(
         {
           :matches => 1,
           :results => [{
-            :docid => 1,
+            :docid => Person.new.it_doc_id,
             :name  => 'pedro'
           }],
           :search_time => 1
         }
       )
 
-      person.class.should_receive(:find).and_return(
-      [person]
+      Person.should_receive(:find).and_return(
+      [Person.new]
       )
 
-      collection = person.search_tank('hey!')
+      collection = Person.search_tank('hey!')
       collection.class.should == WillPaginate::Collection
       collection.total_entries.should == 1
       collection.total_pages.should == 1
@@ -101,7 +95,7 @@ describe Tanker do
     it 'should be able to update the index' do
       person = Person.new
 
-      person.index.should_receive(:add_document)
+      Person.index.should_receive(:add_document)
 
       person.update_tank_indexes
     end
@@ -109,7 +103,7 @@ describe Tanker do
     it 'should be able to delete de document from the index' do
       person = Person.new
 
-      person.index.should_receive(:delete_document)
+      Person.index.should_receive(:delete_document)
 
       person.delete_tank_indexes
     end

data/tanker.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tanker}
-  s.version = "0.0.0"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["@kidpollo"]

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 0
-  version: 0.0.0
+  version: 0.1.0
 platform: ruby
 authors: 
 - "@kidpollo"