any_logger 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de56cdda136e683ae52ee87f6a0cb802792f1e3aa1c6e946ade58b6dde832664
-  data.tar.gz: 9760f9c169b6d1f721e353d2a995b3da7ed07218cfd3f9d7ff1d7f7bd58417cf
+  metadata.gz: 9f41ec5169998e8de01c427d09baccaf59fa27099e5b1e760fafbefd1a0c9218
+  data.tar.gz: 8f10462f5a7fac93fa0b67cd6c1c66c23f73ac2298fa46d87a4a9d33dd5aeaa8
 SHA512:
-  metadata.gz: c3f6346e9da6a573bddc918a41195a7827c9d34086c3ab1a5b47290017615ef1c5d182968ee06a94d8eab2b31d672533cf7166fb7109849d327a7e39e5455dfb
-  data.tar.gz: de5672b026af7fbf51619d947e72ca52495781fc39397c559b10ca467227fb3811e61555eac684310b219e1628007dea3220f19ae0f5571e44cfeb46266723b6
+  metadata.gz: c43933d48c1a555c37d807ae775f5923fba403794fe74d3f8be6565930c07739de0fb0114cef395fd8c6463113ef0d40ae0d27d4e70237046174352c07fb9620
+  data.tar.gz: 19d911b00ce6b65bdaa45649312adf2ae92f692631fb2023f99947b40b50f63e072aa8e6256d4d909b9b48b294dbb29ff9bef01cf172d37b29938be8b5987129

data/CHANGELOG.md

@@ -15,3 +15,11 @@
 ## [0.1.4] - 2025-01-15
 
 - Example::ControllerSubscriberのログの改行位置がおかしかったのを修正
+
+## [0.1.5] - 2025-01-15
+
+- except_unnecessary_paramsをexpectに誤字していたのを修正
+
+## [0.2.0] - 2025-01-19
+
+- process_action.action_controllerのような個別のイベントに対応

data/README.md

@@ -1,6 +1,6 @@
 # AnyLogger
 
-A DSL for simplifying modification of Rails LogSubscribers
+A DSL for simplifying modification of Rails ActiveSupport Instrumentation API
 
 ### Example
 
@@ -11,8 +11,16 @@ require "any_logger/example/controller_subscriber"
 
 AnyLogger.configure do |config|
   config.logger = Rails::Rack::Logger # default: AnyLogger::Example::RackLogger
+
+  config.subscriber.attach :action_mailer, MyLogger::ModelSubscriber
+  # If you call swap, detach, or attach directly in config, the subscriber will be set
   config.swap :action_controller, AnyLogger::Example::ControllerSubscriber
   config.detach :action_view
