callbacks_attachable 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b3cbb8d4bd7ce32583ce955de64c50b6c573df8
-  data.tar.gz: 9f7a8fa43ff82a24fad63277df0a8966fff4bc9e
+  metadata.gz: 9b8373eec469ec47043effaea07261ecdd3412ed
+  data.tar.gz: 0c5df404017b52496a0649dfc7f615a19ad7ee73
 SHA512:
-  metadata.gz: 04afd03c6c374d2cbd40052dafd3c92f9884d8a77303643aec0b91dec3a4655887e27d5d881d5eeb78419765313040cf2e658b6f2e842a33a82a92cf7cc228b6
-  data.tar.gz: 48e973e7699b8ead7d098afb8589b261cdf481340a757693a9e629ed4a9906fbe1c42df06349318f6d0f47c906319f5bdbbc9581e9925857a5344e38489cf4e4
+  metadata.gz: b033254d2951e81ea83199e368035002986d9f79cd6cbd45846d6474d368230dd5ca9bc638a1c13f4adf93da498dbab2e9ac5833295a39089d69bc0e392f7cc7
+  data.tar.gz: f4bc19cc785307178bb9e5a6c8374a51ee6047e998e73607a1d37093fc565e22b121cd5c2645ad142d532ae3e209053b749ccb66a646c4988d24ce76b7844e0d

data/mrblib/callback.rb

@@ -6,6 +6,7 @@ module CallbacksAttachable
       @call_condition = opts.fetch(:if, false)
       @cancel_condition = opts.fetch(:until, false)
       @callback = callback
+      @canceled = false
     end
 
     def call(instance, args)
@@ -19,9 +20,17 @@ module CallbacksAttachable
     end
 
     def cancel
-      @registry.deregister @event, self
-      @on_cancel.call if @on_cancel
-      true
+      if @canceled
+        raise Error, 'already canceled'
+      else
+        @registry.deregister @event, self
+        @on_cancel.call if @on_cancel
+        @canceled = true
+      end
+    end
+
+    def canceled?
+      @canceled
     end
   end
 end

data/mrblib/callbacks_attachable.rb

@@ -1,5 +1,9 @@
 module CallbacksAttachable
   module RegistryOwnable
+    def extended(object)
+      object.singleton_class.extend RegistryOwnable
+    end
+
     def on(event, opts = {}, &callback)
       __callbacks__.register(event, opts, callback)
     end
@@ -9,32 +13,49 @@ module CallbacksAttachable
     end
 
     def on?(event)
-      __callbacks__.registered? event
+      @__callbacks__ ? (@__callbacks__.registered? event) : false
+    end
+
+    def trigger(event, *args)
+      ObjectSpace.each_object(self).each do |inst|
+        trigger_for_instance(inst, event, args)
+      end
+    end
+
+    def trigger_for_instance(inst, event, args)
+      if superclass.respond_to? :trigger_for_instance
+        superclass.trigger_for_instance(inst, event, args)
+      end
+      @__callbacks__ and @__callbacks__.trigger(inst, event, args)
+      :triggered
     end
 
-    private def __callbacks__
-      @__callbacks__ ||= CallbackRegistry.new(self)
+    def __callbacks__
+      @__callbacks__ ||= CallbackRegistry.new self
     end
   end
 
-  include RegistryOwnable
+  def self.extended(object)
+    object.singleton_class.extend RegistryOwnable
+  end
 
   def self.included(klass)
-    klass.extend ClassMethods
+    klass.extend RegistryOwnable
   end
 
-  module ClassMethods
-    include RegistryOwnable
+  def on(*args, &callback)
+    singleton_class.on *args, &callback
+  end
 
-    def trigger(event, *args)
-      ObjectSpace.each_object(self).all?{ |inst| inst.trigger(event, *args) }
-    end
+  def once_on(event, opts = {}, &callback)
+    on(event, opts.merge(until: proc{ true }), &callback)
+  end
+
+  def on?(event)
+    singleton_class.on? event
   end
 
   def trigger(event, *args)
-    @class_callbacks ||= self.class.__send__ :__callbacks__
-    @class_callbacks.trigger(self, event, args)
-    @__callbacks__ and @__callbacks__.trigger(self, event, args)
-    true
+    singleton_class.trigger_for_instance(self, event, args)
   end
 end

data/mrblib/error.rb

@@ -0,0 +1,3 @@
+module CallbacksAttachable
+  class Error < StandardError; end
+end

data/mrblib/version.rb

@@ -1,3 +1,3 @@
 module CallbacksAttachable
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: callbacks_attachable
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-04 00:00:00.000000000 Z
+date: 2017-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,6 +72,7 @@ files:
 - mrblib/callback.rb
 - mrblib/callback_registry.rb
 - mrblib/callbacks_attachable.rb
+- mrblib/error.rb
 - mrblib/version.rb
 homepage: https://github.com/christopheraue/m-ruby-callbacks_attachable
 licenses: