rasem 0.1.1 → 0.2.0

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.2.0

data/lib/rasem/svg_image.rb

@@ -15,25 +15,43 @@ class Rasem::SVGImage
   end
 
   # Draw a straight line between the two end points
-  def line(x1, y1, x2, y2)
-    @output << %Q{<line x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}"/>}
+  def line(x1, y1, x2, y2, style={})
+    @output << %Q{<line x1="#{x1}" y1="#{y1}" x2="#{x2}" y2="#{y2}"}
+    write_style(style)
+    @output << %Q{/>}
   end
   
   # Draw a circle given a center and a radius
-  def circle(cx, cy, r)
-    @output << %Q{<circle cx="#{cx}" cy="#{cy}" r="#{r}"/>}
+  def circle(cx, cy, r, style={})
+    @output << %Q{<circle cx="#{cx}" cy="#{cy}" r="#{r}"}
+    write_style(style)
+    @output << %Q{/>}
   end
  
   # Draw a rectangle or rounded rectangle 
-  def rectangle(x, y, width, height, rx=nil, ry=rx)
+  def rectangle(x, y, width, height, *args)
+    style = (!args.empty? && args.last.is_a?(Hash)) ? args.pop : {}
+    if args.length == 0
+      rx = ry = 0
+    elsif args.length == 1
+      rx = ry = args.pop
+    elsif args.length == 2
+      rx, ry = args
+    else
+      raise "Illegal number of arguments to rectangle"
+    end
+      
     @output << %Q{<rect x="#{x}" y="#{y}" width="#{width}" height="#{height}"}
     @output << %Q{ rx="#{rx}" ry="#{ry}"} if rx && ry
+    write_style(style)
     @output << %Q{/>}
   end
  
   # Draw an circle given a center and two radii
-  def ellipse(cx, cy, rx, ry)
-    @output << %Q{<ellipse cx="#{cx}" cy="#{cy}" rx="#{rx}" ry="#{ry}"/>}
+  def ellipse(cx, cy, rx, ry, style={})
+    @output << %Q{<ellipse cx="#{cx}" cy="#{cy}" rx="#{rx}" ry="#{ry}"}
+    write_style(style)
+    @output << %Q{/>}
   end
   
   def polygon(*args)
@@ -89,6 +107,7 @@ private
   # Draws either a polygon or polyline according to the first parameter
   def polything(name, *args)
     return if args.empty?
+    style = (args.last.is_a?(Hash)) ? args.pop : {}
     coords = args.flatten
     raise "Illegal number of coordinates (should be even)" if coords.length.odd?
     @output << %Q{<#{name} points="}
@@ -98,6 +117,17 @@ private
       @output << "#{x},#{y}"
       @output << " " unless coords.empty?
     end
-    @output << %{"/>}
+    write_style(style)
+    @output << '"/>'
+  end
+  
+  # Writes styles to current output
+  def write_style(style)
+    return if style.nil? || style.empty?
+    @output << ' style="'
+    style.each_pair do |style, value|
+      @output << "#{style}:#{value};"
+    end
+    @output << '"'
   end
 end

data/spec/rasem_spec.rb

@@ -51,6 +51,15 @@ describe Rasem::SVGImage do
     str.should =~ %r{y2="100"}
   end
 
+  it "should draw a line with style" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      line(0, 0, 10, 10, :fill=>"white")
+    end
+    str = img.output
+    str.should =~ %r{style=}
+    str.should =~ %r{fill:white}
+  end
+
   it "should draw a circle" do
     img = Rasem::SVGImage.new("", 100, 100) do
       circle(0, 0, 10)
@@ -61,7 +70,16 @@ describe Rasem::SVGImage do
     str.should =~ %r{cy="0"}
     str.should =~ %r{r="10"}
   end
-  
+
+  it "should draw a circle with style" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      circle(0, 0, 10, :fill=>"white")
+    end
+    str = img.output
+    str.should =~ %r{style=}
+    str.should =~ %r{fill:white}
+  end
+
   it "should draw a rectangle" do
     img = Rasem::SVGImage.new("", 100, 100) do
       rectangle(0, 0, 100, 300)
@@ -72,6 +90,15 @@ describe Rasem::SVGImage do
     str.should =~ %r{height="300"}
   end
 
+  it "should draw a rectangle with style" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      rectangle(0, 0, 10, 10, :fill=>"white")
+    end
+    str = img.output
+    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
       rectangle(0, 0, 100, 300, 20)
@@ -84,6 +111,15 @@ describe Rasem::SVGImage do
     str.should =~ %r{ry="20"}
   end
 
+  it "should draw a symmetric rounded-rectangle with style" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      rectangle(0, 0, 10, 10, 2, :fill=>"white")
+    end
+    str = img.output
+    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
       rectangle(0, 0, 100, 300, 20, 5)
@@ -95,6 +131,15 @@ describe Rasem::SVGImage do
     str.should =~ %r{rx="20"}
     str.should =~ %r{ry="5"}
   end
+
+  it "should draw a non-symmetric rounded-rectangle with style" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      rectangle(0, 0, 10, 10, 2, 4, :fill=>"white")
+    end
+    str = img.output
+    str.should =~ %r{style=}
+    str.should =~ %r{fill:white}
+  end
   
   it "should draw an ellipse" do
     img = Rasem::SVGImage.new("", 100, 100) do
@@ -108,6 +153,15 @@ describe Rasem::SVGImage do
     str.should =~ %r{ry="300"}
   end
 
+  it "should draw an ellipse with style" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      ellipse(0, 0, 3, 10, :fill=>"white")
+    end
+    str = img.output
+    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
       polygon([[0,0], [1,2], [3,4]])
@@ -117,6 +171,15 @@ describe Rasem::SVGImage do
     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
+      polygon([[0,0], [1,2], [3,4]], :fill=>"white")
+    end
+    str = img.output
+    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
       polyline([[0,0], [1,2], [3,4]])

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Ahmed Eldawy
@@ -110,7 +110,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2966740688363327135
+      hash: 3982115988403201538
       segments: 
       - 0
       version: "0"