observers 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82c40c0a93bc5ffefe86c3c27685e18fd699a7188c8ffc10899386974e48ac3c
-  data.tar.gz: 70992908f64214fc993e2bad241c7bb81cccbf6b07d4a895e79a8bf173299b05
+  metadata.gz: b1c16092762a682c96f1cc007988ec2406d3b2dd6ce91c1b793b2fbf4f95d628
+  data.tar.gz: 18045745a7cc775e61dd9afc1f46a80074565be6986a37ead5b30d49105a6e77
 SHA512:
-  metadata.gz: d75da6da3eb93b6e8e3e8fdd9e343560d96bfec7828fe38822945d0927edddd72e80a93e15bb8421629aa2f0d64e6f0012dd242de27204ecf9bc8783ece184b3
-  data.tar.gz: 58df26a6e12b767cbd9ffc46f3eda991a04ab85791c714e61fabd92b98e6e4ec64d537d17f57358cf2974516dbf15375f9320eba4dd87a6fa3fc97c5197fa7da
+  metadata.gz: 8c3eb3b00120bfcd498345c0f1ef44322212eacaa6856d794fb9e74044b7a26fa4a6502067cec87aaeff241b4835f5f5e0c048a80d59fe61e3dda277b84c03af
+  data.tar.gz: 843137754e96d5187b23f36fa72e2aa423cba6b9e0af82a99d3b84ef046bc7c2feb76fd3acfe0b3607ea55a6ef250d23ee0f90a211266bd551d5b2045211156f

data/lib/models/observer.rb

@@ -4,12 +4,14 @@ module Observers
   class Observer
     attr_reader :order
 
-    def initialize(observer:, order:)
+    def initialize(observer:, action:, order:)
       @observer = observer
+      @action = action
       @order = order
     end
 
     def trigger(action:, event:)
+      action = @action if @action
       event ? @observer.send(action, **{ event: event }) : @observer.send(action)
     rescue ArgumentError
       type = @observer.instance_of?(Class) ? @observer : @observer.class

data/lib/observables.rb

@@ -24,8 +24,8 @@ module Observers
         observable.add_observer(observer:)
       end
 
-      def trigger(*args, key:)
-        key, action, event = parse_args(*args, key:)
+      def trigger(actionable:, key:)
+        action, event = parse_actionable(actionable:)
 
         observables[key].observers.each do |observer|
           observer.trigger(action:, event:)
@@ -34,8 +34,8 @@ module Observers
         nil # The trigger method is boring and uneventful, it fires events and if it doesn't complain then all is okay.
       end
 
-      def take(*args, key:)
-        key, action, event = parse_args(*args, key:)
+      def take(actionable:, key:)
+        action, event = parse_actionable(actionable:)
 
         observables[key].observers.each do |observer|
           result = observer.trigger(action:, event:)
@@ -47,23 +47,16 @@ module Observers
 
       private
 
-      def parse_args(*args, key:)
-        action = nil
+      def parse_actionable(actionable:)
+        action = actionable
         event = nil
 
-        case args.count
-        when 1
-          action = args.first
-        when 2
-          key, action = args
-        end
-
-        if action.respond_to?(:action)
-          event = action
+        if actionable.class.ancestors.any? { |ancestor| ancestor.to_s == 'Low::Event' }
+          event = actionable
           action = event.action
         end
 
-        [key, action, event]
+        [action, event]
       end
     end
   end

data/lib/observers.rb

@@ -8,19 +8,19 @@ module Observers
     Observables.upsert(key:)
   end
 
-  # TODO: Test order.
-  def observe(key, order: Observables.observables.count)
-    observer = Observer.new(observer: self, order:)
+  # 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
 
-  def trigger(*args)
-    Observables.trigger(*args, key: self)
+  def trigger(actionable, key = nil)
+    Observables.trigger(actionable:, key: key || self)
   end
 
   # Returns the first observer with a non-nil return value.
   # One day it may use ractors and be concurrent, if we can freeze the args.
-  def take(*args)
-    Observables.take(*args, key: self)
+  def take(actionable, key = nil)
+    Observables.take(actionable:, key: key || self)
   end
 end

data/lib/version.rb

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

metadata

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