tanker 1.1.4 → 1.1.5

data/.travis.yml

@@ -0,0 +1,7 @@
+branches:
+  only:
+    - master
+rvm:
+  - 1.8.7 # (current default)
+  - 1.9.2
+

data/Gemfile

@@ -6,7 +6,8 @@ group :test do
   gem 'rspec', '>= 2.5.0'
   gem 'activerecord', '>= 3.0.7'
   gem 'sqlite3'
-  #gem 'ruby-debug19'
+  gem 'rcov'
+  gem 'ruby-debug19'
 end
 
 group :development do

data/README.rdoc

@@ -1,3 +1,5 @@
+{<img src="https://secure.travis-ci.org/kidpollo/tanker.png" />}[https://secure.travis-ci.org/kidpollo/tanker.png]
+
 = Tanker - IndexTank integration to your favorite orm
 
 IndexTank is a great search indexing service, this gem tries to make
@@ -150,9 +152,6 @@ Paginate Results
     <%= will_paginate @topics %> for WillPaginate 
     <%= paginate @topics %> for Kaminari
 
-Disable pagination of search results
-
-    @topics = Topic.search_tank('keyword', :paginate => false)
 
 == Fetching attributes and snippets
 

data/Rakefile

@@ -21,11 +21,25 @@ end
 require "rspec/core/rake_task"
 # RSpec 2.0
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = 'spec/*_spec.rb'
+  spec.pattern = 'spec/{tanker,utilities}_spec.rb'
   spec.rspec_opts = ['--backtrace']
 end
 task :default => :spec
 
+desc "Generate code coverage"
+RSpec::Core::RakeTask.new(:coverage) do |t|
+  t.pattern = "./spec/**/*_spec.rb" # don't need this, it's default.
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end
+
+desc "Run Integration Specs"
+RSpec::Core::RakeTask.new(:integration) do |t|
+  t.pattern = "spec/integration_spec.rb" # don't need this, it's default.
+  t.rcov = true
+  t.rcov_opts = ['--exclude', 'spec']
+end
+
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""

data/VERSION

@@ -1 +1 @@
-1.1.4
+1.1.5

data/lib/tanker.rb

@@ -61,7 +61,7 @@ module Tanker
       records.first.class.tanker_index.add_documents(data)
     end
 
-    def search(models, query, options = {})
+    def search_results(models, query, options = {})
       ids      = []
       models   = [models].flatten.uniq
       index    = models.first.tanker_index
@@ -111,6 +111,41 @@ module Tanker
       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)
+      SearchState.new(results, fetch, snippets, paginate) 
+    end
+
+    class SearchState
+      def initialize(results, fetch, snippets, paginate)
+        @results = results
+        @fetch = fetch
+        @snippets = snippets
+        @paginate = paginate
+      end
+      def results
+        @results
+      end
+      def fetch
+        @fetch
+      end 
+      def snippets
+        @snippets
+      end
+      def paginate
+        @paginate
+      end
+    end
+
+    def search(models, query, options = {})
+      search_state = search_results(models, query, options)
+      instantiate(search_state)
+    end 
+
+    def instantiate(search_state)
+      results = search_state.results
+      fetch = search_state.fetch
+      snippets = search_state.snippets
+      paginate = search_state.paginate
+
       categories = results['facets'] if results.has_key?('facets')
 
       instantiated_results = if (fetch || snippets)
@@ -195,7 +230,7 @@ module Tanker
 
       def extract_setup_paginate_options(options, defaults)
         # extract
-        paginate_options = if options[:paginate] or options[:paginate] === false
+        paginate_options = if options[:paginate]
           options.delete(:paginate)
         else
           { :page => options.delete(:page), :per_page => options.delete(:per_page) }

data/spec/integration_spec.rb

@@ -78,6 +78,8 @@ describe 'An imaginary store' do
     @iphone = Product.create(:name => 'iphone', :href => "apple", :tags => ['awesome', 'poor reception'], 
       :description => 'Puts even more features at your fingertips')
 
+    100.times do ; Product.create(:name => 'crapoola', :href => "crappy", :tags => ['crappy']) ; end
+
     @products_in_database = Product.all
 
     Product.tanker_reindex
@@ -86,6 +88,13 @@ describe 'An imaginary store' do
     Company.tanker_reindex
   end
 
+  describe 'pagination' do
+    it 'should dilplay total results correctly' do
+      results = Product.search_tank('crapoola')
+      results.total_entries.should == 100
+    end
+  end
+
   describe 'basic searching' do
 
     it 'should find all amazon products' do

data/spec/tanker_spec.rb

@@ -355,34 +355,6 @@ describe Tanker do
       Foo::Bar.search_tank('bar')
     end
 
-    it 'should be able to perform a search without pagination' do
-      Person.tanker_index.should_receive(:search).and_return(
-        {
-          "matches" => 2,
-          "results" => [{
-            "docid"  => 'Person 1',
-            "name"   => 'pedro',
-            "__type" => 'Person',
-            "__id"   => '1'
-          },{
-            "docid"  => 'Person 2',
-            "name"   => 'jaun',
-            "__type" => 'Person',
-            "__id"   => '2'
-          }],
-          "search_time" => 1
-        }
-      )
-
-      Person.should_receive(:find_all_by_id).with(['1', '2']).and_return(
-        [Person.new(:id => 1), Person.new(:id => 2)]
-      )
-      
-      collection = Person.search_tank('hey!', :paginate => false)
-      collection.class.should == Array
-      collection.size.should == 2
-    end
-
     it 'should be able to perform a search with pagination settings in :paginate option' do
       Person.tanker_index.should_receive(:search).and_return(
         {

data/tanker.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{tanker}
-  s.version = "1.1.4"
+  s.version = "1.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Francisco Viramontes}, %q{Jack Danger Canty}]
-  s.date = %q{2011-08-31}
+  s.date = %q{2011-09-23}
   s.description = %q{IndexTank is a great search indexing service, this gem tries to make any orm keep in sync with indextank with ease}
   s.email = %q{kidpollo@gmail.com}
   s.extra_rdoc_files = [
@@ -18,6 +18,7 @@ Gem::Specification.new do |s|
   ]
   s.files = [
     ".document",
+    ".travis.yml",
     "Gemfile",
     "LICENSE",
     "README.rdoc",

metadata

@@ -2,7 +2,7 @@
 name: tanker
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.4
+  version: 1.1.5
 platform: ruby
 authors: 
 - Francisco Viramontes
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-31 00:00:00 Z
+date: 2011-09-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: json
@@ -68,6 +68,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc