tire 0.1.3 → 0.1.4

data/lib/tire/results/pagination.rb

@@ -8,20 +8,27 @@ module Tire
       end
 
       def total_pages
-        result = @total.to_f / (@options[:per_page] ? @options[:per_page].to_i : 10 )
-        result < 1 ? 1 : result.ceil
+        ( @total.to_f / (@options[:per_page] || @options[:size] || 10 ).to_i ).ceil
       end
 
       def current_page
-        @options[:page].to_i
+        if @options[:page]
+          @options[:page].to_i
+        else
+          (@options[:size].to_i + @options[:from].to_i) / @options[:size].to_i
+        end
       end
 
       def previous_page
-        @options[:page].to_i - 1
+        current_page > 1 ? (current_page - 1) : nil
       end
 
       def next_page
-        @options[:page].to_i + 1
+        current_page < total_pages ? (current_page + 1) : nil
+      end
+
+      def out_of_bounds?
+        current_page > total_pages
       end
 
     end

data/lib/tire/search.rb

@@ -3,10 +3,10 @@ module Tire
   
     class Search
 
-      attr_reader :indices, :url, :results, :response, :json, :query, :facets, :filters
+      attr_reader :indices, :url, :results, :response, :json, :query, :facets, :filters, :options
 
       def initialize(*indices, &block)
-        @options = indices.pop if indices.last.is_a?(Hash)
+        @options = indices.last.is_a?(Hash) ? indices.pop  : {}
         @indices = indices
         raise ArgumentError, 'Please pass index or indices to search' if @indices.empty?
         if @options
@@ -49,11 +49,13 @@ module Tire
 
       def from(value)
         @from = value
+        @options[:from] = value
         self
       end
 
       def size(value)
         @size = value
+        @options[:size] = value
         self
       end
 

data/lib/tire/version.rb

@@ -1,3 +1,3 @@
 module Tire
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/integration/active_record_searchable_test.rb

@@ -96,7 +96,7 @@ module Tire
 
             assert_equal 2, results.total_pages
             assert_equal 1, results.current_page
-            assert_equal 0, results.previous_page
+            assert_equal nil, results.previous_page
             assert_equal 2, results.next_page
 
             assert_equal 'Test1', results.first.title
@@ -109,7 +109,7 @@ module Tire
             assert_equal 2, results.total_pages
             assert_equal 2, results.current_page
             assert_equal 1, results.previous_page
-            assert_equal 3, results.next_page
+            assert_equal nil, results.next_page
 
             assert_equal 'Test6', results.first.title
           end
@@ -121,7 +121,7 @@ module Tire
             assert_equal 2, results.total_pages
             assert_equal 3, results.current_page
             assert_equal 2, results.previous_page
-            assert_equal 4, results.next_page
+            assert_equal nil, results.next_page
 
             assert_nil results.first
           end
@@ -132,7 +132,7 @@ module Tire
           setup { @q = 'test*' }
 
           should "find first page with five results" do
-            results = ActiveRecordArticle.search nil, :per_page => 5, :page => 1 do |search|
+            results = ActiveRecordArticle.search do |search|
               search.query { |query| query.string @q }
               search.sort  { title }
               search.from 0
@@ -142,14 +142,14 @@ module Tire
 
             assert_equal 2, results.total_pages
             assert_equal 1, results.current_page
-            assert_equal 0, results.previous_page
+            assert_equal nil, results.previous_page
             assert_equal 2, results.next_page
 
             assert_equal 'Test1', results.first.title
           end
 
           should "find next page with five results" do
-            results = ActiveRecordArticle.search nil, :per_page => 5, :page => 2 do |search|
+            results = ActiveRecordArticle.search do |search|
               search.query { |query| query.string @q }
               search.sort  { title }
               search.from 5
@@ -160,13 +160,13 @@ module Tire
             assert_equal 2, results.total_pages
             assert_equal 2, results.current_page
             assert_equal 1, results.previous_page
-            assert_equal 3, results.next_page
+            assert_equal nil, results.next_page
 
             assert_equal 'Test6', results.first.title
           end
 
-          should "find not find missing page" do
-            results = ActiveRecordArticle.search nil, :per_page => 5, :page => 3 do |search|
+          should "not find a missing page" do
+            results = ActiveRecordArticle.search do |search|
               search.query { |query| query.string @q }
               search.sort  { title }
               search.from 10
@@ -177,7 +177,7 @@ module Tire
             assert_equal 2, results.total_pages
             assert_equal 3, results.current_page
             assert_equal 2, results.previous_page
-            assert_equal 4, results.next_page
+            assert_equal nil, results.next_page
 
             assert_nil results.first
           end

data/test/unit/search_test.rb

@@ -187,6 +187,28 @@ module Tire
           assert_equal 3, hash['from']
         end
 
+        should "set the size value in options" do
+          Results::Collection.any_instance.stubs(:total).returns(50)
+          s = Search::Search.new('index') do
+            size 5
+          end
+
+          assert_equal 5, s.options[:size]
+        end
+
+        should "set the from value in options" do
+          Results::Collection.any_instance.stubs(:total).returns(50)
+          s = Search::Search.new('index') do
+            from 5
+          end
+
+          assert_equal 5, s.options[:from]
+        end
+
+      end
+
+      context "when limiting returned fields" do
+
         should "set the fields limit in request" do
           s = Search::Search.new('index') do
             fields :title

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tire
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 19
   prerelease: 
   segments: 
   - 0
   - 1
-  - 3
-  version: 0.1.3
+  - 4
+  version: 0.1.4
 platform: ruby
 authors: 
 - Karel Minarik