Tidy PlayerServer.

bin/play.rb

@@ -23,7 +23,7 @@ def method_missing(m, *args)
   end
 
   def kill
-    @object.die(@secret)
+    @object.stop(@secret)
   end
 end
 

bin/player_server.rb

@@ -1,14 +1,15 @@
+$:.unshift File.expand_path("../../lib", __FILE__)
 require "drb"
 require "forwardable"
+require "battleship/util"
 
 module Battleship
   class PlayerServer
+    include Battleship::Util
     extend Forwardable
-    METHODS = [:name, :new_game, :take_turn]
 
     def initialize
-      class_name = Module.constants.find{ |c| is_player?(c) }
-      @player_class = Module.const_get(class_name)
+      @player_class = find_player_classes.first
       @player = @player_class.new
     end
 
@@ -18,36 +19,32 @@ def new_game
       @player = @player_class.new
       @player.new_game
     end
-
-    # Ick. Dirty. Is there a cleaner way?
-    def die
-      DRb.stop_service
-    end
-
-  private
-    def is_player?(class_name)
-      class_name.to_s =~ /Player$/ &&
-        (Module.const_get(class_name).instance_methods && METHODS) == METHODS
-    end
   end
 
-  class ValidatingProxy
+  class ValidatingServer
     include DRbUndumped
 
     ValidationError = Class.new(RuntimeError)
 
-    def initialize(secret, object)
+    def initialize(secret, object, port)
       @secret = secret
       @object = object
+      DRb.start_service "druby://localhost:#{port}", self
     end
 
     def method_missing(m, *args)
-      secret = args.shift
-      if secret == @secret
-        @object.__send__(m, *args)
-      else
-        raise ValidationError
-      end
+      validate!(args.shift)
+      @object.__send__(m, *args)
+    end
+
+    def stop(secret)
+      validate!(secret)
+      DRb.stop_service
+    end
+
+  private
+    def validate!(secret)
+      raise ValidationError unless secret == @secret
     end
   end
 end
@@ -56,9 +53,9 @@ def method_missing(m, *args)
   $:.unshift File.join(File.dirname(path), "lib")
   load path
 
-  client = Battleship::ValidatingProxy.new(secret, Battleship::PlayerServer.new)
-
-  DRb.start_service "druby://localhost:#{port}", client
+  Battleship::ValidatingServer.new(
+    secret, Battleship::PlayerServer.new, port
+  )
 }.call(*ARGV)
 
 DRb.thread.join

lib/battleship/util.rb

@@ -0,0 +1,14 @@
+module Battleship
+  module Util
+    PLAYER_METHODS = [:name, :new_game, :take_turn]
+
+    def find_player_classes
+      Module.constants.
+        select { |sym| sym.to_s =~ /Player$/ }.
+        map    { |sym| Module.const_get(sym) }.
+        select { |klass|
+          (klass.instance_methods & PLAYER_METHODS) == PLAYER_METHODS
+        }
+    end
+  end
+end