observers 0.5.2 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 43b98e363f71c1af49c171092474b32876ed8960b95c5ec02a9583d8c86ed7f6
-  data.tar.gz: 885c88e2e012bb1a57570a80e06838cab02c5ddd4f3efeddde73ababa6de2ebe
+  metadata.gz: c6d833421a632a5d73e0b3bcd73d227881b67cfa5384bb386632b04607e3745d
+  data.tar.gz: 458dbadf1111fa9cdbeef5d65cce5bcd8b6da3ea355c4178ced79e0c48824f50
 SHA512:
-  metadata.gz: 2d5d49d769a470b89d5f07aa85bafd1a3f913666f5999de99d84d7649fc5c9fc829fcf555b2d487b47d2870139cc93ef7b0dad040d4a6b4cd987305f0c322ff0
-  data.tar.gz: 72bc50b694eb42de5c8c48bc9775b5ae4386daf0dd74c0bbd2cc7be2540809505d6ef9c8c82ea3ef244fc0442acf5039c646606daf717a701827aeaf9084b98e
+  metadata.gz: 5e1b8ad7ac1007633742d060524135d9013972dd973676a6f89a4c831668f9a590f0106397c315e727758b6e8e30ce344529750fd33d84f3305f7bbb4c805556
+  data.tar.gz: ec92959757150e34c161acd7152bdd4e82501a4dc3f0e4b0ffd79cd321fc196c81ce3d148040bff9121ec651ed351d215f636ac2e3042768032dfe225fa9c241

data/lib/keys.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+require_relative 'models/key'
+
+module Observers
+  class Keys
+    class MissingKeyError < StandardError; end
+
+    class << self
+      def keys
+        @keys ||= {}
+        @keys
+      end
+
+      def fetch(key)
+        # TODO: Log instead per configuration, much better to fail silently sometimes!
+        keys[key] || raise(MissingKeyError, "Key key '#{key}' not found")
+      end
+
+      def [](key)
+        keys[key] || upsert(key:)
+      end
+
+      def upsert(key:)
+        keys[key] = Key.new if keys[key].nil?
+        keys[key]
+      end
+
+      def reset
+        @keys = {}
+      end
+    end
+  end
+end

data/lib/models/{observable.rb → key.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Observers
-  class Observable
+  class Key
     attr_reader :observers
 
     def initialize
@@ -9,11 +9,13 @@ 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?
+      # 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:, event:)
+    def trigger(action: nil, event:)
       action = event.action if event && action.nil?
       action = :handle if action.nil?
 
@@ -22,18 +24,20 @@ module Observers
       @observers.each do |observer|
         result = observer.trigger(action:, event:)
         last_result = result unless result.nil?
+        yield if block_given?
       end
 
       last_result
     end
 
     # @returns: The result of the first observer with a non-nil value.
-    def take(action:, event:)
+    def take(action: nil, event:)
       action = event.action if event && action.nil?
       action = :handle if action.nil?
 
       @observers.each do |observer|
         result = observer.trigger(action:, event:)
+        yield if block_given?
         return result unless result.nil?
       end
 

data/lib/models/observer.rb

@@ -12,13 +12,15 @@ module Observers
     def trigger(action:, event:)
       action = @action if @action
       event ? @object.send(action, **{ event: }) : @object.send(action)
-    rescue ArgumentError
+    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 was sent" if event.nil?
+      raise ArgumentError, "#{type}##{action} has an 'event:' keyword argument but no event arg was sent" if event.nil?
 
-      # TODO: An error here will bubble up to the observer that triggered this observer, overwriting this error with its error.
-      raise ArgumentError, "#{event.class} sent to #{type}##{action} but it has no 'event:' keyword argument"
+      # 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"
+      raise ArgumentError, "#{event.class} sent to #{type}#{method_type}#{action} -> #{e.message}"
     end
   end
 end

data/lib/observers.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'observables'
+require_relative 'keys'
 require_relative 'models/observer'
 
 module Observers
@@ -10,35 +10,35 @@ module Observers
     end
   end
 
-  # Add an observer on the observable side.
+  # Add an observer on the key side.
   def observers(key = self)
     Struct.new(:key) do
       def push(object, action: nil)
-        Observables[key].observe(object:, action:)
+        Keys[key].observe(object:, action:)
       end
       alias :<< :push
 
       def count
-        Observables[key].observers.count
+        Keys[key].observers.count
       end
     end.new(key)
   end
 
   # Add an observer on the observer side.
   def observe(key, action: nil)
-    Observables[key].observe(object: self, action:)
+    Keys[key].observe(object: self, action:)
   end
 
-  def trigger(key = self, action: nil, event: nil)
-    Observables.fetch(key).trigger(action:, event:)
+  def trigger(key: self, action: nil, event: nil)
+    Keys.fetch(key).trigger(action:, event:)
   end
 
-  def take(key = self, action: nil, event: nil)
-    Observables.fetch(key).take(action:, event:)
+  def take(key: self, action: nil, event: nil)
+    Keys.fetch(key).take(action:, event:)
   end
 
   # TODO: Provide a "pipe/port/take" method that uses ractors to be concurrent... if supplied with immutable Data?
 end
 
 # For quick debugging, not official API.
-OOO = Observers::Observables.observables unless defined?(OOO)
+OKK = Observers::Keys.keys unless defined?(OKK)

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: observers
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.6.0
 platform: ruby
 authors:
 - maedi
@@ -30,9 +30,9 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/models/observable.rb
+- lib/keys.rb
+- lib/models/key.rb
 - lib/models/observer.rb
-- lib/observables.rb
 - lib/observers.rb
 - lib/version.rb
 homepage: https://github.com/maedi/observers
@@ -54,7 +54,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.7.2
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Observe objects of any kind
 test_files: []

data/lib/observables.rb

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-require_relative 'models/observable'
-
-module Observers
-  class Observables
-    class MissingKeyError < StandardError; end
-
-    class << self
-      def observables
-        @observables ||= {}
-        @observables
-      end
-
-      def fetch(key)
-        observables[key] || raise(MissingKeyError, "Observable key '#{key}' not found")
-      end
-
-      def [](key)
-        observables[key] || upsert(key:)
-      end
-
-      def upsert(key:)
-        observables[key] = Observable.new if observables[key].nil?
-        observables[key]
-      end
-
-      def reset
-        @observables = {}
-      end
-    end
-  end
-end