chess_validator 0.1.9 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 012e2a3f6be44c4d117d14d0403be0a039d3f003716e899885470ef1fc4459fa
-  data.tar.gz: c11fd3a325de4e9d743fe26a15ec5cf0f91a09bf280e99027966d9ba09fc3d09
+  metadata.gz: '09f1b10fc24cf38a921d5d5166d3bfc5e11d0d91829afae5724911036bf83e26'
+  data.tar.gz: '083459406961668dedccfb076481f69cd8c249203f29c24b372056b06ce9342c'
 SHA512:
-  metadata.gz: 570cedffbcfe74a5427954fa454b889feaf4a962147e99125cbc3d6f4904415f0077180c05af56035e4f67cab0191d3ce69b8263de15e034938cee7de0f9da7a
-  data.tar.gz: d45df24d49ff075283b84565cecd31eab976e792fea274718498f3db1b5e62257d08f336d217ee179740a85fb2c8d0d8802d10b34d8cb89b46ee686a811d81c1
+  metadata.gz: c1a87737a4e96aee2450fc1caf5ce317424c83c07a006ae11e74494c5084919fad6ef259c061d5767d53c56759e6385a47b9037c9ec8ab346a1278746c813fc5
+  data.tar.gz: e4fd8f352273dd65b2378ceb004368fbe1f7dd84e3c75176ba6c090be5deea023d94217010d5d18b7e06f22e36e4f8abc745db4ec3dafc90a6be2a189d9d5332

data/lib/chess_validator.rb

@@ -1,3 +1 @@
-require 'move_logic'
-require 'game_logic'
-require 'pry'
+require 'engine'

data/lib/engine.rb

@@ -0,0 +1,37 @@
+require 'move_logic'
+require 'game_logic'
+
+module ChessValidator
+  class Engine
+    class << self
+      def find_next_moves(fen_notation)
+        fen = PGN::FEN.new(fen_notation)
+        MoveLogic.next_moves(fen)
+      end
+
+      def find_next_moves_from_moves(moves)
+        fen = PGN::Game.new(moves).positions.last.to_fen
+        MoveLogic.next_moves(fen)
+      end
+
+      def make_random_move(fen_notation, pieces_with_moves)
+        piece_to_move = pieces_with_moves.sample
+        move = piece_to_move.valid_moves.sample
+        MoveLogic.make_move(piece_to_move, move, fen_notation)
+      end
+
+      def move(piece, move, fen_notation)
+        MoveLogic.make_move(piece, move, fen_notation)
+      end
+
+      def pieces(fen_notation)
+        fen = PGN::FEN.new(fen_notation)
+        BoardLogic.build_board(fen).values
+      end
+
+      def result(fen_notation)
+        GameLogic.find_game_result(fen_notation)
+      end
+    end
+  end
+end

data/lib/move_logic.rb

@@ -4,16 +4,6 @@ require 'pgn'
 module ChessValidator
   class MoveLogic
     class << self
-      def find_next_moves(fen_notation)
-        fen = PGN::FEN.new(fen_notation)
-        next_moves(fen)
-      end
-
-      def find_next_moves_from_moves(moves)
-        fen = PGN::Game.new(moves).positions.last.to_fen
-        next_moves(fen)
-      end
-
       def next_moves(fen)
         board = BoardLogic.build_board(fen)
         pieces = []
@@ -51,7 +41,8 @@ module ChessValidator
       def with_next_move(piece, board, move)
         index = INDEX_KEY[move]
         new_board = board.clone
-        new_piece = Piece.new(piece.piece_type, index)
+        piece_type = resolve_piece_type(piece.piece_type, move)
+        new_piece = Piece.new(piece_type, index)
         new_board.delete(piece.square_index)
         new_board[index] = new_piece
         new_board = handle_castle(new_board, move) if castled?(piece, move)
@@ -59,6 +50,14 @@ module ChessValidator
         new_board
       end
 
+      def resolve_piece_type(piece_type, move)
+        if piece_type.downcase == 'p' && ['1', '8'].include?(move[1])
+          move[1] == '8' ? 'Q' : 'q'
+        else
+          piece_type
+        end
+      end
+
       def handle_en_passant(board, pawn_color, move)
         if pawn_color == 'w'
           index = INDEX_KEY[move[0] + '5']
@@ -114,8 +113,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
 
@@ -154,9 +151,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
 
@@ -164,11 +165,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)

data/lib/piece.rb

@@ -1,4 +1,4 @@
-require_relative './constants/square_key'
+require_relative './constants/move_key'
 
 module ChessValidator
   class Piece

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chess_validator
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.4
 platform: ruby
 authors:
 - Charles Ellison
@@ -18,7 +18,8 @@ extra_rdoc_files: []
 files:
 - lib/board_logic.rb
 - lib/chess_validator.rb
-- lib/constants/square_key.rb
+- lib/constants/move_key.rb
+- lib/engine.rb
 - lib/game_logic.rb
 - lib/move_logic.rb
 - lib/piece.rb