any_logger 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f98001845d3d41ecb5621293b778be949d6fbb03d0d9090c6b291eb84d298f12
-  data.tar.gz: 81e273e472c2763fc4083f3837f513e6ad5b50e081580855ffd56383c4bf1c7b
+  metadata.gz: 1a99074a727083b5bbaf65e63903454243f220b97a634726f70960404ff8ed56
+  data.tar.gz: 311c175cfb8de2ae27c60517e90de0c35b497c8570da169d2664d27a4528f5b5
 SHA512:
-  metadata.gz: 9aa44a18d030c2e74fd7cfe5aa93118de5b35154e63a072f27e416f0601033fe39fd2fe84d3e7232656470ac01f1377274f5a3dcc3c9e223cafbc78b953eed77
-  data.tar.gz: f61783dfdda725502559d93cdedd9b222d2b084ddf9ee3eede64fe5e0e609896269a63491232bc0c5f38b8fd1b4c7ab8840f0919bd78d124f19362ea501ee8e8
+  metadata.gz: 390870f07c77cc56c650db7a37547bcaa204a8afac6f16b0e02da8761e4daa08f38d16c6edf9ee1772cebd7c13eade85737d7f99bf5ff3dd780b83175a9544e7
+  data.tar.gz: 43be01cce2527595217ec2c0bb766f844b3fc4cc37201c9ce5e42cbfdf4621d81de7bbc02e7cde39c5b084c00e59d072264d77c78340613f6b31d0ed421de243

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 3.4.0
+  TargetRubyVersion: 3.4
 
 Style/StringLiterals:
   EnforcedStyle: double_quotes
@@ -33,3 +33,6 @@ Metrics/AbcSize:
 
 Metrics/MethodLength:
   Enabled: false
+
+Metrics/BlockLength:
+  Enabled: false

data/CHANGELOG.md

@@ -36,4 +36,14 @@
 
 ## [0.2.3] - 2025-03-31
 
-- ライブラリを更新
+- ライブラリを更新
+
+## [0.2.4] - 2025-11-10
+
+- gem更新
+
+## [1.0.0] - 2026-03-26
+
+- テストを追加
+- モジュール構成の見直し
+- subscriptionsはconfigからアクセスできるので削除

data/Rakefile

@@ -1,12 +1,3 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
-
-RSpec::Core::RakeTask.new(:spec)
-
-require "rubocop/rake_task"
-
-RuboCop::RakeTask.new
-
-task default: %i[spec rubocop]
+require "push_gem"

data/how_to_publish.txt

@@ -0,0 +1,10 @@
+some code change
+version.rb change
+changelog.md change
+
+$rake gem:check
+
+$git commit
+$git push
+
+$rake gem:push

data/lib/any_logger/configuration/event/attaching.rb

@@ -0,0 +1,57 @@
+module AnyLogger
+  class Configuration
+    class Event
+      class Attaching
+        Attach = Data.define(:organizer, :event, :subscriber)
+
+        def initialize(organizer, event, subscriber = nil, &block)
+          @organizer  = organizer
+          @event      = event
+          @subscriber = subscriber
+          @block      = block
+          @event_name = "#{@event}.#{@organizer}"
+        end
+
+        def execute
+          validate_provided_block_or_subscriber
+          validate_unless_provided_block_and_subscriber
+          validate_subscriber_is_callable
+
+          push_to_subscriptions
+          subscribe
+        end
+
+        private def push_to_subscriptions
+          AnyLogger.config.subscriptions << Attach.new(@organizer, @event, @subscriber || @block)
+        end
+
+        private def subscribe
+          # 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
+end

data/lib/any_logger/configuration/event/default.rb

@@ -0,0 +1,23 @@
+module AnyLogger
+  class Configuration
+    class Event
+      class Default
+        DEFAULT_ATTACHED_EVENTS = {
+          action_view: [:render_template, :render_layout]
+        }
+
+        def initialize(organizer)
+          @organizer = organizer
+        end
+
+        def detach_all
+          return unless DEFAULT_ATTACHED_EVENTS[@organizer]
+
+          DEFAULT_ATTACHED_EVENTS[@organizer].each do |event|
+            Detaching.new(@organizer, event).execute
+          end
+        end
+      end
+    end
+  end
+end

data/lib/any_logger/configuration/event/detaching.rb

@@ -0,0 +1,28 @@
+module AnyLogger
+  class Configuration
+    class Event
+      class Detaching
+        Detach = Data.define(:organizer, :event)
+
+        def initialize(organizer, event)
+          @organizer  = organizer
+          @event      = event
+          @event_name = "#{@event}.#{@organizer}"
+        end
+
+        def execute
+          push_to_subscriptions
+          cancel_subscription
+        end
+
+        private def push_to_subscriptions
+          AnyLogger.config.subscriptions << Detach.new(@organizer, @event)
+        end
+
+        private def cancel_subscription
+          ActiveSupport::Notifications.unsubscribe(@event_name)
+        end
+      end
+    end
+  end
+end

data/lib/any_logger/configuration/event.rb

@@ -1,99 +1,21 @@
-require "active_support/notifications"
+require_relative "event/attaching"
+require_relative "event/default"
+require_relative "event/detaching"
 
 module AnyLogger
   class Configuration
     class Event
