added boundaries check to ship while moving left or right

Author: luizfar

js/Ship.js

@@ -1,8 +1,12 @@
 function ship(plateau) {
-  var self = square(plateau.initialShipPosition(), 15);
+  var shipSize = 15;
+  var self = square(plateau.initialShipPosition(), shipSize);
   self.position = function(newPosition) {
     return self.corner = newPosition || self.corner;
-  }
+  };
+  self.size = function() {
+    return shipSize;
+  };
 
   self.element = $("<div>")
     .css("position", "absolute")
@@ -16,16 +20,27 @@ function ship(plateau) {
     self.element
       .css("top", self.corner.y)
       .css("left", self.corner.x);
-  };
+  }
   updatePosition();
 
+  function fixBoundaries() {
+    if (!plateau.contains(self.corners()[1])) {
+      self.position().x = plateau.corners()[1].x- self.size() + 1;
+    }
+    if (!plateau.contains(self.position())) {
+      self.position().x = plateau.corner.x;
+    }
+  }
+
   self.moveLeft = function() {
     self.position(self.position().shift({x: -10, y: 0}));
+    fixBoundaries();
     updatePosition();
   };
 
   self.moveRight = function() {
     self.position(self.position().shift({x: 10, y: 0}));
+    fixBoundaries();
     updatePosition();
   };
 

js/Square.js

@@ -4,10 +4,15 @@ function square(corner, side) {
   self.side = side;
 
   self.corners = function() {
-    return [point(corner.x, corner.y),
-            point(corner.x + side - 1, corner.y),
-            point(corner.x + side - 1, corner.y + side - 1),
-            point(corner.x, corner.y + side - 1)];
+    return [point(self.corner.x, self.corner.y),
+            point(self.corner.x + self.side - 1, self.corner.y),
+            point(self.corner.x + self.side - 1, self.corner.y + self.side - 1),
+            point(self.corner.x, self.corner.y + self.side - 1)];
+  };
+
+  self.contains = function(aPoint) {
+    return aPoint.x >= self.corner.x &&
+        aPoint.x < self.corner.x + side;
   };
 
   return self;

spec/ShipSpec.js

@@ -31,6 +31,34 @@ describe("ship", function() {
 
         expect(s.corner.x).toEqual(0);
       });
+      it("should not go beyond plateau's right most limit", function() {
+        var p = fakePlateau();
+        spyOn(p, 'contains').andCallFake(function(corner) {
+          return !(corner.equals(s.corners()[1]));
+        });
+        spyOn(p, 'corners').andReturn(
+          [null, point(40, 45)]
+        );
+
+        var s = ship(p);
+        s.moveRight();
+
+        expect(s.position().x).toBe(26);
+      });
+      it("should not go beyond plateau's left most limit", function() {
+        var p = fakePlateau();
+        spyOn(p, 'contains').andCallFake(function(corner) {
+          return !(corner.equals(s.corners()[0]));
+        });
+        spyOn(p, 'corners').andReturn(
+          [point(5, 15), point(19, 15)]
+        );
+
+        var s = ship(p);
+        s.moveLeft();
+
+        expect(s.position().x).toBe(5);
+      });
     });
 
     describe("right", function () {
@@ -46,10 +74,16 @@ describe("ship", function() {
 
   function fakePlateau() {
     return {
+      side: 31,
       add: function() {},
       initialShipPosition: function () {
         return point(10, 20);
-      }
+      },
+      corner: point(5, 15),
+      contains: function() {
+        return true;
+      },
+      corners: function() {}
     };
   }
 });

spec/SquareSpec.js

@@ -12,4 +12,16 @@ describe("square", function() {
     expect(s.corners()[2]).toBeEqual(point(5, 6));
     expect(s.corners()[3]).toBeEqual(point(2, 6));
   });
+  it("should know when a point is inside of it", function() {
+    var s = square(point(1, 1), 2);
+
+    expect(s.contains(point(1, 1))).toBeTruthy();
+    expect(s.contains(point(2, 2))).toBeTruthy();
+  });
+  it("should know when a point is not inside of it", function() {
+    var s = square(point(1, 1), 2);
+
+    expect(s.contains(point(0, 1))).toBeFalsy();
+    expect(s.contains(point(3, 2))).toBeFalsy();
+  });
 });