chess_validator 0.1.7 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6d13b525f8a4b8ad4edca48708ea50c53b3e754fe3c3f0115fcc13c0a6e12c6f
-  data.tar.gz: 773e8ee7bf7c8c5481b1d8457e2a273b70f3cf9d6ae9ab1f55fe67fe6c16b1dd
+  metadata.gz: 0e4f35f7365cba31d8882b494232dd0357745db3b3390d9da373225e9e378ee1
+  data.tar.gz: bab4ecf238d41abc2290e2f1a7bac33d727d14605140e57414cef484225d581f
 SHA512:
-  metadata.gz: d64ee9edd77f419cf3233c075816f4403cec25a25f29c19da18a4265751f1d2e2807de72f40e6a5b430feb7b75c7c6b6568d73e5a0fd264c4c5b75a936d3356b
-  data.tar.gz: 682bc4d527bed82cff43f3f46f9c3b0c5a6be767604411633bf0eaccbc32b1d364e293df96b6a2358d92451ae5dfc44b72a60b2070f1066b8a6abb2540db5b69
+  metadata.gz: cde6774a3a7e10f367805944038f8ddafb61c1aa4054067d20de055171b062ed270081deee99a50e14f771a8fd9a4f71bee23eaa19faa0256ba374151e6605f2
+  data.tar.gz: fdec3d74fb38c1bd2a4ecbce08c2d1f7c11e705856f58b858868f0628dfab8d1917e4bb972afb4fb07d0c85ac755cae0f7d04685a427a3dcc8322ad5f15e37b2

data/lib/board_logic.rb

@@ -1,3 +1,5 @@
+require 'piece'
+
 module ChessValidator
   class BoardLogic
     def self.build_board(fen)

data/lib/chess_validator.rb

@@ -1,3 +1 @@
-require 'move_logic'
-require 'game_logic'
-require 'pry'
+require 'engine'

data/lib/engine.rb

@@ -0,0 +1,29 @@
+require 'move_logic'
+require 'game_logic'
+
+module ChessValidator
+  class Engine
+    class << self
+      def find_next_moves(fen_notation)
+        fen = PGN::FEN.new(fen_notation)
+        MoveLogic.next_moves(fen)
+      end
+
+      def find_next_moves_from_moves(moves)
+        fen = PGN::Game.new(moves).positions.last.to_fen
+        MoveLogic.next_moves(fen)
+      end
+
+      def make_random_move(fen_notation, pieces_with_moves)
+        piece_to_move = pieces_with_moves.sample
+        move = piece_to_move.valid_moves.sample
+        MoveLogic.make_move(piece_to_move, move, fen_notation)
+      end
+
+      def get_pieces(fen_notation)
+        fen = PGN::Game.new(moves).positions.last.to_fen
+        BoardLogic.build_board(fen).values
+      end
+    end
+  end
+end

data/lib/game_logic.rb

@@ -1,10 +1,14 @@
+require 'board_logic'
+require 'move_logic'
+require 'pgn'
+
 module ChessValidator
   class GameLogic
     class << self
       def find_game_result(fen_notation)
         fen = PGN::FEN.new(fen_notation)
         board = BoardLogic.build_board(fen)
-        no_moves = MoveLogic.find_next_moves(fen).empty?
+        no_moves = MoveLogic.next_moves(fen).empty?
         checkmate_result = checkmate_value(fen, board, no_moves)
 
         if checkmate_result

data/lib/move_logic.rb

@@ -1,16 +1,9 @@
+require 'board_logic'
+require 'pgn'
+
 module ChessValidator
   class MoveLogic
     class << self
-      def find_next_moves(fen_notation)
-        fen = PGN::FEN.new(fen_notation)
-        next_moves(fen)
-      end
-
-      def find_next_moves_from_moves(moves)
-        fen = PGN::Game.new(moves).positions.last.to_fen
-        next_moves(fen)
-      end
-
       def next_moves(fen)
         board = BoardLogic.build_board(fen)
         pieces = []
@@ -48,7 +41,8 @@ module ChessValidator
       def with_next_move(piece, board, move)
         index = INDEX_KEY[move]
         new_board = board.clone
-        new_piece = Piece.new(piece.piece_type, index)
+        piece_type = resolve_piece_type(piece.piece_type, move)
+        new_piece = Piece.new(piece_type, index)
         new_board.delete(piece.square_index)
         new_board[index] = new_piece
         new_board = handle_castle(new_board, move) if castled?(piece, move)
@@ -56,6 +50,14 @@ module ChessValidator
         new_board
       end
 
+      def resolve_piece_type(piece_type, move)
+        if piece_type.downcase == 'p' && ['1', '8'].include?(move[1])
+          move[1] == '8' ? 'Q' : 'q'
+        else
+          piece_type
+        end
+      end
+
       def handle_en_passant(board, pawn_color, move)
         if pawn_color == 'w'
           index = INDEX_KEY[move[0] + '5']
@@ -111,8 +113,6 @@ module ChessValidator
       def king_will_be_safe?(piece, board, move)
         new_board = with_next_move(piece, board, move)
         king, occupied_spaces = find_king_and_spaces(new_board, piece.color)
-
-        return false if king.nil?
         king_is_safe?(king.color, new_board, king.position, occupied_spaces)
       end
 
@@ -151,9 +151,13 @@ module ChessValidator
       def king_is_safe?(king_color, board, king_position, occupied_spaces)
         board.values.none? do |piece|
           piece.color != king_color &&
-          moves_for_piece(piece).select do |move|
-            king_position == move && valid_move_path?(piece, king_position, occupied_spaces)
-          end.size > 0
+          moves_for_piece(piece).any? do |move|
+            if piece.piece_type.downcase == 'p'
+              king_position == move && piece.position[0] != king_position[0]
+            else
+              king_position == move && valid_move_path?(piece, king_position, occupied_spaces)
+            end
+          end
         end
       end
 
@@ -161,11 +165,12 @@ module ChessValidator
         position = piece.position
 
         if position[0] == move[0]
-          advance_pawn?(piece, board, move)
+          valid = advance_pawn?(piece, board, move)
         else
           target_piece = find_piece(board, move)
-          (target_piece && target_piece.color != piece.color) || move == fen.en_passant
+          valid = (target_piece && target_piece.color != piece.color) || move == fen.en_passant
         end
+        valid && king_will_be_safe?(piece, board, move)
       end
 
       def advance_pawn?(pawn, board, move)

data/lib/piece.rb

@@ -1,4 +1,4 @@
-require_relative './constants/square_key'
+require_relative './constants/move_key'
 
 module ChessValidator
   class Piece

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chess_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.2.2
 platform: ruby
 authors:
 - Charles Ellison
@@ -18,7 +18,8 @@ extra_rdoc_files: []
 files:
 - lib/board_logic.rb
 - lib/chess_validator.rb
-- lib/constants/square_key.rb
+- lib/constants/move_key.rb
+- lib/engine.rb
 - lib/game_logic.rb
 - lib/move_logic.rb
 - lib/piece.rb