gui_geometry 0.3.0 → 0.3.1

data/lib/gui_geometry/rectangle.rb

@@ -51,8 +51,8 @@ class Rectangle < Struct.new(:loc, :size)
 
   def area; size.area; end
 
-  def x_range; x .. (x + w - 1) end
-  def y_range; y .. (y + h - 1) end
+  def x_range; x ... (x + w) end
+  def y_range; y ... (y + h) end
 
   def inspect
     "rect"+to_s
@@ -90,6 +90,11 @@ class Rectangle < Struct.new(:loc, :size)
   def bl; point(x, y + h); end
   def tr; point(x + w, y); end
 
+  def top; loc.x; end
+  def left; loc.y; end
+  def right; loc.x + size.x; end
+  def bottom; loc.x + size.y; end
+
 
   def union(b)
     return clone unless b
@@ -107,5 +112,41 @@ class Rectangle < Struct.new(:loc, :size)
     rect l, s
   end
   alias :| :intersection
+
+  # return 1-3 rectangles which, together, cover exactly the same area as self and b, but do not overlapp
+  def disjoint(b)
+    return self if !b || contains(b)
+    return b if b.contains(self)
+    return self,b unless overlaps?(b)
+    tl_contained = contains?(b.tl) ? 1 : 0
+    tr_contained = contains?(b.tr) ? 1 : 0
+    bl_contained = contains?(b.bl) ? 1 : 0
+    br_contained = contains?(b.br) ? 1 : 0
+    sum = tl_contained + tr_contained + bl_contained + br_contained
+    case sum
+    when 0 # rectangles form a plus "+"
+      if b.y < self.y
+        r1,r2 = b,self
+      else
+        r1,r2 = self,b
+      end
+      tl1 = r1.tl
+      br1 = point(r1.right, r2.top)
+      tl2 = point(r1.left, r2.bottom)
+      br2 = r1.br
+      [
+        r2,
+        rect(tl1,br1-tl1),
+        rect(tl2,br2-tl2),
+      ]
+    when 1
+    when 2
+    else raise "internal error in disjoint - cases 3 and 4 should be taken care of by the return-tests at the top of the method"
+    end
+
+
+
+
+  end
 end
 end

data/lib/gui_geometry/version.rb

@@ -1,3 +1,3 @@
 module GuiGeo
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/rectangle_spec.rb

@@ -140,5 +140,12 @@ describe "Rectangle" do
   it ".area" do
     rect(5, 10, 15, 20).area.should == 300
   end
+
+  it ".y_range and .x_range" do
+    rect(5, 10, 15, 20).x_range.should == (5...20)
+    rect(5, 10, 15, 20).y_range.should == (10...30)
+    rect(0,0,0,0).x_range.should == (0...0)
+    rect(0,0,0,0).y_range.should == (0...0)
+  end
 end
 end

metadata

@@ -1,104 +1,120 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: gui_geometry
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 3
-  - 0
-  version: 0.3.0
+version: !ruby/object:Gem::Version
+  version: 0.3.1
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Shane Brinkman-Davis
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-02-24 00:00:00 -08:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2013-03-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rake
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: guard-test
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-test
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: simplecov
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-description: 2D geometry specificly designed to support graphical user interfaces and bitmaps currently focsued on Point and Rectangle classes
-email: 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+description: 2D geometry specificly designed to support graphical user interfaces
+  and bitmaps currently focsued on Point and Rectangle classes
+email:
 - shanebdavis@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - Gemfile
 - Guardfile
@@ -115,37 +131,32 @@ files:
 - spec/rectangle_spec.rb
 - spec/spec_helper.rb
 - spec/tools_spec.rb
-has_rdoc: true
 homepage: https://github.com/shanebdavis/gui_geometry
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: 2D geometry specificly designed to support graphical user interfaces and bitmaps
-test_files: 
+summary: 2D geometry specificly designed to support graphical user interfaces and
+  bitmaps
+test_files:
 - spec/point_spec.rb
 - spec/rectangle_spec.rb
 - spec/spec_helper.rb