rasem 0.2.0 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.3.0

data/lib/rasem/svg_image.rb

@@ -6,6 +6,9 @@ class Rasem::SVGImage
     else
       @output = create_output(nil)
     end
+    
+    # Initialize a stack of default styles
+    @default_styles = []
 
     write_header(*args)
     if block
@@ -76,6 +79,17 @@ class Rasem::SVGImage
     @closed
   end
   
+  def with_style(style={}, &proc)
+    # Merge passed style with current default style
+    updated_style = default_style.update(style)
+    # Push updated style to the stack
+    @default_styles.push(updated_style)
+    # Call the block
+    self.instance_exec(&proc)
+    # Pop style again to revert changes
+    @default_styles.pop
+  end
+  
 private
   # Creates an object for ouput out of an argument
   def create_output(arg)
@@ -121,12 +135,25 @@ private
     @output << '"/>'
   end
   
+  # Return current deafult style
+  def default_style
+    @default_styles.last || {}
+  end
+  
   # Writes styles to current output
+  # Avaialable styles are:
+  # fill: Fill color
+  # stroke-width: stroke width
+  # stroke: stroke color
+  # fill-opacity: fill opacity. ranges from 0 to 1
+  # stroke-opacity: stroke opacity. ranges from 0 to 1
+  # opacity: Opacity for the whole element
   def write_style(style)
-    return if style.nil? || style.empty?
+    style_ = default_style.merge(style)
+    return if style_.empty?
     @output << ' style="'
-    style.each_pair do |style, value|
-      @output << "#{style}:#{value};"
+    style_.each_pair do |style, value|
+      @output << "#{style.to_s.gsub('_','-')}:#{value};"
     end
     @output << '"'
   end

data/spec/rasem_spec.rb

@@ -189,4 +189,75 @@ describe Rasem::SVGImage do
     str.should =~ %r{points="0,0 1,2 3,4"}
   end
 
+  it "should fix style names" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      circle(0, 0, 10, :stroke_width=>3)
+    end
+    str = img.output
+    str.should =~ %r{style=}
+    str.should =~ %r{stroke-width:3}
+  end
+  
+  it "should group styles" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      with_style :stroke_width=>3 do
+        circle(0, 0, 10)
+      end
+    end
+    str = img.output
+    str.should =~ %r{style=}
+    str.should =~ %r{stroke-width:3}
+  end
+
+  it "should group styles nesting" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      with_style :stroke_width=>3 do
+        with_style :fill=>"black" do
+          circle(0, 0, 10)
+        end
+      end
+    end
+    str = img.output
+    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
+      with_style :stroke_width=>3 do
+        with_style :stroke_width=>5 do
+          circle(0, 0, 10)
+        end
+      end
+    end
+    str = img.output
+    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
+      with_style :stroke_width=>3 do
+        with_style :stroke_width=>5 do
+        end
+      end
+      circle(0, 0, 10)
+    end
+    str = img.output
+    str.should_not =~ %r{style=}
+    str.should_not =~ %r{stroke-width:}
+  end
+  
+  it "should create a group" do
+    img = Rasem::SVGImage.new("", 100, 100) do
+      group :stroke_width=>3 do
+        circle(0, 0, 10)
+        circle(20, 20, 10)
+      end
+    end
+    str = img.output
+    str.should =~ %r{<group.*circle.*circle.*</group>}
+  end
+
 end

metadata

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