u-observers 0.3.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe383e800461aeb658a9b17f2d4799b194b7e70fdf5a545dbe07f69cd9d2642
-  data.tar.gz: a42fdd9868c43855006b763faa86b0377ae2204f6e9c20893edfbadf49792a60
+  metadata.gz: 9b67e1c24feb02de944be44aacb6bba935d9dc1dfac6c53de2ba95dcffbd93ee
+  data.tar.gz: aead6fb10e5ada014fed52383f031d140363cbf4f7ef9b21f5ee7c9e9f54c792
 SHA512:
-  metadata.gz: af8ce345aec2b28cef954f6de09ce835d1e4236e115877b04c92227121a85ebedd1b1cf422e3cc1645f2b7ad818cfdf81d9b05bcdb41007bca4fd9115d900fc0
-  data.tar.gz: 45ade4eefd27ae3b8f0aed723681b5c1931cd11c34f78f17a21e59aa745a67de27b32272f4c01377950420f4dd0743c84258b9415cf24dea891d253f9ca1fe4b
+  metadata.gz: a77a575068bdee0f9312e25e5623a4031bb1369dee11df5d039121e84cf7cab418b8b37c3c93ff46265528304b64f80fc1be61ca42e78d9436e9e779c390b2bd
+  data.tar.gz: f90045332776294e6bc3bf6e70c34b0f24f40551f32a4d9be029ecd5fdfcad4b68d33b6f5c81802e9e257dedf9d1e16395bda434ee2dd48f38f9e291099a8a4e

data/lib/micro/observers.rb

@@ -2,23 +2,27 @@ require 'micro/observers/version'
 
 module Micro
   module Observers
+    require 'micro/observers/utils'
+    require 'micro/observers/events_or_actions'
     require 'micro/observers/manager'
 
     module ClassMethods
-      def call_observers(with: :call)
-        proc do |object|
-          Array(with)
-            .each { |action| object.observers.call(action) }
-        end
+      def notify_observers!(with:)
+        proc { |object| with.each { |evt_or_act| object.observers.notify(evt_or_act) } }
       end
 
-      def notify_observers(with: :call)
-        call_observers(with: with)
+      def notify_observers(*events)
+        notify_observers!(with: EventsOrActions[events])
+      end
+
+      def call_observers(options = Utils::EMPTY_HASH)
+        notify_observers!(with: EventsOrActions.fetch_actions(options))
       end
     end
 
     def self.included(base)
       base.extend(ClassMethods)
+      base.send(:private_class_method, :notify_observers!)
     end
 
     def observers

data/lib/micro/observers/events_or_actions.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Micro
+  module Observers
+
+    module EventsOrActions
+      DEFAULTS = [:call]
+
+      def self.[](value)
+        values = Utils.compact_array(value)
+
+        values.empty? ? DEFAULTS : values
+      end
+
+      def self.fetch_actions(hash)
+        return self[hash[:actions] || hash.fetch(:action)] if hash.is_a?(Hash)
+
+        raise ArgumentError, 'expected a hash with the key :action or :actions'
+      end
+
+      private_constant :DEFAULTS
+    end
+
+  end
+end

data/lib/micro/observers/manager.rb

@@ -4,9 +4,7 @@ module Micro
   module Observers
 
     class Manager
-      EMPTY_HASH = {}.freeze
-
-      SameObserver = -> (observer) do
+      EqualTo = -> (observer) do
         -> item { item[0] == :observer && item[1] == observer }
       end
 
@@ -17,56 +15,86 @@ module Micro
       def initialize(subject, list = nil)
         @subject = subject
 
-        @list = (list.kind_of?(Array) ? list : []).flatten.tap(&:compact!)
+        @list = Utils.compact_array(list.kind_of?(Array) ? list : [])
       end
 
       def included?(observer)
-        @list.any?(&SameObserver[observer])
+        @list.any?(&EqualTo[observer])
       end
 
-      def attach(observer, options = EMPTY_HASH)
-        if options[:allow_duplication] || !included?(observer)
-          @list << [:observer, observer, options[:data]]
+      def attach(*args)
+        options = args.last.is_a?(Hash) ? args.pop : Utils::EMPTY_HASH
+
+        Utils.compact_array(args).each do |observer|
+          if options[:allow_duplication] || !included?(observer)
+            @list << [:observer, observer, options[:data]]
+          end
         end
 
         self
       end
 
-      def on(options=EMPTY_HASH)
-        action, callable, with = options[:action], options[:call], options[:with]
+      def on(options = Utils::EMPTY_HASH)
+        event, callable, with = options[:event], options[:call], options[:with]
 
-        return self unless action.is_a?(Symbol) && callable.respond_to?(:call)
+        return self unless event.is_a?(Symbol) && callable.respond_to?(:call)
 
-        arg = with.is_a?(Proc) ? with.call(@subject) : subject
+        @list << [:callable, event, [callable, with]]
+      end
+
+      def detach(*args)
+        Utils.compact_array(args).each do |observer|
+          @list.delete_if(&EqualTo[observer])
+        end
 
-        @list << [:caller, action, [callable, arg]]
+        self
       end
 
-      def detach(observer)
-        @list.delete_if(&SameObserver[observer])
+      def notify(*events)
+        broadcast(EventsOrActions[events])
 
         self
       end
 
-      def call(action = :call)
-        @list.each do |type, observer, data|
-          if type == :caller && observer == action
-            data[0].call(data[1])
-          elsif type == :observer && observer.respond_to?(action)
-            handler = observer.method(action)
+      def call(options = Utils::EMPTY_HASH)
+        broadcast(EventsOrActions.fetch_actions(options))
 
-            return handler.call(@subject) if handler.arity == 1
+        self
+      end
 
-            handler.call(@subject, data)
+      private
+
+        def broadcast(evts_or_acts)
+          evts_or_acts.each do |evt_or_act|
+            @list.each do |strategy, observer, data|
+              call!(observer, strategy, data, with: evt_or_act)
+            end
           end
         end
 
-        self
-      end
+        def call!(observer, strategy, data, with:)
+          return call_callable(data) if strategy == :callable && observer == with
+
+          return call_observer(observer, with, data) if strategy == :observer
+        end
+
+        def call_callable(data)
+          callable, arg = data[0], data[1]
+
+          callable_arg = arg.is_a?(Proc) ? arg.call(@subject) : (arg || @subject)
 
-      alias notify call
+          callable.call(callable_arg)
+        end
+
+        def call_observer(observer, method_name, data)
+          return unless observer.respond_to?(method_name)
+
+          handler = observer.method(method_name)
+
+          handler.arity == 1 ? handler.call(@subject) : handler.call(@subject, data)
+        end
 
-      private_constant :EMPTY_HASH
+      private_constant :EqualTo
     end
 
   end

data/lib/micro/observers/utils.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module Micro
+  module Observers
+
+    module Utils
+      EMPTY_HASH = {}.freeze
+
+      def self.compact_array(value)
+        Array(value).flatten.tap(&:compact!)
+      end
+    end
+
+  end
+end

data/lib/micro/observers/version.rb

@@ -1,5 +1,5 @@
 module Micro
   module Observers
-    VERSION = '0.3.0'
+    VERSION = '0.8.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-observers
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies: []
 description: Simple and powerful implementation of the observer pattern.
 email:
@@ -27,7 +27,9 @@ files:
 - bin/console
 - bin/setup
 - lib/micro/observers.rb
+- lib/micro/observers/events_or_actions.rb
 - lib/micro/observers/manager.rb
+- lib/micro/observers/utils.rb
 - lib/micro/observers/version.rb
 - lib/u-observers.rb
 - u-observers.gemspec