real-growl 0.1.0 → 0.1.1

data/ext/real_growl_api.c

@@ -3,11 +3,26 @@
 VALUE rb_mRealGrowl;
 VALUE rb_cRealGrowlApplication;
 
+static void
+free_delegate(id delegate) {
+  [delegate release];
+}
+
+static VALUE
+alloc_delegate(VALUE klass) {
+  return Data_Wrap_Struct(klass, 0, free_delegate, [[RubyDelegate alloc] init]);  
+}
+
+static NSAutoreleasePool*
+create_autorelease_pool() {
+  return [[NSAutoreleasePool alloc] init];
+}
+
 VALUE
 classMethod_installed(VALUE self) {
-  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  NSAutoreleasePool *pool = create_autorelease_pool();
   BOOL installed = [GrowlApplicationBridge isGrowlInstalled];
-  [pool release];
+  [pool drain];
   
   if(installed) {
     return Qtrue;
@@ -18,9 +33,9 @@ classMethod_installed(VALUE self) {
 
 VALUE
 classMethod_running(VALUE self) {
-  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  NSAutoreleasePool *pool = create_autorelease_pool();
   BOOL running = [GrowlApplicationBridge isGrowlRunning];
-  [pool release];
+  [pool drain];
   
   if(running) {
     return Qtrue;
@@ -31,47 +46,35 @@ classMethod_running(VALUE self) {
 
 VALUE
 method_notify(VALUE self, VALUE title, VALUE description, VALUE priority, VALUE sticky) {
-  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+  NSAutoreleasePool *pool = create_autorelease_pool();
   
   BOOL nsSticky = (sticky == Qtrue) ? YES : NO;
   NSString *nsTitle = [NSString stringWithCString:STR2CSTR(title) encoding: NSASCIIStringEncoding];
   NSString *nsDescription = [NSString stringWithCString:STR2CSTR(description) encoding: NSASCIIStringEncoding];
   [GrowlApplicationBridge notifyWithTitle: nsTitle description: nsDescription notificationName: REAL_GROWL_NOTIFICATION iconData: nil priority: NUM2INT(priority) isSticky:nsSticky clickContext:nil];
   
-  [pool release];
+  [pool drain];
   
   return Qnil;
 }
 
 VALUE 
 method_init(VALUE self, VALUE applicationName) {
-  NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
-  id delegate = NULL;
-  
-  Data_Get_Struct(self, RubyDelegate, delegate);
+  NSAutoreleasePool *pool = create_autorelease_pool();
+  id delegate = NULL;  
   
+  Data_Get_Struct(self, RubyDelegate, delegate);  
   NSString *nsAppName = [NSString stringWithCString:STR2CSTR(applicationName) encoding: NSASCIIStringEncoding];
   [delegate setApplicationName: nsAppName];
   [GrowlApplicationBridge setGrowlDelegate: delegate];
   
-  [pool release];
+  [pool drain];
+  
   return self;
 }
 
-static void
-free_delegate(id delegate) {
-  [delegate release];
-}
-
-static VALUE
-alloc_delegate(VALUE klass) {
-  return Data_Wrap_Struct(klass, 0, free_delegate, [[RubyDelegate alloc] init]);  
-}
-
-
 void
-Init_real_growl_api() {
-  
+Init_real_growl_api() {  
   rb_mRealGrowl = rb_define_module("RealGrowl");
   rb_define_singleton_method(rb_mRealGrowl, "installed?", classMethod_installed, 0);
   rb_define_singleton_method(rb_mRealGrowl, "running?", classMethod_running, 0);

data/ext/ruby_delegate.h

@@ -8,5 +8,5 @@
 }
 
 -(NSDictionary *) registrationDictionaryForGrowl;
-@property(nonatomic, assign) NSString *applicationName;
+@property(nonatomic, retain) NSString *applicationName;
 @end

data/ext/ruby_delegate.m

@@ -3,12 +3,23 @@
 @implementation RubyDelegate
 @synthesize applicationName;
 
--(NSDictionary *)registrationDictionaryForGrowl {
-  if(applicationName == nil) {
-    applicationName = @"RealGrowl";
+-(id)init {
+  if(self = [super init]) {
+    applicationName = [@"RealGrowl" retain];
+    return self;
   }
+  
+  return nil;
+}
+
+-(NSDictionary *)registrationDictionaryForGrowl {
   NSArray *notifications = [NSArray arrayWithObject:REAL_GROWL_NOTIFICATION];
   return [NSDictionary dictionaryWithObjectsAndKeys: [self applicationName], GROWL_APP_ID, [self applicationName], GROWL_APP_NAME, notifications, GROWL_NOTIFICATIONS_ALL, nil];
 }
 
+-(void)dealloc {
+  [applicationName release];
+  [super dealloc];
+}
+
 @end

data/lib/real_growl.rb

@@ -12,11 +12,13 @@ module Kernel
     
     @__growl_app ||= RealGrowl::Application.new("RealGrowl")
     
-    notifications = args.map { |x| x.pretty_inspect }
-    notifications.each do |x|
-      @__growl_app.notify('rg', x, Kernel.rg_priority, Kernel.rg_sticky)
+    if RealGrowl.running?
+      notifications = args.map { |x| x.pretty_inspect }
+      notifications.each do |x|
+        @__growl_app.notify('rg', x, Kernel.rg_priority, Kernel.rg_sticky)
+      end
     end
-    
+        
     nil
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: real-growl
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Justin DeWind
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-13 00:00:00 -05:00
+date: 2010-01-15 00:00:00 -05:00
 default_executable: 
 dependencies: []