engineering 0.2 → 0.3

data/test/builder/sketch.rb

@@ -0,0 +1,161 @@
+require 'minitest/autorun'
+require 'builder/sketch'
+
+describe Engineering::Builder::Sketch do
+    subject { Engineering::Builder::Sketch }
+
+    it 'must build a subclass' do
+	subject.build.ancestors.must_include(Sketch)
+    end
+
+    it 'must build a subclass with an empty block' do
+	klass = subject.build {}
+	klass.ancestors.must_include(Sketch)
+	klass.elements.must_be_empty
+	Class.wont_be :respond_to?, :elements
+    end
+
+    it 'must build a subclass that contains a single element' do
+	klass = subject.build do
+	    rectangle from:[0,0], to:[1,1]
+	end
+	klass.elements.count.must_equal 1
+	klass.elements.first.must_be_instance_of Geometry::Rectangle
+    end
+
+    describe 'when creating a subclass with attributes' do
+	let :klass do
+	    subject.build do
+		attribute :attribute0
+	    end
+	end
+
+	it 'must define the attributes for instances' do
+	    klass.new.must_be :respond_to?, :attribute0
+	    klass.new.must_be :respond_to?, :attribute0=
+	end
+
+	it 'must have working instance accessors' do
+	    test_model = klass.new
+	    test_model.attribute0 = 42
+	    test_model.attribute0.must_equal 42
+	end
+
+	it 'must be able to initialize the attribute during construction' do
+	    klass.new(attribute0: 37).attribute0.must_equal 37
+	end
+    end
+
+    describe 'when creating a subclass with attributes that have default values' do
+	let :klass do
+	    subject.build do
+		attribute :attribute0, 42
+	    end
+	end
+
+	it 'must have the default value' do
+	    klass.new.attribute0.must_equal 42
+	end
+
+	it 'must allow the default value to be overriden' do
+	    klass.new(attribute0: 24).attribute0.must_equal 24
+	end
+
+	it 'must have class attributes' do
+	    klass.attribute0.must_equal 42
+	end
+
+	it 'must not pollute Class' do
+	    Class.wont_be :respond_to?, :attribute0
+	end
+
+	it 'must not have a class setter' do
+	    -> { klass.attribute0 = 5 }.must_raise NoMethodError
+	end
+    end
+
+    describe 'when creating a subclass with read-only attributes that have default values' do
+	let :klass do
+	    subject.build do
+		attr_reader :attributeO, 42
+	    end
+	end
+
+	it 'must have the default value' do
+	    klass.new.attributeO.must_equal 42
+	end
+
+	it 'must not allow the default value to be overriden' do
+	    -> { klass.new(attributeO: 24) }.must_raise NoMethodError
+	end
+
+	it 'must not pollute Class' do
+	    Class.wont_be :respond_to?, :attribute0
+	end
+
+	it 'must have class attributes' do
+	    klass.attributeO.must_equal 42
+	end
+
+	it 'must not have a class setter' do
+	    -> { klass.attributeO = 5 }.must_raise NoMethodError
+	end
+
+	it 'must not have an instance setter' do
+	    -> { klass.new.attributeO = 6 }.must_raise NoMethodError
+	end
+    end
+
+    describe 'when creating a subclass with a group' do
+	let :klass do
+	    subject.build do
+		group origin:[1,2] do
+		end
+	    end
+	end
+
+	it 'must create a Group subclass' do
+	    klass.elements.count.must_equal 1
+	    klass.elements.first.first.ancestors.must_include Sketch::Group
+	    klass.elements.first.last.must_equal [origin:[1,2]]
+	end
+
+	it 'must pass the initializer arguments when instantiating the subclass' do
+	    klass.new.first.must_be_kind_of Sketch::Group
+	    klass.new.first.transformation.translation.must_equal Geometry::Point[1,2]
+	end
+    end
+
+    describe 'when creating a subclass that contains another Sketch subclass' do
+	let :klass do
+	    subject.build do
+		push Sketch
+	    end
+	end
+
+	it 'must add the subclass' do
+	    klass.elements.length.must_equal 1
+	    klass.elements.first.first.ancestors.must_include Sketch
+	    klass.elements.first.last.must_equal []
+	end
+    end
+
+    describe 'when creating a subclass that contains another Sketch subclass that has argument' do
+	let :klass do
+	    subject.build do
+		push Sketch, origin:[1,2]
+	    end
+	end
+
+	it 'must add the subclass' do
+	    klass.elements.length.must_equal 1
+	    klass.elements.first.first.ancestors.must_include Sketch
+	    klass.elements.first.last.must_equal [origin:[1,2]]
+	end
+
+	it 'must pass the initializer arguments when instantiating the subclass' do
+	    klass.new.first.must_be_kind_of Sketch
+	    klass.new.first.transformation.translation.must_equal Geometry::Point[1,2]
+	end
+    end
+end

data/test/engineering.rb

@@ -24,7 +24,6 @@ describe Engineering do
 		end
 	    end
 	end
-	let(:testModel) { TestModel.new }
 
 	it "must create a global constant" do
 	    Object.constants.include?(:TestModel).must_equal true
@@ -37,7 +36,7 @@ describe Engineering do
 
 	it "must call the initializer block when constructed" do
 	    TestModel.new.elements.count.must_equal 1
-	    TestModel.new.elements.first.must_be_instance_of Model::Extrusion
+	    TestModel.new.elements.first.must_be_kind_of Model::Extrusion
 	    TestModel.new.elements.first.length.must_equal 10
 	end
 
@@ -49,18 +48,18 @@ describe Engineering do
 		    end
 		end
 	    end
-	    let(:testModel2) { TestModel2.new }
+	    subject { TestModel2.new }
 
 	    it "must be able to make new instances" do
-		testModel2.must_be_kind_of Model
-		testModel2.must_be_instance_of TestModel2
-		testModel2.wont_be_instance_of TestModel
+		subject.must_be_kind_of Model
+		subject.must_be_instance_of TestModel2
+		subject.wont_be_instance_of TestModel
 	    end
 
 	    it "must call the correct initializer block when constructed" do
-		testModel2.elements.count.must_equal 1
-		testModel2.elements.first.must_be_instance_of Model::Extrusion
-		testModel2.elements.first.length.must_equal 5
+		subject.elements.count.must_equal 1
+		subject.elements.first.must_be_kind_of Model::Extrusion
+		subject.elements.first.length.must_equal 5
 	    end
 
 	    describe "when the original Model class is used again" do
@@ -68,13 +67,22 @@ describe Engineering do
 
 		it "must call the correct initializer block when constructed" do
 		    anotherTestModel.elements.count.must_equal 1
-		    anotherTestModel.elements.first.must_be_instance_of Model::Extrusion
+		    anotherTestModel.elements.first.must_be_kind_of Model::Extrusion
 		    anotherTestModel.elements.first.length.must_equal 10
 		end
 	    end
 	end
     end
 
+    it 'must create a Model subclass inside of a Module' do
+	module TestModule
+	    model :TestModel5 do
+	    end
+	end
+
+	TestModule.constants.include?(:TestModel5).must_equal true
+    end
+
     describe 'when creating a Model subclass with attributes' do
 	before do
 	    model :TestModel4 do
@@ -100,7 +108,7 @@ describe Engineering do
 
     describe 'when creating a Model subclass with attributes that have default values' do
 	subject do
-	    model :TestModel5 do
+	    model do
 		attribute :attribute0, 42
 	    end
 	end
@@ -112,6 +120,42 @@ describe Engineering do
 	it 'must allow the default value to be overriden' do
 	    subject.new(attribute0: 24).attribute0.must_equal 24
 	end
+
+	it 'must have class attributes' do
+	    subject.attribute0.must_equal 42
+	end
+
+	it 'must not have a class setter' do
+	    -> { subject.attribute0 = 5 }.must_raise NoMethodError
+	end
+    end
+
+    describe 'when creating a Model subclass with read-only attributes that have default values' do
+	subject do
+	    model do
+		attr_reader :attributeRO, 42
+	    end
+	end
+
+	it 'must have the default value' do
+	    subject.new.attributeRO.must_equal 42
+	end
+
+	it 'must not allow the default value to be overriden' do
+	    -> { subject.new(attributeRO: 24) }.must_raise NoMethodError
+	end
+
+	it 'must have class attributes' do
+	    subject.attributeRO.must_equal 42
+	end
+
+	it 'must not have a class setter' do
+	    -> { subject.attributeRO = 5 }.must_raise NoMethodError
+	end
+
+	it 'must not have an instance setter' do
+	    -> { subject.new.attributeRO = 6 }.must_raise NoMethodError
+	end
     end
 
     describe "when creating an Extrusion subclass" do
@@ -134,7 +178,7 @@ describe Engineering do
 	end
 
 	it 'must have a class attribute for the Sketch' do
-	    TestExtrusion.sketch.must_be_kind_of Sketch
+	    TestExtrusion.sketch.ancestors.must_include Sketch
 	end
 
 	describe "when initializing a new instance" do
@@ -151,28 +195,49 @@ describe Engineering do
     end
 
     describe 'when creating an Extrusion subclass with a length' do
-	after { Object.send :remove_const, :TestExtrusion }
-
-	before do
-	    extrusion :TestExtrusion do
+	subject do
+	    extrusion do
 		length 10
 		square 5
 	    end
 	end
 
 	it 'must have a class attribute for the length' do
-	    TestExtrusion.length.must_equal 10
+	    subject.length.must_equal 10
 	end
 
 	describe 'when initializing a new instance' do
 	    it 'must reject a length argument' do
-		-> { TestExtrusion.new(length:5) }.must_raise ArgumentError
+		-> { subject.new(length:5) }.must_raise ArgumentError
 	    end
 
 	    it 'must have the proper length' do
-		TestExtrusion.new.length.must_equal 10
+		subject.new.length.must_equal 10
+	    end
+	end
+    end
+
+    describe 'when creating an Extrusion subclass with attributes' do
+	subject do
+	    extrusion do
+		attribute :attribute0
 	    end
 	end
+
+	it 'must define the attributes' do
+	    subject.new.must_be :respond_to?, :attribute0
+	    subject.new.must_be :respond_to?, :attribute0=
+	end
+
+	it 'must have working accessors' do
+	    test_model = subject.new
+	    test_model.attribute0 = 42
+	    test_model.attribute0.must_equal 42
+	end
+
+	it 'must be able to initialize the attribute during construction' do
+	    subject.new(attribute0: 37).attribute0.must_equal 37
+	end
     end
 
     describe "when creating a Model that uses global constants" do
@@ -197,20 +262,20 @@ describe Engineering do
 		square 5
 	    end
 	end
-	let(:testSketch) { TestSketch.new }
+	subject { TestSketch.new }
 
 	it "must create a global constant" do
 	    Object.constants.include?(:TestSketch).must_equal true
 	end
 
 	it "must support creating instances of the subclass" do
-	    testSketch.must_be_kind_of Sketch
-	    testSketch.must_be_kind_of TestSketch
+	    subject.must_be_kind_of Sketch
+	    subject.must_be_kind_of TestSketch
 	end
 
 	it "must call the initializer block when constructed" do
-	    testSketch.elements.count.must_equal 1
-	    testSketch.elements.first.must_be_kind_of Geometry::Square
+	    subject.elements.count.must_equal 1
+	    subject.elements.first.must_be_kind_of Geometry::Square
 	end
 
 	describe "when another sketch class is created with a new name" do
