gui_geometry 0.2.0 → 0.2.1

data/lib/gui_geometry/rectangle.rb

@@ -59,12 +59,24 @@ class Rectangle < Struct.new(:loc, :size)
   end
 
   def overlaps?(b)
-    b.loc + b.size > loc &&
-    loc + size > b.loc
+    case b
+    when Point then
+      contains?(b)
+    when Rectangle then
+      b.loc + b.size > loc &&
+      loc + size > b.loc
+    else raise ArgumentError.new("wrong type: (#{val.class}) - Rectangle or Point expected")
+    end
   end
 
   def contains?(b)
-    (self & b) == self
+    case b
+    when Point then
+      b >= loc && b < (loc+size)
+    when Rectangle then
+      (self & b) == self
+    else raise ArgumentError.new("wrong type: (#{val.class}) - Rectangle or Point expected")
+    end
   end
 
   def tl; loc; end

data/lib/gui_geometry/version.rb

@@ -1,3 +1,3 @@
 module GuiGeo
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

data/spec/rectangle_spec.rb

@@ -112,5 +112,23 @@ describe "Rectangle" do
     r1.bound(rect(30,0,5,5)).should == rect(15,10,5,5)
     r1.bound(rect(0,0,20,5)).should == rect(5,10,15,5)
   end
+
+  it ".overlaps? point" do
+    r1 = rect(5, 10, 15, 20)
+    r1.overlaps?(point(10,10)).should == true
+    r1.overlaps?(point(20,10)).should == false
+    r1.overlaps?(point(10,30)).should == false
+    r1.overlaps?(point(5,9)).should == false
+    r1.overlaps?(point(4,10)).should == false
+  end
+
+  it ".contains? point" do
+    r1 = rect(5, 10, 15, 20)
+    r1.contains?(point(10,10)).should == true
+    r1.contains?(point(20,10)).should == false
+    r1.contains?(point(10,30)).should == false
+    r1.contains?(point(5,9)).should == false
+    r1.contains?(point(4,10)).should == false
+  end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gui_geometry
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-03 00:00:00.000000000 Z
+date: 2013-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake