libnotify 0.2.0 → 0.3.0

data/Gemfile.lock

@@ -1,51 +1,33 @@
---- 
-dependencies: 
-  yard: 
-    group: 
-    - :test
-    version: ">= 0"
-  jeweler: 
-    group: 
-    - :test
-    version: ">= 0"
-  ffi: 
-    group: 
-    - :default
-    version: ">= 0.6.2"
-  riot_notifier: 
-    group: 
-    - :test
-    version: ">= 0.2.0"
-  riot: 
-    group: 
-    - :test
-    version: = 0.11.2
-specs: 
-- rake: 
-    version: 0.8.7
-- ffi: 
-    version: 0.6.3
-- json_pure: 
-    version: 1.4.3
-- gemcutter: 
-    version: 0.5.0
-- git: 
-    version: 1.2.5
-- rubyforge: 
-    version: 2.0.4
-- jeweler: 
-    version: 1.4.0
-- rr: 
-    version: 0.10.11
-- term-ansicolor: 
-    version: 1.0.5
-- riot: 
-    version: 0.11.2
-- riot_notifier: 
-    version: 0.2.0
-- yard: 
-    version: 0.5.8
-hash: 6cb15cfba060c9636f2e2b9a7904cd1827b88ade
-sources: 
-- Rubygems: 
-    uri: http://rubygems.org
+GEM
+  remote: http://rubygems.org/
+  specs:
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.6)
+    rake (0.8.7)
+    riot (0.11.2)
+      rr
+      term-ansicolor
+    riot_notifier (0.3.0)
+      riot (~> 0.11.0)
+    rr (1.0.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    term-ansicolor (1.0.5)
+    yard (0.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ffi (>= 0.6.2)
+  jeweler
+  riot (= 0.11.2)
+  riot_notifier (>= 0.2.0)
+  yard

data/README.rdoc

@@ -15,6 +15,7 @@ RDoc[http://rdoc.info/projects/splattael/libnotify]
     notify.body = "hello"
     notify.timeout = 1.5        # 1.5 (s), 1000 (ms), "2", nil, false
     notify.urgency = :critical  # :low, :normal, :critical
+    notify.append = false       # default true - append onto existing notification
     notify.icon_path = "/usr/share/icons/gnome/scalable/emblems/emblem-default.svg"
   end
   n.show!
@@ -45,8 +46,9 @@ You'll need libnotify. On Debian just type:
 
 == Authors
 
-* Peter Suschlik
+* Peter Suschlik (http://github.com/splattael)
+* Dennis Collective (http://github.com/denniscollective)
 
 == TODO
 
-* Mock FFI calls with rrriot. (test/test_libnotify.rb:58)
+* Mock FFI calls with rrriot. (test/test_libnotify.rb:61)

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/libnotify.rb

@@ -20,7 +20,7 @@ module Libnotify
   #     notify.icon_path = "/usr/share/icons/gnome/scalable/emblems/emblem-default.svg"
   #   end
   #   n.show!
-  # 
+  #
   # @example Mixed syntax
   #   Libnotify.new(options) do |n|
   #     n.timeout = 1.5     # overrides :timeout in options
@@ -77,6 +77,8 @@ module Libnotify
     attach_function :notify_notification_new, [:string, :string, :string, :pointer], :pointer
     attach_function :notify_notification_set_urgency, [:pointer, :urgency], :void
     attach_function :notify_notification_set_timeout, [:pointer, :long], :void
+    attach_function :notify_notification_set_hint_string, [:pointer, :string, :string], :void
+    attach_function :notify_notification_clear_hints, [:pointer], :void
     attach_function :notify_notification_show, [:pointer, :pointer], :bool
   end
 
@@ -84,7 +86,7 @@ module Libnotify
     include FFI
 
     attr_reader :timeout
-    attr_accessor :summary, :body, :icon_path, :urgency
+    attr_accessor :summary, :body, :icon_path, :urgency, :append
 
     # Creates a notification object.
     #
@@ -99,6 +101,7 @@ module Libnotify
       self.summary = self.body = ' '
       self.urgency = :normal
       self.timeout = nil
+      self.append = true
     end
     private :set_defaults
 
@@ -110,7 +113,13 @@ module Libnotify
       notify = notify_notification_new(summary, body, icon_path, nil)
       notify_notification_set_urgency(notify, urgency)
       notify_notification_set_timeout(notify, timeout || -1)
+      if append
+        notify_notification_set_hint_string(notify, "x-canonical-append", "")
+        notify_notification_set_hint_string(notify, "append", "")
+      end
       notify_notification_show(notify, nil)
+    ensure
+      notify_notification_clear_hints(notify) if append
     end
 
     # @todo Simplify timeout=

data/libnotify.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{libnotify}
-  s.version = "0.2.0"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Peter Suschlik"]
-  s.date = %q{2010-07-11}
+  s.date = %q{2010-09-03}
   s.email = %q{peter-libnotify@suschlik.de}
   s.extra_rdoc_files = [
     "README.rdoc"

data/test/test_libnotify.rb

@@ -27,6 +27,7 @@ context Libnotify::API do
     asserts("urgency is :normal") { topic.urgency }.equals(:normal)
     asserts("timeout is nil") { topic.timeout }.nil
     asserts("icon_path is nil") { topic.icon_path }.nil
+    asserts("append is true") { topic.append }.equals(true)
   end
 
   context "with options and block" do
@@ -34,12 +35,14 @@ context Libnotify::API do
       topic.new(:summary => "hello", :body => "body", :invalid_option => 23) do |n|
         n.body = "overwritten"
         n.icon_path = "/path/to/icon"
+        n.append = false
       end
     end
 
     asserts("summary is set") { topic.summary }.equals("hello")
     asserts("body was overwritten by block") { topic.body }.equals("overwritten")
     asserts("icon_path set") { topic.icon_path }.equals("/path/to/icon")
+    asserts("append is set") { topic.append }.equals(false)
   end
 
   context "timeout=" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libnotify
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Peter Suschlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-11 00:00:00 +02:00
+date: 2010-09-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency