chess_validator 0.2.8 → 0.2.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7447add6691d3f9071ad8ef282e15e05303916f4190c68a5a8850bceb6f92677
-  data.tar.gz: e462bf916cb48a88e3b1a1150d98fba07e913ea5b030df003dc1c2983c595d0b
+  metadata.gz: 03b73d5695fddf48ea9494d65ce26cdea0c3400edf94f12a1ae16565a60ca999
+  data.tar.gz: ad5ed89124d328363f8f6f193710b827ad21cf5aeb0e4cd95a75041c8068fe7d
 SHA512:
-  metadata.gz: 1d8d07cd4aef5cdd849581fcd5e7b90d402877abd076b350ac249d29239769646cafd8619e0e2318d140a0800eae1184bae58126889bec28a89e83d63fdf9fc8
-  data.tar.gz: 84335e767809eb2475e1018508e02f015b7f66de2d1bdb89ada50e1213f625a5576f5c534413f9280281893d649214ee3b7e660946980320595f34775f7339fc
+  metadata.gz: f0b7b7b5f1bc7888385a488e5c1304671ac2122777a06a74061799891b3656be37938a531d912ecf74698fccbcdefeb476d423c9d40dfd5dac53daf3c0abadec
+  data.tar.gz: 8b76ad106e6a34fc82e48baea5f125aa0a7271a99c3b2e04dcf2874f728de0909c93f6b89e454fa896b318198f81539f96c66f2d7cc5ccfc222449e612eeb9f3

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,10 +29,12 @@ module ChessValidator
         end
       end
 
-      def find_target(board, piece, move)
-        if board[INDEX_KEY[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' && piece.position[0] != move[0]
+        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
@@ -189,21 +191,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 && piece.piece_type.downcase != 'k'
         else
           true
         end
@@ -214,7 +221,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.8
+  version: 0.2.13
 platform: ruby
 authors:
 - Charles Ellison