rasem 0.5.3 → 0.5.6

data/README.rdoc

@@ -1,6 +1,6 @@
 = Rasem
 
-rasem is a ruby gem that allows you to describe your images in ruby code.
+rasem is a pure ruby gem that allows you to describe your SVG images in ruby code.
 
 == Why Rasem
 
@@ -8,6 +8,8 @@ rasem is a ruby gem that allows you to describe your images in ruby code.
 * Do you want to draw a complex image that is easier to describe using a code?
 * Would you like to power your HTML 5 site with nicely drawn SVG images?
 * Do you need to generate nice images from your ruby code?
+* Did you feed up with using DIVs and Javascript to draw simple graphs?
+* Is your server overwhelmed with sending PNG images that can be described in a few bytes using SVG?
 
 Rasem allows you to generate SVG images that can be easily exported to other
 formats and embed in an HTML 5 page.
@@ -17,6 +19,15 @@ formats and embed in an HTML 5 page.
 * Draw basic elements: line, rectangle, rouned rectangle, circle, ellipse, polygon and polyline.
 * Use SVG styles such as stroke-width, opacity and fill.
 * Create SVG groups for better editing in SVG editors.
+Coming features:
+* Include all SVG standard elements such as gradients, filters and paths
+* Create default rake and thor tasks to convert your .rasem files to .svg.
+* Embed other images in your SVG image
+* Output to more formats such as PNG.
+
+Rasem is still in alpha release. Please report your bugs so that we can work on it.
+You are welcome to contribute to the project by adding more features and fixing bugs.
+The end goal of the project is to fully support SVG standard and make it easy to use.
 
 == Installation
   gem install rasem
@@ -75,7 +86,9 @@ Here is a more sophisticated example.
 tictactoe.rasem
   set_width 150
   set_height 150
-  board = [['x','o','x'], ['o', '-', 'o'], ['x', 'o', 'x']]
+  board = [['x', 'o', 'x'],
+           ['o', '-', 'o'],
+           ['x', 'o', 'x']]
   def draw_x(x,y)
     group :stroke=>"red" do
       line x-20, y-20, x+20, y+20
@@ -87,7 +100,6 @@ tictactoe.rasem
     circle x, y, 20, :stroke=>"blue", :fill=>"white"
   end
 
-  # Draw the board
   group :stroke=>"black" do  
     rectangle 0, 0, 150, 150, :stroke_width=>2, :fill=>"white"
     line 50, 0, 50, 150
@@ -132,12 +144,12 @@ to SVGImage.new
     end
   end
 
-The previous example has another advantage of not buffering the whole image to
-memory before writing to file. Rasem is smart enough to detect that the output
-can be passed directly to the file, hence, saving unnecessary memory buffers.
+The previous example has another advantage.
+It does not need to buffer the whole image to memory before writing to file.
+Rasem is smart enough to detect that the output can be passed directly to the
+file, hence, saving unnecessary memory buffers.
 
 == Contributing to rasem
- 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
 * Fork the project

data/VERSION

@@ -1 +1 @@
-0.5.3
+0.5.6

data/lib/rasem/application.rb

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

data/lib/rasem/svg_image.rb

@@ -1,11 +1,20 @@
 class Rasem::SVGImage
-  DefaultStyle = {:stroke=>"black", :fill=>"black"}
+  DefaultStyles = {
+    :text => {:fill=>"black"},
+    :line => {:stroke=>"black"},
+    :rect => {:stroke=>"black"},
+    :circle => {:stroke=>"black"},
+    :ellipse => {:stroke=>"black"},
+    :polygon => {:stroke=>"black"},
+    :polyline => {:stroke=>"black"}
+  }
+    
 
   def initialize(width, height, output=nil, &block)
     @output = create_output(output)
     
     # Initialize a stack of default styles
-    @default_styles = [DefaultStyle]
+    @default_styles = []
 
     write_header(width, height)
     if block
@@ -31,14 +40,14 @@ class Rasem::SVGImage
   end
 
   # Draw a straight line between the two end points
-  def line(x1, y1, x2, y2, style={})
+  def line(x1, y1, x2, y2, style=DefaultStyles[:line])
     @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, style={})
+  def circle(cx, cy, r, style=DefaultStyles[:circle])
     @output << %Q{<circle cx="#{cx}" cy="#{cy}" r="#{r}"}
     write_style(style)
     @output << %Q{/>}
