emdrb 0.4.0 → 0.4.1

data/History.txt

@@ -1,3 +1,6 @@
+== 0.4.1 / 2009-04-21
+* Bug in calling deferrable methods from a local object now fixed
+
 == 0.4.0 / 2009-03-18
 * Mechanism for deferrable methods using blocks cleaned up further
 * Asynchronous method call API cleaned up

data/README.txt

@@ -33,8 +33,6 @@ It is, however, not yet a complete replacement for the standard DRb:
 * No SSL support.  To support this fully, EventMachine needs to have
   more comprehensive SSL/TLS support.
 * RSpec tests are very basic, and need a lot more comprehensive work.
-  They also don't work for some reason when run under Rake, but work
-  just fine when run manually.
 * Many standard configuration options for DRb still unsupported
 
 These and many other problems are scheduled to be addressed in the
@@ -108,5 +106,5 @@ Copyright © 2008, 2009 Rafael R. Sevilla.  You can redistribute it
 and/or modify it under the same terms as Ruby.  Please see the file
 COPYING for more details.
 
-$Id: README.txt 104 2009-03-18 04:45:56Z dido $
+$Id: README.txt 125 2009-03-19 07:39:16Z dido $
 

data/Rakefile

@@ -5,7 +5,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: Rakefile 94 2009-03-14 07:17:37Z dido $
+# $Id: Rakefile 126 2009-03-19 08:19:17Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -46,4 +46,18 @@ depend_on "eventmachine"
 
 PROJ.spec.opts << '--color'
 
+namespace :spec do
+  task :run do
+    type = ENV["TYPE"]
+    unless type == "drb"
+      type = "emdrb"
+    end
+    trap("SIGCHLD", "IGNORE")
+    pid = fork
+    if pid.nil?
+      exec("ruby -Ilib examples/drbserver.rb #{type}")
+    end
+  end
+end
+
 # EOF

data/{spec → examples}/drbserver.rb

@@ -5,7 +5,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: drbserver.rb 106 2009-03-18 05:48:53Z dido $
+# $Id: drbserver.rb 132 2009-04-21 03:25:00Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -52,22 +52,29 @@ class TestServer
       yield x
     end
   end
+
+  def raise_exception
+    raise "This error should be expected"
+  end
 end
 
 if ARGV[0] == "emdrb"
   class TestServer
     include DRb::DRbEMSafe
-    include EventMachine::Deferrable
 
     deferrable_method :block_df
 
     ##
     # Simple example of a deferrable method structured as a state
-    # machine.
-    def block_df(data, state={:index => 0, :retval => 0 }, &block)
+    # machine.  This method sums values of the data array as they
+    # are returned by the caller.  The similarity of this function
+    # to a tail-recursive, continuation-passing style version of
+    # the same should be obvious...
+    def block_df(data, state={:index => 0, :retval => 0, :df => nil}, &block)
+      state[:df] ||= EventMachine::DefaultDeferrable.new
       if state[:index] >= data.length
-        self.set_deferred_status(:succeeded, state[:retval])
-        return(self)
+        state[:df].set_deferred_status(:succeeded, state[:retval])
+        return(state[:df])
       end
 
       df = yield data[state[:index]]
@@ -77,13 +84,22 @@ if ARGV[0] == "emdrb"
         self.block_df(data, state, &block)
       end
       df.errback do |res|
-        df.fail(res)
+        state[:df].fail(res)
       end
-      return(self)
+      return(state[:df])
     end
   end
+else
+  class TestServer
+    # This is a fake implementation of block_df to be used by the standard
+    # DRb so that the same tests will run against either.
+    def block_df(vals, &block)
+      return(vals.inject(0) { |x,y| x + block.call(y) })
+    end
+
+  end
 end
 
 
-DRb.start_service("druby://:12345", TestServer.new)
+DRb.start_service("druby://127.0.0.1:12345", TestServer.new)
 DRb.thread.join

data/lib/emdrb/emdrb.rb

@@ -5,7 +5,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: emdrb.rb 107 2009-03-18 05:52:00Z dido $
+# $Id: emdrb.rb 129 2009-04-21 03:21:07Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -47,9 +47,9 @@ module DRb
   # 2. Exceptions must be caught and the Deferrable they return must
   #    fail, with the exception object passed as a parameter to its
   #    errbacks.
-  # 3. Blocks passed to the deferrable method will always return a
-  #    Deferrable, which again will succeed 
-  #  
+  # 3. Blocks passed to the deferrable method should always return a
+  #    Deferrable, which again should succeed when the value of the
+  #    block becomes available.
   # 
   module DRbEMSafe
     module ClassMethods
@@ -644,10 +644,10 @@ module DRb
   end
 
   ##
-  # Class representing a drb server instance.  This subclasses DRb::DRbServer
-  # for brevity.  DRbServer instances are normally created indirectly using
-  # either EMDRb.start service (which emulates DRb.start_service) or via
-  # EMDRb.start_drbserver (designed to be called from within an event loop).
+  # Class representing a drb server instance.  DRbServer instances are
+  # normally created indirectly using either DRb.start_service or
+  # EMDRb.start_drbserver (designed to be called from within an event
+  # loop).
   class DRbServer
     def initialize(uri=nil, front=nil, config_or_acl=nil)
       if Hash === config_or_acl
@@ -713,21 +713,33 @@ module DRb
   end
   module_function :start_drbserver
 
+  ##
+  # Stop all servers.
+  def stop_all_servers
+    @server.each do |uri,srv|
+      srv.stop_service
+    end
+  end
+  module_function :stop_all_servers
+
   def start_evloop
     unless EventMachine::reactor_running?
+      q = Queue.new
       @eventloop = Thread.new do
         begin
           EventMachine::run do
             # Start an empty event loop.  The DRb server(s) will be started
-            # by EM#next_tick calls.
+            # by EM#next_tick calls.  Just put a dummy value into the queue
+            # so that the calling thread will resume execution once this
+            # event thread actually starts the loop.
+            q << 1
           end
         ensure
           # close all servers if the event loop ends for whatever reason
-          @server.each do |uri,srv|
-            srv.stop_service
-          end
+          self.stop_all_servers
         end
       end
+      q.shift
     end
   end
   module_function :start_evloop
@@ -833,10 +845,17 @@ module DRb
       if DRb.here?(@uri)
 	obj = DRb.to_obj(@ref)
 	DRb.current_server.check_insecure_method(obj, msg_id)
-        begin
-          df.succeed(obj.__send__(msg_id, *a, &b))
-        rescue
-          df.fail($!)
+        if obj.kind_of?(DRbEMSafe) && obj.class.deferrable_method?(msg_id)
+          # If the method is a deferrable, calling the method will itself
+          # return a deferrable by definition, and we should be using this
+          # deferrable to determine whether the call succeeded or failed.
+          df = obj.__send__(msg_id, *a, &b)
+        else
+          begin
+            df.succeed(obj.__send__(msg_id, *a, &b))
+          rescue
+            df.fail($!)
+          end
         end
         return(df)
       end

data/lib/emdrb/version.rb

@@ -4,7 +4,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU Lesser General Public License / Ruby License
 #
-# $Id: version.rb 110 2009-03-18 05:55:43Z dido $
+# $Id: version.rb 130 2009-04-21 03:21:53Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -22,5 +22,5 @@
 # EMDRb version code
 #
 module EMDRb
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

data/spec/emdrb_spec.rb

@@ -0,0 +1,116 @@
+# -*- coding: utf-8 -*-
+#
+# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
+# Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
+# Homepage:: http://emdrb.rubyforge.org/
+# License:: GNU General Public License / Ruby License
+#
+# $Id: emdrb_spec.rb 128 2009-04-21 03:15:04Z dido $
+#
+#----------------------------------------------------------------------------
+#
+# Copyright © 2008, 2009 Rafael Sevilla
+# This file is part of EMDRb
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of either: 1) the GNU General Public License
+# as published by the Free Software Foundation; either version 2 of the
+# License, or (at your option) any later version; or 2) Ruby's License.
+# 
+# See the file COPYING for complete licensing information.
+#----------------------------------------------------------------------------
+#
+
+require File.join(File.dirname(__FILE__), %w[spec_helper])
+require 'thread'
+
+class LocalDeferrable
+  include DRb::DRbEMSafe
+
+  def df_tester(val)
+    df = EventMachine::DefaultDeferrable.new
+    df.succeed(val+1)
+    return(df)
+  end
+
+  deferrable_method :df_tester
+end
+
+describe EMDRb do
+  before do
+    DRb.start_service("druby://localhost:56789", LocalDeferrable.new)
+    @obj = DRbObject.new_with_uri("druby://localhost:12345")
+    @obj2 = DRbObject.new_with_uri("druby://localhost:56789")
+  end
+
+  after do
+    DRb.stop_service
+  end
+
+  it "should be able to perform simple synchronous method calls" do
+    @obj.identity(1).should == 1
+    @obj.addtwo(1, 2).should == 3
+  end
+
+  it "should be able to perform synchronous method calls with a block" do
+    val = 1
+    @obj.blockyield(1,2,3,4,5,6,7) { |x| val *= x }
+    val.should == 5040
+  end
+
+  it "should propagate exceptions to the client" do
+    lambda do
+      @obj.raise_exception
+    end.should raise_error(RuntimeError) do |error|
+      error.message.should == "This error should be expected"
+    end
+  end
+
+  it "should be able to perform asynchronous method calls" do
+    q = Queue.new
+    EventMachine::next_tick do
+      @obj.send_async(:identity, 1).callback do |data|
+        q << data
+      end
+    end
+    data = q.shift
+    data.should == 1
+  end
+
+  it "should be able to perform asynchronous method calls with a passed block" do
+    q = Queue.new
+    val = 1
+    EventMachine::next_tick do
+      df = @obj.send_async(:blockyield, 1,2,3,4,5,6,7) { |x| val *= x; val }
+      df.callback do |data|
+        q << data
+      end
+    end
+    data = q.shift
+    data[0].should be_true
+    val.should == 5040
+  end
+
+  it "should work with variadic methods" do
+    @obj.sum(1,2,3,4,5).should == 15
+  end
+
+  it "should use deferrable methods correctly" do
+    res = @obj.block_df([1,2,3,4,5]) { |x| x }
+    res.should == 15
+  end
+
+  it "should propagate exceptions raised by a block in a deferrable method" do
+    lambda do
+      res = @obj.block_df([1,2,3,4,5]) { |x| raise "an error" }
+    end.should raise_error(RuntimeError) do |error|
+      error.message.should == "an error"
+    end
+  end
+
+  it "should call local deferrables correctly" do
+    @obj2.df_tester(1).should == 2
+  end
+end
+
+# EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emdrb
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - dido@imperium.ph
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 +08:00
+date: 2009-04-21 00:00:00 +08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.12.2
+        version: 0.12.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: bones
@@ -47,14 +47,12 @@ files:
 - LEGAL
 - README.txt
 - Rakefile
+- examples/drbserver.rb
 - lib/emdrb.rb
 - lib/emdrb/emdrb.rb
 - lib/emdrb/unix.rb
 - lib/emdrb/version.rb
-- spec/client_spec.rb
-- spec/drbserver.rb
-- spec/server_spec.rb
-- spec/spec_common.rb
+- spec/emdrb_spec.rb
 - spec/spec_helper.rb
 - tasks/ann.rake
 - tasks/bones.rake

data/spec/client_spec.rb

@@ -1,66 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
-# Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
-# Homepage:: http://emdrb.rubyforge.org/
-# License:: GNU General Public License / Ruby License
-#
-# $Id: client_spec.rb 105 2009-03-18 05:48:08Z dido $
-#
-#----------------------------------------------------------------------------
-#
-# Copyright © 2008, 2009 Rafael Sevilla
-# This file is part of EMDRb
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#----------------------------------------------------------------------------
-#
-require File.join(File.dirname(__FILE__), %w[spec_helper])
-require File.join(File.dirname(__FILE__), %w[spec_common])
-require 'thread'
-
-Thread.abort_on_exception = true
-
-describe EMDRb, "Client" do
-  it_should_behave_like "DRb basics"
-
-  before do
-    DRb.start_service
-    @obj = DRb::DRbObject.new(nil, "druby://localhost:12345")
-  end
-
-  after do
-    DRb.stop_service
-  end
-
-  it "should be able to perform asynchronous method calls" do
-    q = Queue.new
-    EventMachine::next_tick do
-      @obj.send_async(:identity, 1).callback do |data|
-        q << data
-      end
-    end
-    data = q.shift
-    data.should == 1
-  end
-
-  it "should be able to perform asynchronous method calls with a passed block" do
-    q = Queue.new
-    val = 1
-    EventMachine::next_tick do
-      df = @obj.send_async(:blockyield, 1,2,3,4,5,6,7) { |x| val *= x; val }
-      df.callback do |data|
-        q << data
-      end
-    end
-    data = q.shift
-    data[0].should be_true
-    val.should == 5040
-  end
-
-end

data/spec/server_spec.rb

@@ -1,54 +0,0 @@
-# -*- coding: utf-8 -*-
-#
-# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
-# Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
-# Homepage:: http://emdrb.rubyforge.org/
-# License:: GNU General Public License / Ruby License
-#
-# $Id: server_spec.rb 108 2009-03-18 05:53:00Z dido $
-#
-#----------------------------------------------------------------------------
-#
-# Copyright © 2008, 2009 Rafael Sevilla
-# This file is part of EMDRb
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#----------------------------------------------------------------------------
-#
-# This tests the EMDRb server implementation against the standard DRb
-# client.
-#
-#require File.join(File.dirname(__FILE__), %w[spec_helper])
-require File.join(File.dirname(__FILE__), %w[spec_common])
-require 'drb'       # yes, that's right, we use the STANDARD DRb here!
-require 'thread'
-
-Thread.abort_on_exception = true
-
-describe "EMDRb Server" do
-  it_should_behave_like "DRb basics"
-
-  before(:all) do
-    DRb.start_service
-    @obj = DRbObject.new_with_uri("druby://localhost:12345")
-  end
-
-  after(:all) do
-    DRb.stop_service
-  end
-
-  it "should work with variadic methods" do
-    @obj.sum(1,2,3,4,5).should == 15
-  end
-
-  it "should use deferrable methods correctly" do
-    res = @obj.block_df([1,2,3,4,5]) { |x| x }
-    res.should == 15
-  end
-
-end

data/spec/spec_common.rb

@@ -1,34 +0,0 @@
-#
-# Author:: Rafael R. Sevilla (mailto:dido@imperium.ph)
-# Copyright:: Copyright © 2008, 2009 Rafael R. Sevilla
-# Homepage:: http://emdrb.rubyforge.org/
-# License:: GNU General Public License / Ruby License
-#
-# $Id: spec_common.rb 44 2009-01-23 06:40:54Z dido $
-#
-#----------------------------------------------------------------------------
-#
-# Copyright © 2008, 2009 Rafael Sevilla
-# This file is part of EMDRb
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of either: 1) the GNU General Public License
-# as published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version; or 2) Ruby's License.
-# 
-# See the file COPYING for complete licensing information.
-#----------------------------------------------------------------------------
-#
-describe "DRb basics", :shared => true do
-  it "should be able to perform simple synchronous method calls" do
-    @obj.identity(1).should == 1
-    @obj.addtwo(1, 2).should == 3
-  end
-
-  it "should be able to perform synchronous method calls with a block" do
-    val = 1
-    @obj.blockyield(1,2,3,4,5,6,7) { |x| val *= x }
-    val.should == 5040
-  end
-
-end