plok 1.1.1 → 1.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7801b68f7ae1a30624a95fcf9713bb1251f2e7831960ddd173e64b152ba24f94
-  data.tar.gz: 057c7d13a8922bdeba6150e6d2df6ecec65d0f8af169a50b879ccadbee3688b3
+  metadata.gz: 6267c2e65f2bdf7db8fcefb866007f1dbfa6f283ad481facb47017bad424a05d
+  data.tar.gz: ded3e9ac5159983bd1560b693ba02b312ae7b5f3fce0b100774df30e5e42a18a
 SHA512:
-  metadata.gz: '087677f2caccca0fc4d2e342790860f8514aa002447f2555e018aa4e60e5bb817111209c7cea3c84452ec24b717291fe1e05dc061623cc7b5dd2cd5791271f4b'
-  data.tar.gz: 394542cf38ab37c5740622fee0fc6de8c0b9bd9697e91b94323a3b0edd84ce60aa750af2daf14ccdaaa5782282d548c5ac7a9a77fd56567e936f9164c9a631c2
+  metadata.gz: 540e8f264ea10b8448edd0547edf00bdd1e807b85182be10c8f5a9a0543c83ca00ed3f56371ee5c34ff6fb268caf287f00673b994c2fc8e093c7fa5eaf7aab05
+  data.tar.gz: 895fb179a873f3789959a36f65c9b0cfddfe83f9003d3320e372545d020baf340ff0464184f6922428748e4a7213c6b2a364dfed4248ebd9ddd04b428f8be643

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.3'
 end

data/spec/support/plok/searchable.rb

@@ -9,10 +9,18 @@ shared_examples_for :searchable do
         # Because this is a spec/support included through it_behaves_like,
         # we have to mock the entry points of the data used in
         # Plok::Searchable.
-        allow(described_class).to receive(:searchable_fields_list) { [:foo] }
+        allow(described_class).to receive(:searchable_fields_list) do
+          {
+            backend: [
+              { name: :foo, conditions: [] }
+            ]
+          }
+        end
+
         if described_class.respond_to?(:translatable_fields_list)
           allow(described_class).to receive(:translatable_fields_list) { [] }
         end
+
         described_class.define_method(:foo) { 'bar' }
       end
 
@@ -27,7 +35,13 @@ shared_examples_for :searchable do
 
     if described_class.respond_to?(:translatable_fields)
       before do
-        allow(described_class).to receive(:searchable_fields_list) { [:foo] }
+        allow(described_class).to receive(:searchable_fields_list) do
+          {
+            backend: [
+              { name: :foo, conditions: [] }
+            ]
+          }
+        end
       end
 
       context 'translatable model' do
@@ -62,7 +76,14 @@ shared_examples_for :searchable do
           # Because this is a spec/support included through it_behaves_like,
           # we have to mock the entry points of the data used in
           # Plok::Searchable.
-          allow(described_class).to receive(:searchable_fields_list) { [:foo] }
+          allow(described_class).to receive(:searchable_fields_list) do
+            {
+              backend: [
+                { name: :foo, conditions: [] }
+              ]
+            }
+          end
+
           allow_any_subject_of(described_class).to receive(:foo) { 'bar' }
           allow_any_subject_of(Concerns::Storable::Collection).to receive(:foo) { 'bar' }
 
@@ -90,7 +111,7 @@ shared_examples_for :searchable do
 
   it '.respond_to?' do
     expect(described_class).to respond_to(
-      :searchable_field, :searchable_fields, :searchable_fields_list
+      :plok_searchable, :searchable_field, :searchable_fields_list
     )
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: plok
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.3
 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