u-observers 0.2.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74f927670b4695760167dbbc2c1758cedbe112233b22d938cbcd79083cd8526
-  data.tar.gz: b268b6f4b5d9c92469c20c8ba891bc12146fa52b09e6a44ccb664c6155d9b45f
+  metadata.gz: 20e65a3bddc28ca3121413e665f084f096c7b266304d9c486bc2d7c9b618ab8a
+  data.tar.gz: 455304b5999249cd475f5df8a44e0d855333ccf208f41d9cd98c7cfe1bba3cac
 SHA512:
-  metadata.gz: b1830ebe8c59bd1f7fe66588d2b6b5b8839b487af1fe3c75a876eecc28773996e86dbd61a65af44c28c1b29bbe1a9497a9a234801d50ec19b53878b43f85bc89
-  data.tar.gz: 4d7d0b6289ed0045e85e4edbacd6482d11c5577932f215cab19f0885c7049a20ad2015ceffaea21e1d6a7459727dd64f370cd4555e45b97d78b2c6b1a5e31575
+  metadata.gz: 9fe33fb9bc6bcb060f32329e28774abb6a7b546e178e531d045043889db64c403afd00171351e733df33cc812e84763c9aaf47f89c82dc6cd37264ab8ba8fd04
+  data.tar.gz: af195ddbdacb7e811f8c30d45d389d4b9472df7d06966009740e8cf4400676add7d80cda18db166795fafe27ae82277ed1930a2c72053bf427f4fefe424c37bc

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: 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,7 +4,9 @@ module Micro
   module Observers
 
     class Manager
-      EMPTY_HASH = {}.freeze
+      EqualTo = -> (observer) do
+        -> item { item[0] == :observer && item[1] == observer }
+      end
 
       def self.for(subject)
         new(subject)
@@ -12,42 +14,79 @@ 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?(&EqualTo[observer])
       end
 
-      def attach(observer, options = EMPTY_HASH)
-        if options[:allow_duplication] || @list.none? { |obs, _data| obs == observer }
-          @list << [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 detach(observer)
-        @list.delete_if { |obs, _data| obs == observer }
+      def on(options = Utils::EMPTY_HASH)
+        event, callable, with = options[:event], options[:call], options[:with]
+
+        return self unless event.is_a?(Symbol) && callable.respond_to?(:call)
+
+        arg = with.is_a?(Proc) ? with.call(@subject) : (arg || subject)
+
+        @list << [:callable, event, [callable, arg]]
+      end
+
+      def detach(*args)
+        Utils.compact_array(args).each do |observer|
+          @list.delete_if(&EqualTo[observer])
+        end
 
         self
       end
 
-      def call(action: :call)
-        @list.each do |observer, data|
-          next unless observer.respond_to?(action)
+      def notify(*events)
+        broadcast(EventsOrActions[events])
 
-          handler = observer.method(action)
+        self
+      end
 
-          case handler.arity
-          when 2 then handler.call(@subject, data)
-          when 1 then handler.call(@subject)
-          else raise NotImplementedError
-          end
-        end
+      def call(options = Utils::EMPTY_HASH)
+        broadcast(EventsOrActions.fetch_actions(options))
 
         self
       end
 
-      alias notify call
+      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
+
+        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 :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.2.0'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-observers
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.7.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