event_object 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9622ba5227d8436103a9b8d27c5c8c43499b81a
-  data.tar.gz: 47849679660a76bc72bdc824e901a4f7318c8baf
+  metadata.gz: 5e73347f0743cee6ad8f9e61bde232ce90508b15
+  data.tar.gz: 030aab40ae2016c25031ab3e7136e384b0e9f67b
 SHA512:
-  metadata.gz: 4475ff5a3264ab6b919b6f958edcbf06ba677cc267ab024206892067e6bace0776c50b815c8f46abf7a17fd5b8296c4b120b2d62eb64e7a518a4afa028979bab
-  data.tar.gz: 0003f2b71961aeef736f64d04b3f8347c2601e0e6ebe4e7f0d48e7d277a54e9defa592529def1abfebf6d50ce021b8ff7acf938c54958364023cd8ae7e818509
+  metadata.gz: 170c391c95445cf10d497356ec4c3c0a71a1f395e1994c0ce19d21fed8d9ba6173b5227e35877319bd3165cbeffc23508ff1a12e4446e911b89ca508d1ece80b
+  data.tar.gz: c177bb1525cedb2eb5e7398372e86601e50d7bc38eae0b3c1eeca0836347c91ed6ec596bb7d964a5fd46eaca893e0d37ea2807c7b06cdd16d6cbd972b4efba3d

data/lib/event_object/array.rb

@@ -2,11 +2,11 @@ module EventObject
   refine Array do
     # array like event
     def fire(*a, &b)
-      collect { |h| h.call(*a, &b) }
+      dup.collect { |h| h.call(*a, &b) }
     end
 
     def fire_for(t, *a)
-      collect { |h| t.instance_exec(*a, &h) }
+      dup.collect { |h| t.instance_exec(*a, &h) }
     end
 
     def off(proc=nil)

data/lib/event_object/object.rb

@@ -8,19 +8,19 @@ module EventObject
       instance_variable_get("@#{name}") || instance_variable_set("@#{name}", (init.is_a?(Class) ? init.new : init))
     end
 
-    def on(name, &b)
-      var(name, Array).tap { |e| e << b }; b
+    def on(name, bb=nil, &b)
+      var(name, Array).tap { |e| e << (bb || b) }; (bb || b)
     end
 
     #
-    # obj.off(:data)
-    # obj.off(:data, proc)
-    # obj.off(target, :data, proc) => target.off(:data, proc)
+    # obj.off(:ev)
+    # obj.off(:ev, proc)
+    # obj.off(:ev, target, :meth)
     def off(*a)
       case a.size
       when 1 then var(a[0], Array).clear
       when 2 then var(a[0], Array).tap { |e| e.delete a[1] }
-      when 3 then a[0].off(a[1], a[2])
+      when 3 then var(a[0], Array).tap { |e| e.delete a[1].method(a[2]) }
       end
       self
     end
@@ -31,8 +31,12 @@ module EventObject
       }
     end
 
-    def listen(object, name, meth)
-      object.on :name, &method(meth)
+    def listen(target, ev, meth)
+      target.on ev, method(meth)
+    end
+
+    def stop_listen(target, ev)
+      target.var(ev, Array).delete_if { |e| e.is_a?(Method) && e.receiver == self }
     end
   end
 end

data/lib/event_object/version.rb

@@ -1,3 +1,3 @@
 module EventObject
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/spec/event_object_spec.rb

@@ -1,7 +1,18 @@
 require "spec_helper"
+
 describe EventObject do
   using EventObject
 
+  class EventEmitter
+    events :success, :error
+  end
+
+  class ParentObject
+    def ok
+      'OK'
+    end
+  end
+
   it "should create array of events" do
     events = []
     proc   = lambda { :result }
@@ -23,10 +34,6 @@ describe EventObject do
   end
 
   it "should create events and fire them" do
-    class EventEmitter
-      events :success, :error
-    end
-
     emitter = EventEmitter.new
     emitter.on :success do
       18
@@ -40,4 +47,40 @@ describe EventObject do
     expect(emitter.error).to be_empty
     expect(emitter.error.fire).to be_empty
   end
+
+  # dup required in fires
+  it "add event in event" do
+    emitter = EventEmitter.new
+    counter = 0
+    emitter.on :success do
+      counter += 1
+      emitter.on :success do
+        counter += 1
+      end
+    end
+
+    emitter.success!
+
+    expect(counter).to be 1
+  end
+
+  it "listen other object" do
+    emitter = EventEmitter.new
+    obj = ParentObject.new
+    obj.listen(emitter, :success, :ok)
+    expect(emitter.success!.last).to eq 'OK'
+
+    emitter.off(:success, obj, :ok)
+    expect(emitter.success!).to be_empty
+  end
+
+  it "stop listen" do
+    emitter = EventEmitter.new
+    obj = ParentObject.new
+    obj.listen(emitter, :success, :ok)
+    expect(emitter.success!.last).to eq 'OK'
+
+    obj.stop_listen(emitter, :success)
+    expect(emitter.success!).to be_empty
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: event_object
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - che
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-19 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler