co-elastic-query 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cf60505d2fc6b1e48f1347900644ff952d9e624d
-  data.tar.gz: 0f34b87be2fc3b40ed3e1368b6deb87f993a7cdf
+  metadata.gz: eb69eb7c09bf694d2fde1be05798c6317704eed7
+  data.tar.gz: 19f8a209de01e39c7053a600339fb9e1d21a39fd
 SHA512:
-  metadata.gz: 75ce7fbcff180ae0ae8b0b2ad27ef8993caef0a650a10e06c3a44f0e2f089efca7b115ea1d8e96c6e25b8b21a3e01f1703af3c6bd82aadb07a2938ad9671db30
-  data.tar.gz: d0c5a85991a54a4aebc75f7f3c560d90710abda0aafbea2240ab147651772cb9a49889cf90a9b271f491c1787f928ef39801458a08057db888fdfde09cb392d6
+  metadata.gz: 5df31e54619ce1e3798bf6de57730909e021c477a45bdf4e501a58b5b773d8a74fb810147edba3fb48b3204f8560feccdd63ed102813cdfb7834bfadf1b6fe5a
+  data.tar.gz: 280db23f0a3356fd7832053a5d23af430cf9d18b5f477854183199fad8fd24b37dc0443566f8981b40565350d95d1a2e9303c7467c00d1cc9f9bd6f7872d40c3

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 = "1.0.8"
+    VERSION = "1.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: co-elastic-query
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Stephen von Takach
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2016-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,7 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Elasticsearch query generator