rasem 0.6.1 → 0.7.1

data/spec/defs_spec.rb

@@ -0,0 +1,103 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Rasem::SVGTagWithParent do
+
+  it "should get a reference to the main image object" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100)
+    l = img.line(0, 0, 100, 100)
+
+    (l.img == img).should == true
+  end
+
+
+  it "should propagate the reference to the main image object" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100)
+    l = img.group.group.line(0, 0, 100, 100)
+
+    (l.img == img).should == true
+  end
+
+
+end
+
+
+describe Rasem::SVGImage do
+
+  it "should create a defs section" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      defs do
+        group(:id => "group1") do
+          circle(0, 0, 20)
+        end
+      end
+    end
+ 
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<g[^>]*id="group1">.*<circle[^>]*/></g>.*</defs>.*</svg>}
+  end
+
+
+  it "should also create a defs section" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      def_group("group1") do
+        circle(0, 0, 20)
+      end
+    end
+ 
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<g[^>]*id="group1">.*<circle[^>]*/></g>.*</defs>.*</svg>}
+  end
+
+
+  it "should update the existing definition" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      def_group("group1") do
+        circle(0, 0, 20)
+      end
+
+      def_group("group1", :update) do
+        circle(0, 0, 40)
+      end
+
+    end
+ 
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<g[^>]*id="group1">.*<circle cx="0" cy="0" r="40"[^>]*/></g>.*</defs>.*</svg>}
+  end
+
+
+  it "should skip the new definition" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      def_group("group1") do
+        circle(0, 0, 20)
+      end
+
+      def_group("group1") do
+        circle(0, 0, 40)
+        fail "should skip the block execution"
+      end
+
+      def_group("group1", :skip) do
+        circle(0, 0, 40)
+        fail "should skip the block execution"
+      end
+
+    end
+ 
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<g[^>]*id="group1">.*<circle cx="0" cy="0" r="20"[^>]*/></g>.*</defs>.*</svg>}
+  end
+
+
+  it "should fail with the new definition" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100)
+    img.def_group("group1") do
+      circle(0, 0, 20)
+    end
+
+    expect{img.def_group("group1", :fail) do
+      circle(0, 0, 40)
+    end}.to raise_error
+
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<g[^>]*id="group1">.*<circle cx="0" cy="0" r="20"[^>]*/></g>.*</defs>.*</svg>}
+  end
+
+
+end
+

data/spec/gradient_spec.rb

@@ -0,0 +1,53 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Rasem::SVGLinearGradient do
+
+  it "should create a linear gradient in the defs section" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      linearGradient("lgrad1") {}
+    end
+
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<linearGradient id="lgrad1"/>.*</defs></svg}
+  end
+
+
+  it "should support adding stops" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      linearGradient("lgrad1") do
+        stop("0%", "green", 1)
+        stop("100%", "blue", 1)
+      end
+    end
+
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<linearGradient id="lgrad1">.*<stop offset="0%" stop-color="green" stop-opacity="1"/>.*<stop offset="100%" stop-color="blue" stop-opacity="1"/>.*</linearGradient>.*</defs></svg}
+  end
+
+end
+
+
+describe Rasem::SVGRadialGradient do
+
+  it "should create a radial gradient in the defs section" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      radialGradient("rgrad1") {}
+    end
+
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<radialGradient id="rgrad1"/>.*</defs></svg}
+  end
+
+
+  it "should support adding stops" do
+    img = Rasem::SVGImage.new(:width => 100, :height => 100) do
+      radialGradient("rgrad1") do
+        stop("0%", "green", 1)
+        stop("100%", "blue", 1)
+      end
+    end
+
+    img.to_s.should =~ %r{.*<svg[^>]*>.*<defs>.*<radialGradient id="rgrad1">.*<stop offset="0%" stop-color="green" stop-opacity="1"/>.*<stop offset="100%" stop-color="blue" stop-opacity="1"/>.*</radialGradient.*</defs></svg}
+  end
+
+
+
+end
+

data/spec/path_spec.rb

@@ -0,0 +1,227 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Rasem::SVGPath do
+
+  it "should be an instance of SVGTag" do
+    tag = Rasem::SVGPath.new
+    (class_hierarchy(tag).include? Rasem::SVGTag).should == true
+  end
+
+
+  it "should create an empty path" do
+    tag = Rasem::SVGPath.new
+    tag.to_s.should =~ %r{<path d=\"\"\/>}
+  end
+
+
+  it "should add a move command" do
+    tag = Rasem::SVGPath.new do
+      moveTo(0, 0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*m\s*0,0\"\/>}
+  end
+
+
+  it "should add an absolut move command" do
+    tag = Rasem::SVGPath.new do
+      moveToA(0, 0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*M\s*0,0\"\/>}
+  end
+
+
+  it "should add a line command" do
+    tag = Rasem::SVGPath.new do
+      lineTo(0, 0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*l\s*0,0\"\/>}
+  end
+
+
+  it "should add an absolut line command" do
+    tag = Rasem::SVGPath.new do
+      lineToA(0, 0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*L\s*0,0\"\/>}
+  end
+
+
+  it "should add an horizontal line command" do
+    tag = Rasem::SVGPath.new do
+      hlineTo(0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*h\s*0\"\/>}
+  end
+
+
+  it "should add an absolut horizontal line command" do
+    tag = Rasem::SVGPath.new do
+      hlineToA(0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*H\s*0\"\/>}
+  end
+
+
+  it "should add an vertical line command" do
+    tag = Rasem::SVGPath.new do
+      vlineTo(0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*v\s*0\"\/>}
+  end
+
+
+  it "should add an absolut vertical line command" do
+    tag = Rasem::SVGPath.new do
+      vlineToA(0)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*V\s*0\"\/>}
+  end
+
+
+  it "should add a curve command" do
+    tag = Rasem::SVGPath.new do
+      curveTo(10, 10, 0, 0, 5, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*c\s*0,0\s*5,5\s*10,10\"\/>}
+  end
+
+
+  it "should add an absolut curve command" do
+    tag = Rasem::SVGPath.new do
+      curveToA(10, 10, 0, 0, 5, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*C\s*0,0\s*5,5\s*10,10\"\/>}
+  end
+
+
+  it "should add a smooth curve command" do
+    tag = Rasem::SVGPath.new do
+      scurveTo(10, 10, 5, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*s\s*5,5\s*10,10\"\/>}
+  end
+
+
+  it "should add an absolut smooth curve command" do
+    tag = Rasem::SVGPath.new do
+      scurveToA(10, 10, 5, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*S\s*5,5\s*10,10\"\/>}
+  end
+
+
+  it "should add a quadratic curve command" do
+    tag = Rasem::SVGPath.new do
+      qcurveTo(10, 10, 5, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*q\s*5,5\s*10,10\"\/>}
+  end
+
+
+  it "should add an absolut quadratic curve command" do
+    tag = Rasem::SVGPath.new do
+      qcurveToA(10, 10, 5, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*Q\s*5,5\s*10,10\"\/>}
+  end
+
+
+  it "should add a smooth quadratic curve command" do
+    tag = Rasem::SVGPath.new do
+      sqcurveTo(10, 10)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*t\s*10,10\"\/>}
+  end
+
+
+  it "should add an absolut smooth quadratic curve command" do
+    tag = Rasem::SVGPath.new do
+      sqcurveToA(10, 10)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*T\s*10,10\"\/>}
+  end
+
+
+  it "should add an arc command" do
+    tag = Rasem::SVGPath.new do
+      arcTo(10, 10, 1, 2, 3, 4, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*a\s*1,2\s*3\s*4,5\s*10,10\"\/>}
+  end
+
+
+  it "should add an absolut arc command" do
+    tag = Rasem::SVGPath.new do
+      arcToA(10, 10, 1, 2, 3, 4, 5)
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*A\s*1,2\s*3\s*4,5\s*10,10\"\/>}
+  end
+
+
+  it "should add a closepath command" do
+    tag = Rasem::SVGPath.new do
+      close
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*Z\"\/>}
+  end
+
+
+  it "should allow to combine commands" do
+    tag = Rasem::SVGPath.new do
+      moveTo(0, 0)
+      lineTo(0, 0)
+      hlineTo(0)
+      vlineTo(0)
+      curveTo(10, 10, 0, 0, 5, 5)
+      scurveTo(10, 10, 5, 5)
+      qcurveTo(10, 10, 5, 5)
+      sqcurveTo(10, 10)
+      arcTo(10, 10, 1, 2, 3, 4, 5)
+      close
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*m\s*0,0\s*l\s*0,0\s*h\s*0\s*v\s*0\s*c\s*0,0\s*5,5\s*10,10\s*s\s*5,5\s*10,10\s*q\s*5,5\s*10,10\s*t\s*10,10\s*a\s*1,2\s*3\s*4,5\s*10,10\s*Z\s*\"}
+
+
+    tag = Rasem::SVGPath.new do
+      moveToA(0, 0)
+      lineToA(0, 0)
+      hlineToA(0)
+      vlineToA(0)
+      curveToA(10, 10, 0, 0, 5, 5)
+      scurveToA(10, 10, 5, 5)
+      qcurveToA(10, 10, 5, 5)
+      sqcurveToA(10, 10)
+      arcToA(10, 10, 1, 2, 3, 4, 5)
+      close
+    end
+
+    tag.to_s.should =~ %r{d=\"\s*M\s*0,0\s*L\s*0,0\s*H\s*0\s*V\s*0\s*C\s*0,0\s*5,5\s*10,10\s*S\s*5,5\s*10,10\s*Q\s*5,5\s*10,10\s*T\s*10,10\s*A\s*1,2\s*3\s*4,5\s*10,10\s*Z\s*\"}
+
+  end
+
+
+
+
+
+end
+

data/spec/rasem_spec.rb

@@ -1,50 +1,206 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
-require 'tempfile'
 
-describe Rasem::SVGImage do
-  it "should initialize an empty image" do
-    img = Rasem::SVGImage.new(100, 100)
-    str = img.output
-    str.should =~ %r{width="100"}
-    str.should =~ %r{height="100"}
+describe Rasem::SVGTag do
+  it "should create an empty tag" do
+    tag = Rasem::SVGTag.new("svg")
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg/>}
   end
 
-  it "should initialize XML correctly" do
-    img = Rasem::SVGImage.new(100, 100)
-    str = img.output
-    str.should =~ /^<\?xml/
+  it "should create a tag with parameters" do
+    tag = Rasem::SVGTag.new("svg", :width=>"100%", :height=>"100%")
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg width="100%" height="100%"/>}
+  end
+
+  it "should allow editing a parameter in existing tag" do
+    tag = Rasem::SVGTag.new("svg", :width=>"100%", :height=>"100%")
+    tag.height?.should == "100%"
+    tag.height = "15%"
+    tag.height?.should == "15%"
+  end
+
+  it "should raise errors if trying to reach invalid parameter" do
+    tag = Rasem::SVGTag.new("svg", :width=>"100%", :height=>"100%")
+    expect { tag.hight? }.to raise_error
+    expect { tag.higgg = "10" }.to raise_error
+  end
+
+  it "should call spawn_child if possible to add that child" do
+    tag = Rasem::SVGTag.new("svg", :width=>"100%", :height=>"100%")
+    tag.should_receive('spawn_child').with(:g)
+    tag.g
+  end
+
+  it "should not call spawn_child if not possible to add that child" do
+    tag = Rasem::SVGTag.new("svg", :width=>"100%", :height=>"100%")
+    tag.should_not_receive('spawn_child')
+    expect { tag.ggr }.to raise_error
+  end
+
+  it "should create a child" do
+    tag = Rasem::SVGTag.new("svg")
+    tag.g
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg><g/></svg>}
+  end
+
+  it "should use alias for some children" do
+    tag = Rasem::SVGTag.new("svg")
+    tag.group
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg><g/></svg>}
+  end
+
+  it "should pass parameters to child" do
+    tag = Rasem::SVGTag.new("svg")
+    tag.group :id=>"G1", :class=>"C1"
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg><g id="G1" class="C1"/></svg>}
+  end
+
+  it "should raise an error when passing wrong parameter" do
+    tag = Rasem::SVGTag.new("svg")
+    expect { tag.group :height=>"100%" }.to raise_error
+  end
+
+  it "should allow passing non named parameters" do
+    tag = Rasem::SVGTag.new("svg")
+    tag.line 0, 0, 100, 100
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg><line x1="0" y1="0" x2="100" y2="100".*/></svg>}
+  end
+
+  it "should raise error when passing not enough non named parameters" do
+    tag = Rasem::SVGTag.new("svg")
+    expect { tag.line 0, 0, 100 }.to raise_error
+  end
+
+  it "should raise error when passing ill formed non named parameters (even if count matches)" do
+    tag = Rasem::SVGTag.new("svg")
+    expect { tag.line 0, 0, 100, :x2=>100 }.to raise_error
+  end
+
+  it "should raise error when passing too much non named parameters" do
+    tag = Rasem::SVGTag.new("svg")
+    expect { tag.line 0, 0, 100, 10, 10 }.to raise_error
+  end
+
+  it "should allow following non named parameters with named ones" do
+    tag = Rasem::SVGTag.new("svg")
+    tag.line 0, 0, 100, 100, :id=>"Line1"
+    str = ""
+    tag.write(str)
+    str.should =~ %r{line}
+    str.should =~ %r{x1="0"}
+    str.should =~ %r{y1="0"} 
+    str.should =~ %r{x2="100"}
+    str.should =~ %r{y2="100"}
+    str.should =~ %r{id="Line1"}
+  end
+
+  it "should use named parameters when there is a conflict" do
+    tag = Rasem::SVGTag.new("svg")
+    tag.line 0, 0, 100, 100, :x1=>"10"
+    str = ""
+    tag.write(str)
+    str.should =~ %r{line}
+    str.should =~ %r{x1="10"}
+    str.should_not =~ %r{x1="0"} 
+  end
+
+  it "should insert a child from block within" do
+    tag = Rasem::SVGTag.new("svg",:height=>"100%") do
+      g :id=>"G1" do
+      end
+    end
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg height="100%"><g id="G1"/></svg>}
   end
 
-  it "should close an image" do
-    img = Rasem::SVGImage.new(100, 100)
-    img.close
-    str = img.output
-    str.should =~ %r{</svg>}
+  it "should nest easily" do
+    tag = Rasem::SVGTag.new("svg") do
+      g do
+        g do
+          g do
+            g do
+            end
+          end
+        end
+      end
+    end
+    str = ""
+    tag.write(str)
+    str.should =~ %r{<svg><g><g><g><g/></g></g></g></svg>}
+  end
+
+  it "should add style element if parameters contain style tag" do
+    tag = Rasem::SVGTag.new("svg") do
+      line 0, 0, 10, 10, :stroke=>"violet"
+    end
+    str = ""
+    tag.write(str)
+    str.should =~ %r{style="stroke:violet;"}
   end
 
-  it "should auto close an image with block" do
-    img = Rasem::SVGImage.new(100, 100) do
+  it "should add transform element if parameters contain style tag" do
+    tag = Rasem::SVGTag.new("svg") do
+      line 0, 0, 10, 10, :scale=>2
     end
-    img.should be_closed
+    str = ""
+    tag.write(str)
+    str.should =~ /transform=".*scale\(2\).*"/
   end
-  
+end
+
+describe Rasem::SVGImage do
+  it "should initialize an empty image" do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100")
+    str = ""
+    img.write(str)
+    str.should =~ /<svg.*width="100".*height="100"/
+  end
+
+  it "should initialize an empty image in given output" do
+    str = ""
+    img = Rasem::SVGImage.new({:width=>"100", :height=>"100"}, str) do
+    end
+    str.should =~ /<svg.*width="100".*height="100"/
+  end
+
+  it "should initialize XML correctly" do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100")
+    str = ""
+    img.write(str)
+    str.should =~ /^<\?xml/
+  end
+
   it "should draw line using method" do
-    img = Rasem::SVGImage.new(100, 100)
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100")
     img.line(0, 0, 100, 100)
-    img.close
-    str = img.output
+    str = ""
+    img.write(str)
     str.should =~ %r{<line}
     str.should =~ %r{x1="0"}
     str.should =~ %r{y1="0"}
     str.should =~ %r{x2="100"}
     str.should =~ %r{y2="100"}
   end
-  
+
   it "should draw line using a block" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       line(0, 0, 100, 100)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<line}
     str.should =~ %r{x1="0"}
     str.should =~ %r{y1="0"}
@@ -53,19 +209,23 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a line with style" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       line(0, 0, 10, 10, :fill=>"white")
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{fill:white}
   end
 
   it "should draw a circle" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       circle(0, 0, 10)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<circle}
     str.should =~ %r{cx="0"}
     str.should =~ %r{cy="0"}
@@ -73,38 +233,46 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a circle with style" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       circle(0, 0, 10, :fill=>"white")
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{fill:white}
   end
 
   it "should draw a rectangle" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       rectangle(0, 0, 100, 300)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<rect}
     str.should =~ %r{width="100"}
     str.should =~ %r{height="300"}
   end
 
   it "should draw a rectangle with style" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       rectangle(0, 0, 10, 10, :fill=>"white")
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{fill:white}
   end
 
   it "should draw a symmetric round-rectangle" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       rectangle(0, 0, 100, 300, 20)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<rect}
     str.should =~ %r{width="100"}
     str.should =~ %r{height="300"}
@@ -113,19 +281,23 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a symmetric rounded-rectangle with style" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       rectangle(0, 0, 10, 10, 2, :fill=>"white")
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{fill:white}
   end
 
   it "should draw a non-symmetric round-rectangle" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       rectangle(0, 0, 100, 300, 20, 5)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<rect}
     str.should =~ %r{width="100"}
     str.should =~ %r{height="300"}
@@ -134,19 +306,23 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a non-symmetric rounded-rectangle with style" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       rectangle(0, 0, 10, 10, 2, 4, :fill=>"white")
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{fill:white}
   end
-  
+
   it "should draw an ellipse" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       ellipse(0, 0, 100, 300)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<ellipse}
     str.should =~ %r{cx="0"}
     str.should =~ %r{cy="0"}
@@ -155,178 +331,210 @@ describe Rasem::SVGImage do
   end
 
   it "should draw an ellipse with style" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       ellipse(0, 0, 3, 10, :fill=>"white")
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{fill:white}
   end
 
   it "should draw a polygon given an array of points" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       polygon([[0,0], [1,2], [3,4]])
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<polygon}
     str.should =~ %r{points="0,0 1,2 3,4"}
   end
 
   it "should draw a polygon with style" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       polygon([[0,0], [1,2], [3,4]], :fill=>"white")
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{fill:white}
   end
 
   it "should draw a polyline given an array of points" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       polyline([[0,0], [1,2], [3,4]])
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<polyline}
     str.should =~ %r{points="0,0 1,2 3,4"}
   end
 
   it "should fix style names" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       circle(0, 0, 10, :stroke_width=>3)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{stroke-width:3}
   end
-  
+
   it "should group styles" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       with_style :stroke_width=>3 do
         circle(0, 0, 10)
       end
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{stroke-width:3}
   end
 
   it "should group styles nesting" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       with_style :stroke_width=>3 do
         with_style :fill=>"black" do
           circle(0, 0, 10)
         end
       end
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{stroke-width:3}
     str.should =~ %r{fill:black}
   end
 
   it "should group styles override nesting" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       with_style :stroke_width=>3 do
         with_style :stroke_width=>5 do
           circle(0, 0, 10)
         end
       end
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{style=}
     str.should =~ %r{stroke-width:5}
   end
 
   it "should group styles limited effect" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       with_style :stroke_width=>3 do
         with_style :stroke_width=>5 do
         end
       end
       circle(0, 0, 10)
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should_not =~ %r{stroke-width:3}
     str.should_not =~ %r{stroke-width:5}
   end
-  
+
   it "should create a group" do
-    img = Rasem::SVGImage.new(100, 100) do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
       group :stroke_width=>3 do
         circle(0, 0, 10)
         circle(20, 20, 10)
       end
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<g .*circle.*circle.*</g>}
   end