@@ -46,7 +55,7 @@ class Rasem::SVGImage
  
   # Draw a rectangle or rounded rectangle 
   def rectangle(x, y, width, height, *args)
-    style = (!args.empty? && args.last.is_a?(Hash)) ? args.pop : {}
+    style = (!args.empty? && args.last.is_a?(Hash)) ? args.pop : DefaultStyles[:rect]
     if args.length == 0
       rx = ry = 0
     elsif args.length == 1
@@ -64,7 +73,7 @@ class Rasem::SVGImage
   end
  
   # Draw an circle given a center and two radii
-  def ellipse(cx, cy, rx, ry, style={})
+  def ellipse(cx, cy, rx, ry, style=DefaultStyles[:ellipse])
     @output << %Q{<ellipse cx="#{cx}" cy="#{cy}" rx="#{rx}" ry="#{ry}"}
     write_style(style)
     @output << %Q{/>}
@@ -114,6 +123,23 @@ class Rasem::SVGImage
     @output << "</g>"
   end
   
+  def text(x, y, text, style=DefaultStyles[:text])
+    @output << %Q{<text x="#{x}" y="#{y}"}
+    style = fix_style(default_style.merge(style))
+    @output << %Q{ font-family="#{style.delete "font-family"}"} if style["font-family"]
+    @output << %Q{ font-size="#{style.delete "font-size"}"} if style["font-size"]
+    write_style style
+    @output << ">"
+    dy = 0      # First line should not be shifted
+    text.each_line do |line|
+      @output << %Q{<tspan x="#{x}" dy="#{dy}em">}
+      dy = 1    # Next lines should be shifted
+      @output << line.rstrip
+      @output << "</tspan>"
+    end
+    @output << "</text>"
+  end
+  
 private
   # Creates an object for ouput out of an argument
   def create_output(arg)
@@ -145,7 +171,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 : {}
+    style = (args.last.is_a?(Hash)) ? args.pop : DefaultStyles[name.to_sym]
     coords = args.flatten
     raise "Illegal number of coordinates (should be even)" if coords.length.odd?
     @output << %Q{<#{name} points="}
@@ -164,6 +190,16 @@ private
     @default_styles.last || {}
   end
   
+  # Returns a new hash for styles after fixing names to match SVG standard
+  def fix_style(style)
+    new_style = {}
+    style.each_pair do |k, v|
+      new_k = k.to_s.gsub('_', '-')
+      new_style[new_k] = v
+    end
+    new_style
+  end
+  
   # Writes styles to current output
   # Avaialable styles are:
   # fill: Fill color
@@ -173,11 +209,11 @@ private
   # stroke-opacity: stroke opacity. ranges from 0 to 1
   # opacity: Opacity for the whole element
   def write_style(style)
-    style_ = default_style.merge(style)
+    style_ = fix_style(default_style.merge(style))
     return if style_.empty?
     @output << ' style="'
-    style_.each_pair do |style, value|
-      @output << "#{style.to_s.gsub('_','-')}:#{value};"
+    style_.each_pair do |attribute, value|
+      @output << "#{attribute}:#{value};"
     end
     @output << '"'
   end

data/spec/rasem_spec.rb

@@ -270,4 +270,32 @@ describe Rasem::SVGImage do
     str.should =~ %r{height="300"}
   end
 
+  it "should draw text" do
+    img = Rasem::SVGImage.new(100, 100) do
+      text 10, 20, "Hello world!"
+    end
+    str = img.output
+    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 text with font" do
+    img = Rasem::SVGImage.new(100, 100) do
+      text 10, 20, "Hello\nworld!", :font_family=>"Times", "font-size"=>24
+    end
+    str = img.output
+    str.should =~ %r{font-family="Times"}
+    str.should =~ %r{font-size="24"}
+  end
+
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 5
-  - 3
-  version: 0.5.3
+  - 6
+  version: 0.5.6
 platform: ruby
 authors: 
 - Ahmed Eldawy
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-10 00:00:00 -05:00
+date: 2011-04-14 00:00:00 -05:00
 default_executable: rasem
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -112,7 +112,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1518989641663935495
+      hash: 367852017
       segments: 
       - 0
       version: "0"