libnotify 0.6.0 → 0.7.0.pre

data/README.rdoc

@@ -2,8 +2,9 @@
 
 Ruby bindings for libnotify using FFI.
 
-Source[http://github.com/splattael/libnotify] |
-RDoc[http://rdoc.info/github/splattael/libnotify/master/file/README.rdoc]
+Gem[https://rubygems.org/gems/libnotify] |
+Source[https://github.com/splattael/libnotify] |
+RDoc[http://rubydoc.info/github/splattael/libnotify/master/file/README.rdoc]
 
 http://github.com/splattael/libnotify/raw/master/libnotify.png
 
@@ -36,6 +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
+  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
+
+
 == Installation
 
   gem install libnotify
@@ -54,9 +64,13 @@ You'll need libnotify. On Debian just type:
 
 == Authors
 
-* Peter Suschlik (http://github.com/splattael)
-* Dennis Collective (http://github.com/denniscollective)
-* Daniel Mack (http://github.com/zonque)
+* Peter Suschlik (https://github.com/splattael)
+
+== Contributors
+
+* Dennis Collective (https://github.com/denniscollective)
+* Daniel Mack (https://github.com/zonque)
+* nuisanceofcats (https://github.com/nuisanceofcats)
 
 == License
 
@@ -64,4 +78,4 @@ MIT License[http://www.opensource.org/licenses/mit-license.php]
 
 == TODO
 
-* Mock FFI calls with rrriot. (test/test_libnotify.rb:61)
+* refactor & test! (lib/libnotify/api.rb:21)

data/lib/libnotify.rb

@@ -23,6 +23,14 @@ module Libnotify
   # @example Hash syntax
   #   Libnotify.show(:body => "hello", :summary => "world", :timeout => 2.5)
   #
+  # @example Update pre-existing notification
+  #   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
+  #
   # @example Mixed syntax
   #   Libnotify.new(options) do |n|
   #     n.timeout = 1.5     # overrides :timeout in options

data/lib/libnotify/api.rb

@@ -40,9 +40,14 @@ module Libnotify
     # @see Libnotify.new
     def initialize(options={}, &block)
       set_defaults
+      apply_options(options, &block)
+    end
+
+    def apply_options(options={}, &block)
       options.each { |key, value| send("#{key}=", value) if respond_to?(key) }
       yield(self) if block_given?
     end
+    private :apply_options
 
     def set_defaults
       self.summary = self.body = ' '
@@ -58,19 +63,30 @@ module Libnotify
     # @see Libnotify.show
     def show!
       notify_init(self.class.to_s) or raise "notify_init failed"
-      notify = notify_notification_new(summary, body, icon_path, nil)
-      notify_notification_set_urgency(notify, lookup_urgency(urgency))
-      notify_notification_set_timeout(notify, timeout || -1)
+      @notification = notify_notification_new(summary, body, icon_path, nil)
+      notify_notification_set_urgency(@notification, lookup_urgency(urgency))
+      notify_notification_set_timeout(@notification, timeout || -1)
       if append
-        notify_notification_set_hint_string(notify, "x-canonical-append", "")
-        notify_notification_set_hint_string(notify, "append", "")
+        notify_notification_set_hint_string(@notification, "x-canonical-append", "")
+        notify_notification_set_hint_string(@notification, "append", "")
       end
       if transient
-        notify_notification_set_hint_uint32(notify, "transient", 1)
+        notify_notification_set_hint_uint32(@notification, "transient", 1)
       end
-      notify_notification_show(notify, nil)
+      notify_notification_show(@notification, nil)
     ensure
-      notify_notification_clear_hints(notify) if (append || transient)
+      notify_notification_clear_hints(@notification) if (append || transient)
+    end
+
+    # Updates a previously shown notification.
+    def update(options={}, &block)
+      apply_options(options, &block)
+      if @notification
+        p notify_notification_update(@notification, summary, body, icon_path)
+        notify_notification_show(@notification, nil)
+      else
+        show!
+      end
     end
 
     # @todo Simplify timeout=

data/lib/libnotify/ffi.rb

@@ -22,6 +22,7 @@ module Libnotify
       attach_function :notify_init,                         [:string],                              :bool
       attach_function :notify_uninit,                       [],                                     :void
       attach_function :notify_notification_new,             [:string, :string, :string, :pointer],  :pointer
+      attach_function :notify_notification_update,          [:pointer, :string, :string, :string, :pointer],  :pointer
       attach_function :notify_notification_set_urgency,     [:pointer, :int],                       :void
       attach_function :notify_notification_set_timeout,     [:pointer, :long],                      :void
       attach_function :notify_notification_set_hint_string, [:pointer, :string, :string],           :void

data/lib/libnotify/version.rb

@@ -1,3 +1,3 @@
 module Libnotify
-  VERSION = "0.6.0"
+  VERSION = "0.7.0.pre"
 end

data/test/test_libnotify.rb

@@ -71,6 +71,15 @@ class TestLibnotifyAPI < MiniTest::Unit::TestCase
     assert_icon_path %r{^/.*/libnotify.png},  :"libnotify",             "with symbol"
   end
 
+  def test_update
+    libnotify(:summary => "hello", :body => "world")
+    libnotify.update(:summary => "hell") do |n|
+      n.body = "yeah"
+    end
+    assert_equal "hell", libnotify.summary
+    assert_equal "yeah", libnotify.body
+  end
+
   def test_integration
     skip "enable integration"
 

metadata

@@ -1,70 +1,95 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: libnotify
-version: !ruby/object:Gem::Version
-  version: 0.6.0
-  prerelease: 
+version: !ruby/object:Gem::Version 
+  hash: 961916028
+  prerelease: 6
+  segments: 
+  - 0
+  - 7
+  - 0
+  - pre
+  version: 0.7.0.pre
 platform: ruby
-authors:
+authors: 
 - Peter Suschlik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-04 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-01-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: ffi
-  requirement: &72263050 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
   type: :runtime
-  prerelease: false
-  version_requirements: *72263050
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &72262800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *72262800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: minitest-libnotify
-  requirement: &72262520 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *72262520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: yard
-  requirement: &72262250 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        - 7
+        - 0
         version: 0.7.0
   type: :development
-  prerelease: false
-  version_requirements: *72262250
+  version_requirements: *id004
 description: 
-email:
+email: 
 - peter-libnotify@suschlik.de
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .rvmrc
-- .travis.yml
 - Gemfile
 - LICENSE
 - README.rdoc
@@ -80,27 +105,38 @@ files:
 - test/test_libnotify.rb
 homepage: http://rubygems.org/gems/libnotify
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
+      version: 1.3.1
 requirements: []
+
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Ruby bindings for libnotify using FFI
 test_files: []
-has_rdoc: 
+

data/.travis.yml

@@ -1,4 +0,0 @@
-rvm:
- - ree
- - 1.9.2
- - jruby