alakazam 0.2 → 0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 436e1280e0c920d0918fc29f2451c4539e1ac459
-  data.tar.gz: b7750cfc3ad4054b3acc9b96bfae31d156dc08da
+  metadata.gz: 88403d21dadf02d5883da0004dc3431b83869f58
+  data.tar.gz: 60521c83237c0be9528f0431c4851b56e68fffb1
 SHA512:
-  metadata.gz: d85069fc95a598c8e36b70c59e325a8b55fe4f1284c049a881f298dedfde4ab805541838e82422aeb7b9241298ffeb60df0b616d346cef1e4d853c001b5a8da0
-  data.tar.gz: 2a47986e6d5b728d5d03c549198ca767bf9bfb0537cf58a0ac831d503edaa0e6486e67674ea9c3c4f7d9497a8d5d58282ee86900e29811c1faf5b2ce2fa3fc53
+  metadata.gz: 2aabcfe69b837cfef0ab73fb5b7193691601792ff8b3f4009d8bb1451f4305431947d39662fa2ca0bc0f179c2c70a0952873a2ac9346398d944434823d295228
+  data.tar.gz: fa3fc31cb095f077706fe758301edd9ab713cca8281d543e8a24a587d39bc859bbb2033488528c3d09d17c7c4f56cfba700b019e7314d8ba14c21163bdaa3d50

data/lib/alakazam/alakazam.rb

@@ -9,7 +9,18 @@
 #++
 
 module Alakazam
-  def add_observer(observer, attributes: {}, when_change: true, methods: [] )
+  def add_observer(observer, options = {})
+    on_change = if options.include? :on_fire
+      options[:on_fire]
+    elsif options.include? :on_change
+      options[:on_change]
+    else
+      true
+    end
+
+    attributes  = options[:attributes] || {}
+    methods     = options[:methods   ] || []
+
     attributes = [attributes] unless attributes.is_a? Array
     methods    = [methods   ] unless methods.is_a?    Array
 
@@ -23,30 +34,27 @@ module Alakazam
       end
     }
 
-    if not has_observer? observer
-      @observers ||= {}
-      @observers[observer] = { when_change: when_change, methods: methods }
-    end
+    @observers ||= {}
+    @observers[observer] = { on_change: on_change, methods: methods }
   end
     alias_method :is_observed_by, :add_observer
     alias_method :attach,         :add_observer
     alias_method :observe,        :add_observer
 
-
   def delete_observer(observer)
-    (@observers || {}).delete observer
+    @observers.delete(observer) if @observers
   end
     alias_method :remove_observer, :delete_observer
     alias_method :detach,          :delete_observer
     alias_method :disconnect,      :delete_observer
 
   def has_observer?(observer)
-    (@observers || {}).include? observer
+    @observers.include?(observer) if @observers
   end
     alias_method :is_observed_by?, :has_observer?
 
   def count_observers
-    (@observers || {}).length
+    @observers ? @observers.length : 0
   end
     alias_method :how_many_observers?, :count_observers
 
@@ -67,29 +75,27 @@ module Alakazam
     alias_method :fired?, :changed?
 
   def notify_observers(*things)
-    (@observers || {}).each { |observer, options|
-      if !options[:when_change] || changed?
+    @observers.each { |observer, options|
+      if !options[:on_change] || changed?
         if options[:methods].any?
           options[:methods].each { |method|
             if observer.respond_to? method
               observer.send method, *things
             elsif observer.singleton_class.respond_to? method
               observer.singleton_class.send method, *things
-            elsif observer.respond_to? :"#{method}="
-              observer.send method, *things
             end
           }
         elsif observer.respond_to? :update
           observer.update *things
         elsif observer.is_a? Proc
-          observer.call *things
+          observer.call   *things
         else
           options[:methods].each { |method|
             observer.send(method, *things) if observer.respond_to? method
           }
         end
       end
-    }
+    } if @observers
 
     @changed = false
   end

data/lib/alakazam/version.rb

@@ -9,5 +9,5 @@
 #++
 
 module Alakazam
-  VERSION = '0.2'
+  VERSION = '0.3'
 end

data/tests/alakazam_spec.rb

@@ -74,7 +74,7 @@ describe Alakazam do
   end
 
   it 'invokes a Proc without explicit notify when notified by observed class' do
-    shiftry.is_observed_by logger, when_change: false
+    shiftry.is_observed_by logger, on_change: false
 
     shiftry.lol
     shiftry.lol

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: alakazam
 version: !ruby/object:Gem::Version
-  version: '0.2'
+  version: '0.3'
 platform: ruby
 authors:
 - Giovanni Capuano