waistband 0.16.5 → 0.16.6

data/.travis.yml

@@ -1,11 +1,10 @@
 language: ruby
 
 rvm:
-  - 1.9.3
   - 2.0.0
   - 2.1.1
 
-script: bundle exec rspec spec
+script: bundle exec rspec spec/
 
 services:
   - elasticsearch

data/lib/waistband/search_results.rb

@@ -10,7 +10,7 @@ module Waistband
       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
+        @per_page = (options[:page_size] || options[:per_page] || ::Waistband::SearchResults::DEFAULT_PAGE_SIZE).to_i
         @num_pages = @total_pages = (options[:num_pages] || (@total_count.to_f / @per_page).ceil)
         @limit_value = options[:limit]
         super(arr)

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.16.5"
+  VERSION = "0.16.6"
 end

data/spec/lib/search_results_spec.rb

@@ -30,7 +30,7 @@ describe ::Waistband::SearchResults do
     }
   end
 
-  let(:results) { ::Waistband::SearchResults.new(search_hash) }
+  let(:results) { ::Waistband::SearchResults.new(search_hash, page_size: 10) }
 
   it "provides a method interface for the results hash array" do
     expect(results.took).to eql 1
@@ -83,6 +83,7 @@ describe ::Waistband::SearchResults do
       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
+      expect(results.paginated_hits.instance_variable_get('@per_page')).to eql 10
     end
 
   end
@@ -95,6 +96,7 @@ describe ::Waistband::SearchResults do
       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
+      expect(results.paginated_hits.instance_variable_get('@per_page')).to eql 10
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.16.5
+  version: 0.16.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2017-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport