observers 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3079af102cc83c6d2056ab0e196587fa34ac989fe1893f605f5b2da59bce26b
-  data.tar.gz: d6acee445add7be158414e4f425d7c2342af06774f2ab490d4c26d7f84fa8429
+  metadata.gz: 7a683d87de52e3b964c325db4cc4cb732203c594eac263aadaf513a59a0dab76
+  data.tar.gz: 50b6e45f3357de2e06b5d599c7c2614804af8db850522717f34f6524064c4f53
 SHA512:
-  metadata.gz: b805045427a1c5a5d51815d8025bcb57b4e3567efa958c761e2c55cdc64521ac0b15fcf93f2f75dfe701c26d2c9576c63d88f9dba47884ff337cd946d64531e7
-  data.tar.gz: 86e3e1ff475776e187ce0dab7d447c1ff137bb9c63b6b5c991dfbdaf3e512c8a0fa286c4e119887d100cf1c8c91964a64a63192f26a4b9a381cd2e849e6bcb38
+  metadata.gz: a5e2e9afdb9f313a8bcaddbd8c0b309e01aa52d495458e3cb63efc3182b1c7876b87ccd227bb0fa55fb0866d31514b22fe715a58d276e610e14165d51010188e
+  data.tar.gz: ab2d9cc3aa952df58c7a7b5bfe9fa2f4f1c6eb1aa74469c8e82145324f0f45c5759126770a30d7a1252a20cccbb5dcef6d8e586eeb9d47fc48ed71c01ef9d3e8

data/lib/models/observable.rb

@@ -9,9 +9,23 @@ module Observers
       @observers = []
     end
 
-    def add_observer(observer:)
-      @observers << observer
-      @observers.sort_by(&:order)
+    def observe(object:, action:)
+      @observers << Observer.new(object:, action:)
+    end
+
+    # @returns: The result of the last trigger with a non-nil value.
+    def trigger(action:, event:)
+      action = event.action if event && action.nil?
+      action = :handle if action.nil?
+
+      last_result = nil
+
+      @observers.each do |observer|
+        result = observer.trigger(action:, event:)
+        last_result = result unless result.nil?
+      end
+
+      last_result
     end
   end
 end

data/lib/models/observer.rb

@@ -2,22 +2,22 @@
 
 module Observers
   class Observer
-    attr_reader :order
+    attr_reader :object, :action
 
-    def initialize(observer:, action:, order:)
-      @observer = observer
+    def initialize(object:, action:)
+      @object = object
       @action = action
-      @order = order
     end
 
     def trigger(action:, event:)
       action = @action if @action
-      event ? @observer.send(action, **{ event: }) : @observer.send(action)
+      event ? @object.send(action, **{ event: }) : @object.send(action)
     rescue ArgumentError
-      type = @observer.instance_of?(Class) ? @observer : @observer.class
+      type = @object.instance_of?(Class) ? @object : @object.class
 
       raise ArgumentError, "#{type}##{action} has an 'event:' keyword argument but no event 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"
     end
   end

data/lib/observables.rb

@@ -11,7 +11,14 @@ module Observers
         @observables ||= {}
         @observables
       end
-      alias all observables
+
+      def fetch(key)
+        observables[key] || raise(MissingObservableError, "Observable key '#{key}' not found")
+      end
+
+      def [](key)
+        observables[key] || upsert(key:)
+      end
 
       def upsert(key:)
         observables[key] = Observable.new(key:) if observables[key].nil?
@@ -21,29 +28,6 @@ module Observers
       def reset
         @observables = {}
       end
-
-      def observe(key:, observer:)
-        observable = observables[key] || upsert(key:)
-        observable.add_observer(observer:)
-      end
-
-      # @return: The result of the last trigger with a non-nil value.
-      def trigger(key:, action:, event:)
-        action = event.action if event && action.nil?
-        action = :handle if action.nil?
-
-        observable = observables[key]
-        raise MissingObservableError, "Observable key '#{key}' not found" if observable.nil?
-
-        last_result = nil
-
-        observables[key].observers.each do |observer|
-          result = observer.trigger(action:, event:)
-          last_result = result unless result.nil?
-        end
-
-        last_result
-      end
     end
   end
 end

data/lib/observers.rb

@@ -4,29 +4,33 @@ require_relative 'observables'
 require_relative 'models/observer'
 
 module Observers
-  def self.included(klass)
-    klass.extend Observers
+  class << self
+    def included(klass)
+      klass.extend Observers
+    end
   end
 
-  def observables
-    Observables.observables
+  # Add an observer on the observable side.
+  def observers(key: self)
+    Struct.new(:key) do
+      def <<(object, action: nil)
+        Observables[key].observe(object:, action:)
+      end
+    end.new(key)
   end
 
-  def observable(key = self)
-    Observables.upsert(key:)
+  # Add an observer on the observer side.
+  def observe(key, action: nil)
+    Observables[key].observe(object: self, action:)
   end
 
-  # TODO: Unit test order.
-  def observe(key, action: nil, order: Observables.observables.count)
-    observer = Observer.new(observer: self, action:, order:)
-    Observables.observe(key:, observer:)
-  end
-
-  # Returns the last observer with a non-nil return value.
+  # Returns the last observer's non-nil return value.
   def trigger(key = self, action: nil, event: nil)
-    # TODO: Parsing logic can be simplified/removed now that action and event args are separated.
-    Observables.trigger(key:, action:, event:)
+    Observables.fetch(key).trigger(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

data/lib/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: observers
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - maedi