libnotify 0.7.0 → 0.7.1

data/README.rdoc

@@ -37,13 +37,15 @@ http://github.com/splattael/libnotify/raw/master/libnotify.png
   Libnotify.show(:icon_path => "emblem-default.png")
   Libnotify.show(:icon_path => :"emblem-default")
 
-  # Update pre-existing notification
+  # Update pre-existing notification then close it
   n = Libnotify.new(:summary => "hello", :body => "world")
   n.update # identical to show! if not shown before
   Kernel.sleep 1
   n.update(:body => "my love") do |notify|
     notify.summary = "goodbye"
   end
+  Kernel.sleep 1
+  n.close
 
 
 == Installation

data/lib/libnotify.rb

@@ -23,13 +23,15 @@ module Libnotify
   # @example Hash syntax
   #   Libnotify.show(:body => "hello", :summary => "world", :timeout => 2.5)
   #
-  # @example Update pre-existing notification
+  # @example Update pre-existing notification then close it
   #   n = Libnotify.new(:summary => "hello", :body => "world")
   #   n.update # identical to show! if not shown before
   #   Kernel.sleep 1
   #   n.update(:body => "my love") do |notify|
   #     notify.summary = "goodbye"
   #   end
+  #   Kernel.sleep 1
+  #   n.close
   #
   # @example Mixed syntax
   #   Libnotify.new(options) do |n|

data/lib/libnotify/api.rb

@@ -89,6 +89,11 @@ module Libnotify
       end
     end
 
+    # Close a previously shown notification.
+    def close
+      notify_notification_close(@notification, nil) if @notification
+    end
+
     # @todo Simplify timeout=
     def timeout=(timeout)
       @timeout = case timeout

data/lib/libnotify/ffi.rb

@@ -29,6 +29,7 @@ module Libnotify
       attach_function :notify_notification_set_hint_uint32, [:pointer, :string, :int],              :void
       attach_function :notify_notification_clear_hints,     [:pointer],                             :void
       attach_function :notify_notification_show,            [:pointer, :pointer],                   :bool
+      attach_function :notify_notification_close,           [:pointer, :pointer],                   :bool
     end
 
     def lookup_urgency(urgency)

data/lib/libnotify/version.rb

@@ -1,3 +1,3 @@
 module Libnotify
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/test/helper.rb

@@ -4,3 +4,37 @@ require 'minitest/autorun'
 require 'minitest/libnotify'
 
 require 'libnotify'
+
+module LibnotifyAssertions
+  def assert_timeout(expected, value, message)
+    assert_value_set :timeout, expected, value, message
+  end
+
+  def assert_icon_path(expected, value, message)
+    assert_value_set :icon_path, expected, value, message
+  end
+
+  def assert_value_set(attribute, expected, value, message)
+    libnotify.send("#{attribute}=", value)
+    got = libnotify.send(attribute)
+    case expected
+    when Regexp
+      assert_match expected, got, message
+    else
+      assert_equal expected, got, message
+    end
+  end
+end
+
+class LibnotifyTestCase < MiniTest::Spec
+  include LibnotifyAssertions
+
+  class << self
+    alias :test :it
+    alias :context :describe
+  end
+
+  def libnotify(options={}, &block)
+    @libnotify ||= Libnotify::API.new(options, &block)
+  end
+end

data/test/test_libnotify.rb

@@ -1,121 +1,87 @@
 require 'helper'
 
-class TestLibnotify < MiniTest::Unit::TestCase
-  def test_respond_to
-    assert_respond_to Libnotify, :new
-    assert_respond_to Libnotify, :show
-  end
-
-  def test_delegation
-    skip "test delegation using mock"
-
-    # old code
-    asserts("#new calls API#new") do
-      mock(Libnotify::API).new(hash_including(:body => "test")) { true }
-      Libnotify.new(:body => "test")
-    end
-    asserts("#show calls API#show") do
-      mock(Libnotify::API).show(hash_including(:body => "test")) { true }
-      Libnotify.show(:body => "test")
+class TestLibnotify < LibnotifyTestCase
+  context Libnotify do
+    test "responds to new" do
+      assert_respond_to Libnotify, :new
     end
-  end
 
-  def test_version
-    assert defined?(Libnotify::VERSION), "version is defined"
-    assert Libnotify::VERSION
-  end
-end
-
-class TestLibnotifyAPI < MiniTest::Unit::TestCase
-  def test_without_options_and_block
-    assert_equal " ",     libnotify.summary
-    assert_equal " ",     libnotify.body
-    assert_equal :normal, libnotify.urgency
-    assert_nil            libnotify.timeout
-    assert_nil            libnotify.icon_path
-    assert                libnotify.append
-    assert               !libnotify.transient
-  end
-
-  def test_with_options_and_block
-    libnotify(:summary => "hello", :body => "body", :invalid_option => 23) do |n|
-      n.body      = "overwritten"
-      n.icon_path = "/path/to/icon"
-      n.append    = false
-      n.transient = true
+    test "responds to show" do
+      assert_respond_to Libnotify, :show
     end
 
