es-elasticity 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 81bec50770ad1681435091821100f72489c99522
-  data.tar.gz: e01e698ea9fd852b9a886063ae5072cfbc9ed930
+  metadata.gz: 34c481f8fef0f48b348e3c487aea2f38992fd83f
+  data.tar.gz: 9fce147cb9df7c2ae369d795dc4d31a6777ce2a4
 SHA512:
-  metadata.gz: da2ddc9b326281ccef128a4a502cdfc8344cb3a5ddc01b2d8564ca29a7d34b5bfdbe652cc6102ef508c53e920e2176ef6c7df1afa82bb911584055b19c7100fd
-  data.tar.gz: f5cf61f522db5424dc54cea8ba20578ee3919ae18bc087d9eb2be1928968be619364fe264e4b8632d16525f02e42e247d50d11a341e672aedc2e55abd360675c
+  metadata.gz: 2b2f8782e944c7adfcd11023829d0031657bc669945f65794e04cbd6389f6043569dd06d776e1b39b9589b227f5d1a653c8b594e9f92e6a6ec471c6bd605d1f5
+  data.tar.gz: 5c7abac9d356d50d60617231fef6ccc7746be8106aa3ad356b49873143f2ccd6815e568334f8c118fe5229339089f27778d0bc51022c696a9159ca062c284bc9

data/CHANGELOG

@@ -1,3 +1,5 @@
+v0.5.2
+  - Add aggregations to multi_search
 v0.5.1
   - Add ability to reindex individual attributes of a document using the
   bulk_update API.

data/lib/elasticity/search.rb

@@ -85,7 +85,7 @@ module Elasticity
       include Enumerable
 
       delegate :each, :size, :length, :[], :+, :-, :&, :|, :total, :per_page,
-        :total_pages, :current_page, to: :search_results
+        :total_pages, :current_page, :aggregations, to: :search_results
 
       attr_accessor :search_definition
 
@@ -103,10 +103,6 @@ module Elasticity
         empty?
       end
 
-      def aggregations
-        response["aggregations"] ||= {}
-      end
-
       def suggestions
         response["hits"]["suggest"] ||= {}
       end
@@ -200,7 +196,7 @@ module Elasticity
 
       class Relation < ActiveSupport::ProxyObject
 
-        delegate :total, :per_page, :total_pages, :current_page, to: :@results
+        delegate :total, :per_page, :total_pages, :current_page, :aggregations, to: :@results
 
         def initialize(relation, search_definition, response)
           @relation = relation
@@ -308,6 +304,10 @@ module Elasticity
         @response["hits"]["total"]
       end
 
+      def aggregations
+        @response["aggregations"] ||= {}
+      end
+
       # for pagination
       def per_page
         @body[:size] || DEFAULT_SIZE

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/units/multi_search_spec.rb

@@ -21,11 +21,60 @@ RSpec.describe Elasticity::MultiSearch do
     end
   end
 
+  let :index_with_one_hit do
+    {
+      "hits" => {
+        "total" => 1,
+        "hits" => [
+          { "_id" => 3, "_source" => { "name" => "baz" }}
+        ]
+      }
+    }
+  end
+
+  let :index_with_two_hits do
+    {
+      "hits" => {
+        "total" => 2,
+        "hits" => [
+          { "_id" => 1, "_source" => { "name" => "foo" }},
+          { "_id" => 2, "_source" => { "name" => "bar" }}
+        ]
+      }
+    }
+  end
+
+  let :aggregations do
+    {
+      "aggregations" => {
+        "logins_count" => { "value" => 1495 },
+        "gender" => {
+          "buckets" => [
+            {
+              "doc_count" => 100,
+              "key" => "M"
+            },
+            {
+              "doc_count" => 100,
+              "key" => "F"
+            }
+          ],
+          "doc_count_error_upper_bound" => 0,
+          "sum_other_doc_count" => 0
+        }
+      }
+    }
+  end
+
+  let :index_with_two_hits_and_aggregations do
+    index_with_two_hits.merge(aggregations)
+  end
+
   let :response do
     {
       "responses" => [
-        { "hits" => { "total" => 2, "hits" => [{ "_id" => 1, "_source" => { "name" => "foo" }}, { "_id" => 2, "_source" => { "name" => "bar" }}]}},
-        { "hits" => { "total" => 1, "hits" => [{ "_id" => 3, "_source" => { "name" => "baz" }}]}},
+        index_with_two_hits_and_aggregations,
+        index_with_one_hit
       ]
     }
   end
@@ -44,5 +93,7 @@ RSpec.describe Elasticity::MultiSearch do
     expect(subject[:first].total).to eq 2
     expect(subject[:first].total_pages).to eq 1
     expect(subject[:first].current_page).to eq 1
+    expect(subject[:first].aggregations).to eq aggregations["aggregations"]
+    expect(subject[:second].aggregations).to eq Hash.new
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Rodrigo Kochenburger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-03 00:00:00.000000000 Z
+date: 2016-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler