elastic-rails 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90b6db33bed1636b6da9df58b85bcc09af897e4c
-  data.tar.gz: 5d5b72ba7731c3e650aa5df56fb40014c9aee787
+  metadata.gz: 7b7327309b8afdf84080efb767efa3ba254db36e
+  data.tar.gz: 74a5e89ab5f4b8dff0e547cd6eca69a7534bca72
 SHA512:
-  metadata.gz: 58dfe90b0d76dd018762f1dd0d9016a2abfd758df48025289395f000e03819b0cc0983457a37d2600b10e8c7392e2989543d1e0eeba88c9c90593a35ca050b9b
-  data.tar.gz: cc29015434afc2a7e5408547d89d830ee17a9d57afff15e6644cee2231b2e801042f195ba0a2d6fd899bb3a60cff6c21a6c4f8eedc2bef1ff9a9ad7c594fbc65
+  metadata.gz: 917fcdbc89a3fb8e9e1abb860426f2b574578483c14735f66c2eb1d9e9411d526ffe7ba0b46abcc86aa9a43d697ff0082a2b0d96181c2ccacff891faf0c449db
+  data.tar.gz: 1cae5b66a5cd48eb3f802ca733e657e39a84ce028b1bceba55f2e5f15ad24a1469c9d29d7cb4ddff8d22332f7871b27da5269d7191f6b2d36e3d08637c8bca1a

data/lib/elastic/dsl/bool_query_builder.rb

@@ -10,6 +10,12 @@ module Elastic::Dsl
       end
     end
 
+    def must_not(*_queries)
+      with_bool_query do |query|
+        query.must_not build_query_from_params(_queries)
+      end
+    end
+
     def should(*_queries)
       with_bool_query do |query|
         query.should build_query_from_params(_queries)

data/lib/elastic/nodes/boolean.rb

@@ -15,6 +15,7 @@ module Elastic::Nodes
     def initialize
       super
       @musts = []
+      @must_nots = []
       @shoulds = []
       @filters = []
       @disable_coord = !Elastic::Configuration.coord_similarity
@@ -24,6 +25,10 @@ module Elastic::Nodes
       @musts << _node
     end
 
+    def must_not(_node)
+      @must_nots << _node
+    end
+
     def should(_node)
       @shoulds << _node
     end
@@ -40,6 +45,14 @@ module Elastic::Nodes
       @musts.each
     end
 
+    def must_nots=(_nodes)
+      @must_nots = _nodes.dup.to_a
+    end
+
+    def must_nots
+      @must_nots.each
+    end
+
     def shoulds=(_nodes)
       @shoulds = _nodes.dup.to_a
     end
@@ -65,6 +78,7 @@ module Elastic::Nodes
     def render(_options = {})
       hash = {}
       hash['must'] = @musts.map { |n| n.render(_options) } if !@musts.empty?
+      hash['must_not'] = @must_nots.map { |n| n.render(_options) } if !@must_nots.empty?
       hash['should'] = @shoulds.map { |n| n.render(_options) } if !@shoulds.empty?
       hash['filters'] = @filters.map { |n| n.render(_options) } if !@filters.empty?
       hash['minimum_should_match'] = minimum_should_match unless minimum_should_match.nil?
@@ -75,28 +89,37 @@ module Elastic::Nodes
     end
 
     def clone
-      prepare_clone super, @musts.map(&:clone), @shoulds.map(&:clone), @filters.map(&:clone)
+      prepare_clone(
+        super,
+        @musts.map(&:clone),
+        @must_nots.map(&:clone),
+        @shoulds.map(&:clone),
+        @filters.map(&:clone)
+      )
     end
 
     def simplify
       new_must = @musts.map(&:simplify)
+      new_must_not = @must_nots.map(&:simplify)
       new_should = @shoulds.map(&:simplify)
       new_filter = @filters.map(&:simplify)
 
       # TODO: detect must elements with boost = 0 and move them to "filter"
 
-      if boost.nil? && (new_must.length + new_should.length + new_filter.length) == 1
-        return new_must.first unless new_must.empty?
-        return new_should.first unless new_should.empty? # at least 1 should match
+      total_nodes = new_must.length + new_must_not.length + new_should.length + new_filter.length
+      if boost.nil? && total_nodes == 1
+        return new_must.first if !new_must.empty?
+        return new_should.first if !new_should.empty? # at least 1 should match
       end
 
-      prepare_clone(super, new_must, new_should, new_filter)
+      prepare_clone(super, new_must, new_must_not, new_should, new_filter)
     end
 
     private
 
-    def prepare_clone(_clone, _musts, _shoulds, _filters)
+    def prepare_clone(_clone, _musts, _must_nots, _shoulds, _filters)
       _clone.musts = _musts
+      _clone.must_nots = _must_nots
       _clone.shoulds = _shoulds
       _clone.filters = _filters
       _clone.minimum_should_match = @minimum_should_match

data/lib/elastic/version.rb

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

metadata

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