gui_geometry 0.0.4 → 0.0.5

data/README.md

@@ -27,37 +27,39 @@ require "gui_geometry"
 include GuiGeometry::Tools
 
 # create point x == y == 0
-> point
- => point(0,0)
+point
+# => point(0,0)
 
 # create a point x=3, y=4
-> my_point = point(3,4)
- => point(3,4)
+my_point = point(3,4)
+# => point(3,4)
 
-> [my_point.x, my_point.y]
- => [3, 4]
+[my_point.x, my_point.y]
+# => [3, 4]
 
-# create a rectangle with location (top-left corner) = poiunt(4,5), width=100, height=80
-> rect(4,5,100,80)
- => rect(4,5,100,80)
-> my_rect = rect point(4,5), point(100,80) # alternate form
- => rect(4,5,100,80)
+# create a rectangle - x, y, w, h form
+rect(4,5,100,80)
+# => rect(4,5,100,80)
 
-# create a rect with location == point(0,0), size = point(30,50) (width = 30, height = 50)
-> rect point(30,50)
- => rect(0,0,30,50)
+# create rectangle - location, size form
+my_rect = rect point(4,5), point(100,80)
+# => rect(4,5,100,80)
+
+# create rectangle - size form (location defaults to 0,0
+rect point(30,50)
+# => rect(0,0,30,50)
 
 # get loc and size:
-> [my_rect.loc, my_rect.size]
- => [point(4,5), point(100,80)]
+[my_rect.loc, my_rect.size]
+# => [point(4,5), point(100,80)]
 
 # get x, y, width and height
-> [my_rect.x, my_rect.y, my_rect.w, my_rect.h]
- => [4, 5, 100, 80]
+[my_rect.x, my_rect.y, my_rect.w, my_rect.h]
+# => [4, 5, 100, 80]
 
 # get the 4 corners:
-> [my_rect.tl, my_rect.tr, my_rect.bl, my_rect.br]
- => [point(4,5), point(104,5), point(4,85), point(104,85)]
+[my_rect.tl, my_rect.tr, my_rect.bl, my_rect.br]
+# => [point(4,5), point(104,5), point(4,85), point(104,85)]
 
 ```
 

data/lib/gui_geometry.rb

@@ -7,7 +7,3 @@
 }.each do |file|
   require File.join(File.dirname(__FILE__),"gui_geometry",file)
 end
-
-module GuiGeometry
-  # Your code goes here...
-end

data/lib/gui_geometry/tools.rb

@@ -2,7 +2,14 @@ module GuiGeometry
 module Tools
   def min(a,b) a < b ? a : b; end
   def max(a,b) a > b ? a : b; end
-  def bound(a,bounded,c) bounded < a ? a : (bounded > c) ? c : bounded; end
+  def minmax(a,b)
+    if a <= b
+      return a, b
+    else
+      return b, a
+    end
+  end
+  def bound(a,bounded,c) max(a,min(bounded,c)); end
 
   def point(*args); GuiGeometry::Point.new *args end
   def rect(*args); GuiGeometry::Rectangle.new *args end

data/lib/gui_geometry/version.rb

@@ -1,3 +1,3 @@
 module GuiGeometry
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/spec/tools_spec.rb

@@ -6,6 +6,29 @@ describe "Tools" do
 
   it "min" do
     min(4,5).should == 4
+    min(5,4).should == 4
+  end
+
+  it "max" do
+    max(4,5).should == 5
+    max(5,4).should == 5
+  end
+
+  it "bound" do
+    bound(2,5,7).should == 5
+    bound(2,1,7).should == 2
+    bound(2,8,7).should == 7
+    bound(2,8,1).should == 2
+  end
+
+  it "minmax" do
+    minmax(4,5).should == [4,5]
+    minmax(5,4).should == [4,5]
+  end
+
+  it "easy constructors" do
+    point.class.should == Point
+    rect.class.should == Rectangle
   end
 end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gui_geometry
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-23 00:00:00.000000000 Z
+date: 2013-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake