inquisitio 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89aae9dc681251070a23032fd2dab54af311e0cc
-  data.tar.gz: 3bdf5147f6bd81d43164e38c700255263c58f981
+  metadata.gz: ec481031a9aa085e8b4a41f8cfa054415645f7e1
+  data.tar.gz: 3c52019c27f4b86f38a2da70dd063ec58b2be998
 SHA512:
-  metadata.gz: 0f6218f321736cfa15f6bebd2dc5456817ae118f3e8335929f1c73ab0bf9f0498d5b75db95f5ffe52cbb31a2fd4fd9fed24294995b062798bad30f49fe3aee9b
-  data.tar.gz: 508afe8065da867c2d0eee4fadbdba18f66aabfc584f9998487f0b516ede922b4a21770eac2eefc7e63fc0d5725133d2b01ebcb3e65bcbd478e2cfc472030419
+  metadata.gz: 289d6a4cf32a0a112648c82e9ad38f755eac8a30dc8e13f804d3a01af58f63543843c73f1d2fb4c45645e5a5808fc43ab67fcef426edc5047db8d783f6bb52cd
+  data.tar.gz: ce0514c3be78138eb48447b5cf098025d437bb4831dfe408df120e3cb6a5b86d2a2437dae078cb5b6c2e10ef3b7a99d672ccb9f85fcaebed8441b4fbc2ac1101

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+1.2.1 / 2014-06-03
+[BUGFIX] Fixed start of search offset
+
 1.2.0 / 2014-06-03
 [FEATURE] Support for 2013-01-01 version of cloudsearch API
 

data/lib/inquisitio/search_url_builder.rb

@@ -8,9 +8,10 @@ module Inquisitio
     def initialize(options = {})
       @query         = options[:query]
       @filters       = options[:filters] || {}
-      @arguments     = options[:arguments]
+      @arguments     = options[:arguments] || {}
       @return_fields = options[:return_fields]
-      add_default_size if @arguments.nil? || @arguments[:size].nil?
+      @size = options[:size] || Inquisitio.config.default_search_size
+      @start = options[:start] || 0
     end
 
     def build
@@ -19,6 +20,8 @@ module Inquisitio
       components << (is_simple ? simple_query : boolean_query)
       components << return_fields_query_string
       components << arguments
+      components << "&size=#{@size}" unless @arguments[:size]
+      components << "&start=#{@start}" unless @arguments[:start] || @start == 0 || @start == '0'
       components.join("")
     end
 
@@ -78,13 +81,5 @@ module Inquisitio
       "#{Inquisitio.config.search_endpoint}/#{Inquisitio.config.api_version}/search?"
     end
 
-    def add_default_size
-      if @arguments.nil?
-        @arguments = {}
-      end
-      if @arguments[:size].nil?
-        @arguments = @arguments.merge(:size => Inquisitio.config.default_search_size)
-      end
-    end
   end
 end

data/lib/inquisitio/searcher.rb

@@ -152,10 +152,9 @@ module Inquisitio
         SearchUrlBuilder.build(
           query: params[:criteria],
           filters: params[:filters],
-          arguments: params[:with].merge({
-            size: params[:per],
-            start: params[:per] * params[:page]
-          }),
+          arguments: params[:with],
+          size: params[:per],
+          start: params[:per] * (params[:page] - 1),
           return_fields: return_fields
         )
       end

data/lib/inquisitio/version.rb

@@ -1,3 +1,3 @@
 module Inquisitio
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/test/test_searcher.rb

@@ -168,7 +168,12 @@ module Inquisitio
 
     def test_page_gets_correct_url
       searcher = Searcher.page(3).per(15)
-      assert searcher.send(:search_url).include? "&start=45"
+      assert searcher.send(:search_url).include? '&start=30'
+    end
+
+    def test_that_starts_at_zero
+      searcher = Searcher.where("foo")
+      refute searcher.send(:search_url).include? '&start='
     end
 
     def test_returns_doesnt_mutate_searcher

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inquisitio
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jeremy Walker