co-elastic-query 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b80018d1bc9d22c63decb9c5d6e58741071738d
-  data.tar.gz: a0b7b36f8d9a1ff825e05d99ee527f041d8ed28e
+  metadata.gz: d851fa234bce9d77d291f62372856193735f9626
+  data.tar.gz: 80ba41366f83e32e3095a660d496b84502a4c5d8
 SHA512:
-  metadata.gz: c370b38fbea198853744bc643cd85aab3a588515e912ffe9f97b7219577c862dbd72395f03e925a57c033d70004632949f848b2a4e3bf20eb1439d799addae50
-  data.tar.gz: 5f7520cccf1e5c88d669b79419f2f39729f2d16454efed12589ccf5b2df885e29fa15a97ca1fc32848a152397a80681eb03bdbee62673c67963946950f77c068
+  metadata.gz: eed8442c1cdf8eb3976945fcfe157f5032f9b4f17d9b4dc57e04cd7c06beeb0a61d19473cd3a855fc5f8e264d6356b695cc3c3b3ba5aa9db32486d5f78b976c0
+  data.tar.gz: 34972d0ca63ace7afc763ff53c8a22629f946945e099b01d3be27e3588b68cfae9c52d3c221e20658d780bd6514beda0b28dee62d8446cfdb99857446bf1f1e0

data/lib/co-elastic-query.rb

@@ -47,6 +47,12 @@ class Elastic
             self
         end
 
+        def and_filter(filters)
+            @andFilter ||= {}
+            @andFilter.merge!(filters)
+            self
+        end
+
         # Applys the query to child objects
         def has_child(name)
             @hasChild = name
@@ -113,6 +119,20 @@ class Elastic
                 end
             end
 
+            if @andFilter
+                fieldfilters ||= []
+                fieldfilter = { :and => [] }
+                andArray = fieldfilter[:and]
+
+                @andFilter.each do |key, value|
+                    build_filter(andArray, key, value)
+                end
+
+                unless andArray.empty?
+                    fieldfilters.push(fieldfilter)
+                end
+            end
+
             if @rangeFilter
                 fieldfilters ||= []
 

data/lib/co-elastic-query/version.rb

@@ -1,3 +1,3 @@
 module CoElasticQuery
-    VERSION = "2.0.0"
+    VERSION = "2.0.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co-elastic-query
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Stephen von Takach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-20 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler