emdrb 0.3.0 → 0.3.1

data/History.txt

@@ -1,3 +1,6 @@
+== 0.3.1 / 2009-02-04
+* Used EventMachine::defer instead of spawning own threads
+
 == 0.3.0 / 2009-01-27
 
 * Added provisions for DRb servers to have methods which are

data/README.txt

@@ -33,6 +33,8 @@ 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
@@ -100,11 +102,16 @@ if you would like to run the rspec tests that are included with
 EMDRb.  Daemons is not required to use EMDRb otherwise, and as such it
 is not listed as a hard dependency in the gem install.
 
+If you want to install it manually, you can always download it at the
+EMDRb project page at:
+
+http://rubyforge.org/projects/emdrb
+
 == LICENSE:
 
 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 81 2009-01-29 04:46:14Z dido $
+$Id: README.txt 88 2009-02-04 04:10:52Z dido $
 

data/lib/emdrb/emdrb.rb

@@ -4,7 +4,7 @@
 # Homepage:: http://emdrb.rubyforge.org/
 # License:: GNU General Public License / Ruby License
 #
-# $Id: emdrb.rb 78 2009-01-29 04:21:25Z dido $
+# $Id: emdrb.rb 87 2009-02-04 04:08:06Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -174,7 +174,6 @@ module DRb
     # The peer address for this connection.
     attr_accessor :peer_addr
 
-
     ##
     # The post initialization process sets up the default load
     # and argument length limits, the idconv object, the initial
@@ -209,10 +208,9 @@ module DRb
     # also further execute the method call in its own independent thread
     # and safe level invocations are also taken care of herein.
     def perform_without_block
-      df = EventMachine::DefaultDeferrable.new
       info = Thread.current['DRb']
       req = @request
-      Thread.new do
+      op = lambda do
         Thread.current['DRb'] = info
         if $SAFE < @safe_level
           $SAFE = @safe_level
@@ -221,22 +219,16 @@ module DRb
           if Proc == req[:ro] && req[:msg] == :__drb_yield
             ary = (req[:argv].size == 1) ? req[:argv] :
               [req[:argv]]
-            EventMachine::next_tick do
-              df.set_deferred_status(:succeeded, ary.collect(&@front)[0])
-            end
+            [true, ary.collect(&@front)[0]]
           else
             r = req[:ro].__send__(req[:msg], *req[:argv])
-            EventMachine::next_tick do
-              df.set_deferred_status(:succeeded, r)
-            end
+            [true, r]
           end
         rescue
-          EventMachine::next_tick do
-            df.set_deferred_status(:failed, $!)
-          end
+          [false, $!]
         end
       end
-      return(df)
+      return(op)
     end
 
     ##
@@ -260,10 +252,9 @@ module DRb
     # I suppose there must be a way to do it without using threads (possibly
     # by using call/cc perhaps?), but I suppose this should be okay.
     def perform_with_block
-      df = EventMachine::DefaultDeferrable.new
       info = Thread.current['DRb']
       req = @request
-      Thread.new do
+      op = lambda do
         Thread.current['DRb'] = info
         if $SAFE < @safe_level
           $SAFE = @safe_level
@@ -289,14 +280,12 @@ module DRb
             end
             block_value
           }
-          EventMachine::next_tick { df.set_deferred_status(:succeeded, r) }
+          [true, r]
         rescue Exception => e
-          EventMachine::next_tick do
-            df.set_deferred_status(:failed, e)
-          end
+          [false, e]
         end
       end
-      return(df)
+      return(op)
     end
 
     ##
@@ -315,7 +304,15 @@ module DRb
                                       @request[:argv],
                                       @request[:block]))
       end
-      return((@request[:block]) ? perform_with_block : perform_without_block)
+      df = EventMachine::DefaultDeferrable.new
+      op = (@request[:block]) ? perform_with_block : perform_without_block
+      callback = lambda do |res|
+        succ, val = res
+        df.set_deferred_status((succ) ? :succeeded : :failed, val)
+      end
+
+      EventMachine::defer(op, callback)
+      return(df)
     end
 
     def to_obj(ref)

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 68 2009-01-27 07:26:59Z dido $
+# $Id: version.rb 83 2009-02-04 03:39:51Z dido $
 #
 #----------------------------------------------------------------------------
 #
@@ -26,7 +26,7 @@ module EMDRb
 
     MAJOR = 0
     MINOR = 3
-    TINY = 0
+    TINY = 1
 
     # The version of EMDRb in use.
     STRING = [ MAJOR, MINOR, TINY ].join(".")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: emdrb
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors: 
 - dido@imperium.ph
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-29 00:00:00 +08:00
+date: 2009-02-04 00:00:00 +08:00
 default_executable: 
 dependencies: []