eventmachine-distributed-notification 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/ext/observer_native/observer_native.h

@@ -9,6 +9,7 @@
 @property (assign) VALUE handler;
 
 -(void)observe;
+-(void)unobserve;
 
 @end
 

data/ext/observer_native/observer_native.m

@@ -11,7 +11,7 @@
 
 - (void)dealloc
 {
-  [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
+  [self unobserve];
   [name release];
   [super dealloc];
 }
@@ -26,6 +26,11 @@
    ];
 }
 
+- (void)unobserve
+{
+  [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
+}
+
 - (void)notify:(NSNotification *)theNotification
 {
   VALUE aName = rb_str_new2([[theNotification name] UTF8String]);
@@ -118,7 +123,6 @@ static VALUE cObserverNative_new(int argc, VALUE *argv, VALUE klass)
   }
 
   [obs setHandler:handler];
-  [obs observe];
 
   [pool release];
 
@@ -139,6 +143,24 @@ static VALUE cObserverNative_run_forever(int argc, VALUE *argv, VALUE self)
   return Qnil;
 }
 
+static VALUE cObserverNative_observe(int argc, VALUE *argv, VALUE self)
+{
+  Observer *obs = getObserver(self);
+
+  [obs observe];
+
+  return Qnil;
+}
+
+static VALUE cObserverNative_unobserve(int argc, VALUE *argv, VALUE self)
+{
+  Observer *obs = getObserver(self);
+
+  [obs unobserve];
+
+  return Qnil;
+}
+
 void Init_observer_native(void){
   VALUE rb_mEventMachine, rb_mDistributedNotification;
 
@@ -148,4 +170,6 @@ void Init_observer_native(void){
   rb_define_singleton_method(rb_cObserverNative, "new", cObserverNative_new, -1);
   rb_define_method(rb_cObserverNative, "run", cObserverNative_run, -1);
   rb_define_method(rb_cObserverNative, "run_forever", cObserverNative_run_forever, -1);
+  rb_define_method(rb_cObserverNative, "observe", cObserverNative_observe, -1);
+  rb_define_method(rb_cObserverNative, "unobserve", cObserverNative_unobserve, -1);
 }

data/lib/eventmachine-distributed-notification.rb

@@ -24,12 +24,14 @@ module EventMachine
     end
 
     def start
+      @observer.observe
       @timer = EventMachine::add_periodic_timer(1) do
         @observer.run
       end
     end
 
     def stop
+      @observer.unobserve
       @timer.cancel if @timer
     end
   end

data/spec/eventmachine-distributed-notification_spec.rb

@@ -24,6 +24,7 @@ describe EventMachine::DistributedNotification::Poster do
       EM::add_timer(1) {
         EM::post_distributed_notification('xxx', 'yyy')
         EM.stop
+        watcher.stop
       }
     }
 
@@ -37,8 +38,8 @@ describe EventMachine::DistributedNotificationWatch do
   itunes.stop
 
   context 'instantiate' do
-    it 'should observe distributed notifications' do
-      watcher = Watcher.new(nil)
+    it 'should watch distributed notifications' do
+      watcher = Watcher.new('com.apple.iTunes.playerInfo')
 
       EM.run {
         watcher.start
@@ -48,6 +49,7 @@ describe EventMachine::DistributedNotificationWatch do
         EM::add_timer(1) {
           itunes.stop
           EM.stop
+          watcher.stop
         }
       }
 
@@ -57,21 +59,24 @@ describe EventMachine::DistributedNotificationWatch do
   end
 
   context 'invoked from EM.watch_distributed_notification' do
-    it 'should observe distributed notifications from ' do
-      watcher = nil
+    context 'with class' do
+      it 'should watch distributed notifications' do
+        watcher = nil
 
-      EM.run {
-        watcher = EM.watch_distributed_notification(nil, Watcher)
+        EM.run {
+          watcher = EM.watch_distributed_notification(nil, Watcher)
 
-        itunes.playlists["Music"].tracks[1].play
+          itunes.playlists["Music"].tracks[1].play
 
-        EM::add_timer(1) {
-          itunes.stop
-          EM.stop
+          EM::add_timer(1) {
+            itunes.stop
+            EM.stop
+            watcher.stop
+          }
         }
-      }
 
-      watcher.value.should_not be_nil
+        watcher.value.should_not be_nil
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: eventmachine-distributed-notification
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70278625507360 !ruby/object:Gem::Requirement
+  requirement: &70178503276700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70278625507360
+  version_requirements: *70178503276700
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70278625505040 !ruby/object:Gem::Requirement
+  requirement: &70178503273500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70278625505040
+  version_requirements: *70178503273500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70278625517900 !ruby/object:Gem::Requirement
+  requirement: &70178503287000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70278625517900
+  version_requirements: *70178503287000
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70278625514980 !ruby/object:Gem::Requirement
+  requirement: &70178503284120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.1.0
   type: :development
   prerelease: false
-  version_requirements: *70278625514980
+  version_requirements: *70178503284120
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70278625511060 !ruby/object:Gem::Requirement
+  requirement: &70178503280260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70278625511060
+  version_requirements: *70178503280260
 - !ruby/object:Gem::Dependency
   name: rb-appscript
-  requirement: &70278625526100 !ruby/object:Gem::Requirement
+  requirement: &70178503295420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70278625526100
+  version_requirements: *70178503295420
 description: An EventMachine extension to watch OSX's Distributed Notification, posted
   by iTunes etc.
 email: youpy@buycheapviagraonlinenow.com
@@ -123,7 +123,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3735464898048564235
+      hash: -1517368430001229274
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: