u-observers 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0fe383e800461aeb658a9b17f2d4799b194b7e70fdf5a545dbe07f69cd9d2642
-  data.tar.gz: a42fdd9868c43855006b763faa86b0377ae2204f6e9c20893edfbadf49792a60
+  metadata.gz: d9c81561b00ca412faa80abc349e8a87251f4d84ce81da5fcd95ca1117e2bd2e
+  data.tar.gz: da923ace22c60cac08f710dccac65367b0bb568d9b4a99fbbe8bc164c8824b12
 SHA512:
-  metadata.gz: af8ce345aec2b28cef954f6de09ce835d1e4236e115877b04c92227121a85ebedd1b1cf422e3cc1645f2b7ad818cfdf81d9b05bcdb41007bca4fd9115d900fc0
-  data.tar.gz: 45ade4eefd27ae3b8f0aed723681b5c1931cd11c34f78f17a21e59aa745a67de27b32272f4c01377950420f4dd0743c84258b9415cf24dea891d253f9ca1fe4b
+  metadata.gz: 69eedf04951d55a0889412d50e62e226fdfe2561a3a3a52df087f0091ec15ec696fe002fe906a00fdf15119455c4c7f7f1a54a464c83e56c3ec5d6ff143ed1f4
+  data.tar.gz: 805003dac964746271f6b7789527e608fbd2caf77dd8f9eb735b8d30f42159e9d577f0a8bb0b3b60199fc764b40c0ae7a1edd005deb2d01f7e9567d49e18c4fd

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.call(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(action: :call)
+        notify_observers!(with: EventsOrActions[action])
       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,19 @@
+# frozen_string_literal: true
+
+module Micro
+  module Observers
+
+    module EventsOrActions
+      DEFAULT = [:call]
+
+      def self.[](values)
+        vals = Utils.compact_array(values)
+
+        vals.empty? ? DEFAULT : vals
+      end
+
+      private_constant :DEFAULT
+    end
+
+  end
+end

data/lib/micro/observers/manager.rb

@@ -6,7 +6,7 @@ module Micro
     class Manager
       EMPTY_HASH = {}.freeze
 
-      SameObserver = -> (observer) do
+      EqualTo = -> (observer) do
         -> item { item[0] == :observer && item[1] == observer }
       end
 
@@ -17,11 +17,11 @@ 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)
@@ -33,40 +33,54 @@ module Micro
       end
 
       def on(options=EMPTY_HASH)
-        action, callable, with = options[:action], options[:call], options[:with]
+        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
+        arg = with.is_a?(Proc) ? with.call(@subject) : (arg || subject)
 
-        @list << [:caller, action, [callable, arg]]
+        @list << [:callable, event, [callable, arg]]
       end
 
       def detach(observer)
-        @list.delete_if(&SameObserver[observer])
+        @list.delete_if(&EqualTo[observer])
 
         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 notify(event)
+        notify!(event)
 
-            return handler.call(@subject) if handler.arity == 1
+        self
+      end
 
-            handler.call(@subject, data)
-          end
-        end
+      def call(*actions)
+        EventsOrActions[actions].each { |act| notify!(act) }
 
         self
       end
 
-      alias notify call
+      private
+
+        def notify!(evt_or_act)
+          @list.each do |strategy, observer, data|
+            call!(observer, strategy, data, with: evt_or_act)
+          end
+        end
+
+        def call!(observer, strategy, data, with:)
+          return data[0].call(data[1]) if strategy == :callable && observer == with
+
+          if strategy == :observer && observer.respond_to?(with)
+            handler = observer.method(with)
+
+            return handler.call(@subject) if handler.arity == 1
+
+            handler.call(@subject, data)
+          end
+        end
 
-      private_constant :EMPTY_HASH
+      private_constant :EMPTY_HASH, :EqualTo
     end
 
   end

data/lib/micro/observers/utils.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Micro
+  module Observers
+
+    module Utils
+      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.4.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.4.0
 platform: ruby
 authors:
 - Rodrigo Serradura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-09-25 00:00:00.000000000 Z
+date: 2020-09-26 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