elastic-rails 0.6.3 → 0.6.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b7327309b8afdf84080efb767efa3ba254db36e
-  data.tar.gz: 74a5e89ab5f4b8dff0e547cd6eca69a7534bca72
+  metadata.gz: 66b9bacfe2ed32b87930002d60d7f84d8c996c05
+  data.tar.gz: e2d4f108fb27db7ec85afdb861f35a009db2db0f
 SHA512:
-  metadata.gz: 917fcdbc89a3fb8e9e1abb860426f2b574578483c14735f66c2eb1d9e9411d526ffe7ba0b46abcc86aa9a43d697ff0082a2b0d96181c2ccacff891faf0c449db
-  data.tar.gz: 1cae5b66a5cd48eb3f802ca733e657e39a84ce028b1bceba55f2e5f15ad24a1469c9d29d7cb4ddff8d22332f7871b27da5269d7191f6b2d36e3d08637c8bca1a
+  metadata.gz: 425e22896f8f062c17dd12ead7ec8f052cf3e6a0151c71c788cc55636f3a3db2351e1a4af8bf6af87b3a7441f13c65ebecef0da7925baac0ddc709aeceffa632
+  data.tar.gz: 9e95d2d6e6ba9d85ae68ad88e241d61ba2558d45e20e1c939006eae783c8c7041f095eb18e2f9dc561f29a6271e7a5430188c252eaa9d81166f770338799212e

data/lib/elastic/commands/build_query_from_params.rb

@@ -7,33 +7,39 @@ module Elastic::Commands
         node = build_or_node(params)
       end
 
-      node.simplify
+      node.try(:simplify)
     end
 
     private
 
     def build_or_node(_array)
-      Elastic::Nodes::Boolean.build_or(_array.map do |part|
+      parts = _array.map do |part|
         case part
-        when Elastic::Query
-          extract_query_node part
         when Hash
           build_and_node part
+        when Elastic::Query
+          extract_query_node part
         else
           raise ArgumentError, "expected hash or query but got #{part.class}"
         end
-      end)
-    end
+      end.reject(&:nil?)
 
-    def extract_query_node(_query)
-      raise ArgumentError, "query type mismatch, expected #{index.class}" if _query.index != index
-      _query.as_query_node
+      return nil if parts.empty?
+      Elastic::Nodes::Boolean.build_or(parts)
     end
 
     def build_and_node(_hash)
-      Elastic::Nodes::Boolean.build_and(_hash.map do |field, options|
+      parts = _hash.map do |field, options|
         build_query_node field, options
-      end)
+      end.reject(&:nil?)
+
+      return nil if parts.empty?
+      Elastic::Nodes::Boolean.build_and(parts)
+    end
+
+    def extract_query_node(_query)
+      raise ArgumentError, "query type mismatch, expected #{index.class}" if _query.index != index
+      _query.as_query_node
     end
 
     def build_query_node(_field, _options)

data/lib/elastic/dsl/bool_query_builder.rb

@@ -6,19 +6,22 @@ module Elastic::Dsl
 
     def must(*_queries)
       with_bool_query do |query|
-        query.must build_query_from_params(_queries)
+        node = build_query_from_params(_queries)
+        query.must node unless node.nil?
       end
     end
 
     def must_not(*_queries)
       with_bool_query do |query|
-        query.must_not build_query_from_params(_queries)
+        node = build_query_from_params(_queries)
+        query.must_not node unless node.nil?
       end
     end
 
     def should(*_queries)
       with_bool_query do |query|
-        query.should build_query_from_params(_queries)
+        node = build_query_from_params(_queries)
+        query.should node unless node.nil?
       end
     end
 

data/lib/elastic/version.rb

@@ -1,3 +1,3 @@
 module Elastic
-  VERSION = "0.6.3"
+  VERSION = "0.6.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: elastic-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.3
+  version: 0.6.4
 platform: ruby
 authors:
 - Ignacio Baixas