octiron 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a1d5d04db3e10eb26f3292976922347550a8174
-  data.tar.gz: 609b4ac6d312fc78d74bbe3d3a127cc937584798
+  metadata.gz: 336926004fffc1105bb354c76c1e5435d95b27fc
+  data.tar.gz: 9d6efe5638f209dfabf38062969b72dc0ce71ec6
 SHA512:
-  metadata.gz: 8783e03aa012d7b3049ea7824b00a8699d94ac703ee1506bc6bd9e080367506aebc022e060fa6099a565620ce3146d808743adb5585cbac152271baec5b0471b
-  data.tar.gz: b0d09e6f7d9336fb965272a7d2d66264f1e698377563acd4988472c95901959b8434a8fa20ac757a1dda3b0f5129842db7e7454ff1fe414dbd575f9ac6ea6f01
+  metadata.gz: 05c58fdb427c609711728fb4f965a7e5a86cebe5ccac9d8f87043e1921c690562f775c0a14fb3204b7dc9b4a6d33fc6c2ddbad2999352aa2b5966d353193089a
+  data.tar.gz: fbec63c5c3956741db10a49445503aa8892d77956e3139e9539749b06e6b524998dc91e30992ec26f9b272b35d923537753b34ebdfcd4bbaed8a7708e57b5ac7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    octiron (0.1.0)
+    octiron (0.1.1)
       collapsium (~> 0.8)
       rgl (~> 0.5)
 
@@ -50,7 +50,7 @@ GEM
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
     stream (0.5)
-    unicode-display_width (1.1.1)
+    unicode-display_width (1.1.2)
     yard (0.9.5)
 
 PLATFORMS

data/README.md

@@ -27,6 +27,8 @@ class MyEvent
   # ...
 end
 
+include Octiron::World
+
 on_event(MyEvent) do |event|
   # event.is_a?(MyEvent) == true
   # do something with the event

data/lib/octiron/events/bus.rb

@@ -41,12 +41,9 @@ module Octiron::Events
     #     must be provided.
     # @return The class represented by the event_id, as a String name.
     def subscribe(event_id, handler_object = nil, &handler_proc)
-      handler = resolve_handler(handler_object, &handler_proc)
-      event_name = identify(event_id)
-
-      handlers_for(event_name, true) << handler
-
-      return event_name
+      return with_handlers(event_id, handler_object, handler_proc) do |hlist, h|
+        hlist << h
+      end
     end
     alias register subscribe
 
@@ -62,12 +59,9 @@ module Octiron::Events
     #     must be provided.
     # @return The class represented by the event_id, as a String name.
     def unsubscribe(event_id, handler_object = nil, &handler_proc)
-      handler = resolve_handler(handler_object, &handler_proc)
-      event_name = identify(event_id)
-
-      handlers_for(event_name, true).delete(handler)
-
-      return event_name
+      return with_handlers(event_id, handler_object, handler_proc) do |hlist, h|
+        hlist.delete(h)
+      end
     end
 
     ##
@@ -148,6 +142,15 @@ module Octiron::Events
       return @handlers[name] || []
     end
 
+    def with_handlers(event_id, handler_object, handler_proc)
+      handler = resolve_handler(handler_object, &handler_proc)
+      event_name = identify(event_id)
+
+      yield handlers_for(event_name, true), handler
+
+      return event_name
+    end
+
     def resolve_handler(handler_object = nil, &handler_proc)
       handler = handler_proc || handler_object
       if not handler

data/lib/octiron/version.rb

@@ -8,5 +8,5 @@
 #
 module Octiron
   # The current release version
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: octiron
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Jens Finkhaeuser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-08 00:00:00.000000000 Z
+date: 2016-12-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler