create_custom_attributes 0.5.17 → 0.5.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da291bc2e4b77983c12426a2c6b6b9f0aaeb55b3
-  data.tar.gz: d60409a040c85fa5f876adf99f5df1d1213527a4
+  metadata.gz: 37f1043bf4b471386ce78c80bd9945beef5d780e
+  data.tar.gz: c07398c5b2b32eb27829797600f8d1709653ae69
 SHA512:
-  metadata.gz: b97b5f9be626f258af322b2cc0e2689df04db66e753cbe93c69069cec151876d596e5691e0d56d39d55959185346ede2bd8e5c9aaf75605e59348c8ac02b3d39
-  data.tar.gz: 505ccd757de9304aa6b2f511bee09a892edb66c90903a015f023060f2e9de1a0d586f0f62e47ff04ffee2cf6540eafa36a0481d6adceb48a6d18c07b82110c97
+  metadata.gz: 2751ba3366b7596c9e3b3fe9aa8239d8db42202d5cef8296b7185c58ca86b4052fdd8e85e8cf5d9612ef54836f63dbd9f9e7c92b2d158941e66ab1e2d09d094e
+  data.tar.gz: fb4755ef8823a48ee88af2a1c7abc27fc94b92701ea73e75724b04511975734804150859754fec8d4b48dafdad48529cbe71b6f9d23e434bdc3187d18902fc9f

data/lib/custom_attributes/fluent_search_query.rb

@@ -51,6 +51,18 @@ module CustomAttributes
       self
     end
 
+    def filter_by_delimiter(string)
+      @search_query.filter_by_delimiter = string
+
+      self
+    end
+
+    def filter_or_delimiter(string)
+      @search_query.filter_or_delimiter = string
+
+      self
+    end
+
     def sort_by(field_list)
       @search_query.sort_by.merge! field_list
 

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_or
+    attr_accessor :customizable, :query, :field_list, :defaults, :sort_by, :page, :per_page, :match_any, :filter_by, :filter_or, :filter_by_delimiter, :filter_or_delimiter
 
     def build
       {
@@ -39,6 +39,14 @@ module CustomAttributes
       @filter_or ||= {}
     end
 
+    def filter_by_delimiter
+      @filter_by_delimiter ||= {}
+    end
+
+    def filter_or_delimiter
+      @filter_or_delimiter ||= {}
+    end
+
     def sort_by
       @sort_by ||= {}
     end
@@ -161,8 +169,10 @@ module CustomAttributes
       end
     end
 
-    def filter_hash_to_term_array(filter_list)
+    def filter_hash_to_term_array(filter_list, delimiter = '')
       hash_to_array(filter_list) do |type, field_slug, field_data|
+        field_data = field_data.split(delimiter).map(&:strip) if !delimiter.empty? && !field_data.is_a?(Array)
+
         if type == :custom_fields
           if field_data.is_a? Array
             field_data.map { |fd| custom_query_scaffold(fd, field_slug, true) }
@@ -182,8 +192,8 @@ module CustomAttributes
       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?
+      filter_hash[:must] = filter_hash_to_term_array(filter_by, filter_by_delimiter) unless filter_by.empty?
+      filter_hash[:should] = filter_hash_to_term_array(filter_or, filter_or_delimiter) unless filter_or.empty?
 
       [{
         bool: filter_hash

data/lib/custom_attributes/version.rb

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

metadata

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