elastic_searchable 0.4.0 → 0.5.0

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/elastic_searchable.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{elastic_searchable}
-  s.version = "0.4.0"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan Sonnek"]
-  s.date = %q{2011-02-22}
+  s.date = %q{2011-03-04}
   s.description = %q{integrate the elastic search engine with rails}
   s.email = %q{ryan@codecrate.com}
   s.extra_rdoc_files = [

data/lib/elastic_searchable/queries.rb

@@ -2,17 +2,19 @@ require 'will_paginate/collection'
 
 module ElasticSearchable
   module Queries
+    PER_PAGE_DEFAULT = 20
+
     # search returns a will_paginate collection of ActiveRecord objects for the search results
-    # options:
-    # :per_page/:limit
-    # :page/:offset
+    # supported options:
+    # :page - page of results to search for
+    # :per_page - number of results per page
     #
     # http://www.elasticsearch.com/docs/elasticsearch/rest_api/search/
     def search(query, options = {})
       page = (options.delete(:page) || 1).to_i
       options[:fields] ||= '_id'
       options[:q] ||= query
-      options[:size] ||= (options.delete(:per_page) || 20)
+      options[:size] ||= per_page_for_search(options)
       options[:from] ||= options[:size] * (page - 1)
 
       response = ElasticSearchable.request :get, index_type_path('_search'), :query => options
@@ -24,5 +26,16 @@ module ElasticSearchable
       page.replace results
       page
     end
+
+    private
+    # determine the number of search results per page
+    # supports will_paginate configuration by using:
+    # Model.per_page
+    # Model.max_per_page
+    def per_page_for_search(options = {})
+      per_page = options.delete(:per_page) || (self.respond_to?(:per_page) ? self.per_page : nil) || ElasticSearchable::Queries::PER_PAGE_DEFAULT
+      per_page = [per_page.to_i, self.max_per_page].min if self.respond_to?(:max_per_page)
+      per_page
+    end
   end
 end

data/test/test_elastic_searchable.rb

@@ -20,6 +20,9 @@ class TestElasticSearchable < Test::Unit::TestCase
     create_table :books, :force => true do |t|
       t.column :title, :string
     end
+    create_table :max_page_size_classes, :force => true do |t|
+      t.column :name, :string
+    end
   end
 
   def setup
@@ -282,5 +285,34 @@ class TestElasticSearchable < Test::Unit::TestCase
       end
     end
   end
+
+  class MaxPageSizeClass < ActiveRecord::Base
+    elastic_searchable
+    def self.max_per_page
+      1
+    end
+  end
+  context 'with 2 MaxPageSizeClass instances' do
+    setup do
+      MaxPageSizeClass.create_index
+      @first = MaxPageSizeClass.create! :name => 'foo one'
+      @second = MaxPageSizeClass.create! :name => 'foo two'
+      MaxPageSizeClass.refresh_index
+    end
+    context 'MaxPageSizeClass.search with default options' do
+      setup do
+        @results = MaxPageSizeClass.search 'foo'
+      end
+      should 'have one per page' do
+        assert_equal 1, @results.per_page
+      end
+      should 'return one instance' do
+        assert_equal 1, @results.length
+      end
+      should 'have second page' do
+        assert_equal 2, @results.total_entries
+      end
+    end
+  end
 end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-22 00:00:00 -06:00
+date: 2011-03-04 00:00:00 -06:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency