toyrobot 0.0.1 → 0.0.2

data/lib/toy_robot/controller.rb

@@ -0,0 +1,32 @@
+module ToyRobot
+  class Controller
+    def initialize(args)
+      @robot = args[:robot]
+      @view = args[:view]
+    end
+
+    def place(*args)
+      robot.place(*args)
+    end
+
+    def move(*_)
+      robot.move
+    end
+
+    def left(*_)
+      robot.left
+    end
+
+    def right(*_)
+      robot.right
+    end
+
+    def report(*_)
+      view.report
+    end
+
+    private
+
+    attr_reader :robot, :view
+  end
+end

data/lib/toy_robot/factory.rb

@@ -1,6 +1,5 @@
-require_relative 'robot_controller'
+require_relative 'controller'
 require_relative 'robot'
-require_relative 'placement'
 require_relative 'board'
 require_relative 'pose'
 require_relative 'view'
@@ -12,18 +11,18 @@ module ToyRobot
     def create(identifier, opts = {})
       case identifier
       when :controller
-        RobotControllerFactory.create(opts)
+        ControllerFactory.create(opts)
       end
     end
 
-    module RobotControllerFactory
+    module ControllerFactory
       module_function
 
       def create(opts = {})
         robot = opts[:robot] || RobotFactory.create
         view = opts[:view] || ViewFactory.create(robot: robot)
 
-        ToyRobot::RobotController.new(
+        ToyRobot::Controller.new(
           robot: robot,
           view: view
         )
@@ -47,22 +46,11 @@ module ToyRobot
     module RobotFactory
       module_function
 
-      def create(opts = {})
-        placement = opts[:placement] || PlacementFactory.create
-
-        ToyRobot::Robot.new(
-          placement: placement
-        )
-      end
-    end
-
-    module PlacementFactory
-      module_function
-
       def create(opts = {})
         board = opts[:board] || BoardFactory.create
         pose = opts[:pose] || ToyRobot::Pose.new
-        ToyRobot::Placement.new(
+
+        ToyRobot::Robot.new(
           board: board,
           pose: pose
         )

data/lib/toy_robot/pose.rb

@@ -1,3 +1,5 @@
+require 'ostruct'
+
 module ToyRobot
   class Pose
     module Orientation
@@ -7,14 +9,19 @@ module ToyRobot
       SOUTH = :south
     end
 
-    attr_accessor :x, :y, :orientation
-
     def initialize(args = {})
       @x = args[:x]
       @y = args[:y]
       @orientation = args[:orientation]
     end
 
+    def mutate!(attrs = {})
+      self.x = attrs[:x] || x
+      self.y = attrs[:y] || y
+      self.orientation = attrs[:orientation] || orientation
+      self
+    end
+
     def adjacent
       dup.send(:adjacent!)
     end
@@ -22,6 +29,7 @@ module ToyRobot
     def rotate!(degrees)
       step = (degrees % 90) + (degrees/degrees.abs)
       self.orientation = step_orientation(step)
+      self
     end
 
     def report
@@ -32,8 +40,14 @@ module ToyRobot
       }
     end
 
+    def [](key)
+      report.send(:[], key)
+    end
+
     private
 
+    attr_accessor :x, :y, :orientation
+
     def step_orientation(by = 1)
       orientations = [
         Pose::Orientation::NORTH,
@@ -60,14 +74,14 @@ module ToyRobot
     end
 
     def increment!(coordinate, by = 1)
-      update!(coordinate, by)
+      update_coordinate!(coordinate, by)
     end
 
     def decrement!(coordinate, by = -1)
-      update!(coordinate, by)
+      update_coordinate!(coordinate, by)
     end
 
-    def update!(coordinate, by)
+    def update_coordinate!(coordinate, by)
       case coordinate
       when :x
         self.x = x + by

data/lib/toy_robot/robot.rb

@@ -1,41 +1,37 @@
-require 'forwardable'
-
 module ToyRobot
   class Robot
-    extend Forwardable
-
     def initialize(args)
-      @placement = args[:placement]
+      @board = args[:board]
+      @pose = args[:pose]
     end
 
-    def place(*args)
-      placement.update(*args)
+    def place(a_new_pose)
+      pose.mutate!(a_new_pose) if board.valid_pose?(a_new_pose)
+      nil
     end
 
     def move
-      with_placement { placement.advance }
+      with_placement { place(pose.adjacent) and nil }
     end
 
     def right
-      with_placement { placement.rotate(90) }
+      with_placement { pose.rotate!(90) and nil }
     end
 
     def left
-      with_placement { placement.rotate(-90) }
+      with_placement { pose.rotate!(-90) and nil }
     end
 
     def report
-      with_placement { placement.report }
+      with_placement { pose.report }
     end
 
     private
 
-    attr_accessor :placement
+    attr_reader :board, :pose
 
     def with_placement
-      if placement.on_board?
-        yield
-      end
+      yield if board && board.valid_pose?(pose)
     end
   end
 end

data/lib/toy_robot/view.rb

@@ -1,22 +1,20 @@
 module ToyRobot
-  View = Struct.new(:args) do
+  class View
+    def initialize(args)
+      @robot = args[:robot]
+      @output = args[:output] || $stdout
+    end
+
     def report
-      report = robot.report
-      output.puts report_string(report) if report
+      output.puts format_report(robot.report)
     end
 
     private
 
-    def report_string(report)
-      "#{report[:x]},#{report[:y]},#{report[:orientation].upcase}"
-    end
-
-    def robot
-      args[:robot]
-    end
+    attr_reader :robot, :output
 
-    def output
-      args[:output] || $stdout
+    def format_report(report)
+      "#{report[:x]},#{report[:y]},#{report[:orientation].upcase}" if report
     end
   end
 end

data/test/board_double.rb

@@ -0,0 +1,5 @@
+class BoardDouble
+  def valid_pose?(pose)
+    pose && true
+  end
+end

data/test/integration/test_factory.rb

@@ -11,8 +11,8 @@ module ToyRobot
       assert_respond_to @object, :create
     end
 
-    def test_that_create_returns_a_robot_controller
-      assert_instance_of RobotController, @object.create(:controller)
+    def test_that_create_returns_a_controller
+      assert_instance_of Controller, @object.create(:controller)
     end
   end
 end

data/test/integration/test_toy_robot.rb

@@ -3,7 +3,7 @@ require 'minitest/autorun'
 module ToyRobot
   class ToyRobotTest < MiniTest::Unit::TestCase
     def test_that_it_is_executable
-      assert system('[ -x bin/toyrobots ]')
+      assert system('[ -x bin/toyrobot ]')
     end
   end
 end

data/test/pose_double.rb

@@ -0,0 +1,23 @@
+class PoseDouble
+  def mutate!(_ = nil)
+    self
+  end
+
+  def adjacent
+    self.class.new
+  end
+
+  def rotate!(_)
+    self
+  end
+
+  def report
+    {
+      x: 0,
+      y: 0,
+      orientation: :facing
+    }
+  end
+
+  def [](_); end;
+end

data/test/test_board.rb

@@ -1,31 +1,24 @@
 require_relative '../lib/toy_robot/board'
+require_relative 'test_board_interface'
 require 'minitest/autorun'
 
 module ToyRobot
   class BoardTest < MiniTest::Unit::TestCase
-
-    PoseDouble = Struct.new(:x, :y)
-
+    include BoardInterfaceTest
     def setup
-      @board = Board.new(5,5)
+      @board = @object = Board.new(5,5)
     end
 
     def test_that_knows_a_valid_pose
-      pose_double = PoseDouble.new(0,0)
-
-      assert @board.valid_pose?(pose_double)
+      pose = {x: 0, y: 0}
+      assert @board.valid_pose?(pose)
     end
 
     def test_that_knows_an_invalid_pose
       [[-1,0], [0,-1], [6,0], [0,6]].each do |out_of_range|
-        pose_double = PoseDouble.new(*out_of_range)
-
-        refute @board.valid_pose?(pose_double), "Pose #{pose_double} should be invalid"
+        pose = {x: out_of_range[0], y: out_of_range[1]}
+        refute @board.valid_pose?(pose), "Pose #{pose} should be invalid"
       end
     end
-
-    def test_that_a_nil_pose_is_invalid
-      refute @board.valid_pose?(nil)
-    end
   end
 end

data/test/test_board_double.rb

@@ -0,0 +1,13 @@
+require_relative 'board_double'
+require_relative 'test_board_interface'
+require 'minitest/autorun'
+
+module ToyRobot
+  class BoardDoubleTest < MiniTest::Unit::TestCase
+    include BoardInterfaceTest
+
+    def setup
+      @object = BoardDouble.new
+    end
+  end
+end

data/test/test_board_interface.rb

@@ -0,0 +1,15 @@
+module ToyRobot
+  module BoardInterfaceTest
+    def test_board_public_interface
+      assert_respond_to @object, :valid_pose?
+    end
+
+    def test_that_valid_pose_returns_nil
+      assert_nil @object.valid_pose?(nil)
+    end
+
+    def test_that_valid_pose_returns_true_or_false
+      assert_includes [true, false], @object.valid_pose?({})
+    end
+  end
+end

data/test/{test_command_matcher.rb → test_command_parser.rb}

@@ -2,21 +2,21 @@ require_relative '../lib/toy_robot/command/parser'
 require 'minitest/autorun'
 
 module ToyRobot
-  class CommandMatcherTest < MiniTest::Unit::TestCase
+  class CommandParserTest < MiniTest::Unit::TestCase
     def setup
-      @matcher = Command::Parser
+      @parser = Command::Parser
     end
 
     def test_that_it_can_parse
-      refute_equal nil, @matcher.parse('PLACE 0,0,NORTH')
+      refute_equal nil, @parser.parse('PLACE 0,0,NORTH')
     end
 
     def test_that_parsing_can_fail
-      assert_equal nil, @matcher.parse('PLACE 0,0,NORTHISH')
+      assert_equal nil, @parser.parse('PLACE 0,0,NORTHISH')
     end
 
-    def test_that_it_knows_all_matchers
-      all = @matcher.all
+    def test_that_it_knows_all_parsers
+      all = @parser.all
 
       assert_includes all, Command::Parser::Place
 

data/test/{test_command_matcher_interface.rb → test_command_parser_interface.rb}

@@ -1,6 +1,6 @@
 module ToyRobot
-  module CommandMatcherInterfaceTest
-    def test_it_implement_the_command_matcher_interface
+  module CommandParserInterfaceTest
+    def test_it_implement_the_command_parser_interface
       assert_respond_to @object, :build_with_match
     end
 
@@ -14,9 +14,9 @@ module ToyRobot
       end
     end
 
-    def test_that_response_knows_token
-      assert_equal @object_token,
-                   @object.build_with_match(@object_valid_str).token
+    def test_that_response_knows_msg
+      assert_equal @object_msg,
+                   @object.build_with_match(@object_valid_str).msg
     end
 
     def test_that_response_knows_args

data/test/test_command_parser_left.rb

@@ -0,0 +1,20 @@
+require_relative '../lib/toy_robot/command/parser/left'
+require_relative 'test_command_parser_interface'
+require 'minitest/autorun'
+
+module ToyRobot
+  class CommandParserLeftTest < MiniTest::Unit::TestCase
+    include CommandParserInterfaceTest
+
+    def setup
+      @object = Command::Parser::Left
+      @object_msg = :left
+      @object_valid_str = 'LEFT'
+      @object_invalid_strs = [
+        'LEFT ',
+        'LEFTY',
+        'LEFT 180'
+      ]
+    end
+  end
+end

data/test/{test_command_matcher_move.rb → test_command_parser_move.rb}

@@ -1,14 +1,14 @@
-require_relative '../lib/toy_robot/command/parser/base'
-require_relative 'test_command_matcher_interface'
+require_relative '../lib/toy_robot/command/parser/move'
+require_relative 'test_command_parser_interface'
 require 'minitest/autorun'
 
 module ToyRobot
-  class CommandMatcherMoveTest < MiniTest::Unit::TestCase
-    include CommandMatcherInterfaceTest
+  class CommandParserMoveTest < MiniTest::Unit::TestCase
+    include CommandParserInterfaceTest
 
     def setup
       @object = Command::Parser::Move
-      @object_token = Command::Token::MOVE
+      @object_msg = :move
       @object_valid_str = 'MOVE'
       @object_invalid_strs = [
         'MOVE ',