ruby-dbus 0.9.1 → 0.9.2

data/VERSION

@@ -1 +1 @@
-0.9.1
+0.9.2

data/doc/Reference.md

@@ -108,7 +108,11 @@ Variants are simply unpacked to become their contained type.
 
 D-Bus has stricter typing than Ruby, so the library must decide
 which D-Bus type to choose. Most of the time the choice is dictated
-by the D-Bus signature. However if the signature expects a Variant
+by the D-Bus signature.
+
+##### Variants
+
+If the signature expects a Variant
 (which is the case for all Properties!) then an explicit mechanism is needed.
 
 1. A pair [{DBus::Type::Type}, value] specifies to marshall *value* as
@@ -119,6 +123,8 @@ by the D-Bus signature. However if the signature expects a Variant
    ISSUE: using something else than cryptic signatures is even more painful
    than remembering the signatures!
 
+        foo_i['Bar'] = DBus.variant("au", [0, 1, 1, 2, 3, 5, 8])
+
 2. Other values are tried to fit one of these:
    Boolean, Double, Array of Variants, Hash of String keyed Variants,
    String, Int32, Int64.
@@ -128,12 +134,17 @@ by the D-Bus signature. However if the signature expects a Variant
    type. This will hit you when you rely on method (2) but happen to have
    a particular string value in an array.
 
+##### Byte Arrays
+
+If a byte array (`ay`) is expected you can pass a String too.
+The bytes sent are according to the string's
+[encoding](http://ruby-doc.org/core-1.9.3/Encoding.html).
+
+##### nil
 
 `nil` is not allowed by D-Bus and attempting to send it raises an exception
 (but see [I#16](https://github.com/mvidner/ruby-dbus/issues/16)).
 
-    foo_i['Bar'] = DBus.variant("au", [0, 1, 1, 2, 3, 5, 8])
-
 
 #### Errors
 

data/lib/dbus/marshall.rb

@@ -382,8 +382,12 @@ module DBus
           # Damn ruby rocks here
           val = val.to_a
         end
-        if not val.kind_of?(Array)
-          raise TypeException, "Expected an Array but got a #{val.class}"
+        # If string is recieved and ay is expected, explode the string
+        if val.kind_of?(String) && type.child.sigtype == Type::BYTE
+          val = val.bytes
+        end
+        if not val.kind_of?(Enumerable)
+          raise TypeException, "Expected an Enumerable of #{type.child.inspect} but got a #{val.class}"
         end
         array(type.child) do
           val.each do |elem|

data/lib/dbus/xml.rb

@@ -97,8 +97,12 @@ module DBus
 
     # return a pair: [list of Interfaces, list of direct subnode names]
     def parse
-      interfaces = Array.new
-      subnodes = Array.new
+      # Using a Hash instead of a list helps merge split-up interfaces,
+      # a quirk observed in ModemManager (I#41).
+      interfaces = Hash.new do |hash, missing_key|
+        hash[missing_key] = Interface.new(missing_key)
+      end
+      subnodes = []
       t = Time.now
 
 
@@ -107,7 +111,7 @@ module DBus
         subnodes << e["name"]
       end
       d.each("node/interface") do |e|
-        i = Interface.new(e["name"])
+        i = interfaces[e["name"]]
         e.each("method") do |me|
           m = Method.new(me["name"])
           parse_methsig(me, m)
@@ -118,13 +122,12 @@ module DBus
           parse_methsig(se, s)
           i << s
         end
-        interfaces << i
       end
       d = Time.now - t
       if d > 2
         DBus.logger.debug "Some XML took more that two secs to parse. Optimize me!"
       end
-      [interfaces, subnodes]
+      [interfaces.values, subnodes]
     end
 
     ######################################################################

data/test/async_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the binding of dbus concepts to ruby concepts
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/binding_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the binding of dbus concepts to ruby concepts
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/bus_and_xml_backend_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the bus class
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require 'rubygems'
 require 'nokogiri'

data/test/bus_driver_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the methods of the bus driver
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/bus_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the bus class
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/byte_array_test.rb

@@ -0,0 +1,42 @@
+#!/usr/bin/env ruby
+require File.expand_path("../test_helper", __FILE__)
+require "test/unit"
+require "dbus"
+
+class ByteArrayTest < 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
+
+
+  def test_passing_byte_array
+    data = [0, 77, 255]
+    result = @obj.mirror_byte_array(data).first
+    assert_equal data, result
+  end
+
+  def test_passing_byte_array_from_string
+    data = "AAA"
+    result = @obj.mirror_byte_array(data).first
+    assert_equal [65, 65, 65], result
+  end
+
+  def test_passing_byte_array_from_hash
+    # Hash is an Enumerable, but is caught earlier
+    data = { "this will" => "fail" }
+    assert_raises DBus::TypeException do
+      @obj.mirror_byte_array(data).first
+    end
+  end
+
+  def test_passing_byte_array_from_nonenumerable
+    data = Time.now
+    assert_raises DBus::TypeException do
+       @obj.mirror_byte_array(data).first
+    end
+  end
+end

data/test/dbus-limited-session.conf

@@ -8,7 +8,7 @@
   <type>session</type>
 
   <listen>unix:tmpdir=/tmp</listen>
-  <listen>tcp:host=127.0.0.1,port=0,family=ipv4</listen>
+  <listen>tcp:host=127.0.0.1</listen>
 
   <standard_session_servicedirs />
 

data/test/introspect_xml_parser_test.rb

@@ -0,0 +1,27 @@
+#!/usr/bin/env ruby
+require File.expand_path("../test_helper", __FILE__)
+require "test/unit"
+require "dbus"
+
+class IntrospectXMLParserTest < Test::Unit::TestCase
+  def test_split_interfaces
+    xml = <<EOS
+<node>
+   <interface name="org.example.Foo">
+     <method name="Dwim"/>
+   </interface>
+   <interface name="org.example.Bar">
+     <method name="Drink"/>
+   </interface>
+   <interface name="org.example.Foo">
+     <method name="Smurf"/>
+   </interface>
+</node>
+EOS
+
+    interfaces, _ = DBus::IntrospectXMLParser.new(xml).parse
+
+    foo = interfaces.find {|i| i.name == "org.example.Foo" }
+    assert_equal 2, foo.methods.keys.size
+  end
+end

data/test/introspection_test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/property_test.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/server_robustness_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test that a server survives various error cases
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/server_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test that a server survives various error cases
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/service_newapi.rb

@@ -1,6 +1,8 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
 
+require File.expand_path("../test_helper", __FILE__)
+SimpleCov.command_name "Service Tests" if Object.const_defined? "SimpleCov"
 # find the library without external help
 $:.unshift File.expand_path("../../lib", __FILE__)
 
@@ -23,7 +25,7 @@ class Test < DBus::Object
     end
 
     dbus_method :test_variant, "in stuff:v" do |variant|
-      p variant
+      DBus.logger.debug variant.inspect
     end
 
     dbus_method :bounce_variant, "in stuff:v, out chaff:v" do |variant|
@@ -53,6 +55,10 @@ class Test < DBus::Object
     dbus_method :Error, "in name:s, in description:s" do |name, description|
       raise DBus.error(name), description
     end
+
+    dbus_method :mirror_byte_array, "in bytes:ay, out mirrored:ay" do |bytes|
+      [bytes]
+    end
   end
 
   # closing and reopening the same interface

data/test/session_bus_test_manual.rb

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/signal_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the signal handlers
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/t2.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # -*- coding: utf-8 -*-
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/t3-ticket27.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # Test passing a particular struct array through a variant
 # https://trac.luon.net/ruby-dbus/ticket/27
+require File.expand_path("../test_helper", __FILE__)
 require "dbus"
 session_bus = DBus::ASessionBus.new
 svc = session_bus.service("org.ruby.service")

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

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # should report it missing on org.ruby.SampleInterface
 # (on object...) instead of on DBus::Proxy::ObjectInterface
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/t6-loop.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the main loop
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/test_helper.rb

@@ -0,0 +1,14 @@
+if ENV["COVERAGE"]
+  coverage = ENV["COVERAGE"] == "true"
+else
+  # heuristics: enable for interactive builds but not in Travis or OBS
+  coverage = !!ENV["DISPLAY"]
+end
+
+if coverage && RUBY_VERSION >= "1.9" # SimpleCov does not work with 1.8
+  require 'simplecov'
+  SimpleCov.root File.expand_path("../..", __FILE__)
+  SimpleCov.start
+end
+
+$:.unshift File.expand_path("../../lib", __FILE__)

data/test/thread_safety_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test thread safety
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/type_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test the type class
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

data/test/variant_test.rb

@@ -1,5 +1,6 @@
 #!/usr/bin/env ruby
 # Test marshalling variants according to ruby types
+require File.expand_path("../test_helper", __FILE__)
 require "test/unit"
 require "dbus"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-dbus
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-23 00:00:00.000000000 Z
+date: 2013-05-08 00:00:00.000000000 Z
 dependencies: []
 description: Pure Ruby module for interaction with D-Bus IPC system
 email: ruby-dbus-devel@lists.luon.net
@@ -59,8 +59,10 @@ files:
 - test/bus_and_xml_backend_test.rb
 - test/bus_driver_test.rb
 - test/bus_test.rb
+- test/byte_array_test.rb
 - test/dbus-launch-simple
 - test/dbus-limited-session.conf
+- test/introspect_xml_parser_test.rb
 - test/introspection_test.rb
 - test/property_test.rb
 - test/server_robustness_test.rb
@@ -74,6 +76,7 @@ files:
 - test/t5-report-dbus-interface.rb
 - test/t6-loop.rb
 - test/test_env
+- test/test_helper.rb
 - test/test_server
 - test/thread_safety_test.rb
 - test/type_test.rb