elastic_searchable 1.2.0 → 1.2.1

data/lib/elastic_searchable/queries.rb

@@ -49,8 +49,8 @@ module ElasticSearchable
     # 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 = (options.delete(:per_page) || (self.respond_to?(:per_page) ? self.per_page : nil) || ElasticSearchable::Queries::PER_PAGE_DEFAULT).to_i
+      per_page = [per_page, self.max_per_page].min if self.respond_to?(:max_per_page)
       per_page
     end
   end

data/lib/elastic_searchable/version.rb

@@ -1,4 +1,4 @@
 module ElasticSearchable
-  VERSION = '1.2.0'
+  VERSION = '1.2.1'
 end
 

data/test/test_elastic_searchable.rb

@@ -217,6 +217,15 @@ class TestElasticSearchable < Test::Unit::TestCase
       end
     end
 
+    context 'when per_page is a string' do
+      setup do
+        @results = Post.search 'foo', :per_page => 1.to_s, :sort => 'id'
+      end
+      should 'find first object' do
+        assert_contains @results, @first_post
+      end
+    end
+
     context 'searching for second page using will_paginate params' do
       setup do
         @results = Post.search 'foo', :page => 2, :per_page => 1, :sort => 'id'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: elastic_searchable
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - Ryan Sonnek
@@ -15,13 +15,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-20 00:00:00 -07:00
-default_executable: 
+date: 2011-10-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -32,12 +31,12 @@ dependencies:
         - 0
         - 5
         version: 3.0.5
+  requirement: *id001
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: httparty
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -48,12 +47,12 @@ dependencies:
         - 6
         - 0
         version: 0.6.0
+  requirement: *id002
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: backgrounded
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -64,12 +63,12 @@ dependencies:
         - 7
         - 0
         version: 0.7.0
+  requirement: *id003
   type: :runtime
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: multi_json
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -80,12 +79,12 @@ dependencies:
         - 0
         - 0
         version: 1.0.0
+  requirement: *id004
   type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -96,12 +95,12 @@ dependencies:
         - 9
         - 2
         version: 0.9.2
+  requirement: *id005
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: sqlite3-ruby
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -112,12 +111,12 @@ dependencies:
         - 3
         - 2
         version: 1.3.2
+  requirement: *id006
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: pry
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
@@ -129,12 +128,12 @@ dependencies:
         - 6
         - 2
         version: 0.9.6.2
+  requirement: *id007
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: shoulda
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -143,12 +142,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id008
   type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: mocha
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -157,8 +156,8 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id009
   type: :development
-  version_requirements: *id009
 description: integrate the elastic search engine with rails
 email: 
 - ryan@codecrate.com
@@ -191,7 +190,6 @@ files:
 - test/helper.rb
 - test/setup_database.rb
 - test/test_elastic_searchable.rb
-has_rdoc: true
 homepage: http://github.com/socialcast/elastic_searchable
 licenses: []
 
@@ -221,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: elastic_searchable
-rubygems_version: 1.5.3
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: elastic search for activerecord