Pieces: remove duplication in #raw_directional_moves

alex-tan · Feb 5, 2013 · 589f054 · 589f054
1 parent e896148
commit 589f054
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 11 deletions.
diff --git a/lib/ruby-chess-board/piece.rb b/lib/ruby-chess-board/piece.rb
@@ -73,5 +73,13 @@ def opponent?(variable)
     def ally?(variable)
       variable.kind_of?(Piece) && variable.color == color
     end
+
+    # Returns the coordinates of itself in a given game.
+    # @param [Game] game
+    # @return [Coordinate]
+    def coordinates_in_game(game)
+      board = game.board
+      board.coordinates_of(self)
+    end
   end
 end
diff --git a/lib/ruby-chess-board/pieces/bishop.rb b/lib/ruby-chess-board/pieces/bishop.rb
@@ -2,8 +2,7 @@ module RubyChessBoard
   class Bishop < Piece
     # @private
     def raw_directional_moves(game)
-      board    = game.board
+      position = coordinates_in_game(game)
-      position = board.coordinates_of(self)
 
       CoordinateCollection.new sets: [
         position.relative_coordinate_set(1, 1),

diff --git a/lib/ruby-chess-board/pieces/king.rb b/lib/ruby-chess-board/pieces/king.rb
@@ -2,8 +2,7 @@ module RubyChessBoard
   class King < Piece
     # @private
     def raw_directional_moves(game)
-      board    = game.board
+      position = coordinates_in_game(game)
-      position = board.coordinates_of(self)
 
       CoordinateCollection.new coordinates: [
         position.relative_coordinate(0, 1),

diff --git a/lib/ruby-chess-board/pieces/knight.rb b/lib/ruby-chess-board/pieces/knight.rb
@@ -2,8 +2,7 @@ module RubyChessBoard
   class Knight < Piece
     # @private
     def raw_directional_moves(game)
-      board    = game.board
+      position = coordinates_in_game(game)
-      position = board.coordinates_of(self)
 
       CoordinateCollection.new coordinates: [
         position.relative_coordinate(1, 2),

diff --git a/lib/ruby-chess-board/pieces/pawn.rb b/lib/ruby-chess-board/pieces/pawn.rb
@@ -15,7 +15,7 @@ def rank_directions
     # @private
     def raw_directional_moves(game)
       board    = game.board
-      position = board.coordinates_of(self)
+      position = coordinates_in_game(game)
 
       collection = CoordinateCollection.new
 

diff --git a/lib/ruby-chess-board/pieces/queen.rb b/lib/ruby-chess-board/pieces/queen.rb
@@ -2,8 +2,7 @@ module RubyChessBoard
   class Queen < Piece
     # @private
     def raw_directional_moves(game)
-      board    = game.board
+      position = coordinates_in_game(game)
-      position = board.coordinates_of(self)
 
       CoordinateCollection.new sets: [
         position.relative_coordinate_set(0, 1),

diff --git a/lib/ruby-chess-board/pieces/rook.rb b/lib/ruby-chess-board/pieces/rook.rb
@@ -2,8 +2,7 @@ module RubyChessBoard
   class Rook < Piece
     # @private
     def raw_directional_moves(game)
-      board    = game.board
+      position = coordinates_in_game(game)
-      position = board.coordinates_of(self)
 
       CoordinateCollection.new sets: [
         position.relative_coordinate_set(0, 1),