Merge pull request #13 from scala-academy/refactoring

some refactoring (mostly renaming)

Author: jordi133

src/main/scala/battleship/game/BoardState.scala

@@ -19,7 +19,7 @@ case class BoardState(boats: Set[(Boat, BoatLocation)], history: Seq[Shot]) {
     BoardState(boats + location, history)
   }
 
-  def shoot(coordinate: Coordinate): BoardState = {
+  def processShot(coordinate: Coordinate): BoardState = {
     val coordinateInHistory = history.exists{case (shotLocation, _) => shotLocation == coordinate}
     require(!coordinateInHistory, "Can't shoot at the same coordinate twice")
 

src/main/scala/battleship/game/Game.scala

@@ -27,11 +27,11 @@ class Game(player1: Player, player2: Player, boardSize: Int, allBoats: Seq[Boat]
   def play: Player = {
     def playRecursively(players: (PlayerState, PlayerState)): Player = {
       val (currentPlayer, nextPlayer) = players
-      if (currentPlayer.won) {
+      if (currentPlayer.hasWon) {
         currentPlayer.player
       } else {
         val nextShot = currentPlayer.getNextShot(boardSize, currentPlayer.history)
-        val newBoard = currentPlayer.shoot(nextShot)
+        val newBoard = currentPlayer.processShot(nextShot)
         val updatedPlayers = (nextPlayer, (currentPlayer.player, newBoard))
         playRecursively(updatedPlayers)
       }
@@ -63,12 +63,12 @@ class Game(player1: Player, player2: Player, boardSize: Int, allBoats: Seq[Boat]
     * tuple (Player, BoardState) can be automatically converted to PlayerRepr. As a result, the below defined functions
     * are added to the scope of the tuple (Player, BoardState)
     */
-  implicit class PlayerRepr(playerAndBoard: (Player, BoardState)) {
+  implicit class PlayerStateOps(playerAndBoard: (Player, BoardState)) {
     val (player, board) = playerAndBoard
 
-    def won: Boolean = board.allShipsSunk
+    def hasWon: Boolean = board.allShipsSunk
 
-    def shoot(coordinate: Coordinate): BoardState = board.shoot(coordinate)
+    def processShot(coordinate: Coordinate): BoardState = board.processShot(coordinate)
 
     def history: Seq[((Int, Int), ShotResult)] = board.history
 

src/test/scala/battleship/game/BoardStateSpec.scala

@@ -23,16 +23,16 @@ class BoardStateSpec extends WordSpec with Matchers {
 
   "shoot" should {
     "throw an exception if a shot is made to a coordinate for the second time" in {
-      val state = BoardState.empty.shoot(0, 0)
+      val state = BoardState.empty.processShot(0, 0)
 
       assertThrows[IllegalArgumentException] {
-        state.shoot(0, 0)
+        state.processShot(0, 0)
       }
     }
     "return an updated instance of BoardState with the shot included in the history" in {
       val state = BoardState.empty
 
-      val result = state.shoot(1, 1).shoot(3, 4)
+      val result = state.processShot(1, 1).processShot(3, 4)
 
       result should be(BoardState(Set.empty, Seq(((3, 4), Miss), ((1, 1), Miss))))
     }
@@ -57,10 +57,10 @@ class BoardStateSpec extends WordSpec with Matchers {
       val placement = BoatLocation(0, 0, true)
       val state = BoardState.empty
         .placeBoat(boat, placement)
-        .shoot(0,0)
-        .shoot(1,1)
-        .shoot(1,0)
-        .shoot(0,2)
+        .processShot(0,0)
+        .processShot(1,1)
+        .processShot(1,0)
+        .processShot(0,2)
 
       state.shotsOnBoatSoFar(boat, placement) should be(2)
     }
@@ -80,14 +80,14 @@ class BoardStateSpec extends WordSpec with Matchers {
     "return Hit when a shot hits but does not sink for 2nd shot on size 3 boat" in {
       val state = BoardState.empty
         .placeBoat(Boat(3), BoatLocation(0, 0, true))
-        .shoot(2,0)
+        .processShot(2,0)
 
       state.calculateShotResult(0,0) should be(Hit)
     }
     "return Sink when a shot hits for the x'th time on a x-size boat" in {
       val state = BoardState.empty
         .placeBoat(Boat(2), BoatLocation(0, 0, true))
-        .shoot(1,0)
+        .processShot(1,0)
 
       state.calculateShotResult(0,0) should be(Sink(Boat(2)))
     }