@@ -219,17 +284,17 @@ describe Engineering do
 		    square 10
 		end
 	    end
-	    let(:testSketch2) { TestSketch2.new }
+	    subject { TestSketch2.new }
 
 	    it "must be able to make new instances" do
-		testSketch2.must_be_kind_of Sketch
-		testSketch2.must_be_kind_of TestSketch2
-		testSketch2.wont_be_kind_of TestSketch
+		subject.must_be_kind_of Sketch
+		subject.must_be_kind_of TestSketch2
+		subject.wont_be_kind_of TestSketch
 	    end
 
 	    it "must call the correct initializer block when constructed" do
-		testSketch2.elements.count.must_equal 1
-		testSketch2.elements.first.must_be_kind_of Geometry::Square
+		subject.elements.count.must_equal 1
+		subject.elements.first.must_be_kind_of Geometry::Square
 	    end
 
 	    describe "when the original Sketch class is used again" do

data/test/fixtures/sketchup/sketch_group_group.su

@@ -0,0 +1,4 @@
+model = Sketchup.active_model
+model.entities.clear!
+model.definitions.purge_unused
+lambda{ points = model.entities.add_circle(Geom::Point3d.new(0, 0).transform!(Geom::Transformation.new([4, 6],[1,0,0],[0,1,0])), [0,0,1], 0.5); points[0].find_faces; points[0].faces[0]}.call

data/test/fixtures/sketchup/sketch_group_group_group.su

@@ -0,0 +1,4 @@
+model = Sketchup.active_model
+model.entities.clear!
+model.definitions.purge_unused
+lambda{ points = model.entities.add_circle(Geom::Point3d.new(0, 0).transform!(Geom::Transformation.new([9, 12],[1,0,0],[0,1,0])), [0,0,1], 0.5); points[0].find_faces; points[0].faces[0]}.call

data/test/sketchup/builder.rb

@@ -40,7 +40,7 @@ describe SketchUp::Builder do
 
     describe "when given a Model of a translated Extrusion" do
 	sketch = Sketch.new
-	sketch.add_rectangle size:[10, 20]
+	sketch.push Geometry::Rectangle.new size:[10, 20]
 	before do
 	    subject.container = Model.new do
 		push Model::Extrusion.new(length:5, sketch:sketch, transformation:Geometry::Transformation.new(origin:[1,2,3]))
@@ -54,7 +54,7 @@ describe SketchUp::Builder do
 
     it "should generate the correct text from a Model of a simple extrusion" do
 	sketch = Sketch.new
-	sketch.add_rectangle size:[10, 20]
+	sketch.push Geometry::Rectangle.new size:[10, 20]
 	model = Model.new do
 	    push Model::Extrusion.new(length:5, sketch:sketch)
 	end
@@ -64,7 +64,7 @@ describe SketchUp::Builder do
 
     it "should generate the correct text from a Model of a simple extrusion with units" do
 	sketch = Sketch.new
-	sketch.add_rectangle size:[1.meter, 10]
+	sketch.push Geometry::Rectangle.new size:[1.meter, 10]
 	model = Model.new
 	model.push Model::Extrusion.new(length:5.meters, sketch:sketch)
 	@builder.container = model
@@ -78,7 +78,7 @@ describe SketchUp::Builder do
 
     it "should generate correct text from a simple Sketch object" do
 	sketch = Sketch.new
-	sketch.add_line [0,0], [1,0]
+	sketch.push Geometry::Line[[0,0], [1,0]]
 	@builder.container = sketch
 	@builder.to_s.must_equal File.read('test/fixtures/sketchup/line_sketch.su')
     end
@@ -86,20 +86,21 @@ describe SketchUp::Builder do
     describe "when given a Sketch" do
 	it "must RegularPolygon" do
 	    subject.container = Sketch.new.tap {|s| s.push RegularPolygon.new(sides:6, center:[0,0], radius:5) }
-	    subject.to_s.must_equal File.read('test/fixtures/sketchup/hexagon_sketch.su')
+	    expected = %r{model = Sketchup.active_model\nmodel.entities.clear!\nmodel.definitions.purge_unused\nmodel.entities.add_face\(\[5.0, 0.0\], \[2.5000000000000\d+, 4.330127018922\d+\], \[-2.49999999999\d+, 4.3301270189221\d+\], \[-5.0, 6.123233995736766e-16\], \[-2.5000000000\d+, -4.330127018922\d+\], \[2.4999999999999\d+, -4.330127018922\d+\]\)}
+	    subject.to_s.must_match expected
 	end
     end
 
     it "should generate correct text from a Sketch object with a single Rectangle" do
 	sketch = Sketch.new
-	sketch.add_rectangle origin:[0,0], size:[1,1]
+	sketch.push Geometry::Rectangle.new origin:[0,0], size:[1,1]
 	@builder.container = sketch
 	@builder.to_s.must_equal rectangle_sketch_fixture
     end
 
     it "should generate correct text from a Sketch object with a single Polygon" do
 	sketch = Sketch.new
-	sketch.add_polygon [0,0], [0,1], [1,1], [1,0], [0,0]
+	sketch.push Polygon.new [0,0], [0,1], [1,1], [1,0], [0,0]
 	@builder.container = sketch
 	@builder.to_s.must_equal rectangle_sketch_fixture
     end
@@ -113,7 +114,6 @@ describe SketchUp::Builder do
 
     it "must handle a sub-model" do
 	builder = SketchUp::Builder.new( Model::Builder.new.evaluate { push Model.new, :origin => [3,2,1] })
-	builder.container.elements.count.must_equal 1
 	builder.container.elements.first.must_be_instance_of(Model)
 	builder.to_s.must_match %r{model = Sketchup.active_model\nmodel.entities.clear!\nmodel.definitions.purge_unused\nlambda {|m|\n\t\n}.call(model.definitions.add('Model(\d+)'))\nmodel.entities.add_instance(model.definitions\['Model(\d+)'\], Geom::Transformation.new(\[3, 2, 1\],\[1,0,0\],\[0,1,0\]))}
     end
@@ -129,12 +129,46 @@ describe SketchUp::Builder do
 	    it "must generate the correct text" do
 		subject.to_s.must_equal File.read('test/fixtures/sketchup/sketch_group.su')
 	    end
+
+	    describe 'when the Group contains a Group' do
+		before do
+		    subject.container = Sketch::Builder.new do
+			group origin:[1,2] do
+			    group origin:[3,4] do
+				circle diameter:1
+			    end
+			end
+		    end.sketch
+		end
+
+		it 'must generate the correct text' do
+		    subject.to_s.must_equal File.read('test/fixtures/sketchup/sketch_group_group.su')
+		end
+	    end
+
+	    describe 'when the Group contains a Group with a Group' do
+		before do
+		    subject.container = Sketch::Builder.new do
+			group origin:[1,2] do
+			    group origin:[3,4] do
+				group origin:[5,6] do
+				    circle diameter:1
+				end
+			    end
+			end
+		    end.sketch
+		end
+
+		it 'must generate the correct text' do
+		    subject.to_s.must_equal File.read('test/fixtures/sketchup/sketch_group_group_group.su')
+		end
+	    end
 	end
     end
 
     it "Path" do
 	sketch = Sketch.new
-	sketch.add_path [0,0], Geometry::Arc.new(center:[0,0], radius:5, start:0, end:90*Math::PI/180), [0,0]
+	sketch.push Path.new [0,0], Geometry::Arc.new(center:[0,0], radius:5, start:0, end:90*Math::PI/180), [0,0]
 	builder = SketchUp::Builder.new( Model::Builder.new.evaluate { extrude length:5, sketch:sketch })
     end
 end