ruby-dbus 0.6.0 → 0.7.0

data/lib/dbus/marshall.rb

@@ -42,9 +42,7 @@ module DBus
         @uint16 = "v"
         @double = "E"
       else
-        # FIXME: shouldn't a more special exception be raised here?
-        # yes, idea for a good name ? :)
-        raise Exception, "Incorrect endianness"
+        raise InvalidPacketException, "Incorrect endianness #{@endianness}"
       end
       @idx = 0
     end
@@ -53,7 +51,7 @@ module DBus
     # Return an array of unmarshalled objects
     def unmarshall(signature, len = nil)
       if len != nil
-        if @buffy.size < @idx + len
+        if @buffy.bytesize < @idx + len
           raise IncompleteBufferException
         end
       end
@@ -73,7 +71,7 @@ module DBus
       when 2, 4, 8
         bits = a - 1
         @idx = @idx + bits & ~bits
-        raise IncompleteBufferException if @idx > @buffy.size
+        raise IncompleteBufferException if @idx > @buffy.bytesize
       else
         raise "Unsupported alignment #{a}"
       end
@@ -86,7 +84,7 @@ module DBus
 
     # Retrieve the next _nbytes_ number of bytes from the buffer.
     def get(nbytes)
-      raise IncompleteBufferException if @idx + nbytes > @buffy.size
+      raise IncompleteBufferException if @idx + nbytes > @buffy.bytesize
       ret = @buffy.slice(@idx, nbytes)
       @idx += nbytes
       ret
@@ -96,8 +94,8 @@ module DBus
     def get_nul_terminated
       raise IncompleteBufferException if not @buffy[@idx..-1] =~ /^([^\0]*)\0/
       str = $1
-      raise IncompleteBufferException if @idx + str.size + 1 > @buffy.size
-      @idx += str.size + 1
+      raise IncompleteBufferException if @idx + str.bytesize + 1 > @buffy.bytesize
+      @idx += str.bytesize + 1
       str
     end
 
@@ -107,7 +105,7 @@ module DBus
       align(4)
       str_sz = get(4).unpack(@uint32)[0]
       ret = @buffy.slice(@idx, str_sz)
-      raise IncompleteBufferException if @idx + str_sz + 1 > @buffy.size
+      raise IncompleteBufferException if @idx + str_sz + 1 > @buffy.bytesize
       @idx += str_sz
       if @buffy[@idx].ord != 0
         raise InvalidPacketException, "String is not nul-terminated"
@@ -122,7 +120,7 @@ module DBus
     def get_signature
       str_sz = get(1).unpack('C')[0]
       ret = @buffy.slice(@idx, str_sz)
-      raise IncompleteBufferException if @idx + str_sz + 1 >= @buffy.size
+      raise IncompleteBufferException if @idx + str_sz + 1 >= @buffy.bytesize
       @idx += str_sz
       if @buffy[@idx].ord != 0
         raise InvalidPacketException, "Type is not nul-terminated"
@@ -193,7 +191,7 @@ module DBus
         raise InvalidPacketException if array_sz > 67108864
 
         align(signature.child.alignment)
-        raise IncompleteBufferException if @idx + array_sz > @buffy.size
+        raise IncompleteBufferException if @idx + array_sz > @buffy.bytesize
 
         packet = Array.new
         start_idx = @idx
@@ -223,6 +221,7 @@ module DBus
         packet = get_string
       when Type::STRING
         packet = get_string
+        packet.force_encoding('UTF-8') if RUBY_VERSION >= '1.9'
       when Type::SIGNATURE
         packet = get_signature
       when Type::DICT_ENTRY
@@ -240,7 +239,7 @@ module DBus
 
   # D-Bus packet marshaller class
   #
-  # Class that handles the conversion (unmarshalling) of Ruby objects to
+  # Class that handles the conversion (marshalling) of Ruby objects to
   # (binary) payload data.
   class PacketMarshaller
     # The current or result packet.
@@ -267,18 +266,18 @@ module DBus
 
     # Align the buffer with NULL (\0) bytes on a byte length of _a_.
     def align(a)
-      @packet = @packet.ljust(num_align(@offset + @packet.length, a) - @offset, 0.chr)
+      @packet = @packet.ljust(num_align(@offset + @packet.bytesize, a) - @offset, 0.chr)
     end
 
     # Append the the string _str_ itself to the packet.
     def append_string(str)
       align(4)
-      @packet += [str.length].pack("L") + str + "\0"
+      @packet += [str.bytesize].pack("L") + [str].pack("Z*")
     end
 
     # Append the the signature _signature_ itself to the packet.
     def append_signature(str)
-      @packet += str.length.chr + str + "\0"
+      @packet += str.bytesize.chr + str + "\0"
     end
 
     # Append the array type _type_ to the packet and allow for appending
@@ -286,12 +285,12 @@ module DBus
     def array(type)
       # Thanks to Peter Rullmann for this line
       align(4)
-      sizeidx = @packet.size
+      sizeidx = @packet.bytesize
       @packet += "ABCD"
       align(type.alignment)
-      contentidx = @packet.size
+      contentidx = @packet.bytesize
       yield
-      sz = @packet.size - contentidx
+      sz = @packet.bytesize - contentidx
       raise InvalidPacketException if sz > 67108864
       @packet[sizeidx...sizeidx + 4] = [sz].pack("L")
     end
@@ -308,6 +307,8 @@ module DBus
     end
 
     # Append a value _val_ to the packet based on its _type_.
+    #
+    # Host native endianness is used, declared in Message#marshall
     def append(type, val)
       raise TypeException, "Cannot send nil" if val.nil?
 
@@ -372,7 +373,7 @@ module DBus
 
         append_signature(vartype.to_s)
         align(vartype.alignment)
-        sub = PacketMarshaller.new(@offset + @packet.length)
+        sub = PacketMarshaller.new(@offset + @packet.bytesize)
         sub.append(vartype, vardata)
         @packet += sub.packet
       when Type::ARRAY

data/lib/dbus/matchrule.rb

@@ -15,7 +15,7 @@ module DBus
   #
   # FIXME
   class MatchRule
-    # The list of possible match filters.
+    # The list of possible match filters. TODO argN, argNpath
     FILTERS = [:sender, :interface, :member, :path, :destination, :type]
     # The sender filter.
     attr_accessor :sender
@@ -94,6 +94,7 @@ module DBus
       return false if @interface and @interface != msg.interface
       return false if @member and @member != msg.member
       return false if @path and @path != msg.path
+      # FIXME sender and destination are ignored
       true
     end
   end # class MatchRule

data/lib/dbus/message.rb

@@ -152,7 +152,7 @@ module DBus
       @params.each do |param|
         params.append(param[0], param[1])
       end
-      @body_length = params.packet.length
+      @body_length = params.packet.bytesize
 
       marshaller = PacketMarshaller.new
       marshaller.append(Type::BYTE, HOST_END)

data/ruby-dbus.gemspec

@@ -8,6 +8,7 @@ GEMSPEC = Gem::Specification.new do |s|
   s.summary = "Ruby module for interaction with D-Bus"
   # s.description = FIXME
   s.version = File.read("VERSION").strip
+  s.license = "LGPL v2.1"
   s.author = "Ruby DBus Team"
   s.email = "ruby-dbus-devel@lists.luon.net"
   s.homepage = "https://trac.luon.net/ruby-dbus"
@@ -15,4 +16,5 @@ GEMSPEC = Gem::Specification.new do |s|
   s.require_path = "lib"
   s.has_rdoc = true
   s.extra_rdoc_files = ["COPYING", "README", "NEWS"]
+  s.required_ruby_version = ">= 1.8.7"
 end

data/test/binding_test.rb

@@ -5,7 +5,7 @@ require "dbus"
 
 class BindingTest < Test::Unit::TestCase
   def setup
-    @bus = DBus::SessionBus.instance
+    @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
     @base = @svc.object "/org/ruby/MyInstance"
     @base.introspect

data/test/bus_driver_test.rb

@@ -9,7 +9,7 @@ end
 
 class BusDriverTest < Test::Unit::TestCase
   def setup
-    @bus = DBus::SessionBus.instance
+    @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
     @svc.object("/").introspect
   end

data/test/bus_test.rb

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# Test the bus class
+require "test/unit"
+require "dbus"
+
+class BusTest < Test::Unit::TestCase
+  def setup
+    @bus = DBus::ASessionBus.new
+    @svc = @bus.service("org.ruby.service")
+    @svc.object("/").introspect
+  end
+
+  def test_introspection_not_leaking
+    # peek inside the object to see if a cleanup step worked or not
+    some_hash = @bus.instance_eval { @method_call_replies || Hash.new }
+    assert_equal 0, some_hash.size, "there are leftover method handlers"
+  end
+end

data/test/property_test.rb

@@ -4,7 +4,7 @@ require "dbus"
 
 class PropertyTest < Test::Unit::TestCase
   def setup
-    session_bus = DBus::SessionBus.instance
+    session_bus = DBus::ASessionBus.new
     svc = session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
     @obj.introspect

data/test/server_robustness_test.rb

@@ -5,7 +5,7 @@ require "dbus"
 
 class ServerRobustnessTest < Test::Unit::TestCase
   def setup
-    @bus = DBus::SessionBus.instance
+    @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
   end
 
@@ -57,7 +57,7 @@ class ServerRobustnessTest < Test::Unit::TestCase
     ifc.not_the_answer
     assert false, "should have raised"
   rescue DBus::Error => e
-    assert_no_match(/timeout/, e)
+    assert_no_match(/timeout/, e.to_s)
   end
 
   def test_no_such_interface_without_introspection
@@ -67,6 +67,6 @@ class ServerRobustnessTest < Test::Unit::TestCase
     ifc.the_answer
     assert false, "should have raised"
   rescue DBus::Error => e
-    assert_no_match(/timeout/, e)
+    assert_no_match(/timeout/, e.to_s)
   end
 end

data/test/server_test.rb

@@ -25,7 +25,7 @@ end
 
 class ServerTest < Test::Unit::TestCase
   def setup
-    @bus = DBus::SessionBus.instance
+    @bus = DBus::ASessionBus.new
     @svc = @bus.request_service "org.ruby.server-test"
   end
 

data/test/service_newapi.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 
 # find the library without external help
 $:.unshift File.expand_path("../../lib", __FILE__)
@@ -56,6 +57,13 @@ class Test < DBus::Object
     dbus_method :Error, "in name:s, in description:s" do |name, description|
       raise DBus.error(name), description
     end
+  end
+
+  # closing and reopening the same interface
+  dbus_interface INTERFACE do
+    dbus_method :multibyte_string, "out string:s" do
+      "あいうえお"
+    end
 
     dbus_signal :SomethingJustHappened, "toto:s, tutu:u"
   end
@@ -186,7 +194,7 @@ bus.add_match(mr) do |msg|
   end
 end
 
-puts "listening"
+puts "listening, with ruby-#{RUBY_VERSION}"
 main = DBus::Main.new
 main << bus
 begin

data/test/session_bus_test_manual.rb

@@ -10,7 +10,7 @@ class SessionBusAddressTest < Test::Unit::TestCase
   def setup
     # test getting the session bus address even if unset in ENV (Issue#4)
     ENV.delete "DBUS_SESSION_BUS_ADDRESS"
-    @bus = DBus::SessionBus.instance
+    @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.freedesktop.DBus")
   end
 

data/test/signal_test.rb

@@ -9,7 +9,7 @@ end
 
 class SignalHandlerTest < Test::Unit::TestCase
   def setup
-    @session_bus = DBus::SessionBus.instance
+    @session_bus = DBus::ASessionBus.new
     svc = @session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
     @obj.introspect                  # necessary

data/test/t2.rb

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
 require "test/unit"
 require "dbus"
 
 class ValueTest < Test::Unit::TestCase
   def setup
-    session_bus = DBus::SessionBus.instance
+    session_bus = DBus::ASessionBus.new
     svc = session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
     @obj.introspect                  # necessary
@@ -63,4 +64,9 @@ class ValueTest < Test::Unit::TestCase
     # "warning: default `to_a' will be obsolete"
     @obj.the_answer
   end
+
+  def test_multibyte_string
+    str = @obj.multibyte_string[0]
+    assert_equal "あいうえお", str
+  end
 end

data/test/t3-ticket27.rb

@@ -2,7 +2,7 @@
 # Test passing a particular struct array through a variant
 # https://trac.luon.net/ruby-dbus/ticket/27
 require "dbus"
