mack-distributed/lib/mack-distributed/distributed.rb mack-distributed/spec/lib/distributed/distributed_spec.rb @@ -3,19 +3,29 @@ module Mack module Object def self.included(base) - base.class_eval do - include ::DRbUndumped - end - eval %{ - class ::Mack::Distributed::#{base}Proxy < Mack::Utils::BlankSlate - include Singleton - include DRbUndumped + if app_config.mack.share_objects + base.class_eval do + include ::DRbUndumped + end + eval %{ + class ::Mack::Distributed::#{base}Proxy + include Singleton + include DRbUndumped - def method_missing(sym, *args) - #{base}.send(sym, *args) + def method_missing(sym, *args) + #{base}.send(sym, *args) + end + + # def respond_to?(sym) + # #{base}.respond_to?(sym) + # end end - end - } + } + raise Mack::Distributed::Errors::ApplicationNameUndefined.new if app_config.mack.distributed_app_name.nil? + Mack::Distributed::Utils::Rinda.register_or_renew(:space => app_config.mack.distributed_app_name.to_sym, + :klass_def => "#{base}".to_sym, + :object => "Mack::Distributed::#{base}Proxy".constantize.instance) + end end end # Object mack-distributed/lib/mack-distributed/object.rb @@ -36,7 +36,7 @@ module Mack private def self.handle_options(options = {}) - {:space => :name, :klass_def => nil, :object => nil, :description => nil, :timeout => app_config.mack.drb_timeout}.merge(options) + {:space => nil, :klass_def => nil, :object => nil, :description => nil, :timeout => app_config.mack.drb_timeout}.merge(options) end end mack-distributed/lib/mack-distributed/utils/rinda.rb @@ -8,5 +8,7 @@ mack::page_cache: true mack::use_distributed_routes: false mack::distributed_app_name: fake_app +mack::share_objects: true +mack::drb_timeout: 0 mack::testing_framework: rspec \ No newline at end of file mack-distributed/spec/fake_application/config/app_config/default.yml @@ -4,24 +4,25 @@ require 'rinda/tuplespace' describe Mack::Distributed::Object do - class Car - include Mack::Distributed::Object - - def make - "Toyota" + before(:each) do + begin + DRb.start_service + Rinda::RingServer.new(Rinda::TupleSpace.new) + rescue Errno::EADDRINUSE => e + # it's fine to ignore this, it's expected that it's already running. + # all other exceptions should be thrown end - - def self.buy - end - end it "should include DRbUndumped" do - Car.new.should be_is_a(DRbUndumped) + class Pool + include Mack::Distributed::Object + end + Pool.new.should be_is_a(DRbUndumped) end it "should defined a proxy singleton" do - lambda{Mack::Distributed::BoatProxy}.should raise_error(NameError) + lambda{Mack::Distributed::BoatProxy}.should raise_error(Rinda::RequestExpiredError) class Boat include Mack::Distributed::Object end @@ -32,11 +33,20 @@ describe Mack::Distributed::Object do end it "should respond with the methods of the underlying class" do + class Car + include Mack::Distributed::Object + def make + "Toyota" + end + def self.buy + true + end + end car = Mack::Distributed::CarProxy.instance.new car.should be_is_a(Car) car.make.should == "Toyota" car.respond_to?(:make).should == true - Mack::Distributed::CarProxy.instance.respond_to?(:buy).should == true + Mack::Distributed::CarProxy.instance.buy.should == true end mack-distributed/spec/lib/distributed/object_spec.rb @@ -2,19 +2,14 @@ require File.join(File.dirname(__FILE__), "..", "..", "..", "spec_helper") describe "droute_url" do - before(:all) do + before(:each) do begin DRb.start_service Rinda::RingServer.new(Rinda::TupleSpace.new) - # DRb.thread.join rescue Errno::EADDRINUSE => e # it's fine to ignore this, it's expected that it's already running. # all other exceptions should be thrown end - begin - rs.take([:testing, :String, nil, nil], 0) - rescue Exception => e - end app_config.load_hash({"mack::use_distributed_routes" => true, "mack::distributed_app_name" => :known_app}, :distributed_route_test) Mack::Routes.build do |r| # force the routes to go the DRb server r.known "/my_known_app/my_known_url", :controller => :foo, :action => :bar @@ -22,7 +17,7 @@ describe "droute_url" do end end - after(:all) do + after(:each) do app_config.revert end mack-distributed/spec/lib/distributed/routing/distributed_route_spec.rb @@ -4,11 +4,10 @@ require 'rinda/tuplespace' describe Mack::Distributed::Utils::Rinda do - before(:all) do + before(:each) do begin DRb.start_service Rinda::RingServer.new(Rinda::TupleSpace.new) - # DRb.thread.join rescue Errno::EADDRINUSE => e # it's fine to ignore this, it's expected that it's already running. # all other exceptions should be thrown mack-distributed/spec/lib/distributed/utils/rinda_spec.rb 05bfe9ca17d7bb89e1a5445d6fcb963b38e1f572 Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/59fece7a6a3511724a08edbab4d8e4267b462468 59fece7a6a3511724a08edbab4d8e4267b462468 2008-08-05T14:15:53-07:00 2008-08-05T14:15:53-07:00 More work on distributed objects [#10] 3a4fb3a672aba1fd3e43097819f3dea6f6b845ba Mark Bates mark@markbates.com