classroom 0.0.1 → 0.0.2

data/classroom.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 spec = Gem::Specification.new do |s|
   s.name = 'classroom'
-  s.version = "0.0.1"
+  s.version = "0.0.2"
   s.platform = Gem::Platform::RUBY
   s.summary = "ClassRoom is a 'class server' based on DRb"
   s.files = Dir.glob("**/**/**").delete_if {|item| item.include?(".svn")}

data/examples/demo_client.rb

@@ -17,7 +17,7 @@ klass = %q{
 # Here's the magic..
 class_server = ClassRoom::Client.new(ARGV.first || 'classroom://:2001')
 class_server.add_class(klass)
-class_server.load_class(binding, :all)
+class_server.load_class(:all)
 
 # Create and use objects as you would normally, but remember
 # 'BasicQueue' actually exists on the ClassRoom server and,

data/examples/demo_client2.rb

@@ -9,7 +9,7 @@ require 'rubygems'
 require 'classroom'
 
 class_server = ClassRoom::Client.new(ARGV.first || 'classroom://:2001')
-class_server.load_class(binding, :BasicQueue)
+class_server.load_class(:BasicQueue)
 
 q = BasicQueue.new(5)
 10.times { |i| q.push("test #{i}") }

data/examples/demo_client3.rb

@@ -19,7 +19,7 @@ class_server.add_class(klass)
 
 # Load local references to all the classes on the ClassRoom server,
 # including BasicDataClass
-class_server.load_class(binding, :all)
+class_server.load_class(:all)
 
 # Create and use objects as you would normally, but remember
 # 'BasicDataClass' actually exists on the ClassRoom server

data/examples/demo_client4.rb

@@ -37,8 +37,8 @@ klass = %q{
 # Here's the magic..
 class_server = ClassRoom::Client.new(ARGV.first || 'druby://coop-pb:2001')
 class_server.add_class(klass)
-class_server.load_class(binding, :all)
-#class_server.load_non_present_classes(binding)
+class_server.load_class(:all)
+#class_server.load_non_present_classes()
 
 puts BasicParent.give_child.x
 puts BasicParent.x

data/examples/demo_client5.rb

@@ -25,7 +25,7 @@ klass = %q{
 # Here's the magic..
 class_server = ClassRoom::Client.new(ARGV.first || 'druby://coop-pb:2001')
 class_server.add_class(klass)
-class_server.load_class(binding, :all)
+class_server.load_class(:all)
 
 a = BasicParent.new
 

data/examples/test_modules.rb

@@ -36,7 +36,7 @@ klass = %q{
 # Here's the magic..
 class_server = ClassRoom::Client.new(ARGV.first || 'druby://coop-pb:2001')
 class_server.add_class(klass)
-class_server.load_non_present_classes(binding)
+class_server.load_non_present_classes
 
 puts class_server.classes.inspect
 puts TestModule::BasicParent.give_child.x

data/examples/test_modules2.rb

@@ -26,7 +26,7 @@ klass2 = %q{
 class_server = ClassRoom::Client.new(ARGV.first || 'druby://coop-pb:2001')
 class_server.add_class(klass)
 class_server.add_class(klass2)
-class_server.load_class(binding, :all)
+class_server.load_class(:all)
 
 x = Something.new(10)
 puts x.blah

data/examples/test_modules3.rb

@@ -20,7 +20,7 @@ klass = %q{
 # Here's the magic..
 class_server = ClassRoom::Client.new(ARGV.first || 'druby://coop-pb:2001')
 class_server.add_class(klass)
-class_server.load_class(binding, :all)
+class_server.load_class(:all)
 
 
 class Something

data/lib/classroom.rb

@@ -162,23 +162,22 @@ module ClassRoom
         
     # Load a class (or all classes, if :all is specified) from the 
     # ClassRoom server to be used locally
-    def load_class(b, *classes)
-      return nil unless classes && b
+    def load_class(*classes)
+      return nil unless classes
       classes = self.classes if classes.first == :all
       classes.each do |class_name|
-        eval %Q{
+        eval(%Q{
           class #{class_name} < ClassRoom::Client::ProxyObject
           end
           #{class_name}.class_name = :\"#{class_name}\"
           #{class_name}.drb = ClassRoom::Client::get_drb('#{@drb_url}')
-        }, b
+        }, TOPLEVEL_BINDING)
       end
     end
 
     # Load all classes on the ClassRoom server that do not already
     # exist locally (not fully tested yet!)
-    def load_non_present_classes(b)
-      return nil unless b
+    def load_non_present_classes
       classes = self.classes
       classes.each do |class_name|
         eval %Q{
@@ -186,19 +185,19 @@ module ClassRoom
             class #{class_name} < ClassRoom::Client::ProxyObject
             end
           end
-        }, b
+        }, TOPLEVEL_BINDING
         eval %Q{
           begin
           #{class_name}.drb = @drb
           rescue
           end
-        }
+        }, TOPLEVEL_BINDING
         eval %Q{
           begin
           #{class_name}.class_name = :\"#{class_name}\"
           rescue
           end
-        }
+        }, TOPLEVEL_BINDING
       end
     end
     

data/test/classroom_test.rb

@@ -2,9 +2,6 @@ require 'test/unit'
 require 'rubygems'
 require 'classroom'
 
-# Get a binding for the top level
-$top_level_binding = binding
-
 class ClassRoomTest < Test::Unit::TestCase
 
   def setup
@@ -35,7 +32,7 @@ class ClassRoomTest < Test::Unit::TestCase
   end
   
   def test_e_can_import_classes
-    assert $class_server.load_class($top_level_binding, :all)
+    assert $class_server.load_class(:all)
   end
 
   def test_f_can_use_imported_classes

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: classroom
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 date: 2006-07-12 00:00:00 +01:00
 summary: ClassRoom is a 'class server' based on DRb
 require_paths: