gui_geometry 0.1.1 → 0.2.0

data/Rakefile

@@ -1,6 +1,12 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 
-RSpec::Core::RakeTask.new(:spec)
-
 task :default => :spec
+
+desc "Run specs"
+RSpec::Core::RakeTask.new do |task|
+    task.pattern = "**/spec/*_spec.rb"
+    task.rspec_opts = Dir.glob("[0-9][0-9][0-9]_*").collect { |x| "-I#{x}" }.sort
+    task.rspec_opts << '--color'
+    task.rspec_opts << '-f documentation'
+end

data/gui_geometry.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |gem|
   gem.email         = ["shanebdavis@gmail.com"]
   gem.description   = %q{2D geometry specificly designed to support graphical user interfaces and bitmaps currently focsued on Point and Rectangle classes}
   gem.summary       = %q{2D geometry specificly designed to support graphical user interfaces and bitmaps}
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/shanebdavis/gui_geometry"
 
   gem.files         = `git ls-files`.split($/)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

data/lib/gui_geometry/point.rb

@@ -7,8 +7,18 @@ class Point < Struct.new(:x, :y)
     super if args.length!=0
   end
 
-  def min(b); point(super(x, b.x), super(y, b.y)); end
-  def max(b); point(super(x, b.x), super(y, b.y)); end
+  def min(b); point(Tools::min(x, b.x), Tools::min(y, b.y)); end
+  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
   def to_s; "(#{x},#{y})" end

data/lib/gui_geometry/rectangle.rb

@@ -23,6 +23,25 @@ class Rectangle < Struct.new(:loc, :size)
     !present?
   end
 
+  def clone
+    rect loc.clone, size.clone
+  end
+
+  # val can be a Rectangle or Point
+  # returns a Rectangle or Point that is within this Rectangle
+  # For Rectangles, the size is only changed if it has to be
+  def bound(val)
+    case val
+    when Rectangle then
+      r = val.clone
+      r.size = r.size.min(size)
+      r.loc = r.loc.bound(loc, loc + size - val.size)
+      r
+    when Point then (val-loc).bound(point, size) + loc
+    else raise ArgumentError.new("wrong type: (#{val.class}) - Rectangle or Point expected")
+    end
+  end
+
   def x; loc.x; end
   def y; loc.y; end
   def w; size.x; end

data/lib/gui_geometry/tools.rb

@@ -11,5 +11,9 @@ module Tools
     end
   end
   def bound(a,bounded,c) max(a,min(bounded,c)); end
+
+  class << self
+    include GuiGeo::Tools
+  end
 end
 end

data/lib/gui_geometry/version.rb

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

data/spec/point_spec.rb

@@ -13,6 +13,22 @@ describe "Point" do
     (point(1,2) + 3).should == point(4,5)
   end
 
+  it "clone basic point" do
+    p1 = point(1,2)
+    p2 = p1.clone
+    p1.should == p2
+    p2.x = 3
+    p1.should_not == p2
+  end
+
+  it "clone complex point" do
+    p1 = point("hi","bye")
+    p2 = p1.clone
+    p1.should == p2
+    p2.x.upcase!
+    p1.should_not == p2
+  end
+
   it "-" do
     (point(9,8) - point(3,4)).should == point(6,4)
     (point(9,8) - 3).should == point(6,5)
@@ -79,5 +95,13 @@ describe "Point" do
     point(9,5).max(point(5,9)).should == point(9,9)
     point(5,9).max(point(9,5)).should == point(9,9)
   end
+
+  it "bound" do
+    point(3,4).bound(point(1,2), point(5,6)).should == point(3,4)
+    point(3,0).bound(point(1,2), point(5,6)).should == point(3,2)
+    point(3,6).bound(point(1,2), point(5,6)).should == point(3,6)
+    point(0,4).bound(point(1,2), point(5,6)).should == point(1,4)
+    point(6,4).bound(point(1,2), point(5,6)).should == point(5,4)
+  end
 end
 end

data/spec/rectangle_spec.rb

@@ -13,6 +13,15 @@ describe "Rectangle" do
     expect { rect(1,2,3,4,5) }.to raise_error
   end
 
+  it "clone" do
+    r1 = rect(1,2,3,4)
+    r2 = r1.clone
+    r1.should == r2
+    r1.object_id.should_not == r2.object_id
+    r1.loc.object_id.should_not == r2.loc.object_id
+    r1.size.object_id.should_not == r2.size.object_id
+  end
+
   it "init with one point" do
     rect(point(1,2)).should == rect(0,0,1,2)
   end
@@ -76,11 +85,32 @@ describe "Rectangle" do
     rect(0,0,0,1).present?.should == false
     rect(0,0,0,0).present?.should == false
   end
+
   it ".blank?" do
     rect(0,0,1,1).blank?.should == false
     rect(0,0,1,0).blank?.should == true
     rect(0,0,0,1).blank?.should == true
     rect(0,0,0,0).blank?.should == true
   end
+
+  it ".bound(point)" do
+    r = rect(5, 10, 15, 20)
+    r.bound(point(5,10)).should == point(5,10)
+    r.bound(point(20,30)).should == point(20,30)
+    r.bound(point(5,31)).should == point(5,30)
+    r.bound(point(21,10)).should == point(20,10)
+    r.bound(point(5,10)).should == point(5,10)
+    r.bound(point(5, 9)).should == point(5,10)
+    r.bound(point(4,10)).should == point(5,10)
+  end
+
+  it ".bound(smaller_rect)" do
+    r1 = rect(5, 10, 15, 20)
+    r1.bound(rect(5,0,5,5)).should == rect(5,10,5,5)
+    r1.bound(rect(0,10,5,5)).should == rect(5,10,5,5)
+    r1.bound(rect(0,30,5,5)).should == rect(5,25,5,5)
+    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
 end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,4 @@
 require 'simplecov'
-SimpleCov.start do
-  add_filter "vendor/ruby"
-end
+SimpleCov.start
 
 require File.join(File.dirname(__FILE__),"..","lib","gui_geometry")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gui_geometry
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-24 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -131,7 +131,7 @@ files:
 - spec/rectangle_spec.rb
 - spec/spec_helper.rb
 - spec/tools_spec.rb
-homepage: ''
+homepage: https://github.com/shanebdavis/gui_geometry
 licenses: []
 post_install_message: 
 rdoc_options: []