gui_geometry 0.2.1 → 0.2.2

data/lib/gui_geometry/point.rb

@@ -11,13 +11,6 @@ class Point < Struct.new(:x, :y)
   def max(b); point(Tools::max(x, b.x), Tools::max(y, b.y)); end
   def bound(a, b); point(Tools::bound(a.x, x, b.x), Tools::bound(a.y, y, b.y)); end
 
-  def clone_value(v)
-    case v
-    when Fixnum, Bignum, Float then v
-    else v.clone
-    end
-  end
-
   def clone; point(clone_value(x), clone_value(y)); end
 
   def inspect; "point(#{x},#{y})" end

data/lib/gui_geometry/rectangle.rb

@@ -58,23 +58,25 @@ class Rectangle < Struct.new(:loc, :size)
     "(#{[loc.x,loc.y,size.x,size.y].join ','})"
   end
 
-  def overlaps?(b)
-    case b
+  def overlaps?(val)
+    case val
+    when nil then false
     when Point then
-      contains?(b)
+      contains?(val)
     when Rectangle then
-      b.loc + b.size > loc &&
-      loc + size > b.loc
+      val.loc + val.size > loc &&
+      loc + size > val.loc
     else raise ArgumentError.new("wrong type: (#{val.class}) - Rectangle or Point expected")
     end
   end
 
-  def contains?(b)
-    case b
+  def contains?(val)
+    case val
+    when nil then false
     when Point then
-      b >= loc && b < (loc+size)
+      val >= loc && val < (loc+size)
     when Rectangle then
-      (self & b) == self
+      (self & val) == self
     else raise ArgumentError.new("wrong type: (#{val.class}) - Rectangle or Point expected")
     end
   end

data/lib/gui_geometry/tools.rb

@@ -12,6 +12,13 @@ module Tools
   end
   def bound(a,bounded,c) max(a,min(bounded,c)); end
 
+  def clone_value(v)
+    case v
+    when Fixnum, Bignum, Float then v
+    else v.clone
+    end
+  end
+
   class << self
     include GuiGeo::Tools
   end

data/lib/gui_geometry/version.rb

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

data/spec/rectangle_spec.rb

@@ -130,5 +130,11 @@ describe "Rectangle" do
     r1.contains?(point(5,9)).should == false
     r1.contains?(point(4,10)).should == false
   end
+
+  it ".contains? and .overlaps? with nil" do
+    r1 = rect(5, 10, 15, 20)
+    r1.overlaps?(nil).should == false
+    r1.contains?(nil).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.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake