create_custom_attributes 0.5.16 → 0.5.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65cbc672643cb49ee36b4140fcbeee13e17eacea
-  data.tar.gz: 13a7414a56bab0289504698aeb05928ed87bfe2c
+  metadata.gz: da291bc2e4b77983c12426a2c6b6b9f0aaeb55b3
+  data.tar.gz: d60409a040c85fa5f876adf99f5df1d1213527a4
 SHA512:
-  metadata.gz: 4099784fdf4b46e6be826d56e76febfcc48d6ee6e604ebaaeb354eda7d1f3a777b5ce10a9c6d92e36a62aca5de94103368683339612fe9f7b64bf91497855a0e
-  data.tar.gz: 306496b4c55f325969d32d804aff7322d3107a5dc3561b37b01711ef037a0bd189762952120319edce6e346a9f6e1b76843608432e2f30c4125d4d1ec828af5a
+  metadata.gz: b97b5f9be626f258af322b2cc0e2689df04db66e753cbe93c69069cec151876d596e5691e0d56d39d55959185346ede2bd8e5c9aaf75605e59348c8ac02b3d39
+  data.tar.gz: 505ccd757de9304aa6b2f511bee09a892edb66c90903a015f023060f2e9de1a0d586f0f62e47ff04ffee2cf6540eafa36a0481d6adceb48a6d18c07b82110c97

data/lib/custom_attributes/fluent_search_query.rb

@@ -45,20 +45,20 @@ module CustomAttributes
       self
     end
 
-    def sort_by(field_list)
-      @search_query.sort_by.merge! field_list
+    def filter_or(field_list)
+      @search_query.filter_or.merge! field_list
 
       self
     end
 
-    def match_any
-      @search_query.match_any = true
+    def sort_by(field_list)
+      @search_query.sort_by.merge! field_list
 
       self
     end
 
-    def filter_any
-      @search_query.filter_any = true
+    def match_any
+      @search_query.match_any = true
 
       self
     end

data/lib/custom_attributes/search_query.rb

@@ -3,7 +3,7 @@ require 'custom_attributes/search_query_field'
 module CustomAttributes
   # Builds a query in elastic search DSL
   class SearchQuery
-    attr_accessor :customizable, :query, :field_list, :defaults, :sort_by, :page, :per_page, :match_any, :filter_by, :filter_any
+    attr_accessor :customizable, :query, :field_list, :defaults, :sort_by, :page, :per_page, :match_any, :filter_by, :filter_or
 
     def build
       {
@@ -35,6 +35,10 @@ module CustomAttributes
       @filter_by ||= {}
     end
 
+    def filter_or
+      @filter_or ||= {}
+    end
+
     def sort_by
       @sort_by ||= {}
     end
@@ -54,10 +58,6 @@ module CustomAttributes
       @match_any
     end
 
-    def filter_any?
-      @filter_any
-    end
-
     def default_fields
       default_fields = {
         custom_fields: Hash[customizable.available_custom_fields
@@ -77,7 +77,7 @@ module CustomAttributes
     private
 
     def subquery
-      filter = filter_any_decorator(filter_hash_to_term_array) + [{ term: { visible_in_search: true } }]
+      filter = filter_term_array + [{ term: { visible_in_search: true } }]
 
       # match all documents if no particular query isset
       if query == '*' && field_list.empty?
@@ -161,8 +161,8 @@ module CustomAttributes
       end
     end
 
-    def filter_hash_to_term_array
-      hash_to_array(filter_by) do |type, field_slug, field_data|
+    def filter_hash_to_term_array(filter_list)
+      hash_to_array(filter_list) do |type, field_slug, field_data|
         if type == :custom_fields
           if field_data.is_a? Array
             field_data.map { |fd| custom_query_scaffold(fd, field_slug, true) }
@@ -178,6 +178,18 @@ module CustomAttributes
       end
     end
 
+    def filter_term_array
+      return filter_hash_to_term_array(filter_by) if filter_or.empty?
+
+      filter_hash = { minimum_should_match: 1 }
+      filter_hash[:must] = filter_hash_to_term_array(filter_by) unless filter_by.empty?
+      filter_hash[:should] = filter_hash_to_term_array(filter_or) unless filter_or.empty?
+
+      [{
+        bool: filter_hash
+      }]
+    end
+
     def filter_out_custom_fields(fields)
       return {} if fields[:fields].nil?
 
@@ -214,19 +226,6 @@ module CustomAttributes
       end
     end
 
-    def filter_any_decorator(filter_array)
-      if !filter_any?
-        filter_array
-      else
-        [{
-            bool: {
-              should: filter_hash_to_term_array,
-              minimum_should_match: 1
-            }
-        }]
-      end
-    end
-
     def custom_query_scaffold(query, field_slug, filter = false)
       condition = { match: { 'custom_field_values.value' => query } }
       condition = { term: { 'custom_field_values.value.raw' => query } } if filter

data/lib/custom_attributes/version.rb

@@ -1,3 +1,3 @@
 module CustomAttributes
-  VERSION = '0.5.16'.freeze
+  VERSION = '0.5.17'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: create_custom_attributes
 version: !ruby/object:Gem::Version
-  version: 0.5.16
+  version: 0.5.17
 platform: ruby
 authors:
 - Daniel Grützmacher