-  config.attach :active_record, MyLogger::ModelSubscriber
+
+  # Event can be attached using either a class or a block
+  config.event.swap :active_record, :sql, MyLogger::ActiveRecord::Sql
+  config.event.attach :active_job, :discard do |event|
+    MyErrorReporter.notify(event)
+  end
 end
 ```

data/lib/any_logger/configuration/event.rb

@@ -0,0 +1,85 @@
+require "active_support/notifications"
+
+module AnyLogger
+  class Configuration
+    class Event
+      Detach = Struct.new(:organizer, :event)
+      Attach = Struct.new(:organizer, :event, :subscriber)
+
+      def swap(organizer, event, subscriber = nil, &block)
+        @organizer = organizer
+        @event = event
+        @subscriber = subscriber
+        @block = block
+
+        detach(organizer, event)
+        attach(organizer, event, subscriber, &block)
+      end
+
+      def detach(organizer, event)
+        @organizer ||= organizer
+        @event ||= event
+
+        push_detach_to_subscriptions
+        detach_from_event
+      end
+
+      def attach(organizer, event, subscriber = nil, &block)
+        @organizer ||= organizer
+        @event ||= event
+        @subscriber ||= subscriber
+        @block ||= block
+
+        validate_provided_block_or_subscriber
+        validate_unless_provided_block_and_subscriber
+        validate_subscriber_is_callable
+
+        push_attach_to_subscriptions
+        attach_to_event
+      end
+
+      private def event_name
+        "#{@event}.#{@organizer}"
+      end
+
+      private def push_detach_to_subscriptions
+        AnyLogger.config.subscriptions << Detach.new(@organizer, @event)
+      end
+
+      private def push_attach_to_subscriptions
+        AnyLogger.config.subscriptions << Attach.new(@organizer, @event, @subscriber || @block)
+      end
+
+      private def detach_from_event
+        ActiveSupport::Notifications.unsubscribe(event_name)
+      end
+
+      private def attach_to_event
+        # LogSubscriber#attach_toはmonotonic_subscribeなので、それに合わせる
+        if @subscriber
+          ActiveSupport::Notifications.monotonic_subscribe(event_name, @subscriber.new)
+        else
+          ActiveSupport::Notifications.monotonic_subscribe(event_name, &@block)
+        end
+      end
+
+      private def validate_provided_block_or_subscriber
+        return if @block || @subscriber
+
+        raise ArgumentError, "Block or subscriber must be provided"
+      end
+
+      private def validate_unless_provided_block_and_subscriber
+        return unless @block && @subscriber
+
+        raise ArgumentError, "Block and subscriber cannot be provided simultaneously"
+      end
+
+      private def validate_subscriber_is_callable
+        return unless @subscriber && !@subscriber.public_method_defined?(:call)
+
+        raise NoMethodError, "Subscriber must respond to #call"
+      end
+    end
+  end
+end

data/lib/any_logger/configuration/log_subscriber.rb

@@ -0,0 +1,69 @@
+require "active_support"
+require "active_support/core_ext/string/inflections"
+require "action_controller/log_subscriber"
+require "active_record/log_subscriber"
+require "action_view/log_subscriber"
+require "action_mailer/log_subscriber"
+require "action_dispatch/log_subscriber"
+require "active_job/log_subscriber"
+require "active_storage/log_subscriber"
+
+module AnyLogger
+  class Configuration
+    class LogSubscriber
+      Detach = Struct.new(:organizer, :subscriber)
+      Attach = Struct.new(:organizer, :subscriber)
+
+      DEFAULT_SUBSCRIBERS = {
+        action_controller: ActionController::LogSubscriber,
+        active_record: ActiveRecord::LogSubscriber,
+        action_view: ActionView::LogSubscriber,
+        action_mailer: ActionMailer::LogSubscriber,
+        action_dispatch: ActionDispatch::LogSubscriber,
+        active_job: ActiveJob::LogSubscriber,
+        active_storage: ActiveStorage::LogSubscriber
+      }
+
+      private_constant :DEFAULT_SUBSCRIBERS
+
+      def swap(organizer, subscriber, detach_target = nil)
+        @organizer = organizer
+        @subscriber = subscriber
+        @detach_target = detach_target || DEFAULT_SUBSCRIBERS[organizer]
+
+        detach(organizer, detach_target)
+        attach(organizer, subscriber)
+      end
+
+      def detach(organizer, detach_target = nil)
+        @organizer ||= organizer
+        @detach_target ||= detach_target || DEFAULT_SUBSCRIBERS[organizer]
+
+        validate_detach_target_is_set
+
+        push_detach_to_subscriptions
+        @detach_target.detach_from(@organizer)
+      end
+
+      def attach(organizer, subscriber)
+        @organizer ||= organizer
+        @subscriber ||= subscriber
+
+        push_attach_to_subscriptions
+        @subscriber.attach_to(@organizer)
+      end
+
+      private def push_detach_to_subscriptions
+        AnyLogger.config.subscriptions << Detach.new(@organizer, @detach_target)
+      end
+
+      private def push_attach_to_subscriptions
+        AnyLogger.config.subscriptions << Attach.new(@organizer, @subscriber)
+      end
+
+      private def validate_detach_target_is_set
+        raise KeyError, "#{@organizer}'s default subscriber not found" unless @detach_target
+      end
+    end
+  end
+end

data/lib/any_logger/configuration.rb

@@ -1,43 +1,18 @@
 require "singleton"
-require "active_support"
-require "active_support/core_ext/string/inflections"
-require "action_controller/log_subscriber"
-require "active_record/log_subscriber"
-require "action_view/log_subscriber"
-require "action_mailer/log_subscriber"
-require "action_dispatch/log_subscriber"
-require "active_job/log_subscriber"
-require "active_storage/log_subscriber"
 require_relative "example/rack_logger"
+require_relative "configuration/log_subscriber"
+require_relative "configuration/event"
 
 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,
-      action_view: ActionView::LogSubscriber,
-      action_mailer: ActionMailer::LogSubscriber,
-      action_dispatch: ActionDispatch::LogSubscriber,
-      active_job: ActiveJob::LogSubscriber,
-      active_storage: ActiveStorage::LogSubscriber
-    }
-
-    private_constant :DEFAULT_SUBSCRIBERS
-
     attr_reader :config
 
     def initialize
       @config = {
         logger: ::AnyLogger::Example::RackLogger,
-        subscribers: DEFAULT_SUBSCRIBERS.map { |key, klass| Subscriber.new(key, klass) }
+        subscriptions: []
       }
     end
 
@@ -46,34 +21,36 @@ module AnyLogger
     end
 
     def logger=(klass)
+      Rails.application.config.middleware.swap(logger, klass)
       @config[:logger] = klass
     end
 
-    def subscribers
-      @config[:subscribers]
+    def swap_default_logger
+      Rails.application.config.middleware.swap(Rails::Rack::Logger, logger)
     end
 
-    def swap(key, klass, target_klass = nil)
-      target_klass ||= DEFAULT_SUBSCRIBERS[key]
-      raise KeyError, "Default subscriber not found" unless target_klass
+    def subscriptions
+      @config[:subscriptions]
+    end
 
-      detach(key, target_klass)
-      attach(key, klass)
+    def subscriber
+      LogSubscriber.new
     end
 
-    def detach(key, klass = nil)
-      klass ||= DEFAULT_SUBSCRIBERS[key]
-      raise KeyError, "Default subscriber not found" unless klass
+    def event
+      Event.new
+    end
 
-      target_subscriber =
-        @config[:subscribers].find { it.subscription == key && it.klass == klass }
+    def swap(...)
+      subscriber.swap(...)
+    end
 
-      target_subscriber.detachable = true
-      target_subscriber.attachable = false
+    def detach(...)
+      subscriber.detach(...)
     end
 
-    def attach(key, klass)
-      @config[:subscribers] << Subscriber.new(key, klass, attachable: true)
+    def attach(...)
+      subscriber.attach(...)
     end
   end
 end

data/lib/any_logger/example/controller_subscriber.rb

@@ -57,7 +57,7 @@ module AnyLogger
           duration: round_value(@event.duration),
           view_runtime: round_value(@payload[:view_runtime]),
           db_runtime: round_value(@payload[:db_runtime]),
-          params: expect_unnecessary_params || {},
+          params: except_unnecessary_params || {},
           redirect_to: formatted_redirect_location
         }
       end

data/lib/any_logger/version.rb

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

data/lib/any_logger.rb

@@ -1,22 +1,17 @@
 require_relative "any_logger/version"
 require_relative "any_logger/configuration"
-require_relative "any_logger/initializer"
 
 module AnyLogger
-  def self.configure(auto_startable: true, &block)
+  def self.configure(&block)
+    config.swap_default_logger
     block.call(config)
-    start if auto_startable
-  end
-
-  def self.start
-    Initializer.run
   end
 
   def self.config
     Configuration.instance
   end
 
-  def self.subscribers
-    config.subscribers
+  def self.subscriptions
+    config.subscriptions
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: any_logger
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - milkeclair
 bindir: exe
 cert_chain: []
-date: 2025-01-14 00:00:00.000000000 Z
+date: 2025-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -93,7 +93,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: A DSL for simplifying modification of Rails LogSubscribers
+description: A DSL for simplifying modification of Rails ActiveSupport Instrumentation
+  API
 email:
 - milkeclair.black@gmail.com
 executables: []
@@ -109,9 +110,10 @@ files:
 - Rakefile
 - lib/any_logger.rb
 - lib/any_logger/configuration.rb
+- lib/any_logger/configuration/event.rb
+- lib/any_logger/configuration/log_subscriber.rb
 - lib/any_logger/example/controller_subscriber.rb
 - lib/any_logger/example/rack_logger.rb
-- lib/any_logger/initializer.rb
 - lib/any_logger/version.rb
 - sig/any_logger.rbs
 homepage: https://github.com/milkeclair/any_logger
@@ -135,5 +137,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 rubygems_version: 3.6.2
 specification_version: 4
-summary: A DSL for simplifying modification of Rails LogSubscribers
+summary: A DSL for simplifying modification of Rails ActiveSupport Instrumentation
+  API
 test_files: []

data/lib/any_logger/initializer.rb

@@ -1,27 +0,0 @@
-module AnyLogger
-  class Initializer
-    def self.run
-      swap_default_logger
-      change_subscribers
-    end
-
-    private_class_method def self.swap_default_logger
-      Rails.application.config.middleware.swap(Rails::Rack::Logger, AnyLogger.config.logger)
-    end
-
-    private_class_method def self.change_subscribers
-      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