waistband 0.12.2 → 0.13.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NDA5YTFjYTY5M2ZlOGI4ZDg3ZDA4OTQzNDU5MGI3YWM4OTAwNmE3NQ==
+    NTJiYTBiZGZiN2FmYWEzZTdlZGFhYmU5NjA3MjAyMDgwZTM2MmVhZQ==
   data.tar.gz: !binary |-
-    MDY0ODc4MjU4ZjI5MDRiYWE1Njc2ZWUzZGE4ODMxMTA4NDdlZDM5OA==
+    N2I2MDAzZTEwNGViZGQ0NDE5MWY1NzAyOGE4YTVmMmEwNzk0YTVjYw==
 SHA512:
   metadata.gz: !binary |-
-    YjAwZjIzOGJjZDI1YjczMmZhMWY0ZmNlZGNkMjNlM2UyZjdkOTMwNzJlZWI4
-    YjlmNTJmNmU1ZmUzZDJiMWEwNTExNmFmY2NmYjgxOWQ0NGM0MjQ3OWExZjVl
-    OWIyMWQ1ZWI3ODdhYWJhOTZiOTdhMDkzNWFkYzhiY2I1ZTEwODQ=
+    YTU3ZWVjMGMzNDc2NWQzYTRhYmRjYmE3ODgzODk3ZDkzZDk0ZWQ5ZTczNmMx
+    MjA3M2ZlOTU1NGQ4NTI0OTVlZTc1ZDg0MTEyYTlkMjBlMDE3ODgyOGE4YmUw
+    ZjU4OTUyY2Q3YTJmY2RjNmFhZTFhM2ZlMzNkNTkzODUyZDg1OGM=
   data.tar.gz: !binary |-
-    Y2I2YmY2OTk5YWI4NDlkMDM1YTRhMmFkODNjZjZlNWQzNWE5OTM2M2JjNDI2
-    NDYyNDg5YTA5ZWIzNDEyMTAyN2FiODI3ZmMwMjA4MTY3YjU5ODk1NzcyYmY2
-    YTk0ZTc0YmM3ZTQ5MmFlMWM5YTdkZmM4MDRjYWE4ZmYyZjMyZmE=
+    NGMwMjdiZDUwYzE4ZjQxM2RlZjA5YzZlNzQxNWZlYWJkYzRhN2RmYzM4ZTlh
+    YjRkYTJiYmQ5Njg1ZmMyM2I5ODkxOWVlNWViMzliY2Y2YjVlZWQ0OTgwZTQ1
+    ZWVjYzA0NjlkZjFkODZiNDA0YTRhMmJlNDk1NzVlMDY5MTdkNjQ=

data/Gemfile

@@ -5,5 +5,4 @@ gemspec
 
 gem 'rspec', '~> 3.0.0'
 gem 'debugger', '~> 1.6.8'
-gem 'kaminari', require: false
 gem 'timecop', '~> 0.7.1'

data/README.md

@@ -166,7 +166,7 @@ results.hits # => returns a search results object
 results.total_hits # => 28481
 ```
 
-For paginating the results, you can use the `#paginated_results` method, which requires the [Kaminari](https://github.com/amatsuda/kaminari), gem.  If you use another gem, you can just override the method, etc.
+For paginating the results, you can use the `#paginated_results` method, which will provide an array object compatible with the kaminari gem.  If you use another gem, you can just override the method, etc.
 
 For more information and extra methods, take a peek into the class docs.
 

data/lib/waistband/search_results.rb

@@ -3,11 +3,25 @@ require 'waistband/result'
 module Waistband
   class SearchResults
 
+    class PaginatedArray < Array
+
+      attr_reader :total_count, :per_page, :num_pages, :total_pages, :current_page
+
+      def initialize(arr, options)
+        @current_page = (options[:current_page] || 1).to_i
+        @total_count = (options[:total_count] || arr.length).to_i
+        @per_page = (options[:per_page] || ::Waistband::SearchResults::DEFAULT_PAGE_SIZE).to_i
+        @num_pages = @total_pages = (options[:num_pages] || (@total_count.to_f / @per_page).ceil)
+        super(arr)
+      end
+
+    end
+
     DEFAULT_PAGE_SIZE = 20
 
     def initialize(search_hash, options = {})
-      @page = options[:page] || 1
-      @page_size = options[:page_size] || DEFAULT_PAGE_SIZE
+      @page = (options[:page] || 1).to_i
+      @page_size = (options[:page_size] || DEFAULT_PAGE_SIZE).to_i
       @search_hash = search_hash
     end
 
@@ -25,13 +39,11 @@ module Waistband
     end
 
     def paginated_hits
-      raise "Kaminari gem not found for pagination" unless defined?(Kaminari)
-      Kaminari.paginate_array(hits, total_count: total_results).page(@page).per(@page_size)
+      ::Waistband::SearchResults::PaginatedArray.new(hits, current_page: @page, page_size: @page_size, total_count: total_results)
     end
 
     def paginated_results
-      raise "Kaminari gem not found for pagination" unless defined?(Kaminari)
-      Kaminari.paginate_array(results, total_count: total_results).page(@page).per(@page_size)
+      ::Waistband::SearchResults::PaginatedArray.new(results, current_page: @page, page_size: @page_size, total_count: total_results)
     end
 
     def total_results

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.12.2"
+  VERSION = "0.13.0"
 end

data/spec/lib/index_spec.rb

@@ -183,6 +183,18 @@ describe Waistband::Index do
         expect(query.hits.size).to eql 2
       end
 
+      it 'returns results beyond page 1 (does not double scope)' do
+        query = index.search(page_size: 2, page: 1)
+        hits1 = query.hits
+        expect(hits1.size).to eql 2
+
+        query = index.search(page_size: 2, page: 2)
+        hits2 = query.hits
+        expect(hits2.size).to eql 2
+
+        expect(hits1 & hits2).to be_empty
+      end
+
     end
 
   end

data/spec/lib/search_results_spec.rb

@@ -77,48 +77,26 @@ describe ::Waistband::SearchResults do
 
   describe '#paginated_hits' do
 
-    it "provides a paginated array from Kaminari if Kaminari is defined" do
+    it "provides a paginated array compatible with a readonly Kaminari array" do
       load 'active_support/concern.rb'
-      load 'kaminari/config.rb'
-      load 'kaminari/models/page_scope_methods.rb'
-      load 'kaminari/models/configuration_methods.rb'
-      load 'kaminari/models/array_extension.rb'
 
-      expect(results.paginated_hits).to be_an ::Kaminari::PaginatableArray
+      expect(results.paginated_hits).to be_a ::Waistband::SearchResults::PaginatedArray
       expect(results.paginated_hits.total_pages).to eql 1
       expect(results.paginated_hits.current_page).to eql 1
     end
 
-    it "blows up when kaminari's not required" do
-      # if we've already required Kaminari from the test above, lets remove
-      Object.send(:remove_const, :Kaminari) if defined?(Kaminari)
-
-      expect { results.paginated_hits }.to raise_error RuntimeError, "Kaminari gem not found for pagination"
-    end
-
   end
 
   describe '#paginated_results' do
 
-    it "provides a paginated array from Kaminari if Kaminari is defined" do
+    it "provides a paginated array compatible with a readonly Kaminari array" do
       load 'active_support/concern.rb'
-      load 'kaminari/config.rb'
-      load 'kaminari/models/page_scope_methods.rb'
-      load 'kaminari/models/configuration_methods.rb'
-      load 'kaminari/models/array_extension.rb'
 
-      expect(results.paginated_results).to be_an ::Kaminari::PaginatableArray
+      expect(results.paginated_results).to be_a ::Waistband::SearchResults::PaginatedArray
       expect(results.paginated_results.total_pages).to eql 1
       expect(results.paginated_results.current_page).to eql 1
     end
 
-    it "blows up when kaminari's not required" do
-      # if we've already required Kaminari from the test above, lets remove
-      Object.send(:remove_const, :Kaminari) if defined?(Kaminari)
-
-      expect { results.paginated_results }.to raise_error RuntimeError, "Kaminari gem not found for pagination"
-    end
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.12.2
+  version: 0.13.0
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-23 00:00:00.000000000 Z
+date: 2014-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport