dnode 0.0.1 → 0.0.2

data/examples/simple/client.rb

@@ -2,5 +2,5 @@ require 'rubygems'
 require 'dnode'
 
 DNode.new({}).connect(5050) do |remote|
-    remote.f(30000) { |x| puts "x=<#{x}>" }
+    remote.f(30000, proc { |x| puts "x=<#{x}>" })
 end

data/examples/simple/server.rb

@@ -2,5 +2,5 @@ require 'rubygems'
 require 'dnode'
 
 DNode.new({
-    :f => proc { |x| yield x + 1337 }
+    :f => proc { |x,cb| cb.call(x + 1337) }
 }).listen(5050)

data/lib/dnode/conn.rb

@@ -29,12 +29,24 @@ class Conn
         
         if req['method'].is_a? Integer then
             id = req['method']
-            @scrub.callbacks[id].call(*JSObject.create(args))
+            cb = @scrub.callbacks[id]
+            if cb.arity < 0 then
+                cb.call(*JSObject.create(args))
+            else
+                argv = *JSObject.create(args)
+                padding = argv.length.upto(cb.arity - 1).map{ nil }
+                argv = argv.concat(padding).take(cb.arity)
+                cb.call(*argv)
+            end
         elsif req['method'] == 'methods' then
             @remote.update(args[0])
             js = JSObject.create(@remote)
             
-            @block.call(*[ js, self ][ 0 .. @block.arity - 1 ])
+            if @block.arity === 0 then
+                @block.call
+            else
+                @block.call(*[ js, self ][ 0 .. @block.arity - 1 ])
+            end
             self.emit('remote', js)
             self.emit('ready')
         end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: dnode
 version: !ruby/object:Gem::Version 
-  hash: 29
   prerelease: false
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - James Halliday
@@ -15,10 +14,35 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-12 00:00:00 +00:00
+date: 2011-11-06 00:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: events
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id002
 description: "\n        With DNode you can tie together servers written in ruby, node.js, and\n        perl.\n        \n        DNode is similar to DRb, but is asynchronous and transforms callbacks\n        embedded in deeply nested structures.\n    "
 email: mail@substack.net
 executables: []
@@ -30,14 +54,14 @@ extra_rdoc_files:
 files: 
 - LICENSE
 - lib/dnode.rb
-- lib/dnode/conn.rb
-- lib/dnode/scrub.rb
 - lib/dnode/walk.rb
+- lib/dnode/scrub.rb
+- lib/dnode/conn.rb
 - lib/dnode/jsobject.rb
-- examples/simple/client.rb
 - examples/simple/server.rb
-- examples/moo/client.rb
+- examples/simple/client.rb
 - examples/moo/server.rb
+- examples/moo/client.rb
 has_rdoc: true
 homepage: http://github.com/substack/dnode-ruby
 licenses: []
@@ -52,7 +76,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -61,7 +84,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"