Merge pull request #8 from benrutter/rect-issue

Rect issue

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='shades',
-    version='1.1',
+    version='1.2',
     author='Ben Rutter',
     description='A Python module for generative 2d image creation',
     long_description=long_description,

shades/shades.py

@@ -225,10 +225,21 @@ def rectangle(
         """
         Draws a rectangle on the image.
         """
-        top_right_corner = (top_corner[0] + width, top_corner[1])
-        bottom_corner = (top_corner[0], top_corner[1] + height)
-        bottom_right_corner = (top_corner[0] + width, top_corner[1] + height)
-        self.shape(canvas, [top_corner, top_right_corner, bottom_corner, bottom_right_corner])
+        for x_coord in range(top_corner[0], top_corner[0] + width):
+            for y_coord in range(top_corner[1], top_corner[1] + height):
+                self.point(canvas, (x_coord, y_coord))
+
+    def square(
+            self,
+            canvas: Image,
+            top_corner: Tuple[int, int],
+            size: int,
+        ) -> None:
+        """
+        Draws a square on the canvas
+        """
+        self.rectangle(canvas, top_corner, size, size)
+
 
     def triangle(
             self,

tests/test_shades.py

@@ -121,6 +121,10 @@ def test_rectangle(self):
         self.shade.rectangle(self.canvas, (0, 0), 10, 10)
 
 
+    @marks_canvas_test
+    def test_square(self):
+        self.shade.square(self.canvas, (0, 0), 10)
+
     @marks_canvas_test
     def test_triangle(self):
         self.shade.triangle(self.canvas, (0, 0), (10, 10), (0, 10))