co-elastic-query 1.0.10 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e94c8425ecf401d73b82251269377bc1d2cb9cfe
-  data.tar.gz: 6bba205713da3df95335b1f614360e7e367fcba0
+  metadata.gz: 0b80018d1bc9d22c63decb9c5d6e58741071738d
+  data.tar.gz: a0b7b36f8d9a1ff825e05d99ee527f041d8ed28e
 SHA512:
-  metadata.gz: 3090a78ef6542089a821e086fb37fa953372812f1105949dd824d39ca9efb964691bf4f6f997b2ebef09b7df5ad9723823ac4f875ebd92520d4b136d392b65bd
-  data.tar.gz: 3feead0db5492d9a37f35bb498a8bcc56099e888254a855a1d6e452e00a14d85be839e37445e74226b0713442512232efae5d995efef6f413f1b0e75bb257307
+  metadata.gz: c370b38fbea198853744bc643cd85aab3a588515e912ffe9f97b7219577c862dbd72395f03e925a57c033d70004632949f848b2a4e3bf20eb1439d799addae50
+  data.tar.gz: 5f7520cccf1e5c88d669b79419f2f39729f2d16454efed12589ccf5b2df885e29fa15a97ca1fc32848a152397a80681eb03bdbee62673c67963946950f77c068

data/lib/co-elastic-query.rb

@@ -19,7 +19,7 @@ class Elastic
         end
 
 
-        attr_accessor :offset, :limit, :sort, :fields, :query_settings
+        attr_accessor :offset, :limit, :sort, :fields
 
         def raw_filter(filter)
             @raw_filter ||= []
@@ -47,12 +47,6 @@ 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
@@ -119,20 +113,6 @@ 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 ||= []
 
@@ -145,9 +125,9 @@ class Elastic
                 fieldfilters ||= []
 
                 @nots.each do |key, value|
-                    fieldfilter = { :not => { :or => [] } }
-                    build_filter(fieldfilter[:not][:or], key, value)
-                    unless fieldfilter[:not].empty?
+                    fieldfilter = { not: { filter: { or: [] } } }
+                    build_filter(fieldfilter[:not][:filter][:or], key, value)
+                    unless fieldfilter[:not][:filter][:or].empty?
                         fieldfilters.push(fieldfilter)
                     end
                 end
@@ -190,10 +170,6 @@ class Elastic
                             }
                         }]
 
-                    if @query_settings
-                        should[0][:simple_query_string].merge! @query_settings
-                    end
-
                     if @hasChild
                         should << {
                                 has_child: {
@@ -377,10 +353,12 @@ class Elastic
             body: {
                 sort: sort,
                 query: {
-                    filtered: {
-                        query: {
-                            bool: {
-                                must: queries
+                    bool: {
+                        must: {
+                            query: {
+                                bool: {
+                                    must: queries
+                                }
                             }
                         },
                         filter: {

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

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

metadata

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