real-growl 0.1.1 → 0.2.0

data/README.rdoc

@@ -8,17 +8,19 @@ A Growl notification library that uses native c bindings to interact with GrowlA
 
   >> require 'real_growl'
   => true
-  >> rg("Check out", ["Real", "Growl"])
+  >> rg("Check out", ["Real", "Growl"], :icon => "/path/to/a/picture.jpg")
   => nil
   
   >> Kernel.rg_sticky = false
   => false
   >> Kernel.rg_priority = 3
   => 3
+  >> Kernel.rg_icon = "/the/path/cool.png"
+  => "/the/path/cool.png"
   
   >> my_own_application = RealGrowl::Application.new("AppName")
   => #<RealGrowl::Application:0x1018eb6b8>
-  >> my_own_application.notify("Title", "Desc", 0, true)
+  >> my_own_application.notify(:title => "Title", :description => "Desc", :priority => 0, :sticky => true, :icon => "/path/to/image.png")
   
   >> RealGrowl.installed?
   => true
@@ -27,7 +29,6 @@ A Growl notification library that uses native c bindings to interact with GrowlA
 
 == TODO:
   * Add executable script
-  * Allow for custom icons
   * Enable growl callbacks
   
 == REQUIREMENTS:

data/ext/real_growl_api.c

@@ -3,6 +3,15 @@
 VALUE rb_mRealGrowl;
 VALUE rb_cRealGrowlApplication;
 
+static NSString*
+build_nsstring(VALUE string) {
+  if(string == Qnil) {
+    return nil;
+  } else {
+    return [NSString stringWithCString:STR2CSTR(string) encoding: NSASCIIStringEncoding];    
+  }
+}
+
 static void
 free_delegate(id delegate) {
   [delegate release];
@@ -45,13 +54,22 @@ classMethod_running(VALUE self) {
 }
 
 VALUE
-method_notify(VALUE self, VALUE title, VALUE description, VALUE priority, VALUE sticky) {
+// VALUE title, VALUE description, VALUE priority, VALUE sticky, VALUE iconPath
+method_notify(VALUE self, VALUE options) {
   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];
+  VALUE title             = rb_hash_aref(options, ID2SYM(rb_intern("title")));
+  VALUE description       = rb_hash_aref(options, ID2SYM(rb_intern("description")));
+  VALUE priority          = rb_hash_aref(options, ID2SYM(rb_intern("priority")));
+  priority                = (priority == Qnil) ? INT2NUM(0) : priority;
+  VALUE sticky            = rb_hash_aref(options, ID2SYM(rb_intern("sticky")));
+  VALUE iconPath          = rb_hash_aref(options, ID2SYM(rb_intern("icon")));  
+  BOOL nsSticky           = (sticky == Qtrue) ? YES : NO;
+  NSData *data            = [NSData dataWithContentsOfFile:build_nsstring(iconPath)];
+  NSString *nsTitle       = build_nsstring(title);
+  NSString *nsDescription = build_nsstring(description);
+  
+  [GrowlApplicationBridge notifyWithTitle: nsTitle description: nsDescription notificationName: REAL_GROWL_NOTIFICATION iconData: data priority: NUM2INT(priority) isSticky:nsSticky clickContext:nil];
   
   [pool drain];
   
@@ -82,6 +100,6 @@ Init_real_growl_api() {
   rb_cRealGrowlApplication = rb_define_class_under(rb_mRealGrowl, "Application", rb_cObject);
   rb_define_alloc_func(rb_cRealGrowlApplication, alloc_delegate);
   rb_define_method(rb_cRealGrowlApplication, "initialize", method_init, 1);
-  rb_define_method(rb_cRealGrowlApplication, "notify", method_notify, 4);  
+  rb_define_method(rb_cRealGrowlApplication, "notify", method_notify, 1);  
 }
 

data/lib/real_growl.rb

@@ -3,19 +3,31 @@ require 'pp'
 
 module Kernel
   class<<self
-    attr_accessor :rg_sticky, :rg_priority
+    attr_accessor :rg_sticky, :rg_priority, :rg_icon
   end
   
   def rg(*args)
     Kernel.rg_priority ||= 0
     Kernel.rg_sticky = true if Kernel.rg_sticky.nil?
+    icon = Kernel.rg_icon
     
     @__growl_app ||= RealGrowl::Application.new("RealGrowl")
     
+    if args.last.is_a?(Hash) and args.last[:icon]
+      icon = args.last[:icon]
+      args.pop
+    end
+    
     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)
+        @__growl_app.notify(
+          :title        => 'rg', 
+          :description  => x, 
+          :priority     => Kernel.rg_priority, 
+          :sticky       => Kernel.rg_sticky, 
+          :icon         => icon
+        )
       end
     end
         

metadata

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