rubypost 0.0.1 → 0.0.2

data/tests/test_path.rb

@@ -1,11 +1,10 @@
-#require 'rubygems'
-#gem 'rubypost'
 #require 'rubypost'
 
-#load the rest of rubypost
 require '../lib/objects'
 require '../lib/drawable'
+require '../lib/draw'
 require '../lib/options'
+require '../lib/graph'
 
 include RubyPost
 
@@ -13,103 +12,88 @@ include RubyPost
 #to use File#view.  tex mproof breaks
 file = RubyPost::File.new('testpath')
 
-#draw a curved path
-fig1 = Figure.new
-file.add_figure(fig1)
+#create a curved path
 path = Path.new
 path.curved
 8.times{ |i| path.add_pair(Pair.new(i.cm, ((i/4.0)**2).cm)) }
-fig1.add_drawable(path)
+
+#draw a curved path
+fig1 = Figure.new
+file.add_figure(fig1)
+fig1.add_drawable(Draw.new(path))
 
 #draw the same path but with an arrow at the end
 fig2 = Figure.new
 file.add_figure(fig2)
-arrow = Path.new.arrow
-arrow.curved
-8.times{ |i| arrow.add_pair(Pair.new(i.cm, ((i/4.0)**2).cm)) }
-fig2.add_drawable(arrow)
+fig2.add_drawable(Arrow.new(path))
 
 #draw the same path but with an arrow on both ends
 fig3 = Figure.new
 file.add_figure(fig3)
-#see the ruby reference for clone symatics
-arrow2 = arrow.clone
-arrow2.dblarrow
-fig3.add_drawable(arrow2)
+fig3.add_drawable(DoubleArrow.new(path))
 
 #draw the same path but with an arrow at the start
 #this is achieved by reversing the path
 fig4 = Figure.new
 file.add_figure(fig4)
 #see the ruby reference for clone symatics
-arrow3 = arrow.clone
-arrow3.reverse
-fig4.add_drawable(arrow3)
+revpath = path.clone
+revpath.reverse
+fig4.add_drawable(Arrow.new(revpath))
 
-#draw the arrow but scale it by 0.5 and make it dashed
+#draw the path but scale it by 0.5 and make it dashed
 fig5 = Figure.new
 file.add_figure(fig5)
-arrow4 = Path.new.arrow
-arrow4.add_option(Scale.new(0.5))
-arrow4.add_option(Dashed.new)
-8.times{ |i| arrow4.add_pair(Pair.new(i.cm, ((i/4.0)**2).cm)) }
-fig5.add_drawable(arrow4)
+draw_command = Arrow.new.add_option(Scale.new(0.5)).add_option(Dashed.new)
+draw_command.set_drawable(path)
+fig5.add_drawable(draw_command)
 
 #draw the same arrow but scale it by 0.5 and rotate 140 degrees
 #and make it red
 fig6 = Figure.new
 file.add_figure(fig6)
-arrow5 = Path.new.arrow
-arrow5.add_option(Rotate.new(140))
-arrow5.add_option(Scale.new(0.5))
-arrow5.add_option(Colour.new(1.0,0.0,0.0))
-8.times{ |i| arrow5.add_pair(Pair.new(i.cm, ((i/4.0)**2).cm)) }
-fig6.add_drawable(arrow5)
-
-#draw arrow5 again and draw another arrow but translate right by 5cm.
-#note the order of translation and rotation is important.
-#also make the colour blue and use a square pen that is
+draw_command = Arrow.new
+draw_command.add_option(Rotate.new(140))
+draw_command.add_option(Scale.new(0.5))
+draw_command.add_option(Colour.new(1.0,0.0,0.0))
+draw_command.set_drawable(path)
+fig6.add_drawable(draw_command)
+
+#draw the previous arrow again again and draw 
+#another arrow but translate right by 5cm. <br>
+#Note the order of translation and rotation is important.
+#Also make the colour blue and use a square pen that is
 #thickened by a factor of 2
 fig7 = Figure.new
 file.add_figure(fig7)
-arrow6 = Path.new.arrow
-arrow6.add_option(Rotate.new(140))
-arrow6.add_option(Scale.new(0.5))
-arrow6.add_option(Translate.new(Pair.new(5.0.cm,0.0)))
-arrow6.add_option(Colour.new(0.0,0.0,1.0))
-arrow6.add_option(Pen.new('pensquare', 2.0))
-8.times{ |i| arrow6.add_pair(Pair.new(i.cm, ((i/4.0)**2).cm)) }
-fig7.add_drawable(arrow6)
-fig7.add_drawable(arrow5)
-
-#draw the path, make it cycle
+draw_command2 = Arrow.new
+draw_command2.add_option(Rotate.new(140))
+draw_command2.add_option(Scale.new(0.5))
+draw_command2.add_option(Translate.new(Pair.new(5.0.cm,0.0)))
+draw_command2.add_option(Colour.new(0.0,0.0,1.0))
+draw_command2.add_option(Pen.new('pensquare', 2.0))
+draw_command2.set_drawable(path)
+fig7.add_drawable(draw_command)
+fig7.add_drawable(draw_command2)
+
+#draw same path, make it cycle and make it use straight lines
 fig8 = Figure.new
 file.add_figure(fig8)
-cycled_path = Path.new
-8.times{ |i| cycled_path.add_pair(Pair.new(i.cm, ((i/3.0)**2).cm)) }
+cycled_path = path.clone
 cycled_path.add_pair('cycle')
-fig8.add_drawable(cycled_path)
+cycled_path.straight
+fig8.add_drawable(Draw.new(cycled_path))
 
-#draw the path, make it cycle and filled with colour
+#draw the path, make it cycle and filled with black
 fig9 = Figure.new
 file.add_figure(fig9)
-filled_path = Path.new.fill
-8.times{ |i| filled_path.add_pair(Pair.new(i.cm, ((i/3.0)**2).cm)) }
-filled_path.add_pair('cycle')
-fig9.add_drawable(filled_path)
+fig9.add_drawable(Fill.new(cycled_path))
 
 #draw the path, make it cycle and filled with colour
 fig10 = Figure.new
 file.add_figure(fig10)
-test_center = Path.new
-test_center.add_pair(Pair.new(0.0,0.0))
-test_center.add_pair(Pair.new(0.0,3.0.cm))
-test_center.add_pair(Pair.new(3.0.cm,3.0.cm))
-test_center.add_pair(Pair.new(3.0.cm,0.0))
-test_center.add_pair(Pair.new('cycle'))
-
-filled_path.add_pair('cycle')
-fig10.add_drawable(filled_path)
+fig10.add_drawable(Fill.new(cycled_path).colour(1,0,0))
+
 
 puts file.compile_to_string
 file.compile

data/tests/test_picture.rb

@@ -0,0 +1,26 @@
+#require 'rubypost'
+
+require '../lib/objects'
+require '../lib/drawable'
+require '../lib/draw'
+require '../lib/options'
+require '../lib/graph'
+
+include RubyPost
+
+file = RubyPost::File.new('testpicture')
+fig = Figure.new
+
+pic = Picture.new('testpic')
+fig.add_drawable(Draw.new(pic))
+file.add_figure(fig)
+
+pic.add_drawable(Draw.new(Square.new).scale(1.cm))
+pic.add_drawable(Draw.new(Circle.new).scale(1.cm))
+
+fig.add_drawable(Draw.new(pic).rotate(45).translate(0,-5.cm).colour(0,0,1))
+
+puts file.compile_to_string
+file.compile
+file.view
+

data/tests/test_square.rb

@@ -1,11 +1,10 @@
-#require 'rubygems'
-#gem 'rubypost'
 #require 'rubypost'
 
-#load the rest of rubypost
 require '../lib/objects'
 require '../lib/drawable'
+require '../lib/draw'
 require '../lib/options'
+require '../lib/graph'
 
 include RubyPost
 
@@ -16,27 +15,28 @@ file = RubyPost::File.new('testsquare')
 #draw a square
 fig1 = Figure.new
 file.add_figure(fig1)
-square1 = RubyPost::Square.new.scale(1.cm)
-fig1.add_drawable(square1)
+square1 = RubyPost::Square.new
+fig1.add_drawable(Draw.new(square1).scale(1.cm))
 
-#draw a curved path
+#draw a square with a circular and thickened pen.  Also
+#rotate and change scale and colour
 fig2 = Figure.new
 file.add_figure(fig2)
-square2 = RubyPost::Square.new
-square2.add_option(Rotate.new(45))
-square2.add_option(Scale.new(2.cm))
-square2.add_option(Colour.new(1.0,0.0,1.0))
-square2.add_option(Dashed.new)
-square2.add_option(Pen.new('pencircle', 2.0))
-fig2.add_drawable(square2)
+square_drawer = Draw.new
+square_drawer.add_option(Rotate.new(45))
+square_drawer.add_option(Scale.new(2.cm))
+square_drawer.add_option(Colour.new(1.0,0.0,1.0))
+square_drawer.add_option(Dashed.new)
+square_drawer.add_option(Pen.new('pencircle', 2.0))
+fig2.add_drawable(square_drawer.set_drawable(square1))
 
 #draw a green filled square
 #we are using the colour method for Drawable.  It actually just
 #calls add_option(Colour.new(r,g,b))
 fig3 = Figure.new
 file.add_figure(fig3)
-square3= RubyPost::Square.new.fill.scale(1.cm).colour(0.0,1.0,0.0)
-fig3.add_drawable(square3)
+square_drawer = Fill.new.scale(1.cm).colour(0.0,1.0,0.0).set_drawable(square1)
+fig3.add_drawable(square_drawer)
 
 
 puts file.compile_to_string

metadata

@@ -1,10 +1,10 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.2
+rubygems_version: 0.9.4
 specification_version: 1
 name: rubypost
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
-date: 2008-01-22 00:00:00 +10:00
+  version: 0.0.2
+date: 2008-01-27 00:00:00 +10:00
 summary: Ruby wrapper for the MetaPost drawing language
 require_paths: 
 - lib
@@ -29,11 +29,13 @@ post_install_message:
 authors: 
 - Robby McKilliam
 files: 
-- tests/test_cricle.rb
+- tests/test_circle.rb
 - tests/test_graph.rb
 - tests/test_pair.rb
 - tests/test_path.rb
+- tests/test_picture.rb
 - tests/test_square.rb
+- lib/draw.rb
 - lib/drawable.rb
 - lib/graph.rb
 - lib/objects.rb
@@ -41,6 +43,13 @@ files:
 - lib/redefine_float_to_s_for_metapost.rb
 - lib/revert_float_to_s.rb
 - lib/rubypost.rb
+- doc/classes
+- doc/created.rid
+- doc/files
+- doc/fr_class_index.html
+- doc/fr_file_index.html
+- doc/fr_method_index.html
+- doc/index.html
 - README
 test_files: 
 - tests/test_path.rb