observers 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 701e08478d6d96ff9be87ea056510e4dcf4995bc779c726d263dc9ba7d5803be
-  data.tar.gz: 1d9a10983efabeb4d7ac66c7d6df2f4d4204b947b85836369fdc93e9d91ffc57
+  metadata.gz: 3803ec73448522b725c60b2929a3f3fe2fee1e87f102b5a75f8fadbebc2beec9
+  data.tar.gz: 9d4e91f3e4026c4fc813b338e8baf2b45164c46681e404e10b5a53c539302a60
 SHA512:
-  metadata.gz: 2b1a653fa0e7cc33a70d121620c67141061618dc270cd6793b713b04822fe2ed32f0934c30b30079f190d8c3acfeb7aa90df086a4fe66fd3c09fc1e12adaa231
-  data.tar.gz: bcb0708e1be9ec611a28b887a3d18b3cba0798a05d4b8c9c3a502694aa3770e9a06f6cc1767d83aaa085900de6bb58d46e557edfc0dc9b80bd7ad68a7ac731af
+  metadata.gz: 64bec520fd5246a61892e71ec40609b1e5cdaf00ef4e1cf9c28c5f1e0c27e9a6e561f3d6db2e3b89bb596d8c4d867deb4aac8c18cba97a80085e5d7149f458be
+  data.tar.gz: bb87af0e748a370272c760b80236694228596a0d9e702d2636f8854122f72636b5607f28cec56b9bef483f449a79dd0e5d8c67b659586b6742d881a97f044445

data/lib/models/observer.rb

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

data/lib/observables.rb

@@ -27,9 +27,10 @@ module Observers
         observable.add_observer(observer:)
       end
 
-      # @return: The last result of the trigger.
-      def trigger(actionable:, key:)
-        action, event = parse_actionable(actionable:)
+      # @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?
@@ -43,20 +44,6 @@ module Observers
 
         last_result
       end
-
-      private
-
-      def parse_actionable(actionable:)
-        action = actionable
-        event = nil
-
-        if actionable.class.ancestors.any? { |ancestor| ancestor.to_s == 'Low::Event' }
-          event = actionable
-          action = event.action
-        end
-
-        [action, event]
-      end
     end
   end
 end

data/lib/observers.rb

@@ -24,10 +24,8 @@ module Observers
 
   # Returns the last observer with a non-nil return value.
   def trigger(key = self, action: nil, event: nil)
-    raise ArgumentError, 'Action or event required' if action.nil? && event.nil?
-
     # TODO: Parsing logic can be simplified/removed now that action and event args are separated.
-    Observables.trigger(actionable: action || event, key:)
+    Observables.trigger(key:, action:, event:)
   end
 
   # TODO: Provide a "pipe/port/take" method that uses ractors to be concurrent... if supplied with immutable Data?

data/lib/version.rb

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

metadata

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