chess_validator 0.2.10 → 0.2.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b367a02178081794d8ac5adc34cada855ae9aa3615459fd2c6aa81698f0cc8e7
-  data.tar.gz: 3f49bc22122a0318a991fb6340b0b6f22b0d30d919f07396b0a02de00affc219
+  metadata.gz: 755cc8b1ad78feff8ad130c8a3e5c11803263d8ccf41db3ec1c67fa7a08427aa
+  data.tar.gz: b926a815e705bda86df14da9269533229c76c36d2bc0301a5c18200d5cf1e9f4
 SHA512:
-  metadata.gz: b6074c987ce55676e9f41e05c501438459757c6fe8ac24dec622f50d9b7ca7e80c637b495393839df2a9bee05efca5601e41088e2b035dfe824b8cd05ff26272
-  data.tar.gz: 3a06c0c82eb0d9317b0b439cb37d47975aaecfe484d65d28d3d0733f71b89b07b7dcae6895f599632921293ed0642ccae113a6517279cfad1f7dee5064d429bd
+  metadata.gz: 9bc14f5b3a08834a3a80da545fcd9612a5624ff6f869918dc6d1a4798320708034a0120d2c6b9509f9746f532dbfdfeccf4f0c8ae07d28e05bf3084345aff996
+  data.tar.gz: ab77aa9915b79663a765596d3f31bb792363feb393e49b618a1c35c5ab46cdac5591cd60a8c781f2bb4449f9e82d2de799eafafe3bcb7456cfcf5fb5b76b5b44

data/lib/board_logic.rb

@@ -20,7 +20,7 @@ module ChessValidator
     def self.to_fen_notation(board, previous_fen, piece, move)
       notation = handle_position(board)
       notation += find_turn(previous_fen.active)
-      notation += handle_castle(previous_fen.castling, piece)
+      notation += handle_castle(previous_fen.castling, piece, board)
       notation += handle_en_passant(piece, move)
       notation += handle_half_move_clock(board.size, previous_fen, piece)
       notation += piece.color == 'b' ? previous_fen.fullmove.next : previous_fen.fullmove
@@ -35,17 +35,15 @@ module ChessValidator
       end
     end
 
-    def self.handle_castle(castling, piece)
+    def self.handle_castle(castling, piece, board)
       return castling if castling == '-'
-      if ['K', 'Q', 'k', 'q'].include?(piece.piece_type)
-        castling.size == 1 ? '-' : castling.delete(piece.piece_type)
-      elsif piece.piece_type.downcase == 'r'
-        castle_side = piece.position[0] == 'a' ? 'q' : 'k'
-        castle_side = castle_side.capitalize if piece.color == 'w'
-        castling.size == 1 ? '-' : castling.delete(castle_side)
-      else
-        castling
-      end
+      castling.delete!('K') if board[64].nil? || board[64].piece_type != 'R'
+      castling.delete!('K') if board[61].nil? || board[61].piece_type != 'K'
+      castling.delete!('Q') if board[57].nil? || board[57].piece_type != 'R'
+      castling.delete!('k') if board[8].nil? || board[8].piece_type != 'r'
+      castling.delete!('k') if board[5].nil? || board[5].piece_type != 'k'
+      castling.delete!('q') if board[1].nil? || board[1].piece_type != 'r'
+      castling.size == 1 ? '-' : castling
     end
 
     def self.handle_en_passant(piece, move)

data/lib/move_logic.rb

@@ -21,7 +21,7 @@ module ChessValidator
         moves_for_piece(piece).each do |move|
           if valid_move?(piece, board, move, fen)
             piece.valid_moves << move
-            target = find_target(board, piece, move)
+            target = find_target(board, piece, move, fen.en_passant)
             piece.targets << target if target
           else
             piece.move_potential << move
@@ -29,12 +29,12 @@ module ChessValidator
         end
       end
 
-      def find_target(board, piece, move)
+      def find_target(board, piece, move, en_passant)
         if piece.piece_type.downcase == 'p' && piece.position[0] == move[0]
           nil
         elsif board[INDEX_KEY[move]]
           board[INDEX_KEY[move]]
-        elsif piece.piece_type.downcase == 'p'
+        elsif piece.piece_type.downcase == 'p' && move == en_passant
           en_passant_position = piece.color == 'w' ? move[0] + '5' : move[0] + '4'
           board[INDEX_KEY[en_passant_position]]
         end
@@ -130,6 +130,7 @@ 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
 
@@ -161,7 +162,7 @@ module ChessValidator
           board.values.none? { |piece| [between, move].include?(piece.position) } &&
           empty_b_square
         else
-          valid_destination?(king, board, move) && king_is_safe?(king.color, board, move, occupied_spaces)
+          valid_destination?(king, board, move) && king_will_be_safe?(king, board, move)
         end
       end
 
@@ -210,7 +211,7 @@ module ChessValidator
       def valid_destination?(piece, board, move)
         target_piece = find_piece(board, move)
         if target_piece
-          target_piece.color != piece.color
+          target_piece.color != piece.color && target_piece.piece_type.downcase != 'k'
         else
           true
         end
@@ -221,7 +222,7 @@ module ChessValidator
       end
 
       def empty_square?(board, move)
-        board.values.detect { |piece| piece.position == move }.nil?
+        board.values.none? { |piece| piece.position == move }
       end
 
       def valid_move_path?(piece, move, occupied_spaces)

metadata

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