lib/spinal/spinald/service_registry.rb test/service_connection_test.rb test/service_registry_test.rb @@ -5,6 +5,8 @@ $: << File.dirname(__FILE__) require "shared" +require "spinald/service_registry" + module Spinal #FIXME: Tmp hacks def debug(str) puts str if @debug end @@ -25,94 +27,18 @@ module Spinal def handle_request(packet) case packet.class.name - when 'Spinal::Packet::Query' : handle_query(packet) - when 'Spinal::Packet::Register' : handle_registration(packet) + when 'Spinal::Packet::Query' : services.request(packet, self) + when 'Spinal::Packet::Register' : services.register(packet, self) else raise("Unknown packet type: #{packet.class.inspect}") end end - def handle_query(packet) - if resource = resources[packet.address] - resource.request(packet.raw) { |resp| send_data(resp) } - else - send_data(Packet::Response.new(StatusCodes::UNKNOWN_RESOURCE).raw) - end - end - - def handle_registration(packet) - resources[packet.address] ||= Resource.new(packet.address) - resources[packet.address].add_service(packet.host, packet.port) - send_data(Packet::Response.new(StatusCodes::OK).raw) - close_connection_after_writing - end - - def resources - @@resources ||= {} - end - def packet_parser @packet_parser ||= PacketParser.new end - - class Resource - def initialize(address) - @address = address - @queue = [] - @pool = ServiceConnectionPool.new - end - - def add_service(host, port) - @pool.connect_service(host, port) - end - - def request(data, &reply_callback) - if conn = @pool.reserve - conn.reply &reply_callback - conn.release do - @pool.release(conn) - if queued_request = @queue.pop - request(queued_request[0], &queued_request[1]) - end - end - conn.send_data(data) - else - @queue.unshift([data, reply_callback]) - end - end - end - - class ServiceConnectionPool - def initialize - @connections = [] - end - - def connect_service(host, port) - @connections.unshift(EM.connect(host, port, ServiceConnection)) - end - - def reserve - @connections.pop - end - - def release(conn) - @connections.unshift(conn) - end - end - - module ServiceConnection - def receive_data(data) - Spinal.debug "ServiceConnection received: #{data}" - @reply.call(data) - @release.call - end - - def reply(&cb) - @reply = cb - end - - def release(&cb) - @release = cb - end + + def services + @@service_registry ||= ServiceRegistry.new end end end lib/spinal/spinald.rb @@ -1,6 +1,11 @@ -begin - require "minitest/unit" - Test = MiniTest -rescue LoadError - require "test/unit" -end +require "test/unit" +require "rubygems" +require "mocha" + +# begin +# require "minitest/unit" +# Test = MiniTest +# rescue LoadError +# require "test/unit" +# end +# test/test_helper.rb c96291e78f033a90ae8722996fca68e6e814e206 George Malamidis george@nutrun.com http://github.com/gmalamid/spinal/commit/6498de4a0759bd16b0547c907b753493ca94262d 6498de4a0759bd16b0547c907b753493ca94262d 2009-06-04T16:09:27-07:00 2009-06-04T16:09:27-07:00 . 4303594917f9a0aa89761e94967ae0f7f8eed50d George Malamidis george@nutrun.com