callbacks_attachable 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12ec8224c4c44dbd6b2f911c85dfdee057523d61
-  data.tar.gz: b73d81ff789dc2ba7db11bf0fc7fbc022f79623b
+  metadata.gz: 5704f2e0b5be12b67d21705fd058832d8b43c768
+  data.tar.gz: af96252e63b77c3d83b99f9c0b1df8d75144e916
 SHA512:
-  metadata.gz: 5bf6762f10eb1429d222a696e125f7e724ff589c8f4f49a457725471d20931261d35874518cceb336223d54cbe89c7bc6505a2bfcddcb81325af4596f46ba4c4
-  data.tar.gz: ced69ccc31423f7fd0d3255e503890c40043ae313a046babf154561fa931978940dc1c73a3a624b94445a4df62f3b8d2f4ea6b978cdc157aeb0a8b12636964ce
+  metadata.gz: 908846d84dcba7ffa75ee38efd635e6c600015cfd029d39cc83b08ece263a80ec2b66c87c916d5d534aeff5e75d5684e34126109d8374a18e8b5763a9a7067c4
+  data.tar.gz: 619ad1b6ea59e844fb2e54bd2835ca7b1637b662a1dec721cfa84efb06ecca1b973e2e1a984c7afee60f05be34c55326dd3989969be5586837c3c6a079f2fe75

data/Gemfile

@@ -1,3 +1,7 @@
 source 'https://rubygems.org'
 
 gemspec
+
+group :test do
+  gem 'rspec', '~>3.6'
+end

data/README.md

@@ -58,6 +58,12 @@ callback = AClass.on(:event) { do_something }
 callback.cancel
 ```
 
+A callback can also be registered for multiple events:
+
+```ruby
+AClass.on(:event1, :event2, :event3, opts, &callback) 
+```
+
 If you want to execute a callback just a single time attach it with `.once_on`:
 
 ```ruby

data/callbacks_attachable.gemspec

@@ -1,4 +1,3 @@
-# coding: utf-8
 require_relative 'mrblib/version'
 
 Gem::Specification.new do |spec|
@@ -18,8 +17,4 @@ to an individual instance to be triggered only for this instance.
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", "~> 1.8"
-  spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "rspec", "~> 3.4"
 end

data/mrblib/callback.rb

@@ -1,8 +1,8 @@
 module CallbacksAttachable
   class Callback
-    def initialize(registry, event, opts, instance_scope, callback)
+    def initialize(registry, events, opts, instance_scope, callback)
       @registry = registry
-      @event = event
+      @events = events
       @call_condition = opts.fetch(:if, false)
       @cancel_condition = opts.fetch(:until, false)
       @instance_scope = instance_scope
@@ -28,7 +28,7 @@ module CallbacksAttachable
       if @canceled
         raise Error, 'already canceled'
       else
-        @registry.deregister @event, self
+        @events.each{ |event| @registry.deregister event, self }
         @on_cancel.call if @on_cancel
         @canceled = true
       end

data/mrblib/callback_registry.rb

@@ -5,10 +5,16 @@ module CallbacksAttachable
       @callbacks = {}
     end
 
-    def register(event, opts, callback)
-      @callbacks[event] ||= {}
-      callback = Callback.new(self, event, opts, !@singleton_owner, callback)
-      @callbacks[event][callback] = true
+    def register(*events, opts, callback)
+      unless opts.is_a? Hash
+        events << opts
+        opts = {}
+      end
+      callback = Callback.new(self, events, opts, !@singleton_owner, callback)
+      events.each do |event|
+        @callbacks[event] ||= {}
+        @callbacks[event][callback] = true
+      end
       callback
     end
 

data/mrblib/callbacks_attachable.rb

@@ -8,12 +8,14 @@ module CallbacksAttachable
       CallbacksAttachable.included klass
     end
 
-    def on(event, opts = {}, &callback)
-      __callbacks__.register(event, opts, callback)
+    def on(event, *more_events_and_opts, &callback)
+      __callbacks__.register(event, *more_events_and_opts, callback)
     end
 
-    def once_on(event, opts = {}, &callback)
-      on(event, opts.merge(until: proc{ true }), &callback)
+    def once_on(event, *more_events_and_opts, &callback)
+      opts = (more_events_and_opts.last.is_a? Hash) ? more_events_and_opts.pop : {}
+      opts[:until] = proc{ true }
+      on event, *more_events_and_opts, opts, &callback
     end
 
     def on?(event)
@@ -47,12 +49,14 @@ module CallbacksAttachable
     klass.extend RegistryOwnable
   end
 
-  def on(*args, &callback)
-    singleton_class.on *args, &callback
+  def on(event, *more_events_and_opts, &callback)
+    singleton_class.on event, *more_events_and_opts, &callback
   end
 
-  def once_on(event, opts = {}, &callback)
-    on(event, opts.merge(until: proc{ true }), &callback)
+  def once_on(event, *more_events_and_opts, &callback)
+    opts = (more_events_and_opts.last.is_a? Hash) ? more_events_and_opts.pop : {}
+    opts[:until] = proc{ true }
+    on event, *more_events_and_opts, opts, &callback
   end
 
   def on?(event)

data/mrblib/version.rb

@@ -1,3 +1,3 @@
 module CallbacksAttachable
-  VERSION = "2.2.0"
+  VERSION = "2.3.0"
 end

metadata

@@ -1,57 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: callbacks_attachable
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Christopher Aue
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-03 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
+date: 2017-07-07 00:00:00.000000000 Z
+dependencies: []
 description: |
   Attach callbacks to classes to be triggered for all instances or attach them
   to an individual instance to be triggered only for this instance.
@@ -95,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Attach callbacks to classes or individual instances.