co-elastic-query 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 272f832b729096f2ffc296f06276461db55df1ec
-  data.tar.gz: cc92ac8f7b830a06e6b6529800974b1c50a24802
+  metadata.gz: cb06a0255fd72056eede70e58e97638b3b0187ff
+  data.tar.gz: 07e712c603aa04b0a4dc94dc4a424bbd86bb4729
 SHA512:
-  metadata.gz: d094797eeb4d609456b156a1da5287740002f7865b933a5ba243c49f46f1cb32db68463e0139685aaf430ef5a122b0255d1c32208ce7268409ce3000f72c613e
-  data.tar.gz: 260883cc679078087afe9fa4dc89a1673adc89c2dee149d62d4c061ad443a8ccb2216bbbb63aedf13b4ee626ab4fe8dff505ac4edc5c53d8069b493fe66b4fda
+  metadata.gz: 366a55f2a4f06023536220dec23610ab01107f46b2d11399848424b489f8ad725c2bd3c00cbff527cc909e2eccee15829a1e77bc3654fecc9f53d6948080e558
+  data.tar.gz: 1b1d8c3dc6d5ec94b02af7aa859ac17eba936596f5a3203e4c9e864aec5c4302d4dbb7f1d1bad4025913bb7bd4c6bababd2b77548fabd1315f090e5a1f2477fd

data/lib/co-elastic-query.rb

@@ -2,8 +2,8 @@ require 'elasticsearch'
 
 class Elastic
     class Query
-        def initialize(params)
-            query = params.permit(:q, :limit, :offset)
+        def initialize(params = nil)
+            query = params ? params.permit(:q, :limit, :offset) : {}
 
             @filters = nil
             @search = query[:q]
@@ -240,6 +240,15 @@ class Elastic
         @@client.search *args
     end
 
+    def self.count *args
+        @@client.count *args
+    end
+
+    def self.client
+        @@client
+    end
+
+    COUNT = 'count'.freeze
     HITS = 'hits'.freeze
     TOTAL = 'total'.freeze
     ID = '_id'.freeze
@@ -254,13 +263,49 @@ class Elastic
     end
 
     # Safely build the query
-    def query(params, filters = nil)
+    def query(params = nil, filters = nil)
         builder = ::Elastic::Query.new(params)
         builder.filter(filters) if filters
         builder
     end
 
     def search(builder, &block)
+        query = generate_body(builder)
+
+        # if a formatter block is supplied, each loaded record is passed to it
+        # allowing annotation/conversion of records using data from the model
+        # and current request (e.g groups are annotated with 'admin' if the
+        # currently logged in user is an admin of the group). nils are removed
+        # from the list.
+        result = Elastic.search(query)
+        records = @klass.find_by_id(result[HITS][HITS].map {|entry| entry[ID]}) || []
+        {
+            total: result[HITS][TOTAL] || 0,
+            results: block_given? ? (records.map {|record| yield record}).compact : records
+        }
+    end
+    
+    def count(builder)
+        query = generate_body(builder)
+
+        # Simplify the query
+        query[:body].delete(:from)
+        query[:body].delete(:size)
+        query[:body].delete(:sort)
+
+        # if a formatter block is supplied, each loaded record is passed to it
+        # allowing annotation/conversion of records using data from the model
+        # and current request (e.g groups are annotated with 'admin' if the
+        # currently logged in user is an admin of the group). nils are removed
+        # from the list.
+        Elastic.count(query)[COUNT]
+    end
+    
+    
+    protected
+    
+    
+    def generate_body(builder)
         opt = builder.build
 
         sort = opt[:sort] || []
@@ -277,7 +322,7 @@ class Elastic
             filters.unshift({type: {value: @filter}})
         end
 
-        query = {
+        {
             index: @index,
             body: {
                 sort: sort,
@@ -299,17 +344,5 @@ class Elastic
                 size: opt[:limit]
             }
         }
-
-        # if a formatter block is supplied, each loaded record is passed to it
-        # allowing annotation/conversion of records using data from the model
-        # and current request (e.g groups are annotated with 'admin' if the
-        # currently logged in user is an admin of the group). nils are removed
-        # from the list.
-        result = Elastic.search(query)
-        records = @klass.find_by_id(result[HITS][HITS].map {|entry| entry[ID]}) || []
-        {
-            total: result[HITS][TOTAL] || 0,
-            results: block_given? ? (records.map {|record| yield record}).compact : records
-        }
     end
 end

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

@@ -1,3 +1,3 @@
 module CoElasticQuery
-    VERSION = "1.0.1"
+    VERSION = "1.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co-elastic-query
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Stephen von Takach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler