geometry 6 → 6.1

data/test/geometry/rectangle.rb

@@ -76,7 +76,6 @@ describe Geometry::Rectangle do
 	    -> { Rectangle.new height:1 }.must_raise ArgumentError
 	    -> { Rectangle.new width:1 }.must_raise ArgumentError
 	end
-
     end
 
     describe "comparison" do
@@ -86,6 +85,24 @@ describe Geometry::Rectangle do
 	end
     end
 
+    describe "inset" do
+	subject { Rectangle.new [0,0], [10,10] }
+
+	it "must inset equally" do
+	    subject.inset(1).must_equal Rectangle.new [1,1], [9,9]
+	end
+
+	it "must inset vertically and horizontally" do
+	    subject.inset(1,2).must_equal Rectangle.new [1,2], [9,8]
+	    subject.inset(x:1, y:2).must_equal Rectangle.new [1,2], [9,8]
+	end
+
+	it "must inset from individual sides" do
+	    subject.inset(1,2,3,4).must_equal Rectangle.new [2,3], [6,9]
+	    subject.inset(top:1, left:2, bottom:3, right:4).must_equal Rectangle.new [2,3], [6,9]
+	end
+    end
+
     describe "properties" do
 	subject { Rectangle.new [1,2], [3,4] }
 	let(:rectangle) { Rectangle [1,2], [3,4] }

data/test/geometry/regular_polygon.rb

@@ -6,6 +6,7 @@ describe Geometry::RegularPolygon do
 
     describe "when constructed with named center and radius arguments" do
 	let(:polygon) { RegularPolygon.new sides:4, center:[1,2], radius:3 }
+	subject { RegularPolygon.new sides:4, center:[1,2], radius:3 }
 
 	it "must create a RegularPolygon" do
 	    polygon.must_be_instance_of(RegularPolygon)
@@ -26,6 +27,12 @@ describe Geometry::RegularPolygon do
 	it "must compare equal" do
 	    polygon.must_equal RegularPolygon.new(sides:4, center:[1,2], radius:3)
 	end
+
+	describe "properties" do
+	    it "must have vertices" do
+		subject.vertices.must_equal [Point[4.0, 2.0], Point[1.0000000000000002, 5.0], Point[-2.0, 2.0000000000000004], Point[0.9999999999999994, -1.0]]
+	    end
+	end
     end
 
     describe "when constructed with a center and diameter" do
@@ -69,8 +76,8 @@ describe Geometry::RegularPolygon do
 	    polygon.edge_count.must_equal 4
 	end
 
-	it "must have a nil center" do
-	    polygon.center.must_be_nil
+	it "must be at the origin" do
+	    polygon.center.must_equal Point.zero
 	end
 
 	it "must have a diameter" do
@@ -81,4 +88,33 @@ describe Geometry::RegularPolygon do
 	    polygon.radius.must_equal 2
 	end
     end
+
+    describe "properties" do
+	subject { RegularPolygon.new sides:6, diameter:4 }
+
+	it "must have edges" do
+	    expected_edges = [Edge(Point[2, 0], Point[1, 1.732]), Edge(Point[1, 1.732], Point[-1, 1.732]), Edge(Point[-1, 1.732], Point[-2, 0]), Edge(Point[-2, 0], Point[-1, -1.732]), Edge(Point[-1, -1.732], Point[1, -1.732]), Edge(Point[1, -1.732], Point[2, 0])]
+	    subject.edges.zip(expected_edges) do |edge1, edge2|
+		edge1.to_a.zip(edge2.to_a) do |point1, point2|
+		    point1.to_a.zip(point2.to_a) {|a, b| a.must_be_close_to b }
+		end
+	    end
+	end
+
+	it "must have a bounds property that returns a Rectangle" do
+	    subject.bounds.must_equal Rectangle.new([-2,-2], [2,2])
+	end
+
+	it "must have a minmax property that returns the corners of the bounding rectangle" do
+	    subject.minmax.must_equal [Point[-2,-2], Point[2,2]]
+	end
+
+	it "must have a max property that returns the upper right corner of the bounding rectangle" do
+	    subject.max.must_equal Point[2,2]
+	end
+
+	it "must have a min property that returns the lower left corner of the bounding rectangle" do
+	    subject.min.must_equal Point[-2,-2]
+	end
+    end
 end

data/test/geometry/rotation.rb

@@ -2,7 +2,29 @@ require 'minitest/autorun'
 require 'geometry/rotation'
 
 describe Geometry::Rotation do
+    Point = Geometry::Point
     Rotation = Geometry::Rotation
+    RotationAngle = Geometry::RotationAngle
+
+    describe "when constructed" do
+	it "must accept a rotation angle" do
+	    rotation = Rotation.new angle:Math::PI/2
+	    rotation.must_be_instance_of(RotationAngle)
+	    rotation.angle.must_equal Math::PI/2
+	    rotation.x.x.must_be_close_to 0
+	    rotation.x.y.must_be_close_to 1
+	    rotation.y.x.must_be_close_to -1
+	    rotation.y.y.must_be_close_to 0
+	end
+
+	it "must accept an X axis" do
+	    rotation = Rotation.new x:[1,0]
+	    rotation.must_be_instance_of(RotationAngle)
+	    rotation.angle.must_equal 0
+	    rotation.x.must_equal Point[1,0]
+	    rotation.y.must_equal Point[0,1]
+	end
+    end
 
     it "must accept x and y axes" do
 	rotation = Geometry::Rotation.new :x => [1,2,3], :y => [4,5,6]
@@ -45,4 +67,42 @@ describe Geometry::Rotation do
 	    Rotation.new(x:[1,2,3], y:[4,5,6]).must_equal Rotation.new(x:[1,2,3], y:[4,5,6])
 	end
     end
+
+    describe "comparison" do
+	it "must equate equal angles" do
+	    Rotation.new(angle:45).must_equal Rotation.new(angle:45)
+	end
+
+	it "must not equate unequal angles" do
+	    Rotation.new(angle:10).wont_equal Rotation.new(angle:45)
+	end
+    end
+
+    describe "composition" do
+	it "must add angles" do
+	    (Rotation.new(angle:45) + Rotation.new(angle:45)).must_equal Rotation.new(angle:90)
+	end
+
+	it "must subtract angles" do
+	    (Rotation.new(angle:45) - Rotation.new(angle:45)).must_equal Rotation.new(angle:0)
+	end
+
+	it "must negate angles" do
+	    (-Rotation.new(angle:45)).must_equal Rotation.new(angle:-45)
+	end
+    end
+
+    describe "when transforming a Point" do
+	describe "when no rotation is set" do
+	    it "must return the Point" do
+		Rotation.new.transform(Point[1,0]).must_equal Point[1,0]
+	    end
+	end
+
+	it "must rotate" do
+	    rotated_point = Rotation.new(angle:Math::PI/2).transform(Point[1,0])
+	    rotated_point.x.must_be_close_to 0
+	    rotated_point.y.must_be_close_to 1
+	end
+    end
 end

data/test/geometry/transformation.rb

@@ -58,46 +58,112 @@ describe Geometry::Transformation do
 	end
 
 	describe "rotation" do
-	    it "must accept an x axis option" do
-		t = Transformation.new :x => [0,1]
-		t.rotation.x.must_equal [0,1]
-		t.identity?.wont_equal true
-	    end
-
 	    it "must accept a y axis option" do
 		t = Transformation.new :y => [1,0]
 		t.rotation.y.must_equal [1,0]
 		t.identity?.wont_equal true
 	    end
+
+	    it "must accept a rotation angle" do
+		transformation = Transformation.new angle:90
+		transformation.identity?.wont_equal true
+		transformation.rotation.wont_be_nil
+		transformation.rotation.angle.must_equal 90
+	    end
+
+	    it "must accept a rotation angle specified by an X-axis" do
+		transformation = Transformation.new x:[0,1]
+		rotation = transformation.rotation
+		rotation.must_be_instance_of(RotationAngle)
+		rotation.angle.must_equal Math::PI/2
+		rotation.x.x.must_be_close_to 0
+		rotation.x.y.must_be_close_to 1
+		rotation.y.x.must_be_close_to -1
+		rotation.y.y.must_be_close_to 0
+	    end
 	end
     end
 
     describe "comparison" do
+	subject { Transformation.new(origin:[1,2]) }
+
 	it "must equate equal transformations" do
-	    Transformation.new(origin:[1,2]).must_equal Transformation.new(origin:[1,2])
+	    subject.must_equal Transformation.new(origin:[1,2])
+	end
+
+	it "must not equal nil" do
+	    subject.eql?(nil).wont_equal true
+	end
+
+	it "must not equate a translation with a rotation" do
+	    subject.wont_equal Transformation.new(x:[0,1,0], y:[1,0,0])
+	end
+
+	it "must equate empty transformations" do
+	    Transformation.new.must_equal Transformation.new
+	end
+    end
+
+    describe "attributes" do
+	describe "has_rotation?" do
+	    it "must properly be true" do
+		Transformation.new(angle:90).has_rotation?.must_equal true
+	    end
+
+	    it "must properly be false" do
+		Transformation.new.has_rotation?.must_equal false
+	    end
 	end
     end
 
     describe "composition" do
+	let(:translate_left) { Geometry::Transformation.new origin:[-2,-2] }
+	let(:translate_right) { Geometry::Transformation.new origin:[1,1] }
 	let(:transformation) { Geometry::Transformation.new }
 
+	it "must add pure translation" do
+	    (translate_left + translate_right).must_equal Geometry::Transformation.new origin:[-1,-1]
+	end
+
+	it "must add translation and no translation" do
+	    (transformation + translate_left).must_equal translate_left
+	    (translate_left + transformation).must_equal translate_left
+	end
+
 	it "array addition" do
 	    (transformation + [1,2]).translation.must_equal Point[1,2]
 	    ((transformation + [1,2]) + [2,3]).translation.must_equal Point[3,5]
-	    (transformation + [1,2]).rotation.identity?.must_equal true
+	    (transformation + [1,2]).rotation.must_be_nil
 	end
 
 	it "must update the translation when an array is subtracted" do
 	    (transformation - [1,2]).translation.must_equal Point[-1,-2]
 	    ((transformation - [1,2]) - [2,3]).translation.must_equal Point[-3,-5]
-	    (transformation - [1,2,3]).rotation.identity?.must_equal true
+	    (transformation - [1,2,3]).rotation.must_be_nil
+	end
+
+	it "must subtract translation and no translation" do
+	    (transformation - translate_left).must_equal translate_left
+	    (translate_left - transformation).must_equal translate_left
 	end
     end
 
     describe "when transforming a Point" do
+	describe "when no transformation is set" do
+	    it "must return the Point" do
+		Transformation.new.transform(Point[1,2]).must_equal Point[1,2];
+	    end
+	end
+
 	it "must translate" do
 	    Geometry::Transformation.new(origin:[0,1]).transform([1,0]).must_equal Point[1,1]
 	end
-    end
 
+	it "must rotate" do
+	    rotated_point = Transformation.new(angle:Math::PI/2).transform([1,0])
+	    rotated_point.x.must_be_close_to 0
+	    rotated_point.y.must_be_close_to 1
+	end
+
+    end
 end

data/test/geometry/transformation/composition.rb

@@ -0,0 +1,49 @@
+require 'minitest/autorun'
+require 'geometry/transformation/composition'
+
+describe Geometry::Transformation::Composition do
+    Composition = Geometry::Transformation::Composition
+    Transformation = Geometry::Transformation
+
+    subject { Composition.new }
+
+    describe "when constructed" do
+	it "must accept multiple transformations" do
+	    composition = Composition.new(Transformation.new, Transformation.new)
+	    composition.size.must_equal 2
+	end
+
+	it "must reject anything that isn't a Transformation" do
+	    -> { Composition.new :foo }.must_raise TypeError
+	end
+    end
+
+    describe "attributes" do
+	describe "has_rotation?" do
+	    it "must properly be true" do
+		Composition.new(Transformation.new angle:90).has_rotation?.must_equal true
+	    end
+
+	    it "must properly be false" do
+		subject.has_rotation?.must_equal false
+	    end
+	end
+    end
+
+    describe "when composing" do
+	it "must append a Transformation" do
+	    (Composition.new(Transformation.new) + Transformation.new).size.must_equal 2
+	end
+
+	it "must merge with a Composition" do
+	    (Composition.new(Transformation.new) + Composition.new(Transformation.new)).size.must_equal 2
+	end
+    end
+
+    describe "when transforming a Point" do
+	it "must handle composed translations" do
+	    composition = Composition.new(Transformation.new origin:[1,2]) + Composition.new(Transformation.new [3,4])
+	    composition.transform(Point[5,6]).must_equal Point[9, 12]
+	end
+    end
+end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: geometry
 version: !ruby/object:Gem::Version
-  version: '6'
-  prerelease: 
+  version: '6.1'
 platform: ruby
 authors:
 - Brandon Fosdick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-18 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies: []
 description: Geometric primitives and algorithms for Ruby
 email:
@@ -43,6 +42,7 @@ files:
 - lib/geometry/size_zero.rb
 - lib/geometry/square.rb
 - lib/geometry/transformation.rb
+- lib/geometry/transformation/composition.rb
 - lib/geometry/triangle.rb
 - lib/geometry/vector.rb
 - test/geometry.rb
@@ -63,37 +63,31 @@ files:
 - test/geometry/size_zero.rb
 - test/geometry/square.rb
 - test/geometry/transformation.rb
+- test/geometry/transformation/composition.rb
 - test/geometry/triangle.rb
 - test/geometry/vector.rb
 homepage: http://github.com/bfoz/geometry
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1868771796100540308
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1868771796100540308
 requirements: []
 rubyforge_project: geometry
-rubygems_version: 1.8.25
+rubygems_version: 2.1.11
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Geometric primitives and algoritms
 test_files:
 - test/geometry.rb
@@ -114,5 +108,6 @@ test_files:
 - test/geometry/size_zero.rb
 - test/geometry/square.rb
 - test/geometry/transformation.rb
+- test/geometry/transformation/composition.rb
 - test/geometry/triangle.rb
 - test/geometry/vector.rb