-  
+
+  it "should apply transforms to a group" do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
+      group(:scale => 5, :translate => [15,20]) do
+        circle(0, 0, 10)
+      end
+    end
+    str = ""
+    img.write(str)
+
+    str.should =~ %r{scale\(5\)}
+    str.should =~ %r{translate\(15,20\)}
+  end
+
   it "should update width and height after init" do
-    img = Rasem::SVGImage.new(100, 100) do
-      set_width 200
-      set_height 300
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
+      self.width = 200
+      self.height = 300
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{width="200"}
     str.should =~ %r{height="300"}
   end
 
   it "should draw text" do
-    img = Rasem::SVGImage.new(100, 100) do
-      text 10, 20, "Hello world!"
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
+      text 10, 20 do 
+        raw "Hello world!"
+      end
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{<text}
     str.should =~ %r{x="10"}
     str.should =~ %r{y="20"}
     str.should =~ %r{Hello world!}
   end
 
-  it "should draw multiline text" do
-    img = Rasem::SVGImage.new(100, 100) do
-      text 10, 20, "Hello\nworld!"
-    end
-    str = img.output
-    str.should =~ %r{<text.*tspan.*tspan.*</text}
-  end
-  
+#  it "should draw multiline text" do
+#    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
+#      text 10, 20 do
+#        raw "Hello\nworld!"
+#      end
+#    end
+#    str = ""
+#    img.write(str)
+#
+#    str.should =~ %r{<text.*tspan.*tspan.*</text}
+#  end
+
   it "should draw text with font" do
