chess_validator 0.2.14 → 0.2.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae31a40890e32644ea7bab6a82407dea4d40f155a6557777b401b260b18d41d0
-  data.tar.gz: ce29175b6af41591075e5158488c26bffc4cb92ee040d7389d6f751fa8117679
+  metadata.gz: 293d47ecb588b6f6654cf76c014d242980c74f4c0f9b155d9b19e656bf7fcac6
+  data.tar.gz: 4a3b4ce1c0c0013514474f3cfa6a62bf6088581cbbb6ec0b2723b2c0b9421140
 SHA512:
-  metadata.gz: fc687efb628401bcf9f5f3374b877a4eca8c4d496004dafdff545e66332416565aaa17a988eaf6e83750e39357f2dea684638402f6c641427a0c4460caebefae
-  data.tar.gz: 3fcb3650f113f585147f3afa567134564717f4952af4794de1c0c4b4d3c6cb25ddcd2ae041fc1300c14a45cf1f58279c728578f06aa5b81d220e9774136dce7e
+  metadata.gz: cbe22e6fdb5bb096f8ca66ec790d7f21d5e1077e1ac8cffd6074742277cb17a91c47b5a0ce6ecc27dc2227111fbac0b888eb1394c98b8b57d07af6814c156699
+  data.tar.gz: a99822336ff54cac4d82797e7d73288ccb1d6954870b2c1c23e4a0b8fe5c3d92289be5f13b8405ce82401469e83cd983d08c38565477106b7c8e8df1c9faff8b

data/lib/board_logic.rb

@@ -17,35 +17,33 @@ module ChessValidator
       board
     end
 
-    def self.to_fen_notation(board, previous_fen, piece, move)
+    def self.to_fen_notation(board, previous_fen, piece, move, captured)
       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 += handle_half_move_clock(previous_fen, piece.piece_type, captured)
       notation += piece.color == 'b' ? previous_fen.fullmove.next : previous_fen.fullmove
       notation
     end
 
-    def self.handle_half_move_clock(board_size, previous_fen, piece)
-      if piece.piece_type == 'pawn' || build_board(previous_fen).size > board_size
+    def self.handle_half_move_clock(previous_fen, piece_type, captured)
+      if piece_type.downcase == 'p' || captured
         '0 '
       else
         previous_fen.halfmove.next + ' '
       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!('KQ') 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!('kq') if board[5].nil? || board[5].piece_type != 'k'
+      castling.delete!('q') if board[1].nil? || board[1].piece_type != 'r'
+      castling.size == 0 ? '-' : castling
     end
 
     def self.handle_en_passant(piece, move)

data/lib/move_logic.rb

@@ -116,7 +116,7 @@ module ChessValidator
         board = BoardLogic.build_board(fen)
         new_board = with_next_move(piece, board, move)
 
-        BoardLogic.to_fen_notation(new_board, fen, piece, move)
+        BoardLogic.to_fen_notation(new_board, fen, piece, move, board[INDEX_KEY[move]])
       end
 
       def castled?(piece, move)
@@ -211,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.piece_type.downcase != 'k'
+          target_piece.color != piece.color
         else
           true
         end

metadata

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