u-observers 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a74f927670b4695760167dbbc2c1758cedbe112233b22d938cbcd79083cd8526
-  data.tar.gz: b268b6f4b5d9c92469c20c8ba891bc12146fa52b09e6a44ccb664c6155d9b45f
+  metadata.gz: 0fe383e800461aeb658a9b17f2d4799b194b7e70fdf5a545dbe07f69cd9d2642
+  data.tar.gz: a42fdd9868c43855006b763faa86b0377ae2204f6e9c20893edfbadf49792a60
 SHA512:
-  metadata.gz: b1830ebe8c59bd1f7fe66588d2b6b5b8839b487af1fe3c75a876eecc28773996e86dbd61a65af44c28c1b29bbe1a9497a9a234801d50ec19b53878b43f85bc89
-  data.tar.gz: 4d7d0b6289ed0045e85e4edbacd6482d11c5577932f215cab19f0885c7049a20ad2015ceffaea21e1d6a7459727dd64f370cd4555e45b97d78b2c6b1a5e31575
+  metadata.gz: af8ce345aec2b28cef954f6de09ce835d1e4236e115877b04c92227121a85ebedd1b1cf422e3cc1645f2b7ad818cfdf81d9b05bcdb41007bca4fd9115d900fc0
+  data.tar.gz: 45ade4eefd27ae3b8f0aed723681b5c1931cd11c34f78f17a21e59aa745a67de27b32272f4c01377950420f4dd0743c84258b9415cf24dea891d253f9ca1fe4b

data/lib/micro/observers.rb

@@ -8,7 +8,7 @@ module Micro
       def call_observers(with: :call)
         proc do |object|
           Array(with)
-            .each { |action| object.observers.call(action: action) }
+            .each { |action| object.observers.call(action) }
         end
       end
 

data/lib/micro/observers/manager.rb

@@ -6,39 +6,58 @@ module Micro
     class Manager
       EMPTY_HASH = {}.freeze
 
+      SameObserver = -> (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 = (list.kind_of?(Array) ? list : []).flatten.tap(&:compact!)
       end
 
+      def included?(observer)
+        @list.any?(&SameObserver[observer])
+      end
+
       def attach(observer, options = EMPTY_HASH)
-        if options[:allow_duplication] || @list.none? { |obs, _data| obs == observer }
-          @list << [observer, options[:data]]
+        if options[:allow_duplication] || !included?(observer)
+          @list << [:observer, observer, options[:data]]
         end
 
         self
       end
 
+      def on(options=EMPTY_HASH)
+        action, callable, with = options[:action], options[:call], options[:with]
+
+        return self unless action.is_a?(Symbol) && callable.respond_to?(:call)
+
+        arg = with.is_a?(Proc) ? with.call(@subject) : subject
+
+        @list << [:caller, action, [callable, arg]]
+      end
+
       def detach(observer)
-        @list.delete_if { |obs, _data| obs == observer }
+        @list.delete_if(&SameObserver[observer])
 
         self
       end
 
-      def call(action: :call)
-        @list.each do |observer, data|
-          next unless observer.respond_to?(action)
+      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)
 
-          handler = observer.method(action)
+            return handler.call(@subject) if handler.arity == 1
 
-          case handler.arity
-          when 2 then handler.call(@subject, data)
-          when 1 then handler.call(@subject)
-          else raise NotImplementedError
+            handler.call(@subject, data)
           end
         end
 

data/lib/micro/observers/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: u-observers
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Rodrigo Serradura