create_custom_attributes 0.5.14 → 0.5.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a82b2f25d17e3ef2765629bedc963acbc6ec9378
-  data.tar.gz: 5d395bcea5b5de1dde9d660be8c1785b8414fd3e
+  metadata.gz: bcd5b48d261a8d97dc3d171d34b7cd822b4e8a12
+  data.tar.gz: 3cdfe34ec1454b14dc21fba38f9c169a16154857
 SHA512:
-  metadata.gz: 5f32f954866a102877e87fc7ca7e4a357d3327624f2626e6c9381b13bd766cc348472dc2076891c1728f9d8a62c382dd1a31a3bb53508489aa6be861b1301cca
-  data.tar.gz: 765023bf69179dd28ac30e53381023033c56e2d73656265d22c8519eae060217d145f11e714c69145873bab6ebcb3b89c3b0d0fe5b203c8d99d422d12597c649
+  metadata.gz: 9bed5e3b463fc71b5c01adcf761c41d6842b759357744cb26715cdb0b9a7e81b701e557a7635e536c94b03dac12cd496c4887df110cfd8f97d9ba5b26aec6d81
+  data.tar.gz: a2f69fed3cedb1be241076befb47d3a2af3f9746575b9d73e9008d9e8376a889c0f0f9999d57e60f8ee059a04949b54916f9d486527597123fe3347b605a0605

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
+    attr_accessor :customizable, :query, :field_list, :defaults, :sort_by, :page, :per_page, :match_any, :filter_by, :filter_any
 
     def build
       {
@@ -54,6 +54,10 @@ module CustomAttributes
       @match_any
     end
 
+    def filter_any?
+      @filter_any
+    end
+
     def default_fields
       default_fields = {
         custom_fields: Hash[customizable.available_custom_fields
@@ -73,7 +77,7 @@ module CustomAttributes
     private
 
     def subquery
-      filter = filter_hash_to_term_array + [{ term: { visible_in_search: true } }]
+      filter = filter_any_decorator(filter_hash_to_term_array) + [{ term: { visible_in_search: true } }]
 
       # match all documents if no particular query isset
       if query == '*' && field_list.empty?
@@ -89,6 +93,7 @@ module CustomAttributes
         }
       end
 
+
       {
         bool: {
           filter: filter
@@ -159,7 +164,11 @@ module CustomAttributes
     def filter_hash_to_term_array
       hash_to_array(filter_by) do |type, field_slug, field_data|
         if type == :custom_fields
-          custom_query_scaffold(field_data, field_slug, true)
+          if field_data.is_a? Array
+            field_data.map { |fd| custom_query_scaffold(fd, field_slug, true) }
+          else
+            custom_query_scaffold(field_data, field_slug, true)
+          end
         else
           key = 'term'
           key = key.pluralize if field_data.is_a? Array
@@ -205,6 +214,19 @@ 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.14'.freeze
+  VERSION = '0.5.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: create_custom_attributes
 version: !ruby/object:Gem::Version
-  version: 0.5.14
+  version: 0.5.15
 platform: ruby
 authors:
 - Daniel Grützmacher
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-06 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails