arelastic 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d79ffe813785f55f0bd3e040733b153097536ce7
-  data.tar.gz: bee96019633d9749923bd18c89e98f6534a77f99
+  metadata.gz: a0a7a0a703d0ab5dd36a676449fc8bfa2cdc20b7
+  data.tar.gz: 8f79e245f42b144533d1fa2c17883c824b091cf2
 SHA512:
-  metadata.gz: a9ec7ea6554904b71cc2b2d3df584f50650ce0c8a298df1c9bb119c126a1d739c5e581f98a07773c7412e80e7b3cc191e268c7fefb19ba186d43094abf2271fa
-  data.tar.gz: 55d443c8e3f3a8cc67699d8096c62a527bdab3306d3b3748aa15085ad5c9e57d708e3c6815c11a5816d6fdcbe75f2a2b3e446e1a37f2d09efd3c4a87f84bb195
+  metadata.gz: 660f7f84062fab516fea41a0e7b0e35365c5032d6c955ca799f199917ed98bd5e9bb4b7b3305d0a415e5332c4354eb578dbc02761f9f4e9e332487d9c10615a6
+  data.tar.gz: 2ddf09ade0864e340bda0f6a4e5e865e345acd15fe5ba428b32babc35f9c6e06e74bad220186629a63194afd5588651d098d1e79cabf40e50613ddee953ff319

data/lib/arelastic/filters/filter.rb

@@ -1,6 +1,6 @@
 module Arelastic
   module Filters
-    class Filter < Arelastic::Nodes::Node
+    class Filter < Arelastic::Queries::Query
       def or other
         Arelastic::Filters::Or.new [self, other]
       end
@@ -9,10 +9,6 @@ module Arelastic
         Arelastic::Filters::And.new [self, other]
       end
 
-      def negate
-        Arelastic::Filters::Not.new self
-      end
-
       def nested path
         Arelastic::Filters::Nested.new path, self
       end

data/lib/arelastic/queries/bool.rb

@@ -16,4 +16,4 @@ module Arelastic
       end
     end
   end
-end
+end

data/lib/arelastic/queries/query.rb

@@ -4,6 +4,10 @@ module Arelastic
       def nested path
         Arelastic::Queries::Nested.new path, self
       end
+
+      def negate
+        Arelastic::Queries::Bool.new must_not: self
+      end
     end
   end
 end

data/lib/arelastic.rb

@@ -1,9 +1,9 @@
 require 'arelastic/arities'
 require 'arelastic/nodes'
 require 'arelastic/aggregations'
+require 'arelastic/queries'
 require 'arelastic/filters'
 require 'arelastic/mappings'
-require 'arelastic/queries'
 require 'arelastic/searches'
 require 'arelastic/sorts'
 

data/test/arelastic/filters/filter_test.rb

@@ -19,15 +19,6 @@ class Arelastic::FilterTest < Minitest::Test
     assert_equal [filter, filter], and_filter.children
   end
 
-  def test_negate
-    filter = Arelastic::Filters::Term.new 'foo', 'bar'
-
-    negated_filter = filter.negate
-
-    assert negated_filter.is_a?(Arelastic::Filters::Not)
-    assert_equal filter, negated_filter.expr
-  end
-
   def test_nested
     filter = Arelastic::Filters::Term.new('foo', 'bar')
 

data/test/arelastic/queries/query_test.rb

@@ -15,4 +15,13 @@ class Arelastic::Queries::QueryTest < Minitest::Test
     }
     assert_equal(expected, nested_query.as_elastic)
   end
+
+  def test_negate
+    filter = Arelastic::Queries::Term.new 'foo', 'bar'
+
+    negated_filter = filter.negate
+
+    assert negated_filter.is_a?(Arelastic::Queries::Bool)
+    assert_equal filter, negated_filter.options[:must_not]
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: arelastic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Matthew Higgins
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-06 00:00:00.000000000 Z
+date: 2016-06-09 00:00:00.000000000 Z
 dependencies: []
 description: Build Elastic Search queries with objects
 email: developer@matthewhiggins.com
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.8.11
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elastic Search query builder