chess_validator 0.2.9 → 0.2.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22fa05aafa1d1598ba384879860f4fc10de365c683e69a0f0f37592afa833c22
-  data.tar.gz: db2436d2d489d82d919701d301e4ece358ec2a1692bab9f929dd16f815c8e279
+  metadata.gz: ae31a40890e32644ea7bab6a82407dea4d40f155a6557777b401b260b18d41d0
+  data.tar.gz: ce29175b6af41591075e5158488c26bffc4cb92ee040d7389d6f751fa8117679
 SHA512:
-  metadata.gz: fce7255b5a6d5ed612ed3c33300ffbfdcb4a06c25046f621d0172fd5b4eda853d31f7109dae74b46247de07927982e35da79d94f8df438b07e2240318d835c6a
-  data.tar.gz: 922583c5f2ff843b2292ebf10fe8d69cfcaac72a55732593188b4d5952758127a554bf498da632f1b34908a269a071b9e8c88a3d55f4f083829958d36bbba1e3
+  metadata.gz: fc687efb628401bcf9f5f3374b877a4eca8c4d496004dafdff545e66332416565aaa17a988eaf6e83750e39357f2dea684638402f6c641427a0c4460caebefae
+  data.tar.gz: 3fcb3650f113f585147f3afa567134564717f4952af4794de1c0c4b4d3c6cb25ddcd2ae041fc1300c14a45cf1f58279c728578f06aa5b81d220e9774136dce7e

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
 
@@ -191,21 +192,26 @@ module ChessValidator
       end
 
       def advance_pawn?(pawn, board, move)
-        if (pawn.position[1].to_i - move[1].to_i).abs == 1
-          empty_square?(board, move)
-        else
-          occupied_spaces = []
-          board.values.each do |piece|
-            occupied_spaces << piece.position
+        if empty_square?(board, forward_by(pawn, 1))
+          if (pawn.position[1].to_i - move[1].to_i).abs == 2
+            empty_square?(board, forward_by(pawn, 2))
+          else
+            true
           end
-          valid_move_path?(pawn, move, occupied_spaces) && empty_square?(board, move)
+        else
+          false
         end
       end
 
+      def forward_by(piece, count)
+        position = piece.position
+        piece.color == 'w' ? position[0] + (position[1].to_i + count).to_s : position[0] + (position[1].to_i - count).to_s
+      end
+
       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
@@ -216,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.9
+  version: 0.2.14
 platform: ruby
 authors:
 - Charles Ellison