activekit 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71b9eb7bd5fc27d2794cd15b8ec08a68e9baae06e37e072188260ddbaaa25473
-  data.tar.gz: 33f906a96b417c86b8048a2f663dbac5d4a6b0595f9cea23b6a0db92f98982cb
+  metadata.gz: ba3aca1371dc2faabb495460be4001b827591a485579b33d1e1c880a88df88ee
+  data.tar.gz: 63bad99e0d6b416b6a2b9b565134068fd02a1c943b05439aac5d0ebc17357124
 SHA512:
-  metadata.gz: 5172f9cb6b0aa0623a9e6f9a0263de7a5fadc016a25c6b92514f9916fca13653f8326479f4bc7fa8c54314c77c8d9d75435034b3c0e1e40054f7f002bf969d90
-  data.tar.gz: 65cb7a16747fb2281042dced7e1781bf0709437c470e8621b7ee232b6b205ab1ad021d8b1287a147abba85ddb96fe4f020e1ebb455b00a532d45488fbdf6d47f
+  metadata.gz: af8a6fc28a2b4b38a49f690a11384c0199837e6fb983475690bd44d4f69fbd3a063ba6da8f030e464903bea734f71af4888baf45eb628fc799e031b060f6b381
+  data.tar.gz: d241982535485df4b8a253e5e3a46087839339717350816b97ca4226423175a36489409106f453a95ebf1d8b8e66093b623818d22028a3dbf68d23c07249e462

data/lib/active_kit/bedrock/bedrocker.rb

@@ -50,10 +50,10 @@ module ActiveKit
 
       def for(describer_name)
         describer_name = @describers.keys[0] if describer_name.nil?
-        raise "Could not find any describer name in #{@current_class.name}." if describer_name.blank?
+        raise "Could not find any describer name in '#{@current_class.name}'." if describer_name.blank?
 
         describer_name = describer_name.to_sym
-        raise "Could not find describer '#{describer_name}' in #{@current_class.name}." unless @describers.dig(describer_name)
+        raise "Could not find describer '#{describer_name}' in '#{@current_class.name}'." unless @describers.dig(describer_name)
         componenting = @describers.dig(describer_name, :componenting)
         return componenting if componenting
 

data/lib/active_kit/search/searcher.rb

@@ -6,7 +6,7 @@ module ActiveKit
 
         depends_on = options.delete(:depends_on) || {}
         describer_names.each do |describer_name|
-          set_reload_callbacks(depends_on, describer_name)
+          set_callbacks(describer_name, depends_on)
           self.for(describer_name).add_attribute(name: name, options: options.deep_dup)
         end
       end
@@ -18,33 +18,58 @@ module ActiveKit
 
       private
 
-      # Set callbacks for current class and depending classes.
-      def set_reload_callbacks(depends_on, describer_name)
-        @current_class.class_eval do
-          unless searcher.for(describer_name).attributes_present?
-            after_commit do
-              self.class.searcher.for(describer_name).reload(record: self)
-              logger.info "ActiveKit::Search | Indexing from #{self.class.name}: Done."
-            end
-          end
+      # Set callbacks for depending classes and then current class.
+      def set_callbacks(describer_name, depends_on)
+        depends_on.each do |depends_on_association, depends_on_inverse|
+          klass = @current_class.reflect_on_all_associations.map { |assoc| [assoc.name, assoc.klass.name] }.to_h[depends_on_association]
+
+          next if klass.constantize.private_method_defined?(after_commit_depends_callback_method_name(describer_name))
+          klass.constantize.class_eval <<-CODE, __FILE__, __LINE__ + 1
+            after_commit :#{after_commit_depends_callback_method_name(describer_name)}
+
+            private
 
-          unless depends_on.empty?
-            depends_on.each do |depends_on_association, depends_on_inverse|
-              klass = self.reflect_on_all_associations.map { |assoc| [assoc.name, assoc.klass.name] }.to_h[depends_on_association]
-              klass.constantize.class_eval do
-                after_commit do
-                  inverse_assoc = self.public_send(depends_on_inverse)
-                  if inverse_assoc.respond_to?(:each)
-                    inverse_assoc.each { |instance| instance.class.searcher.for(describer_name).reload(record: instance) }
-                  else
-                    inverse_assoc.class.searcher.for(describer_name).reload(record: inverse_assoc)
+            def #{after_commit_depends_callback_method_name(describer_name)}
+              inverse_assoc = self.public_send("#{depends_on_inverse}")
+              if inverse_assoc.respond_to?(:each)
+                inverse_assoc.each do |instance|
+                  if instance.class.name == "#{@current_class.name}"
+                    instance.class.searcher.for("#{describer_name}").reload(record: instance)
                   end
-                  logger.info "ActiveKit::Search | Indexing from #{self.class.name}: Done."
+                end
+              else
+                if inverse_assoc.class.name == "#{@current_class.name}"
+                  inverse_assoc.class.searcher.for("#{describer_name}").reload(record: inverse_assoc)
                 end
               end
+              logger.info "ActiveKit::Search | Indexing Done. (Class: " + self.class.name + " | Reloading: #{@current_class.name} | Describer: #{describer_name})"
             end
-          end
+          CODE
         end
+
+        return if @current_class.private_method_defined?(after_commit_callback_method_name(describer_name))
+        @current_class.class_eval <<-CODE, __FILE__, __LINE__ + 1
+          after_commit :#{after_commit_callback_method_name(describer_name)}
+
+          private
+
+          def #{after_commit_callback_method_name(describer_name)}
+            self.class.searcher.for("#{describer_name}").reload(record: self)
+            logger.info "ActiveKit::Search | Indexing Done. (Class: " + self.class.name + " | Reloading: #{@current_class.name} | Describer: #{describer_name})"
+          end
+        CODE
+      end
+
+      def after_commit_callback_method_name(describer_name)
+        "#{callback_method_name(describer_name)}_callback"
+      end
+
+      def after_commit_depends_callback_method_name(describer_name)
+        "#{callback_method_name(describer_name)}_depends_callback"
+      end
+
+      def callback_method_name(describer_name)
+        "activekit_search_#{@current_class.model_name.singular}_#{describer_name}"
       end
     end
   end

data/lib/active_kit/version.rb

@@ -1,3 +1,3 @@
 module ActiveKit
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activekit
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - plainsource
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -16,20 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.3
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 6.1.3.1
+        version: 7.0.0
 description: Add the essential kit for rails ActiveRecord models and be happy.
 email:
 - plainsource@timeboard.org