Merge 204cfc8 into 3182781

.travis.yml

@@ -1,4 +1,3 @@
 language: node_js
 node_js:
-    - 0.8
-    - 0.10
+    - 0.10

HISTORY.md

@@ -1,3 +1,8 @@
+0.2.2 / 2014-09-12
+==================
+
+	* introducing fix for phantom black Pawn spawn (issue #8)
+
 0.2.1 / 2014-03-11
 ==================
 
@@ -44,4 +49,4 @@
 	0.1.2 / 2011-06-12
 ==================
 
-	* initial release
+	* initial release

lib/board.js

@@ -158,6 +158,11 @@ Board.prototype.move = function (src, dest, simulate) {
 					} else {
 						b.getSquare(m.postSquare.file,
 							m.prevSquare.rank).piece = m.capturedPiece;
+
+						// there is no piece on the post square in the event of
+						// an en-passant, clear anything that me be present as
+						// a result of the move (fix for issue #8)
+						m.postSquare.piece = null;
 					}
 
 					if (m.castle) {
@@ -274,4 +279,4 @@ module.exports = {
 
 	// enums
 	NeighborType : NeighborType
-};
+};

lib/boardValidation.js

@@ -132,6 +132,7 @@ BoardValidation.prototype.filterKingAttack = function (kingSquare, moves) {
 		squares = [];
 
 		for (n = 0; n < moves[i].squares.length; n++) {
+			// simulate move on the board
 			r = this.board.move(moves[i].src, moves[i].squares[n], true);
 
 			// check if king is attacked
@@ -141,6 +142,7 @@ BoardValidation.prototype.filterKingAttack = function (kingSquare, moves) {
 				isCheck = this.isSquareAttacked(moves[i].squares[n]);
 			}
 
+			// reverse the move
 			r.undo();
 
 			if (!isCheck) {
@@ -301,4 +303,4 @@ module.exports = {
 
 		return new BoardValidation(g);
 	}
-};
+};

lib/pieceValidation.js

@@ -303,7 +303,8 @@ PawnValidation.prototype.applySpecialValidation = function (opt) {
 	} else if (opt.origin.rank ===
 			(opt.piece.side === piece.SideType.White ? 5 : 4)) {
 		// get squares left & right of pawn
-		squares = [this.board.getNeighborSquare(opt.origin, board.NeighborType.Left),
+		squares = [
+			this.board.getNeighborSquare(opt.origin, board.NeighborType.Left),
 			this.board.getNeighborSquare(opt.origin, board.NeighborType.Right)];
 		i = 0;
 
@@ -315,6 +316,7 @@ PawnValidation.prototype.applySpecialValidation = function (opt) {
 					p.side !== opt.piece.side &&
 					p.moveCount === 1 &&
 					this.board.lastMovedPiece === p) {
+
 				opt.destSquares.push(
 					this.board.getNeighborSquare(
 						squares[i],
@@ -383,4 +385,4 @@ module.exports = {
 			return null;
 		}
 	}
-};
+};

package.json

@@ -1,7 +1,7 @@
 {
   "name": "chess",
   "description": "An algebraic notation driven chess engine that can validate board position and produce a list of viable moves (notated).",
-  "version": "0.2.1",
+  "version": "0.2.2",
   "author": "Joshua Thomas (http://github.com/brozeph)",
   "engine": "node >= 0.8.1",
   "repository": {

test/lib/algebraicGameClient.js

@@ -166,7 +166,6 @@ describe('AlgebraicGameClient', function() {
 		assert.ok(m.move.castle);
 	});
 
-	/*
 	// test pawn promotion
 	// adding for issue #6
 	it('should properly show valid White Pawn promotions', function() {
@@ -195,20 +194,19 @@ describe('AlgebraicGameClient', function() {
 		gc.game.board.getSquare('a2').piece = null;
 		gc.game.board.getSquare('a1').piece = null;
 		gc.game.board.getSquare('a7').piece = null;
-		gc.game.board.getSquare('a2').piece = piece.createPawn(piece.SideType.White);
+		gc.game.board.getSquare('a2').piece = piece.createPawn(piece.SideType.Black);
 		gc.game.board.getSquare('a2').piece.moveCount = 1;
 
 		gc.getStatus(true);
 		gc.move('h4');
-		r = gc.getStatus();
+		r = gc.getStatus(true);
 
 		assert.isUndefined(r.notatedMoves['a1'], 'pawn should promote');
 		assert.isDefined(r.notatedMoves['a1R'], 'pawn promotion to rook');
 		assert.isDefined(r.notatedMoves['a1N'], 'pawn promotion to Knight');
 		assert.isDefined(r.notatedMoves['a1B'], 'pawn promotion to Bishop');
 		assert.isDefined(r.notatedMoves['a1Q'], 'pawn promotion to Queen');
 	});
-	//*/
 
 	// test pawn promotion
 	it('should properly recognize White Pawn promotion to Rook', function() {
@@ -450,7 +448,6 @@ describe('AlgebraicGameClient', function() {
 	it ('should properly detect checkmate', function () {
 		var gc = algebraicGameClient.create(),
 			m = null,
-			s = gc.game.board.getSquare('a6'),
 			status = null;
 
 		gc.move('e4');
@@ -558,5 +555,23 @@ describe('AlgebraicGameClient', function() {
 		status = gc.getStatus();
 		assert.strictEqual(status.notatedMoves['Kf7'], undefined);
 	});
-	//*/
-});
+
+	// Issue #8 - Ensure no extraneous Black Pawn
+	it ('should not have a random Black Pawn appear on the board (bug fix test)', function () {
+		var gc = algebraicGameClient.create(),
+			m = null,
+			s = gc.game.board.getSquare('e6');
+
+		gc.move('d4');
+		gc.move('a6');
+
+
+		gc.move('d5');
+
+		assert.ok(s.piece === null, 'phantom piece appears before e5');
+
+		gc.move('e5');
+
+		assert.ok(s.piece === null, 'phantom piece appears after e5');
+	});
+});