chess_validator 0.1.6 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d391ec459430072a8e9df514b4b68f1363fc16705971d5dc262ea601ebc64d9e
-  data.tar.gz: d5f8beef914ae16c35185441f80ec0f0f3459875480a8a2d1518e08f7f72fe8f
+  metadata.gz: 1af34872a259842b2169becd1ee7570ceac96f7fc626e4c4306e7544fca7e25a
+  data.tar.gz: 821da801fa31123bd8ec1a6d151bb14364da5ad60d833b11b129ef205ec51411
 SHA512:
-  metadata.gz: 0572624b876491ca99ddd3a8999993c1a023c1496f4435375c7e1f087342839175e6455dce3a8128916fcd323125640ec11c8c46a72f27449353aaeddd91e066
-  data.tar.gz: 57b46adca5631c768e9386c0467b8b6318e4888ec3e44567b7b0240f13f84883419ecdbd8ac2840b10e477fa24776f33f7625b524c801d382a7fc59940cf8438
+  metadata.gz: dae4d729c77310493648f7c3ec78ee954b3f04055b94a9a7410a74a3028d1b86918a6161e148bdaa27eaf75249a3a80e9ee9e2c54ed69cfcae8250740a62ba54
+  data.tar.gz: d0dcfb4661d6c5f8b231207ad0cd96c7634ed84898c3d76331c10f64aad54f345d4ef10538e3f27fb428eadf686958f7ccd69ea48fbb18bd1ceb0d40a4bf2b05

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,2 @@
 require 'move_logic'
 require 'game_logic'
-require 'pry'

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,3 +1,6 @@
+require 'board_logic'
+require 'pgn'
+
 module ChessValidator
   class MoveLogic
     class << self
@@ -111,8 +114,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 +152,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 +166,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chess_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.2.1
 platform: ruby
 authors:
 - Charles Ellison