-    img = Rasem::SVGImage.new(100, 100) do
-      text 10, 20, "Hello\nworld!", :font_family=>"Times", "font-size"=>24
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
+      text 10, 20, "font-family"=>"Times", "font-size"=>24 do
+        raw "Hello World"
+      end
     end
-    str = img.output
+    str = ""
+    img.write(str)
+
     str.should =~ %r{font-family="Times"}
     str.should =~ %r{font-size="24"}
   end
 
-  it "should generate an image out of a .rasem file" do
-    rasem_file = Tempfile.new("temp.rasem")
-    rasem_file.puts "circle 50, 50, 50"
-    rasem_file.close
-    
-    File.should_not be_exists(rasem_file.path+".svg")
-    Rasem::Application.run!(rasem_file.path)
-    
-    File.should be_exists(rasem_file.path+".svg")
-  end
-  
-  it "should raise an exception for a malformed .rasem file" do
-    rasem_file = Tempfile.new("temp.rasem")
-    rasem_file.puts "@x.asdf"
-    rasem_file.close
-    
-    lambda { Rasem::Application.run!(rasem_file.path) }.should raise_error
-  end
-  
-  it "should generate only the portion of backtrace in .rasem file" do
-    rasem_file = Tempfile.new("temp.rasem")
-    rasem_file.puts "@x.asdf"
-    rasem_file.close
-    
-    begin
-      Rasem::Application.run!(rasem_file.path)
-    rescue Exception => e
-      e.backtrace.should have(1).lines
+  it "should include an image" do
+    img = Rasem::SVGImage.new(:width=>"100", :height=>"100") do
+      image 10, 20, 30, 40, 'image.png'
     end
+    str = ""
+    img.write(str)
+
+    str.should =~ %r{<image}
+    str.should =~ %r{x="10"}
+    str.should =~ %r{y="20"}
+    str.should =~ %r{width="30"}
+    str.should =~ %r{height="40"}
+    str.should =~ %r{xlink:href="image.png"}
   end
+
 end