plok 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7801b68f7ae1a30624a95fcf9713bb1251f2e7831960ddd173e64b152ba24f94
-  data.tar.gz: 057c7d13a8922bdeba6150e6d2df6ecec65d0f8af169a50b879ccadbee3688b3
+  metadata.gz: fe8e289922e36071642ae46ff78b49eded873476b9721668a5c9df0f8d51bd4f
+  data.tar.gz: 06ee8edde78842db587ee3e0076b9a791cd78247d9987ba07a5441bd0f03c270
 SHA512:
-  metadata.gz: '087677f2caccca0fc4d2e342790860f8514aa002447f2555e018aa4e60e5bb817111209c7cea3c84452ec24b717291fe1e05dc061623cc7b5dd2cd5791271f4b'
-  data.tar.gz: 394542cf38ab37c5740622fee0fc6de8c0b9bd9697e91b94323a3b0edd84ce60aa750af2daf14ccdaaa5782282d548c5ac7a9a77fd56567e936f9164c9a631c2
+  metadata.gz: 562556d7edcf1db8f174203ba55fd3e7cf111ffdab3b1b63d0532a44f3d09d955c9ff7545e83a08e0ed7cf22dff9afd2b14fd5e0857217eae08448f47d8f2915
+  data.tar.gz: c2d565bdfdd0aae5244dd82d9e7bcd04dcb672a7cb7fcc7f8fe40bf5cdd87f3f085a4f33a51c912db353b76d633c0b53b9e5a98a40704b1d0e0d3640c78ec2de

data/app/models/concerns/plok/searchable.rb

@@ -16,17 +16,17 @@ module Plok::Searchable
     end
 
     def trigger_indices_save!
-      self.class.searchable_fields_list.each do |namespace, keys|
-        keys.each do |key|
-          if key == :flexible_content
+      self.class.searchable_fields_list.each do |namespace, fields|
+        fields.each do |field|
+          if field[:name] == :flexible_content
             save_flexible_content_search_indices!(namespace) && next
           end
 
-          if respond_to?(:translatable?) && self.class.translatable_fields_list.include?(key)
-            save_translatable_search_index!(namespace, key) && next
+          if respond_to?(:translatable?) && self.class.translatable_fields_list.include?(field[:name])
+            save_translatable_search_index!(namespace, field[:name]) && next
           end
 
-          save_search_index!(namespace, key)
+          save_search_index!(namespace, field[:name], conditions: field[:conditions])
         end
       end
     end
@@ -51,7 +51,11 @@ module Plok::Searchable
       end
     end
 
-    def save_search_index!(namespace, key, value: nil, locale: nil)
+    def save_search_index!(namespace, key, value: nil, locale: nil, conditions: [])
+      if conditions.any?
+        return unless conditions.map { |c| send(c) }.all?
+      end
+
       value = if value.present?
                 value
               elsif ActiveRecord::Base.connection.column_exists?(self.class.table_name, key)
@@ -81,18 +85,23 @@ module Plok::Searchable
   end
 
   module ClassMethods
-    def searchable_field(namespace, key)
-      return if searchable_fields_list.dig(namespace.to_sym)&.include?(key.to_sym)
+    def searchable_field(namespace, key, conditions)
+      return if !!searchable_fields_list.dig(namespace.to_sym)&.detect do |field|
+        field[:name] == key.to_sym
+      end
 
       if searchable_fields_list[namespace.to_sym].blank?
         searchable_fields_list[namespace.to_sym] = []
       end
 
-      searchable_fields_list[namespace.to_sym] << key.to_sym
+      searchable_fields_list[namespace.to_sym] << {
+        name: key.to_sym,
+        conditions: conditions
+      }
     end
 
     def plok_searchable(namespace: nil, fields: [], conditions: [])
-      fields.each { |key| searchable_field(namespace, key) }
+      fields.each { |key| searchable_field(namespace, key, conditions) }
     end
 
     def searchable_fields_list

data/lib/plok/version.rb

@@ -1,3 +1,3 @@
 module Plok
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plok
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - Davy Hellemans
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-05 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails