any_logger 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2358954386fe713d2a0ecd983defb8d9490cb0e343c19fb7837984d031a1bd2
-  data.tar.gz: 7885ea10527db0410b819c16e91b9baf7f503ceb380f69a5098cf948e72536ac
+  metadata.gz: b26a8df3ee6ce7ee55d83fc442b93692952e9f5b5d91cd47dbaf0c44ce9fcd0f
+  data.tar.gz: e3dbad423f82581ac1051103a82d0ba1eef69418351c7c916ec13375585ae5d4
 SHA512:
-  metadata.gz: 32f35f4c25058f116c5503bdd750a198e3ad6e14924d9075882226b15357aa3b6b565ce8b3d6a10bcfcaf3a0d11f09d161186759a107470d66fef8669d64f21d
-  data.tar.gz: acccf7756be61b8171373dcd9e96087951c41954a67eb69a77ed282204b862298ddc6badb9b98698b11ea28e8defb38b5a784c30bf1bbad050ddb25627771e6e
+  metadata.gz: 20defb8b3a5791d1e691f85bc9bd0774b013cbd43bb473b463ab0e03250cb4d5149e27ebb31f2b9f4a5a96440dfc25e13cfe0bfb8e008cc4268732b12df0e4d8
+  data.tar.gz: 7f18668828179449c462dd18a23fe60357ef0e314026faaccb6939e3c54f68d7d0b959dea66d2055713fde2e41bf655e2ea920afa5b8bef313050ad3d6b79670

data/CHANGELOG.md

@@ -3,3 +3,7 @@
 ## [0.1.0] - 2025-01-14
 
 - Initial release
+
+## [0.1.2] - 2025-01-14
+
+- detach, attach, swapが正常に動作していなかったのを修正

data/README.md

@@ -5,10 +5,13 @@ Easier to change LogSubscribers in rails.
 ### Example
 
 ```ruby
+require "any_logger"
+require "any_logger/example/controller_subscriber"
+
 AnyLogger.configure do |config|
   config.logger = Rails::Rack::Logger # default: AnyLogger::Example::RackLogger
   config.swap :action_controller, AnyLogger::Example::ControllerSubscriber
-  config.detach :action_view
+  config.detach :active_record
   config.attach :active_record, MyLogger::ModelSubscriber
 end
 

data/lib/any_logger/configuration.rb

@@ -14,6 +14,12 @@ module AnyLogger
   class Configuration
     include Singleton
 
+    Subscriber = Struct.new(:subscription, :klass, :detachable, :attachable) do
+      def initialize(subscription, klass, detachable: false, attachable: false)
+        super(subscription, klass, detachable, attachable)
+      end
+    end
+
     DEFAULT_SUBSCRIBERS = {
       action_controller: ActionController::LogSubscriber,
       active_record: ActiveRecord::LogSubscriber,
@@ -24,16 +30,14 @@ module AnyLogger
       active_storage: ActiveStorage::LogSubscriber
     }
 
-    DEFAULT_SUBSCRIBER_OPTIONS = { klass: nil, detachable: false, attachable: false }
-
-    private_constant :DEFAULT_SUBSCRIBER_OPTIONS
+    private_constant :DEFAULT_SUBSCRIBERS
 
     attr_reader :config
 
     def initialize
       @config = {
         logger: ::AnyLogger::Example::RackLogger,
-        subscribers: DEFAULT_SUBSCRIBERS.dup.transform_values { |k| DEFAULT_SUBSCRIBER_OPTIONS.dup.merge(klass: k) }
+        subscribers: DEFAULT_SUBSCRIBERS.map { |key, klass| Subscriber.new(key, klass) }
       }
     end
 
@@ -49,24 +53,27 @@ module AnyLogger
       @config[:subscribers]
     end
 
-    def swap(key, klass)
-      return unless @config[:subscribers].key?(key)
+    def swap(key, klass, target_klass = nil)
+      target_klass ||= DEFAULT_SUBSCRIBERS[key]
+      raise KeyError, "Default subscriber not found" unless target_klass
 
-      @config[:subscribers][key] = { klass: klass, detachable: true, attachable: true }
+      detach(key, target_klass)
+      attach(key, klass)
     end
 
     def detach(key, klass = nil)
-      return unless @config[:subscribers].key?(key)
+      klass ||= DEFAULT_SUBSCRIBERS[key]
+      raise KeyError, "Default subscriber not found" unless klass
 
-      @config[:subscribers][key][:detachable] = true
-      @config[:subscribers][key][:klass] = klass if klass
+      target_subscriber =
+        @config[:subscribers].find { it.subscription == key && it.klass == klass }
+
+      target_subscriber.detachable = true
+      target_subscriber.attachable = false
     end
 
     def attach(key, klass)
-      return unless @config[:subscribers].key?(key)
-
-      @config[:subscribers][key][:attachable] = true
-      @config[:subscribers][key][:klass] = klass
+      @config[:subscribers] << Subscriber.new(key, klass, attachable: true)
     end
   end
 end

data/lib/any_logger/initializer.rb

@@ -10,14 +10,18 @@ module AnyLogger
     end
 
     private_class_method def self.change_subscribers
-      Configuration::DEFAULT_SUBSCRIBERS.each do |key, default_subscriber|
-        subscribers = AnyLogger.config.subscribers
-        detachable = subscribers[key][:detachable]
-        attachable = subscribers[key][:attachable]
-
-        default_subscriber.detach_from(key) if detachable
-        subscribers[key][:klass].attach_to(key) if attachable
+      AnyLogger.config.subscribers.each do
+        detach_subscriber(it) if it.detachable
+        attach_subscriber(it) if it.attachable
       end
     end
+
+    private_class_method def self.detach_subscriber(subscriber)
+      subscriber.klass.detach_from(subscriber.subscription)
+    end
+
+    private_class_method def self.attach_subscriber(subscriber)
+      subscriber.klass.attach_to(subscriber.subscription)
+    end
   end
 end

data/lib/any_logger/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AnyLogger
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/any_logger.rb

@@ -16,6 +16,6 @@ module AnyLogger
   end
 
   def self.subscribers
-    config.config[:subscribers]
+    config.subscribers
   end
 end

metadata

@@ -1,14 +1,28 @@
 --- !ruby/object:Gem::Specification
 name: any_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - milkeclair
 bindir: exe
 cert_chain: []
-date: 2025-01-13 00:00:00.000000000 Z
+date: 2025-01-14 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: actionmailer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: actionpack
   requirement: !ruby/object:Gem::Requirement