trackstamps-reborn 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f6ded086f151de9ea9948bf8ce5055bf668c8c591e4c7e745dae7461cbe438c
-  data.tar.gz: 4b1fd16c08d4fa1e15265f8e2ad929c5225db30e5671ff4d18ed696a9a131dcb
+  metadata.gz: 6bd2b68b118dba98cdff561775667db2e1091429b44a412e4205746fc8ba69b3
+  data.tar.gz: bacc74efbb46c07174eb2bd854d7f33e0c437bd9491b79146878dc082f5ec36d
 SHA512:
-  metadata.gz: 5902f55877212109239d449fb196c6fc303066b8cfa153ab20f04142885a68ada8bbb606b51ee232a38124477aac59dde7addb9ca3870faca5cbc636909d4900
-  data.tar.gz: 7a2b7cae52e62135381460889ecfd6147d1e84512fe7a1c0a3395fc3018a767cb67ca8e82badee7428810f48353d52d6593abb732162ea23e80d6559c473ffb2
+  metadata.gz: 6bb48156152409fd08b14d69e653843873c5e02decfe0c41999587294d3e71c6ec62dbdec492a1e52bb710352a08bc1875255d409477f75dc0a3c33b51a66601
+  data.tar.gz: f4573930bbbc22e8b02962a00549203ce0e17eb96717acb52f1f4dd92c5a558c38d3749220d2bbd9262eee23c7c2ffb5844fcca048d09f5b50a313b2a2ddbb4a

data/lib/trackstamps/base.rb

@@ -1,7 +1,7 @@
 require "active_support"
 require "dry-configurable"
 
-# rubocop:disable  Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength, Style/ClassVars
+# rubocop:disable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength
 module Trackstamps
   module Base
     @mixins = ::Concurrent::Map.new
@@ -10,75 +10,94 @@ module Trackstamps
       attribute :user
     end
 
-    def self.[](instance_name=:default)
-      @mixins.fetch_or_store(instance_name.to_s) do
-        Module.new do
-          @@trackstamps_target_key = instance_name
-          const_set(:Current, Trackstamps::Base::Current)
+    def self.[](module_key=:default)
+      @mixins.fetch_or_store(module_key.to_s) do
+        construct_new_module(module_key)
+      end
+    end
 
-          extend Dry::Configurable
-          extend ActiveSupport::Concern
-          autoload :VERSION, "trackstamps/reborn/version"
+    def self.construct_new_module(module_key)
+      mod = Module.new
+      mod.define_singleton_method(:inspect) do
+        "Trackstamps::Reborn[:#{module_key}]"
+      end
 
-          setting :get_current_user, default: -> { Current.user }
+      mod.define_method(:trackstamps_module) do
+        mod
+      end
 
-          setting :user_class_name, default: "User".freeze
-          setting :updater_foreign_key, default: "updated_by_id".freeze
-          setting :creator_foreign_key, default: "created_by_id".freeze
+      mod.define_singleton_method(:[]) do |key|
+        Trackstamps::Base[key]
+      end
 
-          def trackstamps_current_user
-            Trackstamps::Base[@@trackstamps_target_key].config.get_current_user.call
-          end
+      mod.module_eval do
+        extend Dry::Configurable
+        extend ActiveSupport::Concern
+        autoload :VERSION, "trackstamps/reborn/version"
 
-          def self.inspect
-            "Trackstamps::Reborn[:#{@@trackstamps_target_key}]"
+        const_set(:Current, Trackstamps::Base::Current)
+
+        setting :get_current_user, default: -> { Current.user }
+        setting :user_class_name, default: "User".freeze
+        setting :updater_foreign_key, default: "updated_by_id".freeze
+        setting :creator_foreign_key, default: "created_by_id".freeze
+
+        included do
+          def trackstamps_current_user
+            trackstamps_module.config.get_current_user.call
           end
 
-          def self.included(base)
-            trackstamps_module_self = self
-            base.class_eval do
-              before_save :trackstamps_set_updater
-              before_create :trackstamps_set_creator
+          private :trackstamps_module
+          private :trackstamps_current_user
 
-              const_set(:UPDATER_FOREIGN_KEY, trackstamps_module_self.config.updater_foreign_key.dup.freeze)
+          before_save :trackstamps_set_updater
+          before_create :trackstamps_set_creator
 
-              private_constant :UPDATER_FOREIGN_KEY
+          const_set(
+            :UPDATER_FOREIGN_KEY,
+            mod.config.updater_foreign_key.dup.freeze
+          )
+          const_set(
+            :CREATOR_FOREIGN_KEY,
+            mod.config.creator_foreign_key.dup.freeze
+          )
 
-              belongs_to :updater,
-                         class_name: trackstamps_module_self.config.user_class_name,
-                         foreign_key: const_get(:UPDATER_FOREIGN_KEY),
-                         optional: true
+          private_constant :UPDATER_FOREIGN_KEY
+          private_constant :CREATOR_FOREIGN_KEY
 
-              const_set(:CREATOR_FOREIGN_KEY, trackstamps_module_self.config.creator_foreign_key.dup.freeze)
-              private_constant :CREATOR_FOREIGN_KEY
+          belongs_to :updater,
+                     class_name: mod.config.user_class_name,
+                     foreign_key: const_get(:UPDATER_FOREIGN_KEY),
+                     optional: true
 
-              belongs_to :creator,
-                         class_name: trackstamps_module_self.config.user_class_name,
-                         foreign_key: const_get(:CREATOR_FOREIGN_KEY),
-                         optional: true
+          belongs_to :creator,
+                     class_name: mod.config.user_class_name,
+                     foreign_key: const_get(:CREATOR_FOREIGN_KEY),
+                     optional: true
 
-              def trackstamps_set_updater
-                return unless trackstamps_current_user
+          def trackstamps_set_updater
+            return unless trackstamps_current_user
 
-                send(:"#{self.class.const_get(:UPDATER_FOREIGN_KEY)}=", trackstamps_current_user.id)
-              end
+            send(:"#{self.class.const_get(:UPDATER_FOREIGN_KEY)}=", trackstamps_current_user.id)
+          end
 
-              def trackstamps_set_creator
-                return unless trackstamps_current_user
+          def trackstamps_set_creator
+            return unless trackstamps_current_user
 
-                send(:"#{self.class.const_get(:CREATOR_FOREIGN_KEY)}=", trackstamps_current_user.id)
-              end
-            end
+            send(:"#{self.class.const_get(:CREATOR_FOREIGN_KEY)}=", trackstamps_current_user.id)
           end
+        end
 
-          class_methods do
-            def with_trackstamps
-              includes(:creator, :updater)
-            end
+        class_methods do
+          def with_trackstamps
+            includes(:creator, :updater)
           end
         end
       end
+
+      mod
     end
   end
 end
-# rubocop:enable  Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength, Style/ClassVars
+
+# rubocop:enable Metrics/AbcSize, Metrics/MethodLength, Metrics/BlockLength

data/lib/trackstamps/reborn.rb

@@ -2,9 +2,4 @@ require_relative "base"
 
 module Trackstamps
   Reborn = Trackstamps::Base[:default]
-  Reborn.module_eval do
-    def self.[](instance_name)
-      Trackstamps::Base[instance_name]
-    end
-  end
 end

data/lib/trackstamps/version.rb

@@ -1,3 +1,3 @@
 module Trackstamps
-  VERSION = "0.2.0".freeze
+  VERSION = "0.3.0".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trackstamps-reborn
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Dušan
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-25 00:00:00.000000000 Z
+date: 2024-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport