nserver 1.1.2 → 1.1.3

data/History.txt

@@ -1,3 +1,9 @@
+== 1.1.3 / 2007-11-10
+
+* Minor updates
+ * Support for receiving message objects
+ * Support in client for sending message objects.  Messy (sort of) but works.
+
 == 1.1.2 / 2007-11-09
 
 * Bugfix in RNotify require (server won't work for anybody.  Ooops)

data/README.txt

@@ -41,6 +41,16 @@ Assuming you have a NServer::Server instance running, you can use the client lik
   
   NServer::Client.notify("My test message goes here").
 
+There is also support for building messages to send.
+
+  require 'nserver'
+  
+  msg = NServer::Message.new
+  msg.text = "My text"
+  msg.title = "Test Message"
+
+  NServer::Client.notify( msg )
+
 Or, if you want a easy command line client:
 
   % nclient "Message"
@@ -58,6 +68,7 @@ If you're NServer is listening on another mahcine, you can:
 * daemons
 * rnotify
 * gtk
+* yaml
 
 == INSTALL:
 

data/lib/nserver.rb

@@ -8,9 +8,10 @@ end
 require 'gserver'
 require 'socket'
 require 'ipaddr'
+require 'yaml'
 
 module NServer
-  VERSION = '1.1.2'
+  VERSION = '1.1.3'
   class Server < GServer
     # Create a NServer::Server instance
     #
@@ -52,17 +53,17 @@ module NServer
       @allowed_clients = opts[:allow]
 
       Notify.init("Notification Server")
-      tray_icon = Gtk::StatusIcon.new
-      tray_icon.icon_name = opts[:tray_icon]
+      @tray_icon = Gtk::StatusIcon.new
+      @tray_icon.icon_name = opts[:tray_icon]
       #tray_icon.file = File.join( File.dirname(__FILE__), 'icons', 'default.png')
-      tray_icon.tooltip = "NServer"
+      @tray_icon.tooltip = "NServer"
 
-      @notification = Notify::Notification::new("X", nil, nil, tray_icon)
+      @notification = Notify::Notification::new("X", nil, nil, @tray_icon)
       @notification.timeout = opts[:msg_timeout]
 
       Thread.new { Gtk.main }
       sleep 5
-      tray_icon.embedded? || raise("Failed to setup tray icon.")
+      @tray_icon.embedded? || raise("Failed to setup tray icon.")
 
       ## Setup msg thread
       @msg_thread = Thread.new(self, @check_interval) do |server, intv|
@@ -75,8 +76,9 @@ module NServer
 
     # Display the message
     def notify(msg)
-      @notification.update("Message Received", msg.text, nil)
+      @notification.update((msg.title or "Message Received"), msg.text, nil)
       @notification.urgency = msg.priority
+      #@tray_icon.tooltip = msg.title
       @notification.show
     end
 
@@ -85,6 +87,11 @@ module NServer
       @msg_list << Message.new(msg, priority)
     end
 
+    # Add an actual message object
+    def add_message_obj(msg)
+      @msg_list << msg
+    end
+
     # Display the next message, if any.
     def process
       if @msg_list.size > 0
@@ -113,6 +120,11 @@ module NServer
       if msg == "EXITNOW"
         notify("Shutting down.")
         self.shutdown
+      elsif msg =~ /^--- !ruby\/object:NServer::Message/
+        ## Yaml message?
+        m = YAML.load( msg )
+        add_message_obj(m)
+        io.puts "OK"
       else
         priority = :normal
         if msg =~ /^(.*?):/
@@ -150,12 +162,18 @@ module NServer
       @host_ip = ( opts[:host] or '127.0.0.1' )
       @host_port = ( opts[:port] or '10001' ).to_i
     end
-
+    
+    # Send a notification.  If `msg` is a Message object, send it, and ignore
+    # supplied priority
     def notify( msg, priority = :normal )
       begin
         sock = TCPSocket.new(@host_ip, @host_port)
         sleep(0.1) ## Needs delay, or wait until prompt.
-        sock.write("#{priority.to_s.upcase}:#{msg}\n.\n")
+        if msg.is_a? NServer::Message
+          sock.write( msg.to_yaml + "\n.\n" )
+        else
+          sock.write("#{priority.to_s.upcase}:#{msg}\n.\n")
+        end
         sock.close
       rescue Errno::ECONNREFUSED
         raise NoServerAvailable.new
@@ -207,11 +225,13 @@ module NServer
     PRIORITIES = [:low, :normal, :critical]
 
     attr :text, :writable => true
+    attr :title, :writable => true
     attr :priority, :writable => true
 
-    def initialize( text = "", priority = :normal )
+    def initialize( text = "", priority = :normal, title = nil )
       @text = text
       @priority = ( PRIORITIES.index( priority ) or 1 )
+      @title = title
     end
   end
 

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.4.5
 specification_version: 2
 name: nserver
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
-date: 2007-11-09 00:00:00 -05:00
+  version: 1.1.3
+date: 2007-11-10 00:00:00 -05:00
 summary: Notification server for ruby using libnotify
 require_paths: 
 - lib