rasem 0.5.1 → 0.5.2

data/VERSION

@@ -1 +1 @@
-0.5.1
+0.5.2

data/lib/rasem/application.rb

@@ -18,10 +18,11 @@ class Rasem::Application
       else
         svg_file = source_file + ".svg"
       end
+      img = Rasem::SVGImage.new(nil, "100%", "100%") do
+        eval(File.read(source_file), binding)
+      end
       File.open(svg_file, "w") do |f|
-        Rasem::SVGImage.new(f, 100, 100) do
-          eval(File.read(source_file), binding)
-        end
+        f << img.output
       end
     end
     

data/lib/rasem/svg_image.rb

@@ -1,21 +1,34 @@
 class Rasem::SVGImage
+  DefaultStyle = {:stroke=>"black", :fill=>"black"}
 
-  def initialize(*args, &block)
-    if args.length == 3
-      @output = create_output(args.shift)
-    else
-      @output = create_output(nil)
-    end
+  def initialize(width, height, output=nil, &block)
+    @output = create_output(output)
     
     # Initialize a stack of default styles
-    @default_styles = []
+    @default_styles = [DefaultStyle]
 
-    write_header(*args)
+    write_header(width, height)
     if block
       self.instance_exec(&block)
       self.close
     end
   end
+  
+  def set_width(new_width)
+    if @output.respond_to?(:sub!)
+      @output.sub!(/<svg width="[^"]+"/, %Q{<svg width="#{new_width}"})
+    else
+      raise "Cannot change width after initialization for this output"
+    end
+  end
+  
+  def set_height(new_height)
+    if @output.respond_to?(:sub!)
+      @output.sub!(/<svg width="([^"]+)" height="[^"]+"/, %Q{<svg width="\\1" height="#{new_height}"})
+    else
+      raise "Cannot change width after initialization for this output"
+    end
+  end
 
   # Draw a straight line between the two end points
   def line(x1, y1, x2, y2, style={})
@@ -81,7 +94,7 @@ class Rasem::SVGImage
   
   def with_style(style={}, &proc)
     # Merge passed style with current default style
-    updated_style = default_style.update(style)
+    updated_style = default_style.merge(style)
     # Push updated style to the stack
     @default_styles.push(updated_style)
     # Call the block
@@ -142,8 +155,8 @@ private
       @output << "#{x},#{y}"
       @output << " " unless coords.empty?
     end
-    write_style(style)
     @output << '"/>'
+    write_style(style)
   end
   
   # Return current deafult style

data/spec/rasem_spec.rb

@@ -2,33 +2,33 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe Rasem::SVGImage do
   it "should initialize an empty image" do
-    img = Rasem::SVGImage.new("", 100, 100)
+    img = Rasem::SVGImage.new(100, 100)
     str = img.output
     str.should =~ %r{width="100"}
     str.should =~ %r{height="100"}
   end
 
   it "should initialize XML correctly" do
-    img = Rasem::SVGImage.new("", 100, 100)
+    img = Rasem::SVGImage.new(100, 100)
     str = img.output
     str.should =~ /^<\?xml/
   end
 
   it "should close an image" do
-    img = Rasem::SVGImage.new("", 100, 100)
+    img = Rasem::SVGImage.new(100, 100)
     img.close
     str = img.output
     str.should =~ %r{</svg>}
   end
 
   it "should auto close an image with block" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
     end
     img.should be_closed
   end
   
   it "should draw line using method" do
-    img = Rasem::SVGImage.new("", 100, 100)
+    img = Rasem::SVGImage.new(100, 100)
     img.line(0, 0, 100, 100)
     img.close
     str = img.output
@@ -40,7 +40,7 @@ describe Rasem::SVGImage do
   end
   
   it "should draw line using a block" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       line(0, 0, 100, 100)
     end
     str = img.output
@@ -52,7 +52,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a line with style" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       line(0, 0, 10, 10, :fill=>"white")
     end
     str = img.output
@@ -61,7 +61,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a circle" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       circle(0, 0, 10)
     end
     str = img.output
@@ -72,7 +72,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a circle with style" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       circle(0, 0, 10, :fill=>"white")
     end
     str = img.output
@@ -81,7 +81,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a rectangle" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       rectangle(0, 0, 100, 300)
     end
     str = img.output
@@ -91,7 +91,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a rectangle with style" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       rectangle(0, 0, 10, 10, :fill=>"white")
     end
     str = img.output
@@ -100,7 +100,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a symmetric round-rectangle" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       rectangle(0, 0, 100, 300, 20)
     end
     str = img.output
@@ -112,7 +112,7 @@ 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(100, 100) do
       rectangle(0, 0, 10, 10, 2, :fill=>"white")
     end
     str = img.output
@@ -121,7 +121,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a non-symmetric round-rectangle" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       rectangle(0, 0, 100, 300, 20, 5)
     end
     str = img.output
@@ -133,7 +133,7 @@ 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(100, 100) do
       rectangle(0, 0, 10, 10, 2, 4, :fill=>"white")
     end
     str = img.output
@@ -142,7 +142,7 @@ describe Rasem::SVGImage do
   end
   
   it "should draw an ellipse" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       ellipse(0, 0, 100, 300)
     end
     str = img.output
@@ -154,7 +154,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw an ellipse with style" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       ellipse(0, 0, 3, 10, :fill=>"white")
     end
     str = img.output
@@ -163,7 +163,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a polygon given an array of points" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       polygon([[0,0], [1,2], [3,4]])
     end
     str = img.output
@@ -172,7 +172,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a polygon with style" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       polygon([[0,0], [1,2], [3,4]], :fill=>"white")
     end
     str = img.output
@@ -181,7 +181,7 @@ describe Rasem::SVGImage do
   end
 
   it "should draw a polyline given an array of points" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       polyline([[0,0], [1,2], [3,4]])
     end
     str = img.output
@@ -190,7 +190,7 @@ describe Rasem::SVGImage do
   end
 
   it "should fix style names" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       circle(0, 0, 10, :stroke_width=>3)
     end
     str = img.output
@@ -199,7 +199,7 @@ describe Rasem::SVGImage do
   end
   
   it "should group styles" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       with_style :stroke_width=>3 do
         circle(0, 0, 10)
       end
@@ -210,7 +210,7 @@ describe Rasem::SVGImage do
   end
 
   it "should group styles nesting" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       with_style :stroke_width=>3 do
         with_style :fill=>"black" do
           circle(0, 0, 10)
@@ -224,7 +224,7 @@ describe Rasem::SVGImage do
   end
 
   it "should group styles override nesting" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       with_style :stroke_width=>3 do
         with_style :stroke_width=>5 do
           circle(0, 0, 10)
@@ -237,7 +237,7 @@ describe Rasem::SVGImage do
   end
 
   it "should group styles limited effect" do
-    img = Rasem::SVGImage.new("", 100, 100) do
+    img = Rasem::SVGImage.new(100, 100) do
       with_style :stroke_width=>3 do
         with_style :stroke_width=>5 do
         end
@@ -245,12 +245,12 @@ describe Rasem::SVGImage do
       circle(0, 0, 10)
     end
     str = img.output
-    str.should_not =~ %r{style=}
-    str.should_not =~ %r{stroke-width:}
+    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(100, 100) do
       group :stroke_width=>3 do
         circle(0, 0, 10)
         circle(20, 20, 10)
@@ -259,5 +259,15 @@ describe Rasem::SVGImage do
     str = img.output
     str.should =~ %r{<g .*circle.*circle.*</g>}
   end
+  
+  it "should update width and height after init" do
+    img = Rasem::SVGImage.new(100, 100) do
+      set_width 200
+      set_height 300
+    end
+    str = img.output
+    str.should =~ %r{width="200"}
+    str.should =~ %r{height="300"}
+  end
 
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Ahmed Eldawy
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2955251890705000744
+      hash: -1380337936267073737
       segments: 
       - 0
       version: "0"