waistband 0.9.7 → 0.9.8

checksums.yaml

@@ -0,0 +1,15 @@
+---
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YTBiNmFlNjY5YzRjYjdhZGQwYWJmNjAxNTAwODdiYTZiYjIyYjI1Mw==
+  data.tar.gz: !binary |-
+    NDQ3MzMzMGVmNjNlNzFlYTMwNWRhNjU0YmYwYzU4ODFkMDU5NDY1Zg==
+SHA512:
+  metadata.gz: !binary |-
+    ZWM1NjdmNDMwY2JkMmRlYzczNDM1MzM5NDIwN2M2MzRiYTc1MDRjNmY4MmQz
+    NGE0NWQxNzFkZjcyYjM1M2I2MTNjNmQ2ZjVkYWM1NTdmNWJlMjVmYjNkMWI5
+    YWExNmM0ZmYzMDEzMDkzYjBkZDkzN2Q2NGZlMGQ5Nzc3MjY1ZDY=
+  data.tar.gz: !binary |-
+    MjJhZjYyODBlM2ZhNzJiZDliMTBkOTRkZDg2ODVlMzk5ZjRkYjdmOTFmYTJh
+    NWRjZTc4OWQ3YTczMDhlNmE3YWE1ZjFkZDJmOTc4ODc5NWI1MDAxYzA4NzJk
+    MWU4ZjU1NTFmOWQ1NjUwZjcwYjUwODcyNTczNjk5MmUwN2M0MzM=

data/lib/waistband/index.rb

@@ -175,7 +175,8 @@ module Waistband
         page = body_hash.delete(:page)
         page_size = body_hash.delete(:page_size)
 
-        if page
+        if page || page_size
+          page ||= 1
           page = page.to_i
           page_size ||= 20
           body_hash[:from] = page_size * (page - 1) unless body_hash[:from]

data/lib/waistband/version.rb

@@ -1,3 +1,3 @@
 module Waistband
-  VERSION = "0.9.7"
+  VERSION = "0.9.8"
 end

data/spec/lib/index_spec.rb

@@ -98,6 +98,22 @@ describe Waistband::Index do
 
   end
 
+  describe 'paginating search results' do
+
+    it "permits paginating" do
+      results = index.search(page: 5, page_size: 15)
+      expect(results.instance_variable_get('@page')).to eql 5
+      expect(results.instance_variable_get('@page_size')).to eql 15
+    end
+
+    it "permits passing in page_size without page" do
+      results = index.search(page_size: 999)
+      expect(results.instance_variable_get('@page')).to eql 1
+      expect(results.instance_variable_get('@page_size')).to eql 999
+    end
+
+  end
+
   describe 'subindexes' do
 
     let(:sharded_index) { Waistband::Index.new('events', subs: %w(2013 01)) }

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: waistband
 version: !ruby/object:Gem::Version
-  version: 0.9.7
-  prerelease: 
+  version: 0.9.8
 platform: ruby
 authors:
 - David Jairala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-21 00:00:00.000000000 Z
+date: 2014-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: elasticsearch
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -131,27 +120,26 @@ files:
 homepage: https://github.com/taskrabbit/waistband
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Configuration and sensible defaults for ElasticSearch on Ruby
 test_files:
 - spec/config/waistband/waistband.yml