another_toy_robot 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19356ced35855d3bd280b77f6ec6174698d4f8ba
-  data.tar.gz: 773afcf5e484aff26acc7db9c247c4164aae0d63
+  metadata.gz: 7c172c05d49f128057d23173ff7b4dd448378db9
+  data.tar.gz: e2c7f21029d0cdca40e142ed3cce0a8afd185d3c
 SHA512:
-  metadata.gz: 8775ee5ad28ec404de542c2b69b4585c67a7d46749570e68414bebd144e3e1e390dc3017742f909fdc7b137702a323bfe5ac9affd89b31542d3d4b7584daa153
-  data.tar.gz: 1e2ff237e8cdf6ad4bd7e46fa051613759f4ee8b4efd89e43d19899085f8c47638f06ec403a7c2a16a0ca497ab385e7aaa2a30167399406508ad75027803b4fb
+  metadata.gz: a6544b8a114e7ae2266077ff6491ef35aaa9b629e945fb268a56862c0f28b68ef9edaf817f543d07b2e0b15aa2be97e1d689d7a479f9f3fcf0643e968a0c0cbd
+  data.tar.gz: 638af44750a27e6ffdb62fffcc3717a1eb06240ded47d21cb5c07e0e4363997849a221ccb5fe1085e1f32bbbb477412293e802682c3aa7e2e2a9a855ac354912

data/lib/toy_robot/arena.rb

@@ -6,8 +6,8 @@ class Arena
     @height = height
   end
 
-  def inbounds?(x, y)
-    x.between?(0, max_x) && y.between?(0, max_y)
+  def inbounds?(x_coord, y_coord)
+    x_coord&.between?(0, max_x) && y_coord&.between?(0, max_y)
   end
 
   private
@@ -20,9 +20,3 @@ class Arena
     height - 1
   end
 end
-
-class NullArena
-  def inbounds?(*)
-    true
-  end
-end

data/lib/toy_robot/client.rb

@@ -1,13 +1,13 @@
 class Client
   def initialize
-    @robot = Robot.new
     @table = Arena.new width: 5, height: 5
+    @robot = Robot.new arena: @table
   end
 
   def instruction(input)
     command = case input
-              when /place\s+(\d+,\s*){2}[nesw]/
-                PlaceCommand.new robot: @robot, arena: @table, command: input
+              when /place\s+(\d+,\s*){2}([nesw]|(north)|(east)|(south)|(west))$/
+                PlaceCommand.new robot: @robot, command: input
               when "move"
                 MoveCommand.new robot: @robot
               when "left"

data/lib/toy_robot/command.rb

@@ -1,16 +1,24 @@
 class PlaceCommand
-  def initialize(robot:, arena: NullArena.new, command:)
+  def initialize(robot:, command:)
     @robot  = robot
-    @arena  = arena
     @params = command[/\s.*/].delete(" ").split(",")
   end
 
   def execute
-    position = NullPosition.new arena: @arena
-    position = position.go_to(x:         @params[0].to_i,
-                              y:         @params[1].to_i,
-                              direction: @params[2].to_sym)
-    @robot.position = position
+    @robot.place RealPosition.new(x_coord:   @params[0].to_i,
+                                  y_coord:   @params[1].to_i,
+                                  direction: direction)
+  end
+
+  private
+
+  def direction
+    case @params[2]
+    when "n", "north" then North.new
+    when "e", "east"  then East.new
+    when "s", "south" then South.new
+    when "w", "west"  then West.new
+    end
   end
 end
 

data/lib/toy_robot/direction.rb

@@ -0,0 +1,71 @@
+class North
+  attr_reader :x_displacement, :y_displacement, :to_s
+
+  def initialize
+    @x_displacement = 0
+    @y_displacement = 1
+    @to_s           = "north"
+  end
+
+  def left
+    West.new
+  end
+
+  def right
+    East.new
+  end
+end
+
+class East
+  attr_reader :x_displacement, :y_displacement, :to_s
+
+  def initialize
+    @x_displacement = 1
+    @y_displacement = 0
+    @to_s           = "east"
+  end
+
+  def left
+    North.new
+  end
+
+  def right
+    South.new
+  end
+end
+
+class South
+  attr_reader :x_displacement, :y_displacement, :to_s
+
+  def initialize
+    @x_displacement = 0
+    @y_displacement = -1
+    @to_s           = "south"
+  end
+
+  def left
+    East.new
+  end
+
+  def right
+    West.new
+  end
+end
+
+class West
+  attr_reader :x_displacement, :y_displacement, :to_s
+
+  def initialize
+    @x_displacement = -1
+    @y_displacement = 0
+    @to_s           = "west"
+  end
+
+  def left
+    South.new
+  end
+
+  def right
+    North.new
+  end
+end

data/lib/toy_robot/position.rb

@@ -1,45 +1,22 @@
-class Position
-  attr_accessor :arena
+class RealPosition
+  attr_reader :x_coord, :y_coord, :direction
 
-  def initialize(arena: NullArena.new, **args)
-    @arena = arena
-    post_initialize args
-  end
-
-  def go_to(x: @x_coord, y: @y_coord, direction: @direction)
-    if @arena.inbounds? x, y
-      RealPosition.new x: x, y: y, direction: direction, arena: @arena
-    else
-      self
-    end
-  end
-end
-
-class RealPosition < Position
-  attr_accessor :x_coord, :y_coord, :direction
-
-  ROTATION     = { left: -1, right: 1 }.freeze
-  DISPLACEMENT = { n: { x:  0, y:  1 },
-                   e: { x:  1, y:  0 },
-                   s: { x:  0, y: -1 },
-                   w: { x: -1, y:  0 } }.freeze
-
-  def post_initialize(x: 0, y: 0, direction: :n)
-    @x_coord   = x
-    @y_coord   = y
+  def initialize(x_coord: 0, y_coord: 0, direction: North.new)
+    @x_coord   = x_coord
+    @y_coord   = y_coord
     @direction = direction
   end
 
   def advance
-    new_x = @x_coord + DISPLACEMENT[@direction][:x]
-    new_y = @y_coord + DISPLACEMENT[@direction][:y]
-    go_to x: new_x, y: new_y
+    x = @x_coord + @direction.x_displacement
+    y = @y_coord + @direction.y_displacement
+    RealPosition.new x_coord: x, y_coord: y, direction: @direction
   end
 
   def turn(hand_side)
-    compass = DISPLACEMENT.keys
-    index = (compass.find_index(@direction) + ROTATION[hand_side]) % 4
-    go_to direction: compass[index]
+    RealPosition.new(x_coord:   @x_coord,
+                     y_coord:   @y_coord,
+                     direction: @direction.send(hand_side))
   end
 
   def to_s
@@ -47,8 +24,14 @@ class RealPosition < Position
   end
 end
 
-class NullPosition < Position
-  def post_initialize(*); end
+class NullPosition
+  attr_reader :x_coord, :y_coord, :direction
+
+  def initialize
+    @x_coord   = nil
+    @y_coord   = nil
+    @direction = nil
+  end
 
   def advance
     self

data/lib/toy_robot/robot.rb

@@ -1,12 +1,17 @@
 class Robot
-  attr_accessor :position
+  attr_accessor :position, :arena
 
-  def initialize(position: NullPosition.new)
+  def initialize(position: NullPosition.new, arena:)
     @position = position
+    @arena    = arena
+  end
+
+  def place(new_position)
+    @position = safely_go_to new_position
   end
 
   def move
-    @position = @position.advance
+    @position = safely_go_to @position.advance
   end
 
   def left
@@ -20,4 +25,14 @@ class Robot
   def report
     puts @position.to_s
   end
+
+  private
+
+  def safely_go_to(new_position)
+    if @arena.inbounds? new_position.x_coord, new_position.y_coord
+      new_position
+    else
+      @position
+    end
+  end
 end

data/lib/toy_robot/version.rb

@@ -1,3 +1,3 @@
 module ToyRobot
-  VERSION = "0.1.2"
+  VERSION = "0.1.3"
 end

data/lib/toy_robot.rb

@@ -4,16 +4,23 @@ require "toy_robot/robot"
 require "toy_robot/arena"
 require "toy_robot/command"
 require "toy_robot/position"
+require "toy_robot/direction"
 
 module ToyRobot
   def self.main
     client = Client.new
 
     loop do
-      print "Input command: "
-      input = gets.strip
-      break if input == "exit"
-      client.instruction input
+      command = get_input
+      break if command == "exit"
+      client.instruction command
     end
   end
+
+  private
+
+  def self.get_input
+    print "Input command: "
+    gets.downcase.strip
+  end
 end

data/toy_robot.gemspec

@@ -6,7 +6,7 @@ require 'toy_robot/version'
 Gem::Specification.new do |spec|
   spec.name                  = "another_toy_robot"
   spec.version               = ToyRobot::VERSION
-  spec.date                  = "2016-11-27"
+  spec.date                  = "2016-11-29"
   spec.authors               = "Sheldon J. Johnson"
   spec.email                 = "sheldon.j.johnson@outlook.com"
   spec.homepage              = "https://github.com/drzel/toy_robot"
@@ -16,7 +16,8 @@ Gem::Specification.new do |spec|
 
   spec.description = <<~HEREDOC
     The application is a simulation of a toy robot moving on a square tabletop.
-    It is an example of a well tested, object oriented design, employing the command design pattern.
+    It is an example of a well tested, object oriented design, employing the 
+    command design pattern.
   HEREDOC
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|

metadata

@@ -1,18 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: another_toy_robot
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Sheldon J. Johnson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2016-11-29 00:00:00.000000000 Z
 dependencies: []
-description: |
-  The application is a simulation of a toy robot moving on a square tabletop.
-  It is an example of a well tested, object oriented design, employing the command design pattern.
+description: "The application is a simulation of a toy robot moving on a square tabletop.\nIt
+  is an example of a well tested, object oriented design, employing the \ncommand
+  design pattern.\n"
 email: sheldon.j.johnson@outlook.com
 executables:
 - toy_robot
@@ -33,6 +33,7 @@ files:
 - lib/toy_robot/arena.rb
 - lib/toy_robot/client.rb
 - lib/toy_robot/command.rb
+- lib/toy_robot/direction.rb
 - lib/toy_robot/position.rb
 - lib/toy_robot/robot.rb
 - lib/toy_robot/version.rb