-      Detach = Struct.new(:organizer, :event)
-      Attach = Struct.new(:organizer, :event, :subscriber)
-
-      DEFAULT_ATTACHED_EVENTS = {
-        action_view: [:render_template, :render_layout]
-      }
-
-      private_constant :DEFAULT_ATTACHED_EVENTS
-
       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 detaches_default_attached_for(organizer)
-        return unless DEFAULT_ATTACHED_EVENTS[organizer]
-
-        DEFAULT_ATTACHED_EVENTS[organizer].each do |event|
-          @event = event # detachではメモ化されている@eventを使うので、ここで更新しておく
-          detach(organizer, event)
-        end
+        Detaching.new(organizer, event).execute
       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"
+        Attaching.new(organizer, event, subscriber, &block).execute
       end
     end
   end

data/lib/any_logger/configuration/log_subscriber/attaching.rb

@@ -0,0 +1,23 @@
+module AnyLogger
+  class Configuration
+    class LogSubscriber
+      class Attaching
+        Attach = Data.define(:organizer, :subscriber)
+
+        def initialize(organizer, subscriber)
+          @organizer  = organizer
+          @subscriber = subscriber
+        end
+
+        def execute
+          push_to_subscriptions
+          @subscriber.attach_to(@organizer)
+        end
+
+        private def push_to_subscriptions
+          AnyLogger.config.subscriptions << Attach.new(@organizer, @subscriber)
+        end
+      end
+    end
+  end
+end

data/lib/any_logger/configuration/log_subscriber/detaching.rb

@@ -0,0 +1,40 @@
+module AnyLogger
+  class Configuration
+    class LogSubscriber
+      class Detaching
+        Detach = Data.define(: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
+        }
+
+        def initialize(organizer, detach_target = nil)
+          @organizer     = organizer
+          @detach_target = detach_target || DEFAULT_SUBSCRIBERS[@organizer]
+        end
+
+        def execute
+          validate_detach_target_is_set
+
+          push_to_subscriptions
+          @detach_target.detach_from(@organizer)
+          Event::Default.new(@organizer).detach_all
+        end
+
+        private def push_to_subscriptions
+          AnyLogger.config.subscriptions << Detach.new(@organizer, @detach_target)
+        end
+
+        private def validate_detach_target_is_set
+          raise KeyError, "#{@organizer}'s default subscriber not found" unless @detach_target
+        end
+      end
+    end
+  end
+end

data/lib/any_logger/configuration/log_subscriber.rb

@@ -1,73 +1,20 @@
-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 "log_subscriber/attaching"
+require_relative "log_subscriber/detaching"
 
 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)
-        event.detaches_default_attached_for(@organizer)
+        Detaching.new(organizer, detach_target).execute
       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
-
-      private def event
-        AnyLogger.config.event
+        Attaching.new(organizer, subscriber).execute
       end
     end
   end

data/lib/any_logger/configuration.rb

@@ -1,7 +1,7 @@
 require "singleton"
 require_relative "example/rack_logger"
-require_relative "configuration/log_subscriber"
 require_relative "configuration/event"
+require_relative "configuration/log_subscriber"
 
 module AnyLogger
   class Configuration
@@ -16,10 +16,6 @@ module AnyLogger
       }
     end
 
-    def logger
-      @config[:logger]
-    end
-
     def logger=(klass)
       Rails.application.config.middleware.swap(logger, klass)
       @config[:logger] = klass
@@ -29,28 +25,14 @@ module AnyLogger
       Rails.application.config.middleware.swap(Rails::Rack::Logger, logger)
     end
 
-    def subscriptions
-      @config[:subscriptions]
-    end
+    def logger = @config[:logger]
+    def subscriptions = @config[:subscriptions]
 
-    def subscriber
-      LogSubscriber.new
-    end
+    def subscriber = LogSubscriber.new
+    def event = Event.new
 
-    def event
-      Event.new
-    end
-
-    def swap(...)
-      subscriber.swap(...)
-    end
-
-    def detach(...)
-      subscriber.detach(...)
-    end
-
-    def attach(...)
-      subscriber.attach(...)
-    end
+    def swap(...) = subscriber.swap(...)
+    def detach(...) = subscriber.detach(...)
+    def attach(...) = subscriber.attach(...)
   end
 end

data/lib/any_logger/version.rb

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

data/lib/any_logger.rb

@@ -1,3 +1,13 @@
+require "active_support"
+require "active_support/notifications"
+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 "any_logger/version"
 require_relative "any_logger/configuration"
 
@@ -10,8 +20,4 @@ module AnyLogger
   def self.config
     Configuration.instance
   end
-
-  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.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - milkeclair
 bindir: exe
 cert_chain: []
-date: 2025-03-30 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionmailer
@@ -108,10 +108,16 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- how_to_publish.txt
 - lib/any_logger.rb
 - lib/any_logger/configuration.rb
 - lib/any_logger/configuration/event.rb
+- lib/any_logger/configuration/event/attaching.rb
+- lib/any_logger/configuration/event/default.rb
+- lib/any_logger/configuration/event/detaching.rb
 - lib/any_logger/configuration/log_subscriber.rb
+- lib/any_logger/configuration/log_subscriber/attaching.rb
+- lib/any_logger/configuration/log_subscriber/detaching.rb
 - lib/any_logger/example/controller_subscriber.rb
 - lib/any_logger/example/rack_logger.rb
 - lib/any_logger/version.rb
@@ -135,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.1
 specification_version: 4
 summary: A DSL for simplifying modification of Rails ActiveSupport Instrumentation
   API