co-elastic-query 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4389b2a1e238f60babf42360ca0516ce80a44c08
-  data.tar.gz: 28812f1413d6fbf0a77fa146b6292d59c9cd75fb
+  metadata.gz: 3489925baf41679f2a9aa16aae290404e741354f
+  data.tar.gz: 21b226a58a8b355bb1436384760d1c99272ce6d5
 SHA512:
-  metadata.gz: cdb2822452dad56ea492abcf1a248b766cc81b64b34e5789bd762b502c86076bebf227709385d5be8c660760e481f76e79b4e0f9f980b2d49b08d3e9c9ca82bf
-  data.tar.gz: bbec41df09fc57dc948f85dcde4776c17c158f8a4a9f34c1bebc091674c80d95702ad851ec4c1dd8975895e9c6f2d67d0e61101dc92d1e080fbfea463ae360a4
+  metadata.gz: 37358c84deea5643769466d6a6c63a05483b88aecaa5367b3dcfa62bec387c2a0250155329978a641ab2f8e4fb0afacfd26e033206a60527f1afbc5ff02e2600
+  data.tar.gz: e29b7000e79e4cb3dc1052d4aec1d3f7bec4ceec8f3704ecbc0da4baaefbabaf3b1736968ab7328dba88f3444bcc9a6f5311970c649ac094fd320bac6e7cc69a

data/lib/co-elastic-query.rb

@@ -339,9 +339,19 @@ class Elastic
         # from the list.
         result = Elastic.search(query)
         records = Array(@klass.find_by_id(result[HITS][HITS].map {|entry| entry[ID]}))
+        results = block_given? ? (records.map {|record| yield record}).compact : records
+
+        # Ensure the total is accurate
+        total = result[HITS][TOTAL] || 0
+        total = total - (records.length - results.length) # adjust for compaction
+
+        # We check records against limit (pre-compaction) and total against actual result length
+        # Worst case senario is there is one additional request for results at an offset that returns no results.
+        # The total results number will be accurate on the final page of results from the clients perspective.
+        total = results.length + builder.offset if records.length < builder.limit && total > (results.length + builder.offset)
         {
-            total: result[HITS][TOTAL] || 0,
-            results: block_given? ? (records.map {|record| yield record}).compact : records
+            total: total,
+            results: results
         }
     end
     

data/lib/co-elastic-query/version.rb

@@ -1,3 +1,3 @@
 module CoElasticQuery
-    VERSION = "3.0.1"
+    VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co-elastic-query
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Stephen von Takach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-04 00:00:00.000000000 Z
+date: 2017-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -103,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
 summary: Elasticsearch query generator