ruby-dbus 0.7.0 → 0.7.1

data/NEWS

@@ -5,6 +5,14 @@ Note about bug numbers:
  Issue#1  - http://github.com/mvidner/ruby-dbus/issues#issue/1
  bnc#1    - https://bugzilla.novell.com/show_bug.cgi?id=1
 
+== Ruby D-Bus 0.7.1 - 2012-04-04
+
+Bug fixes:
+ * Fixed calling asynchronous methods on the default interface (Issue#13,
+   by Eugene Korbut). 
+ * Fixed Main#quit to really quit the loop (by Josef Reidinger)
+ * Unbundled files from Active Support (by Bohuslav Kabrda)
+
 == Ruby D-Bus 0.7.0 - 2011-07-26
 
 Features:

data/VERSION

@@ -1 +1 @@
-0.7.0
+0.7.1

data/lib/dbus.rb

@@ -8,7 +8,6 @@
 # License, version 2.1 as published by the Free Software Foundation.
 # See the file "COPYING" for the exact licensing terms.
 
-require 'dbus/core_ext/class/attribute'
 require 'dbus/type'
 require 'dbus/introspect'
 require 'dbus/error'

data/lib/dbus/bus.rb

@@ -827,8 +827,9 @@ module DBus
         end
       end
       while not @quitting and not @buses.empty?
-        ready, dum, dum = IO.select(@buses.keys)
-        ready.each do |socket|
+        ready = IO.select(@buses.keys,[],[],5) #timeout 5 seconds
+        continue unless ready #timeout exceed so continue unless quitting
+        ready.first.each do |socket|
           b = @buses[socket]
           begin
             b.update_buffer

data/lib/dbus/export.rb

@@ -19,8 +19,10 @@ module DBus
   class Object
     # The path of the object.
     attr_reader :path
-    # The interfaces that the object supports. Hash: String => Interface
-    class_attribute :intfs
+    # The interfaces that the object supports.
+    # intfs: Hash: String => Interface
+    # @@intfs_hash simulates a class attribute by being a hash Class => intfs
+    @@intfs_hash = {DBus::Object => nil}
     # The service that the object is exported by.
     attr_writer :service
 
@@ -34,6 +36,26 @@ module DBus
       @service = nil
     end
 
+    def self.intfs
+      if self.equal? DBus::Object
+        @@intfs_hash[DBus::Object]
+      else
+        @@intfs_hash[self] || self.superclass.intfs
+      end
+    end
+
+    def self.intfs= param
+      @@intfs_hash[self] = param
+    end
+
+    def intfs
+      self.class.intfs
+    end
+
+    def intfs= param
+      self.class.intfs = param
+    end
+
     # State that the object implements the given _intf_.
     def implements(intf)
       # use a setter

data/lib/dbus/introspect.rb

@@ -497,10 +497,10 @@ module DBus
 
     # Handles all unkown methods, mostly to route method calls to the
     # default interface.
-    def method_missing(name, *args)
+    def method_missing(name, *args, &reply_handler)
       if @default_iface and has_iface?(@default_iface)
         begin
-          @interfaces[@default_iface].method(name).call(*args)
+          @interfaces[@default_iface].method(name).call(*args, &reply_handler)
         rescue NameError => e
           # interesting, foo.method("unknown")
           # raises NameError, not NoMethodError

data/test/async_test.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+# Test the binding of dbus concepts to ruby concepts
+require "test/unit"
+require "dbus"
+
+class AsyncTest < Test::Unit::TestCase
+  def setup
+    @bus = DBus::ASessionBus.new
+    @svc = @bus.service("org.ruby.service")
+    @obj = @svc.object "/org/ruby/MyInstance"
+    @obj.introspect
+    @obj.default_iface = "org.ruby.SampleInterface"
+  end
+
+  # https://github.com/mvidner/ruby-dbus/issues/13
+  def test_async_call_to_default_interface
+    loop = DBus::Main.new
+    loop << @bus
+
+    immediate_answer = @obj.the_answer do |msg, retval|
+      assert_equal 42, retval
+      loop.quit
+    end
+
+    assert_nil immediate_answer
+
+    # wait for the async reply
+    loop.run
+  end
+
+  def test_async_call_to_explicit_interface
+    loop = DBus::Main.new
+    loop << @bus
+
+    ifc = @obj["org.ruby.AnotherInterface"]
+    immediate_answer = ifc.Reverse("abcd") do |msg, retval|
+      assert_equal "dcba", retval
+      loop.quit
+    end
+
+    assert_nil immediate_answer
+
+    # wait for the async reply
+    loop.run
+  end
+
+end

data/test/service_newapi.rb

