mack-distributed/lib/mack-distributed/object.rb mack-distributed/spec/lib/distributed/distributed_spec.rb mack-distributed/spec/lib/distributed/object_spec.rb mack-facets/lib/mack-facets/utils/blank_slate.rb mack-facets/spec/lib/utils/blank_slate_spec.rb @@ -5,7 +5,6 @@ module Mack def self.register_or_renew(options = {}) options = handle_options(options) - ::DRb.start_service begin ring_server.take([options[:space], options[:klass_def], nil, nil], options[:timeout]) rescue Exception => e @@ -16,7 +15,6 @@ module Mack def self.register(options = {}) options = handle_options(options) - ::DRb.start_service ring_server.write([options[:space], options[:klass_def], options[:object], @@ -25,6 +23,7 @@ module Mack end def self.ring_server + ::DRb.start_service rs = ::Rinda::RingFinger.primary rs end @@ -36,7 +35,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 @@ -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 @@ -17,7 +17,7 @@ require 'extlib/hook' fl = File.join(File.dirname(__FILE__), "mack-facets") -[:inflector, :inflections, :options_merger, :registry_list, :registry_map].each do |k| +[:inflector, :inflections, :options_merger, :registry_list, :registry_map, :blank_slate].each do |k| path = File.join(fl, "utils", "#{k}") require path end mack-facets/lib/mack-facets.rb 11e638487135b69bda7a5cb6a51b22754ea64c85 8b87cd8ca819d68711176fc240b1a6f2546c3c31 Mark Bates mark@markbates.com http://github.com/markbates/mack-more/commit/4f0a551aa0e15fb5a99faa4a31286b664e73a0f2 4f0a551aa0e15fb5a99faa4a31286b664e73a0f2 2008-08-05T14:30:34-07:00 2008-08-05T14:30:34-07:00 Merge branch 'dmodels' * dmodels: Finished distributed objects [#10 state:resolved] More work on distributed objects [#10] Added specs for Mack::Distributed::Object [#10] Starting work on distributed models. [#10] e7f53dff86a7d643707baf384f182bfacd976b73 Mark Bates mark@markbates.com