observers 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2d0c58f136cc23164aa0cf64ded4ff642c86d8f82842fedaf459a0205024b17
-  data.tar.gz: 4ab7392ec00ad1fcb13ad891051c807c40c496037bcd6e730c9692f9c6acfdbb
+  metadata.gz: fbb9116b5b3a86d777d4aca13b5c4c04214340596e1df83adebada4dd871bc43
+  data.tar.gz: 560fbbb9480ac2968036b8024e9362c12ea68994c77a587abc2432505ceeda7f
 SHA512:
-  metadata.gz: fb4a46da4a46c8036f5f8acdebff74817138eb3566db27e929054d4b6d4670715324cb31cead6371bcd45b6f1ea11b927aadb8508dc5707bd417a8c6d7631e2b
-  data.tar.gz: e30650c3284a90f0a94c6fbf80ab0aa549e8676b2f93531d4d99da16944f4e0fa70922a220c224b41ccf8e839dfa01b2162a08c936a56c12350e1b6445a9c232
+  metadata.gz: 403fe656fda85237d897b4e82b84e9b770f352807ac5ef05a37f4c1d58784af7f43e5f22d6ab5999bdebeea831350757125f184870de45ad78330efc6fe07ace
+  data.tar.gz: '06680f408eaf15377c441fd995a7a3b05b3a41bcf6b8e3e3aa87dd06a6e65227f43a50b01c03193845d26d306e368b2ecfaec814af0cb8f4ba9a34386641af83'

data/lib/models/key.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 module Observers
+  class NoObserversError < StandardError; end
+
   class Key
     attr_reader :observers
 
@@ -10,21 +12,19 @@ module Observers
     end
 
     def observe(object:, action:)
-      # TODO: We can observe objects directly, no need to wrap in an observer... no need to let the object's observer override the action?
+      # TODO: We can observe objects directly, no need to wrap in an observer, unless need to let the object's observer override the action?
       # A future reason I can think of for keeping observer wrapper is to track whether the object has implemented certain actions/methods.
       @observers << Observer.new(object:, action:)
     end
 
     # @returns: The result of the last observer with a non-nil value.
     def trigger(action: nil, event: nil)
-      key_callback
-
-      action = event.action if event && action.nil?
-      action = :handle if action.nil?
+      # TODO: Breaks some tests... should it? Yes. Should it be disabled when testing? Yes.
+      # raise NoObserversError, "No observers configured for #{@key}" if @observers.empty?
 
       last_result = nil
 
-      @observers.each do |observer|
+      per_observer_per_action(action:, event:) do |observer, action|
         result = observer.trigger(action:, event:)
         last_result = result unless result.nil?
         yield if block_given?
@@ -33,26 +33,41 @@ module Observers
       last_result
     end
 
-    # @returns: The result of the first observer with a non-nil value.
+    # @returns: The result of the first observer and the first action with a non-nil value.
     def take(action: nil, event: nil)
-      key_callback
-
-      action = event.action if event && action.nil?
-      action = :handle if action.nil?
+      # TODO: Breaks some tests... should it? Yes. Should it be disabled when testing? Yes.
+      # raise NoObserversError, "No observers configured for #{@key}" if @observers.empty?
 
-      @observers.each do |observer|
+      per_observer_per_action(action:, event:) do |observer, action|
         result = observer.trigger(action:, event:)
         yield if block_given?
         return result unless result.nil?
       end
 
-      nil # This is a bad day for the take method, one of the worst.
+      # None of the observers returned a non-nil value.
+      nil
     end
 
     private
 
-    def key_callback
-      Observers.config.key_callback.call(@key) if Observers.config.key_callback && @observers.empty?
+    def per_observer_per_action(action:, event:)
+      action ||= event&.action
+
+      if action
+        @observers.each do |observer|
+          yield observer, action
+        end
+      elsif event&.actions
+        @observers.each do |observer|
+          event.actions.each do |action|
+            yield observer, action
+          end
+        end
+      else
+        @observers.each do |observer|
+          yield observer, :handle
+        end
+      end
     end
   end
 end

data/lib/models/observer.rb

@@ -11,15 +11,23 @@ module Observers
 
     def trigger(action:, event:)
       action = @action if @action
-      event ? @object.send(action, **{ event: }) : @object.send(action)
+
+      return unless @object.respond_to?(action)
+
+      # Assumption that if method has params then that param is "event:".
+      if event && @object.method(action).parameters.count > 0
+        @object.send(action, **{ event: })
+      else
+        @object.send(action)
+      end
     rescue ArgumentError => e
       type = @object.instance_of?(Class) ? @object : @object.class
       method_type = @object.instance_of?(Class) ? '.' : '#'
 
       raise ArgumentError, "#{type}##{action} has an 'event:' keyword argument but no event arg was sent" if event.nil?
 
-      # Events trigger events, so the error bubbles up to becomes the error message for the next rescue's error message:
-      # "RequestEvent sent to Rain::Router#handle -> StatusEvent sent to Error404Node.render -> unknown keyword: :props"
+      # Events trigger events, so the error bubbles up to become the error message for the next rescue's error message:
+      # "RequestEvent sent to Rain::Router#route_request -> StatusEvent sent to Error404Node.render -> unknown keyword: :props"
       raise ArgumentError, "#{event.class} sent to #{type}#{method_type}#{action} -> #{e.message}"
     end
   end

data/lib/observers.rb

@@ -4,7 +4,7 @@ require_relative 'keys'
 require_relative 'models/observer'
 
 module Observers
-  Config = Struct.new(:key_callback)
+  Config = Struct.new(:empty_observers_callback)
 
   class << self
     def [](key)
@@ -16,7 +16,7 @@ module Observers
     end
 
     def config
-      @config ||= Config.new(key_callback: nil)
+      @config ||= Config.new(empty_observers_callback: nil)
     end
 
     def configure

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Observers
-  VERSION = '0.7.0'
+  VERSION = '0.9.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: observers
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.9.0
 platform: ruby
 authors:
 - maedi
@@ -21,11 +21,11 @@ files:
 - lib/models/observer.rb
 - lib/observers.rb
 - lib/version.rb
-homepage: https://github.com/maedi/observers
+homepage: https://github.com/raindeer-rb/observers
 licenses: []
 metadata:
-  homepage_uri: https://github.com/maedi/observers
-  source_code_uri: https://github.com/maedi/observers/src/branch/main
+  homepage_uri: https://github.com/raindeer-rb/observers
+  source_code_uri: https://github.com/raindeer-rb/observers/src/branch/main
 rdoc_options: []
 require_paths:
 - lib