-    assert_equal "hello",         libnotify.summary
-    assert_equal "overwritten",   libnotify.body
-    assert_equal "/path/to/icon", libnotify.icon_path
-    assert                       !libnotify.append
-    assert                        libnotify.transient
-  end
-
-  def test_timeout_setter
-    assert_timeout 2500,  2.5,    "with float"
-    assert_timeout 100,   100,    "with fixnum ms"
-    assert_timeout 101,   101,    "with fixnum ms"
-    assert_timeout 1000,  1,      "with fixnum seconds"
-    assert_timeout 99000, 99,     "with fixnum seconds"
-    assert_timeout nil,   nil,    "with nil"
-    assert_timeout nil,   false,  "with false"
-    assert_timeout 2,     :"2 s", "with to_s.to_i"
-  end
-
-  def test_icon_path_setter
-    Libnotify::API.icon_dirs << File.expand_path("../..", __FILE__)
-    assert_icon_path "/some/path/image.jpg",  "/some/path/image.jpg",   "with absolute path"
-    assert_icon_path "some-invalid-path.jpg", "some-invalid-path.jpg",  "with non-existant relative path"
-    assert_icon_path %r{^/.*/libnotify.png},  "libnotify.png",          "with relative path"
-    assert_icon_path %r{^/.*/libnotify.png},  :"libnotify",             "with symbol"
-  end
-
-  def test_update
-    libnotify(:summary => "hello", :body => "world").show!
-    libnotify.update(:summary => "hell") do |n|
-      n.body = "yeah"
+    test "has version" do
+      assert defined?(Libnotify::VERSION), "version is defined"
+      assert Libnotify::VERSION
     end
-    assert_equal "hell", libnotify.summary
-    assert_equal "yeah", libnotify.body
   end
 
-  def test_integration
-    skip "enable integration"
-
-    libnotify = Libnotify::API.new(:timeout => 0.5, :icon_path => :"emblem-favorite", :append => true)
+  context Libnotify::API do
+    test "instance default values" do
+      assert_equal " ",     libnotify.summary
+      assert_equal " ",     libnotify.body
+      assert_equal :normal, libnotify.urgency
+      assert_nil            libnotify.timeout
+      assert_nil            libnotify.icon_path
+      assert                libnotify.append
+      refute                libnotify.transient
+    end
 
-    [ :low, :normal, :critical ].each do |urgency|
-      libnotify.summary = "#{RUBY_VERSION} at #{RUBY_PLATFORM}"
-      libnotify.body    = [ urgency, defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : '?' ].join(" ")
-      libnotify.urgency = urgency
-      libnotify.show!
+    test "instance with options and block" do
+      libnotify(:summary => "hello", :body => "body", :invalid_option => 23) do |n|
+        n.body      = "overwritten"
+        n.icon_path = "/path/to/icon"
+        n.append    = false
+        n.transient = true
+      end
+
+      assert_equal "hello",         libnotify.summary
+      assert_equal "overwritten",   libnotify.body
+      assert_equal "/path/to/icon", libnotify.icon_path
+      refute                        libnotify.append
+      assert                        libnotify.transient
     end
-  end
 
-  private
+    test "timeout=" do
+      assert_timeout 2500,  2.5,    "with float"
+      assert_timeout 100,   100,    "with fixnum ms"
+      assert_timeout 101,   101,    "with fixnum ms"
+      assert_timeout 1000,  1,      "with fixnum seconds"
+      assert_timeout 99000, 99,     "with fixnum seconds"
+      assert_timeout nil,   nil,    "with nil"
+      assert_timeout nil,   false,  "with false"
+      assert_timeout 2,     :"2 s", "with to_s.to_i"
+    end
 
-  def libnotify(options={}, &block)
-    @libnotify ||= Libnotify::API.new(options, &block)
-  end
+    test "icon_path=" do
+      Libnotify::API.icon_dirs << File.expand_path("../..", __FILE__)
+      assert_icon_path "/some/path/image.jpg",  "/some/path/image.jpg",   "with absolute path"
+      assert_icon_path "some-invalid-path.jpg", "some-invalid-path.jpg",  "with non-existant relative path"
+      assert_icon_path %r{^/.*/libnotify.png},  "libnotify.png",          "with relative path"
+      assert_icon_path %r{^/.*/libnotify.png},  :"libnotify",             "with symbol"
+    end
 
-  def assert_timeout(expected, value, message)
-    assert_value_set :timeout, expected, value, message
+    test "update" do
+      libnotify(:summary => "hello", :body => "world").show!
+      libnotify.update(:summary => "hell") do |n|
+        n.body = "yeah"
+      end
+      assert_equal "hell", libnotify.summary
+      assert_equal "yeah", libnotify.body
+      libnotify.close
+    end
   end
 
-  def assert_icon_path(expected, value, message)
-    assert_value_set :icon_path, expected, value, message
-  end
+  context "integration" do
+    test "works" do
+      libnotify = Libnotify::API.new(:timeout => 0.5, :icon_path => :"emblem-favorite", :append => true)
 
-  def assert_value_set(attribute, expected, value, message)
-    libnotify.send("#{attribute}=", value)
-    got = libnotify.send(attribute)
-    case expected
-    when Regexp
-      assert_match expected, got, message
-    else
-      assert_equal expected, got, message
+      [ :low, :normal, :critical ].each do |urgency|
+        libnotify.summary = "#{RUBY_VERSION} at #{RUBY_PLATFORM}"
+        libnotify.body    = [ urgency, defined?(RUBY_DESCRIPTION) ? RUBY_DESCRIPTION : '?' ].join(" ")
+        libnotify.urgency = urgency
+        libnotify.show!
+      end
     end
   end
-
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: libnotify
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 7
-  - 0
-  version: 0.7.0
+  - 1
+  version: 0.7.1
 platform: ruby
 authors: 
 - Peter Suschlik
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-02 00:00:00 Z
+date: 2012-01-04 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ffi