pangdudu-ruby-dbus 0.2.4.2 → 0.2.4.3

data/README.rdoc

@@ -3,23 +3,17 @@
 Ruby D-Bus provides an implementation of the D-Bus protocol such that the
 D-Bus system can be used in the Ruby programming language.
 
+You can switch between REXML and Hpricot as XML parsers!
 
-This is my personal dev-fork of mvidners upstream.
+Still a little bumpy with multiple threads, but getting there.
 
-If you'd like to contrib to this fork, let me know.
 
+This is my personal dev-fork of mvidners upstream.
 
+If you'd like to contrib to this fork, let me know.
 
 Most of my work here is actually for another project: http://github.com/pangdudu/robots/tree/master
 
-I might also start writing a less ugly version of: http://github.com/pangdudu/ruby-dbus-daemon/tree/master 
-
-If you know of a nice custom-dbus-daemon let me know. Still thinking about writing
-a dbus spec compliant server/daemon implementation in (pure) Ruby, so that I can
-play around with the network and authentification more easily.
-
-Oki, will clean up a little now. :)
-
 Peace.
 
 == Requirements

data/lib/dbus/introspect.rb

@@ -9,6 +9,7 @@ p# dbus/introspection.rb - module containing a low-level D-Bus introspection imp
 # See the file "COPYING" for the exact licensing terms.
 
 require 'rexml/document'
+require 'hpricot'
 
 module DBus
   # Regular expressions that should match all method names.
@@ -199,21 +200,58 @@ module DBus
     # Creates a new parser for XML data in string _xml_.
     def initialize(xml)
       @xml = xml
+      @hpricot = true
     end
 
     # Recursively parses the subnodes, constructing the tree.
     def parse_subnodes
       subnodes = Array.new
       t = Time.now
-      d = REXML::Document.new(@xml)
-      d.elements.each("node/node") do |e|
-        subnodes << e.attributes["name"]
+      if @hpricot
+        d = Hpricot.XML(@xml)
+        (d/"node/node").each { |e| subnodes << e.attributes['name'] }
+        return subnodes
+      end
+      unless @hpricot
+        d = REXML::Document.new(@xml)
+        d.elements.each("node/node") do |e|
+          subnodes << e.attributes["name"]
+        end
+        return subnodes
       end
-      subnodes
     end
-
-    # Parses the XML, constructing the tree.
+    
+    #make it easy to switch
     def parse
+      parse_rexml unless @hpricot
+      parse_hpricot if @hpricot      
+    end
+    
+    # Parses the XML, constructing the tree, using hpricot
+    def parse_hpricot
+      ret = Array.new
+      subnodes = Array.new
+      d = Hpricot.XML(@xml)
+      (d/"node/node").each { |e| subnodes << e.attributes['name'] }
+      (d/"node/interface").each do |e|
+        i = Interface.new(e.attributes['name'])
+        (e/"method").each do |me|
+          m = Method.new(me.attributes['name'])
+          parse_methsig_hpricot(me, m)
+          i << m
+        end
+        (e/"signal").each do |se|
+          s = Signal.new(se.attributes['name'])
+          parse_methsig_hpricot(se, s)
+          i << s
+        end
+        ret << i
+      end
+      [ret, subnodes]
+    end
+    
+    # Parses the XML, constructing the tree, using rexml
+    def parse_rexml
       ret = Array.new
       subnodes = Array.new
       t = Time.now
@@ -225,12 +263,12 @@ module DBus
         i = Interface.new(e.attributes["name"])
         e.elements.each("method") do |me|
           m = Method.new(me.attributes["name"])
-          parse_methsig(me, m)
+          parse_methsig_rexml(me, m)
           i << m
         end
         e.elements.each("signal") do |se|
           s = Signal.new(se.attributes["name"])
-          parse_methsig(se, s)
+          parse_methsig_rexml(se, s)
           i << s
         end
         ret << i
@@ -247,7 +285,29 @@ module DBus
 
     # Parses a method signature XML element _e_ and initialises
     # method/signal _m_.
-    def parse_methsig(e, m)
+    def parse_methsig_hpricot(e, m)
+      (e/"arg").each do |ae|
+        name = ae.attributes['name']
+        dir = ae.attributes['direction']
+        sig = ae.attributes['type']
+	      if m.is_a?(DBus::Signal)
+          m.add_param([name, sig])
+	      elsif m.is_a?(DBus::Method)
+          case dir
+          when "in"
+            m.add_param([name, sig])
+          when "out"
+	          m.add_return([name, sig])
+	        end
+        else
+          raise NotImplementedError, dir
+        end
+      end
+    end
+
+    # Parses a method signature XML element _e_ and initialises
+    # method/signal _m_.
+    def parse_methsig_rexml(e, m)
       e.elements.each("arg") do |ae|
         name = ae.attributes["name"]
         dir = ae.attributes["direction"]

data/lib/dbus.rb

@@ -9,6 +9,7 @@
 # See the file "COPYING" for the exact licensing terms.
 require 'rubygems'
 require 'rofl' #http://github.com/pangdudu/rofl/tree/master makes the debug/tracing easy
+require 'hpricot' #hope this will speed stuff up a little
 require 'dbus/type'
 require 'dbus/introspect'
 require 'dbus/export'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pangdudu-ruby-dbus
 version: !ruby/object:Gem::Version 
-  version: 0.2.4.2
+  version: 0.2.4.3
 platform: ruby
 authors: 
 - Ruby DBUS Team, pangdudu
@@ -22,6 +22,16 @@ dependencies:
       - !ruby/object:Gem::Version 
         version: "0"
     version: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
 description: Ruby module for interaction with dbus, panda dev fork.
 email: pangdudu@github
 executables: []