u-observers 0.1.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5b6af97772fa9dd076bce666422332213179f338466d8be317fa7d324fc82c84
-  data.tar.gz: 133d22595bb0ad4dc70c7b6d2be2481f2dc0522acf7bddc7d015cd2141362f63
+  metadata.gz: ee142231055e893f34d726e7bbf57b5fd27da851e49c63a5a33a3dcf6a000abe
+  data.tar.gz: 5ca62a10c247a02435622b8190114f45c8e28be50f9a5e8e8dd5f21c42a99c2c
 SHA512:
-  metadata.gz: 775bc25517f90cea5b657ae9753a025796ba7091062033b515b3311b390f126315db16fb7732763f3b618cc0df4ae9430d211740f6dce1a8733eabee73fa9214
-  data.tar.gz: 29ab84f8b07117108c431c05810727532afd63e42c88cc8c6799e4e6efb7c12ef40ddc8f1e8c526d23326cbd9a6792b2de1853d7121ee2abe2c45fe0f95ad3d1
+  metadata.gz: c8bb160a235375a6a99c2c379413b79952ac85492211feb08dc77e0435e7e87aef3edc5c68bed81b16364a5197615321ea3a894c6bbad9143c831fb63f781fdd
+  data.tar.gz: c861884ac244f036a9ab78edce25cf857fed41afcf18467354dd784e27728921b3a6c61695cbbf86ae3d0bef2ad71a2364e84bed2d9b6f6f33d27bae810ab0cf

data/.gitignore

@@ -6,3 +6,5 @@
 /pkg/
 /spec/reports/
 /tmp/
+
+Gemfile.lock

data/lib/micro/observers.rb

@@ -2,27 +2,31 @@ 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(object, 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
-      @observers ||= Observers::Manager.new
+      @observers ||= Observers::Manager.for(self)
     end
 
   end

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.fetch(: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,45 +4,83 @@ 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)
+      end
+
+      def initialize(subject, list = nil)
+        @subject = subject
+
+        @list = Utils.compact_array(list.kind_of?(Array) ? list : [])
+      end
 
-      def initialize(list = nil)
-        @list = (list.kind_of?(Array) ? list : []).flatten.tap(&:compact!)
+      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(observer, options = Utils::EMPTY_HASH)
+        if options[:allow_duplication] || !included?(observer)
+          @list << [:observer, observer, options[:data]]
         end
 
         self
       end
 
+      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(observer)
-        @list.delete_if { |obs, _data| obs == observer }
+        @list.delete_if(&EqualTo[observer])
+
+        self
+      end
+
+      def notify(*events)
+        broadcast(EventsOrActions[events])
 
         self
       end
 
-      def call(subject, action: :call)
-        @list.each do |observer, data|
-          next unless observer.respond_to?(action)
+      def call(options = Utils::EMPTY_HASH)
+        broadcast(EventsOrActions.fetch_actions(options))
+
+        self
+      end
 
-          handler = observer.method(action)
+      private
 
-          case handler.arity
-          when 2 then handler.call(subject, data)
-          when 1 then handler.call(subject)
-          else raise NotImplementedError
+        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 data[0].call(data[1]) if strategy == :callable && observer == with
+
+          if strategy == :observer && observer.respond_to?(with)
+            handler = observer.method(with)
 
-      alias notify call
+            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.1.0'
+    VERSION = '0.6.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: u-observers
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.6.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:
@@ -21,14 +21,15 @@ files:
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
 - Rakefile
 - 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

data/Gemfile.lock

@@ -1,48 +0,0 @@
-PATH
-  remote: .
-  specs:
-    u-observers (0.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    activemodel (6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activerecord (6.0.3.3)
-      activemodel (= 6.0.3.3)
-      activesupport (= 6.0.3.3)
-    activesupport (6.0.3.3)
-      concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.2, >= 2.2.2)
-    concurrent-ruby (1.1.7)
-    docile (1.3.2)
-    i18n (1.8.5)
-      concurrent-ruby (~> 1.0)
-    minitest (5.14.2)
-    rake (12.3.3)
-    simplecov (0.19.0)
-      docile (~> 1.1)
-      simplecov-html (~> 0.11)
-    simplecov-html (0.12.2)
-    sqlite3 (1.4.2)
-    thread_safe (0.3.6)
-    tzinfo (1.2.7)
-      thread_safe (~> 0.1)
-    zeitwerk (2.4.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  activerecord
-  minitest (~> 5.0)
-  rake (~> 12.0)
-  simplecov (~> 0.19)
-  sqlite3
-  u-observers!
-
-BUNDLED WITH
-   2.1.4