-session_bus = DBus::SessionBus.instance
+session_bus = DBus::ASessionBus.new
 svc = session_bus.service("org.ruby.service")
 obj = svc.object("/org/ruby/MyInstance")
 obj.introspect                  # necessary

data/test/t5-report-dbus-interface.rb

@@ -6,7 +6,7 @@ require "dbus"
 
 class ErrMsgTest < Test::Unit::TestCase
   def setup
-    session_bus = DBus::SessionBus.instance
+    session_bus = DBus::ASessionBus.new
     svc = session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
     @obj.introspect                  # necessary

data/test/t6-loop.rb

@@ -9,7 +9,7 @@ end
 
 class MainLoopTest < Test::Unit::TestCase
   def setup
-    @session_bus = DBus::SessionBus.instance
+    @session_bus = DBus::ASessionBus.new
     svc = @session_bus.service("org.ruby.service")
     @obj = svc.object("/org/ruby/MyInstance")
     @obj.introspect                  # necessary

data/test/thread_safety_test.rb

@@ -0,0 +1,35 @@
+#!/usr/bin/env ruby
+# Test thread safety
+require "test/unit"
+require "dbus"
+
+def d(msg)
+  puts "#{$$} #{msg}" if $DEBUG
+end
+
+class ThreadSafetyTest < Test::Unit::TestCase
+  def test_thread_competition
+    print "Thread competition: "
+    jobs = []
+    5.times do
+      jobs << Thread.new do
+        Thread.current.abort_on_exception = true
+
+        # use separate connections to avoid races
+        bus = DBus::ASessionBus.new
+        svc = bus.service("org.ruby.service")
+        obj = svc.object("/org/ruby/MyInstance")
+        obj.introspect
+        obj.default_iface = "org.ruby.SampleInterface"
+
+        10.times do |i|
+          print "#{i} "
+          $stdout.flush
+          assert_equal 42, obj.the_answer[0]
+          sleep 0.1 * rand
+        end
+      end
+    end
+    jobs.each do |thread| thread.join end
+  end
+end

data/test/variant_test.rb

@@ -5,7 +5,7 @@ require "dbus"
 
 class VariantTest < Test::Unit::TestCase
   def setup
-    @bus = DBus::SessionBus.instance
+    @bus = DBus::ASessionBus.new
     @svc = @bus.service("org.ruby.service")
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-dbus
 version: !ruby/object:Gem::Version 
-  hash: 7
-  prerelease: false
+  hash: 3
+  prerelease: 
   segments: 
   - 0
-  - 6
+  - 7
   - 0
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors: 
 - Ruby DBus Team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-10 00:00:00 +01:00
+date: 2011-07-26 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -32,12 +32,10 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - VERSION
-- doc/tutorial/index.html
 - doc/tutorial/index.markdown
 - examples/gdbus/gdbus
 - examples/gdbus/gdbus.glade
 - examples/gdbus/launch.sh
-- examples/no-introspect/call-overloaded.rb
 - examples/no-introspect/nm-test.rb
 - examples/no-introspect/tracker-test.rb
 - examples/rhythmbox/playpause.rb
@@ -63,6 +61,7 @@ files:
 - ruby-dbus.gemspec
 - test/binding_test.rb
 - test/bus_driver_test.rb
+- test/bus_test.rb
 - test/dbus-launch-simple
 - test/dbus-limited-session.conf
 - test/property_test.rb
@@ -78,14 +77,15 @@ files:
 - test/t6-loop.rb
 - test/test_env
 - test/test_server
+- test/thread_safety_test.rb
 - test/variant_test.rb
 - COPYING
 - README
 - NEWS
 has_rdoc: true
 homepage: https://trac.luon.net/ruby-dbus
-licenses: []
-
+licenses: 
+- LGPL v2.1
 post_install_message: 
 rdoc_options: []
 
@@ -96,10 +96,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
+      hash: 57
       segments: 
-      - 0
-      version: "0"
+      - 1
+      - 8
+      - 7
+      version: 1.8.7
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
@@ -112,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.5.2
 signing_key: 
 specification_version: 3
 summary: Ruby module for interaction with D-Bus