@@ -74,7 +74,6 @@ class Test < DBus::Object
     end
     dbus_method :Reverse, "in instr:s, out outstr:s" do |instr|
       outstr = instr.split(//).reverse.join
-      puts "got: #{instr}, replying: #{outstr}"
       [outstr]
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-dbus
 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: 
 - Ruby DBus Team
@@ -15,8 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-26 00:00:00 +02:00
-default_executable: 
+date: 2012-04-04 00:00:00 Z
 dependencies: []
 
 description: 
@@ -48,9 +47,6 @@ files:
 - lib/dbus.rb
 - lib/dbus/auth.rb
 - lib/dbus/bus.rb
-- lib/dbus/core_ext/class/attribute.rb
-- lib/dbus/core_ext/kernel/singleton_class.rb
-- lib/dbus/core_ext/module/remove_method.rb
 - lib/dbus/error.rb
 - lib/dbus/export.rb
 - lib/dbus/introspect.rb
@@ -59,6 +55,7 @@ files:
 - lib/dbus/message.rb
 - lib/dbus/type.rb
 - ruby-dbus.gemspec
+- test/async_test.rb
 - test/binding_test.rb
 - test/bus_driver_test.rb
 - test/bus_test.rb
@@ -82,7 +79,6 @@ files:
 - COPYING
 - README
 - NEWS
-has_rdoc: true
 homepage: https://trac.luon.net/ruby-dbus
 licenses: 
 - LGPL v2.1
@@ -114,7 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.5.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Ruby module for interaction with D-Bus

data/lib/dbus/core_ext/class/attribute.rb

@@ -1,91 +0,0 @@
-# copied from activesupport/core_ext from Rails, MIT license
-require 'dbus/core_ext/kernel/singleton_class'
-require 'dbus/core_ext/module/remove_method'
-
-class Class
-  # Declare a class-level attribute whose value is inheritable by subclasses.
-  # Subclasses can change their own value and it will not impact parent class.
-  #
-  #   class Base
-  #     class_attribute :setting
-  #   end
-  #
-  #   class Subclass < Base
-  #   end
-  #
-  #   Base.setting = true
-  #   Subclass.setting            # => true
-  #   Subclass.setting = false
-  #   Subclass.setting            # => false
-  #   Base.setting                # => true
-  #
-  # In the above case as long as Subclass does not assign a value to setting
-  # by performing <tt>Subclass.setting = _something_ </tt>, <tt>Subclass.setting</tt>
-  # would read value assigned to parent class. Once Subclass assigns a value then
-  # the value assigned by Subclass would be returned.
-  #
-  # This matches normal Ruby method inheritance: think of writing an attribute
-  # on a subclass as overriding the reader method. However, you need to be aware
-  # when using +class_attribute+ with mutable structures as +Array+ or +Hash+.
-  # In such cases, you don't want to do changes in places but use setters:
-  #
-  #   Base.setting = []
-  #   Base.setting                # => []
-  #   Subclass.setting            # => []
-  #
-  #   # Appending in child changes both parent and child because it is the same object:
-  #   Subclass.setting << :foo
-  #   Base.setting               # => [:foo]
-  #   Subclass.setting           # => [:foo]
-  #
-  #   # Use setters to not propagate changes:
-  #   Base.setting = []
-  #   Subclass.setting += [:foo]
-  #   Base.setting               # => []
-  #   Subclass.setting           # => [:foo]
-  #
-  # For convenience, a query method is defined as well:
-  #
-  #   Subclass.setting?       # => false
-  #
-  # Instances may overwrite the class value in the same way:
-  #
-  #   Base.setting = true
-  #   object = Base.new
-  #   object.setting          # => true
-  #   object.setting = false
-  #   object.setting          # => false
-  #   Base.setting            # => true
-  #
-  # To opt out of the instance writer method, pass :instance_writer => false.
-  #
-  #   object.setting = false  # => NoMethodError
-  def class_attribute(*attrs)
-    instance_writer = !attrs.last.is_a?(Hash) || attrs.pop[:instance_writer]
-
-    attrs.each do |name|
-      class_eval <<-RUBY, __FILE__, __LINE__ + 1
-        def self.#{name}() nil end
-        def self.#{name}?() !!#{name} end
-
-        def self.#{name}=(val)
-          singleton_class.class_eval do
-            remove_possible_method(:#{name})
-            define_method(:#{name}) { val }
-          end
-          val
-        end
-
-        def #{name}
-          defined?(@#{name}) ? @#{name} : singleton_class.#{name}
-        end
-
-        def #{name}?
-          !!#{name}
-        end
-      RUBY
-
-      attr_writer name if instance_writer
-    end
-  end
-end

data/lib/dbus/core_ext/kernel/singleton_class.rb

@@ -1,14 +0,0 @@
-# copied from activesupport/core_ext from Rails, MIT license
-module Kernel
-  # Returns the object's singleton class.
-  def singleton_class
-    class << self
-      self
-    end
-  end unless respond_to?(:singleton_class) # exists in 1.9.2
-
-  # class_eval on an object acts like singleton_class.class_eval.
-  def class_eval(*args, &block)
-    singleton_class.class_eval(*args, &block)
-  end
-end

data/lib/dbus/core_ext/module/remove_method.rb

@@ -1,12 +0,0 @@
-# copied from activesupport/core_ext from Rails, MIT license
-class Module
-  def remove_possible_method(method)
-    remove_method(method)
-  rescue NameError
-  end
-
-  def redefine_method(method, &block)
-    remove_possible_method(method)
-    define_method(method, &block)
-  end
-end