chess_validator 0.2.0 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 82d293dc8df9520f07a2f6d92b6d9e896f96b244e77088c400ec2896afe099ef
-  data.tar.gz: 52af33ff9401c878693c751483bedcc05f0e5713e39af53ac5c82d99c7ac09bd
+  metadata.gz: bc4e4db78c99ebcedfafa450a0e4153e8356874196a28a60e769dda532a296eb
+  data.tar.gz: 6274fc54794fe98fc5ebb8da759e09429f7f8bbb65e182345df17fd7cb564407
 SHA512:
-  metadata.gz: fb8d4a4129e5bb7d639dd2851bb4d1c9ce4c44879f2541eb1baf5f3c0ec272cc9c368d6bc7af1a9718eb303263c3405e189bcfeae4bc38b6761877f5f85af7e1
-  data.tar.gz: 0abbe121cba65bebfae2f3ed8caa4115e4daee8c35c82af697e215db9fc144ff182490690ed843a8bc1943a232d211cba4b01a9e0448ddca67e83ee28d1acf2a
+  metadata.gz: ce0c91b9ab1109e68364a5246a4b1a63841f142dfd8af958bdedf1ac15bc698faeec8fdb1c1f3ee2074495ae72f1aade09745ab265502ffa0799468a9180fa85
+  data.tar.gz: 6588469e32c28933cfb78671b39d9ea37ee4683eaddc070aa1fa62b9479caa2c9b39d2279cf0a8c229fd75229f77d1ace05d76b1aa6fe519916b264b3de4efb4

data/lib/chess_validator.rb

@@ -1,2 +1 @@
-require 'move_logic'
-require 'game_logic'
+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 = []
@@ -29,7 +19,10 @@ module ChessValidator
 
       def load_valid_moves(board, piece, fen)
         moves_for_piece(piece).each do |move|
-          piece.valid_moves << move if valid_move?(piece, board, move, fen)
+          if valid_move?(piece, board, move, fen)
+            piece.valid_moves << move
+            piece.targets << board[INDEX_KEY[move]] if board[INDEX_KEY[move]]
+          end
         end
       end
 
@@ -51,7 +44,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 +53,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']
@@ -152,9 +154,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
 

data/lib/piece.rb

@@ -1,16 +1,16 @@
-require_relative './constants/square_key'
+require_relative './constants/move_key'
 
 module ChessValidator
   class Piece
-    attr_accessor :position, :piece_type, :color, :square_index, :valid_moves
+    attr_accessor :position, :piece_type, :color, :square_index, :valid_moves, :targets
 
     def initialize(char, square_index)
       @piece_type = char
       @square_index = square_index
       @color = get_color(char)
       @position = get_position(square_index)
-      @enemy_targets = []
       @valid_moves = []
+      @targets = []
     end
 
     def get_position(square_index)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chess_validator
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.5
 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