Bug fixes and TEST ALL THE THINGS

lib/geomotion/cg_point.rb

@@ -1,7 +1,7 @@
 class CGPoint
   # CGPoint.make(x: 10, y: 30)
   def self.make(options = {})
-    CGPoint.new([options[:x] || 0, options[:y] || 0])
+    CGPoint.new(options[:x] || 0, options[:y] || 0)
   end
 
   # size = CGSize.make width: 100, height: 100
@@ -21,12 +21,16 @@ def +(other)
     end
   end
 
-  def intersects?(rect)
+  def round
+    CGPoint.new(self.x.round, self.y.round)
+  end
+
+  def inside?(rect)
     CGRectContainsPoint(rect, self)
   end
 
   def ==(point)
-    point.is_a? CGPoint && CGPointEqualToPoint(self, point)
+    point.is_a?(CGPoint) && CGPointEqualToPoint(self, point)
   end
 
 end

lib/geomotion/cg_rect.rb

@@ -14,7 +14,8 @@ def self.make(options = {})
   end
 
   def self.empty
-    CGRectZero
+    # Don't return CGRectZero; can be mutated
+    CGRect.make
   end
 
   def self.null
@@ -156,23 +157,23 @@ def centered_in(rect, relative = false)
   def +(other)
     case other
     when CGRect
-      return self.union(other)
+      return self.union_with(other)
     when CGSize
-      return CGRect.new(self.x, self.y, self.width + other.width, self.height + other.height)
+      return CGRect.new([self.x, self.y], [self.width + other.width, self.height + other.height])
     when CGPoint
       return CGRectOffset(self, other.x, other.y)
     when UIOffset
-      CGRectOffset(self, rect.horizontal, rect.vertical)
+      CGRectOffset(self, other.horizontal, other.vertical)
     when UIEdgeInsets
-      UIEdgeInsetsInsetRect(self, rect)
+      UIEdgeInsetsInsetRect(self, other)
     end
   end
 
-  def intersection(rect)
+  def intersection_with(rect)
     CGRectIntersection(self, rect)
   end
 
-  def union(rect)
+  def union_with(rect)
     CGRectUnion(self, rect)
   end
 
@@ -202,12 +203,10 @@ def null?
     CGRectIsNull(self)
   end
 
-  def intersects?(rect_or_point)
-    case rect_or_point
-    when CGPoint
-      CGRectContainsPoint(self, rect_or_point)
+  def intersects?(rect)
+    case rect
     when CGRect
-      CGRectIntersectsRect(self, rect_or_point)
+      CGRectIntersectsRect(self, rect)
     else
       super
     end
@@ -225,6 +224,6 @@ def contains?(rect_or_point)
   end
 
   def ==(rect)
-    rect.is_a? CGRect && CGRectEqualToRect(self, rect)
+    rect.is_a?(CGRect) && CGRectEqualToRect(self, rect)
   end
 end

lib/geomotion/cg_size.rb

@@ -1,12 +1,12 @@
 class CGSize
   # CGSize.make(width: 10, height: 30)
   def self.make(options = {})
-    CGSize.new([options[:width] || 0, options[:height] || 0])
+    CGSize.new(options[:width] || 0, options[:height] || 0)
   end
 
   def self.infinite
     infinity = CGRect.null[0][0]
-    CGSize(infinity, infinity)
+    CGSizeMake(infinity, infinity)
   end
 
   # size = CGSize.make width: 100, height: 100
@@ -31,7 +31,11 @@ def infinite?
     self.width == infinity or self.height == infinity
   end
 
+  def empty?
+    self == CGSizeZero
+  end
+
   def ==(size)
-    size.is_a? CGSize && CGSizeEqualToSize(self, size)
+    size.is_a?(CGSize) && CGSizeEqualToSize(self, size)
   end
 end

spec/cg_point_spec.rb

@@ -0,0 +1,65 @@
+describe "CGPoint" do
+  before do
+    @point = CGPoint.make(x: 10, y: 20)
+  end
+
+  describe ".make" do
+    it "should work with options" do
+      CGPointEqualToPoint(@point, CGPointMake(10, 20)).should == true
+    end
+
+    it "should work with no options" do
+      CGPointEqualToPoint(CGPoint.make, CGPointMake(0, 0)).should == true
+    end
+  end
+
+  describe "#rect_of_size" do
+    it "should work" do
+      size = CGSizeMake(20, 30)
+      @point.rect_of_size(size).should == CGRectMake(10, 20, 20, 30)
+    end
+  end
+
+  describe "#+" do
+    it "should work with CGSize" do
+      size = CGSizeMake(20, 30)
+      (@point + size).should == CGRectMake(10, 20, 20, 30)
+    end
+
+    it "should work with CGPoint" do
+      point = CGPoint.make(x: 100, y: 200)
+      (@point + point).should == CGPointMake(110, 220)
+    end
+  end
+
+  describe "#inside?" do
+    it "should return true" do
+      rect = CGRectMake(0, 0, 100, 100)
+      @point.inside?(rect).should == true
+    end
+
+    it "should return false" do
+      rect = CGRectMake(0, 0, 5, 5)
+      @point.inside?(rect).should == false
+    end
+  end
+
+  describe "#round" do
+    it "should work" do
+      point = CGPointMake(10.4, 11.5).round
+      CGPointEqualToPoint(point, CGPointMake(10, 12)).should == true
+    end
+  end
+
+  describe "#==?" do
+    it "should return true" do
+      point = CGPointMake(10, 20)
+      @point.should == point
+    end
+
+    it "should return false" do
+      point = CGPointMake(20, 10)
+      @point.should != point
+    end
+  end
+end