es-elasticity 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d72499e7492430676f282eea3890061607c2b875
-  data.tar.gz: 7c912b62cb5c42c178454051ffab439315a4c7b5
+  metadata.gz: 1c5f0cdc13a933f514fc74015c2dc23b8733f8a0
+  data.tar.gz: f345594a1b7770bfc40ad274e947b3db3b3b5ffd
 SHA512:
-  metadata.gz: 72078a3e8bbbb87bd6a34b31995df58da3380f87610870e77b415bbfa4330389d7ba918e6905a494007d11aef11254000931239a0a5844a40ab98c57a70b77c5
-  data.tar.gz: 644b482f73d666e6e9ac22f38bbf36e16507b9b894e75191cebebaf734e5dd6549d5d7baa8b0ca374d9c55093dcc0ed1ad2bcab0f40d09244addc650691c585c
+  metadata.gz: 22d071dd3e4166f747022a8fb0202edbd468e108874a310408f98227738b99201f37e167208d6c663ce61913a502ceda3d4f4165c1cbb874b8c57da28556b676
+  data.tar.gz: b32c8f0fdfc9d27822f13125f18fc71248b3d41b3e5dd73c0465603fabf63eacac6844d6c4cd93b0838c7503f1b3b34dcf35ab8b0344e036cac5ac8a1bb1e478

data/lib/elasticity/instrumented_client.rb

@@ -1,11 +1,14 @@
 module Elasticity
   class InstrumentedClient
+    INDICES_METHODS = %w(exists create delete get_settings get_mapping flush get_alias get_aliases put_alias delete_alias exists_alias update_aliases)
+    INDEX_METHODS   = %w(index delete get mget search count msearch scroll delete_by_query bulk)
+
     def initialize(client)
       @client = client
     end
 
     # Generate wrapper methods for @client.indices
-    %w(exists create delete get_settings get_mapping flush get_alias get_aliases put_alias delete_alias exists_alias update_aliases).each do |method_name|
+    INDICES_METHODS.each do |method_name|
       full_name = "index_#{method_name}"
 
       define_method(full_name) do |*args, &block|
@@ -16,7 +19,7 @@ module Elasticity
     end
 
     # Generate wrapper methods for @client
-    %w(index delete get mget search count msearch scroll delete_by_query bulk).each do |method_name|
+    INDEX_METHODS.each do |method_name|
       define_method(method_name) do |*args, &block|
         instrument(method_name, args) do
           @client.public_send(method_name, *args, &block)

data/lib/elasticity/log_subscriber.rb

@@ -5,13 +5,13 @@ module Elasticity
   GRAY = "\e[90m"
 
   class LogSubscriber < ::ActiveSupport::LogSubscriber
-    %w(exists create delete get_settings get_mapping flush get_alias get_aliases put_alias delete_alias exists_alias update_aliases).each do |method_name|
+    InstrumentedClient::INDICES_METHODS.each do |method_name|
       define_method("index_#{method_name}") do |event|
         log_event(event)
       end
     end
 
-    %w(index delete get search scroll delete_by_query bulk).each do |method_name|
+    InstrumentedClient::INDEX_METHODS.each do |method_name|
       define_method(method_name) do |event|
         log_event(event)
       end

data/lib/elasticity/search.rb

@@ -21,7 +21,10 @@ module Elasticity
       end
 
       def to_count_args
-        { index: @index_name, type: @document_type, body: { query: @body.fetch(:query) }}
+        { index: @index_name, type: @document_type}.tap do |args|
+          body = @body.slice(:query)
+          args[:body] = body if body.present?
+        end
       end
 
       def to_search_args

data/lib/elasticity/version.rb

@@ -1,3 +1,3 @@
 module Elasticity
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/functional/persistence_spec.rb

@@ -31,6 +31,11 @@ RSpec.describe "Persistence", elasticsearch: true do
       subject.delete_index
     end
 
+    it "counts empty search" do
+      count = subject.search({}).count
+      expect(count).to eq 0
+    end
+
     it "successfully index, update, search, count and delete" do
       john = subject.new(name: "John", birthdate: "1985-10-31")
       mari = subject.new(name: "Mari", birthdate: "1986-09-24")
@@ -92,6 +97,11 @@ RSpec.describe "Persistence", elasticsearch: true do
       subject.delete_index
     end
 
+    it "counts empty search" do
+      count = subject.search({}).count
+      expect(count).to eq 0
+    end
+
     it "remaps to a different index transparently" do
       john = subject.new(name: "John", birthdate: "1985-10-31")
       mari = subject.new(name: "Mari", birthdate: "1986-09-24")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: es-elasticity
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - Rodrigo Kochenburger
@@ -242,3 +242,4 @@ test_files:
 - spec/units/multi_search_spec.rb
 - spec/units/search_spec.rb
 - spec/units/strategies/single_index_spec.rb
+has_rdoc: