@@ -13,7 +13,7 @@ require File.join(File.dirname(__FILE__), 'lib', 'distribunaut_tasks') @gem_spec = Gem::Specification.new do |s| s.name = "distribunaut" - s.version = "0.2.1" + s.version = "0.2.2" s.summary = "distribunaut" s.description = "distribunaut was developed by: markbates" s.author = "markbates" Rakefile @@ -2,11 +2,11 @@ Gem::Specification.new do |s| s.name = %q{distribunaut} - s.version = "0.2.1.20090624214017" + s.version = "0.2.2.20090626214209" s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version= s.authors = ["markbates"] - s.date = %q{2009-06-24} + s.date = %q{2009-06-26} s.default_executable = %q{distribunaut_ring_server} s.description = %q{distribunaut was developed by: markbates} s.email = %q{mark@mackframework.com} distribunaut.gemspec @@ -17,6 +17,7 @@ module Distribunaut # :nodoc: module Distributable def self.included(base) # :nodoc: + raise Distribunaut::Distributed::Errors::ApplicationNameUndefined.new if configatron.distribunaut.app_name.nil? base.class_eval do include ::DRbUndumped end @@ -33,15 +34,23 @@ module Distribunaut # :nodoc: undef :id if method_defined?(:id) undef :inspect if method_defined?(:inspect) undef :to_s if method_defined?(:to_s) + + def borrow(&block) + Distribunaut::Utils::Rinda.borrow(:space => :#{base}, + :object => self, + :description => "#{base} Service", + :app_name => configatron.distribunaut.app_name.to_sym) do |tuple| + yield tuple.object + end + end end } - obj = "Distribunaut::Distributed::#{c_name}Proxy".constantize.instance - raise Distribunaut::Distributed::Errors::ApplicationNameUndefined.new if configatron.distribunaut.app_name.nil? + obj = "Distribunaut::Distributed::#{c_name}Proxy".constantize.instance Distribunaut::Utils::Rinda.register_or_renew(:space => "#{base}".to_sym, - :object => obj, - :description => "#{base} Service", - :app_name => configatron.distribunaut.app_name.to_sym) + :object => obj, + :description => "#{base} Service", + :app_name => configatron.distribunaut.app_name.to_sym) end end # Distributable lib/distribunaut/distributable.rb @@ -35,6 +35,24 @@ module Distribunaut tuple = Distribunaut::Tuple.from_array(results) tuple.object end + + def borrow(values = {}, &block) + tuple = build_tuple(values) + results = ring_server.take(tuple.to_array, tuple.timeout) + tuple = Distribunaut::Tuple.from_array(results) + tuple.space = "#{tuple.space}-onloan-#{Time.now}".to_sym + register(tuple) + begin + yield tuple if block_given? + rescue Exception => e + raise e + ensure + # (.+)-onloan-.+$ + tuple.space.to_s.match(/(.+)-onloan-.+$/) + tuple.space = $1.to_sym + register(tuple) + end + end def available_services ring_server = self.ring_server lib/distribunaut/utils/rinda.rb @@ -58,7 +58,8 @@ describe Distribunaut::Distributable do end axl_proxy = Distribunaut::Distributed::Axl.new - axl_proxy.inspect.should == "Sweet Child O'Mine" + # axl_proxy.inspect.should == "Sweet Child O'Mine" + axl_proxy.inspect.should match(/#<DRb::DRbObject:0x\d{1,10} @ref=\d{1,10}, @uri=\\"druby:\/\/127.0.0.1:\d{3,6}\\">|Sweet Child O'Mine/) axl_proxy.yell.should == 'YEAH!!!!' axls = Distribunaut::Distributed::Axl.find @@ -66,4 +67,25 @@ describe Distribunaut::Distributable do axls.size.should == 2 end + describe 'borrow' do + + it 'should return the object and prevent others from accessing it' do + class Cracker + include Distribunaut::Distributable + + def self.monkeys + "You should be guarded by monkeys..." + end + end + lambda { + Distribunaut::Distributed::Cracker.borrow do |cracker| + cracker.monkeys.should == "You should be guarded by monkeys..." + lambda{Distribunaut::Distributed::Cracker.monkeys}.should raise_error(Rinda::RequestExpiredError) + end + raise Distribunaut::TestingError + }.should raise_error(Distribunaut::TestingError) + end + + end + end spec/distribunaut/distributable_spec.rb @@ -24,6 +24,41 @@ describe Distribunaut::Utils::Rinda do end + describe 'borrow' do + + it 'should lock a tuple for the duration of the block and then return it back at the end' do + Distribunaut::Utils::Rinda.register_or_renew(:app_name => :testing, :space => :String, :object => 'A', :description => "AAA") + obj = Distribunaut::Utils::Rinda.read(:app_name => :testing, :space => :String) + obj.should_not be_nil + obj.should == 'A' + lambda do + Distribunaut::Utils::Rinda.borrow(:app_name => :testing, :space => :String) do |tuple| + tuple.object.should == 'A' + tuple.space.to_s.should match(/(.+)\-onloan\-.+$/) + lambda{Distribunaut::Utils::Rinda.read(:app_name => :testing, :space => :String)}.should raise_error(Rinda::RequestExpiredError) + raise Distribunaut::TestingError.new + end + end.should raise_error(Distribunaut::TestingError) + + obj = Distribunaut::Utils::Rinda.read(:app_name => :testing, :space => :String) + obj.should_not be_nil + obj.should == 'A' + end + + end + + describe 'read' do + + it 'should return a tuple from the ring server' do + Distribunaut::Utils::Rinda.register_or_renew(:app_name => :testing, :space => :String, :object => 'A', :description => "AAA") + obj = Distribunaut::Utils::Rinda.read(:app_name => :testing, :space => :String) + obj.should_not be_nil + obj.should == 'A' + lambda {Distribunaut::Utils::Rinda.read(:app_name => :testing, :space => :String2)}.should raise_error(Rinda::RequestExpiredError) + end + + end + describe 'register' do it "should be able to register new service" do spec/distribunaut/utils/rinda_spec.rb @@ -8,15 +8,20 @@ require File.join(File.dirname(__FILE__), '..', 'lib', 'distribunaut') configatron.distribunaut.app_name = :test_app +$test_ring_server_started = false + Spec::Runner.configure do |config| config.before(:all) 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 + unless $test_ring_server_started + begin + DRb.start_service + Rinda::RingServer.new(Rinda::TupleSpace.new) + $test_ring_server_started = true + rescue Exception => e + # it's fine to ignore this, it's expected that it's already running. + # all other exceptions should be thrown + end end end @@ -48,3 +53,8 @@ class String end end + +module Distribunaut + class TestingError < StandardError + end +end spec/spec_helper.rb f804b4b3eccc2f79b6d8d22f65caf938b850351b Mark Bates mark@markbates.com http://github.com/markbates/distribunaut/commit/cc0245d9dfd977ac40d8ac80955220dc0ecc1e68 cc0245d9dfd977ac40d8ac80955220dc0ecc1e68 2009-06-26T18:42:27-07:00 2009-06-26T18:42:27-07:00 Added the ability to borrow a service. e679439fd51332e6ae3ca3e72cb75564e1dcf1ff Mark Bates mark@markbates.com