mac-event-monitor 0.0.2 → 0.0.3

data/ext/event_monitor/event_monitor.m

@@ -26,29 +26,29 @@
 
   eventMonitor = [NSEvent addGlobalMonitorForEventsMatchingMask:mask
                                                         handler:^(NSEvent *incomingEvent) {
-      VALUE event;
-
-      event = rb_str_new2([[incomingEvent description] UTF8String]);
-      rb_funcall(rb_monitor, rb_intern("receive_event"), 1, event);
+      rb_funcall(rb_monitor, rb_intern("receive_event"), 1, rb_str_new2([[incomingEvent description] UTF8String]));
     }];
 }
 
 - (void)onTimeout:(NSTimer *)timer {
   NSEvent *event;
 
+  [timer release];
+
   [[NSApplication sharedApplication] stop:nil];
   //[NSEvent removeMonitor:eventMonitor];
 
   // http://www.cocoabuilder.com/archive/cocoa/219842-nsapp-stop.html
   event = [NSEvent otherEventWithType: NSApplicationDefined
-                                      location: NSMakePoint(0,0)
-                                 modifierFlags: 0
-                                     timestamp: 0.0
-                                  windowNumber: 0
-                                       context: nil
-                                       subtype: 0
-                                         data1: 0
-                                         data2: 0];
+                             location: NSMakePoint(0,0)
+                        modifierFlags: 0
+                            timestamp: 0.0
+                         windowNumber: 0
+                              context: nil
+                              subtype: 0
+                                data1: 0
+                                data2: 0];
+
   [NSApp postEvent: event atStart: true];
 }
 
@@ -63,13 +63,13 @@ static VALUE cMonitor_run_app(int argc, VALUE *argv, VALUE self)
 
   rb_scan_args(argc, argv, "1", &stopAfter);
 
-  delegate = [EventMonitorAppDelegate new];
-  delegate.rb_monitor = self;
-
-  [NSApplication sharedApplication];
-  [NSApp setDelegate: delegate];
+  if(!(delegate = [[NSApplication sharedApplication] delegate])) {
+    delegate = [[EventMonitorAppDelegate alloc] init];
+    delegate.rb_monitor = self;
+    [NSApp setDelegate: delegate];
+  }
 
-  if(stopAfter) {
+  if(stopAfter != Qnil) {
     [NSTimer scheduledTimerWithTimeInterval:(NSTimeInterval)NUM2INT(stopAfter)
                                      target:delegate
                                    selector:@selector(onTimeout:)

data/ext/event_monitor/extconf.rb

@@ -10,9 +10,7 @@ extension_name = 'event_monitor'
 # Set your target name
 dir_config(extension_name)
 
-$LDFLAGS += ' -framework ApplicationServices -framework AppKit'
-
-have_header(extension_name)
+$LDFLAGS += ' -framework AppKit'
 
 # Do the work
 create_makefile(extension_name)

data/lib/mac-event-monitor/version.rb

@@ -1,5 +1,5 @@
 module Mac
   module EventMonitor
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mac-event-monitor
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-14 00:00:00.000000000 Z
+date: 2012-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70149660258920 !ruby/object:Gem::Requirement
+  requirement: &70325557283420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70149660258920
+  version_requirements: *70325557283420
 - !ruby/object:Gem::Dependency
   name: mac-robot
-  requirement: &70149660258500 !ruby/object:Gem::Requirement
+  requirement: &70325557283000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149660258500
+  version_requirements: *70325557283000
 - !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &70149660258040 !ruby/object:Gem::Requirement
+  requirement: &70325557282540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70149660258040
+  version_requirements: *70325557282540
 description: A Library to Monitor User Interactions
 email:
 - youpy@buycheapviagraonlinenow.com
@@ -85,7 +85,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -357376635066606538
+      hash: 3251763459567005321
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -94,7 +94,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -357376635066606538
+      hash: 3251763459567005321
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10