observers 0.0.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68ed3549e7a8375ac16107eb8ed0ef8af09f795e63ad661eb1c527cb7aa5b524
-  data.tar.gz: 3a512366ee467b661186e97d25deeb0e9b8afbdcca7e31ebd63f54b7d0b2b9a7
+  metadata.gz: 82c40c0a93bc5ffefe86c3c27685e18fd699a7188c8ffc10899386974e48ac3c
+  data.tar.gz: 70992908f64214fc993e2bad241c7bb81cccbf6b07d4a895e79a8bf173299b05
 SHA512:
-  metadata.gz: 351eff64a0e434b7e4add326cf1cbc98bf133500746ebff43feb74106d819c2f8c49047f9c5547700fd75a0296b8d22329193850b347ec9702867b027714077e
-  data.tar.gz: 7ad91d958cb08eb9cf21b092f02267065b8df90e7e69ebc976cb285142a310bd3a9b99b85ae6f9ad47d0f72f6c82a735268668a73d13621a4973b9d21f77bab7
+  metadata.gz: d75da6da3eb93b6e8e3e8fdd9e343560d96bfec7828fe38822945d0927edddd72e80a93e15bb8421629aa2f0d64e6f0012dd242de27204ecf9bc8783ece184b3
+  data.tar.gz: 58df26a6e12b767cbd9ffc46f3eda991a04ab85791c714e61fabd92b98e6e4ec64d537d17f57358cf2974516dbf15375f9320eba4dd87a6fa3fc97c5197fa7da

data/lib/models/observer.rb

@@ -10,7 +10,10 @@ module Observers
     end
 
     def trigger(action:, event:)
-      event ? @observer.send(action, event) : @observer.send(action)
+      event ? @observer.send(action, **{ event: event }) : @observer.send(action)
+    rescue ArgumentError
+      type = @observer.instance_of?(Class) ? @observer : @observer.class
+      raise ArgumentError, "#{event.class} sent to #{type}##{action} but it has no 'event:' keyword argument"
     end
   end
 end

data/lib/observables.rb

@@ -24,10 +24,46 @@ module Observers
         observable.add_observer(observer:)
       end
 
-      def trigger(key:, action:, event: nil)
+      def trigger(*args, key:)
+        key, action, event = parse_args(*args, key:)
+
         observables[key].observers.each do |observer|
           observer.trigger(action:, event:)
         end
+
+        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:)
+
+        observables[key].observers.each do |observer|
+          result = observer.trigger(action:, event:)
+          return result unless result.nil?
+        end
+
+        nil # This is a bad day for the take method, one of the worst.
+      end
+
+      private
+
+      def parse_args(*args, key:)
+        action = nil
+        event = nil
+
+        case args.count
+        when 1
+          action = args.first
+        when 2
+          key, action = args
+        end
+
+        if action.respond_to?(:action)
+          event = action
+          action = event.action
+        end
+
+        [key, action, event]
       end
     end
   end

data/lib/observers.rb

@@ -8,28 +8,19 @@ module Observers
     Observables.upsert(key:)
   end
 
-  def observe(key, order: 0)
+  # TODO: Test order.
+  def observe(key, order: Observables.observables.count)
     observer = Observer.new(observer: self, order:)
     Observables.observe(key:, observer:)
   end
 
   def trigger(*args)
-    key = self
-    action = nil
-
-    case args.count
-    when 1
-      action = args.first
-    when 2
-      key, action = args
-    end
-
-    event = nil
-    if action.is_a?(Event)
-      event = action
-      action = arg.action
-    end
+    Observables.trigger(*args, key: self)
+  end
 
-    Observables.trigger(key:, action:, event:)
+  # 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)
   end
 end

data/lib/version.rb

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

metadata

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