ruby_svg_light 0.0.1 → 0.0.2

data/examples/shapes.rb

@@ -9,6 +9,7 @@ canvas.circle(40,40,20)
 canvas.rectangle(80,20,40,40)
 canvas.line(20,80,100,0)
 canvas.line(20,105,100,0)
+canvas.ellipse(200, 200, 20, 30)
 
 options = {:font_size=>'12px'}
 canvas.options(options)

data/lib/ruby_svg_light.rb

@@ -1,6 +1,6 @@
 
 module RubySVGLight
-  VERSION = '0.0.1'
+  VERSION = '0.0.2'
 
   class Document
     attr_reader :body
@@ -26,10 +26,10 @@ module RubySVGLight
       text = %{<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 
-<svg 
+<svg
  width="100%"
  height="100%"
- version="1.1" 
+ version="1.1"
  xmlns="http://www.w3.org/2000/svg">
  }
     end
@@ -40,14 +40,14 @@ module RubySVGLight
 
 
 
-    ## Drawing methodds 
+    ## Drawing methodds
     def circle(x=0, y=0, radius=10, opts={})
       local_options = calc_local_options(opts)
       text = %{<circle
-      cx="#{x}" cy="#{y}" 
-      r="#{radius}" 
+      cx="#{x}" cy="#{y}"
+      r="#{radius}"
       stroke="#{local_options[:stroke]}"
-      stroke-width="#{local_options[:stroke_width]}" 
+      stroke-width="#{local_options[:stroke_width]}"
       fill="#{local_options[:fill]}"/>
       }
 
@@ -59,7 +59,7 @@ module RubySVGLight
     def line(x,y,w,h, opts={})
       local_options = calc_local_options(opts)
       text = %{<line
-       x1="#{x}" y1="#{y}" 
+       x1="#{x}" y1="#{y}"
        x2="#{x+w}" y2="#{y+h}"
        stroke="#{local_options[:stroke]}"
        stroke-width="#{local_options[:stroke_width]}"
@@ -85,6 +85,20 @@ module RubySVGLight
       @body << text
     end
 
+    def ellipse(x,y,rx,ry, opts={})
+      local_options = calc_local_options(opts)
+      text = %{<ellipse
+       cx="#{x}" cy="#{y}"
+       rx="#{rx}" ry="#{ry}"
+       fill="#{local_options[:fill]}"
+       stroke="#{local_options[:stroke]}"
+       stroke-width="#{local_options[:stroke_width]}"
+        />
+      }
+      update_size(x+rx, y+ry)
+      @body << text
+    end
+
     def text(x,y, input_text, opts={})
       centre_text = "text-anchor:middle; dominant-baseline:central;"
       local_options = calc_local_options(opts)
@@ -100,11 +114,11 @@ module RubySVGLight
        >#{input_text}
        </text>
 }
-       #{centre_text}"
-       # xml:space="preserve"
-       #Do not know height or width of text only the anchor 
-       update_size(x, y)
-       @body << text
+      #{centre_text}"
+      # xml:space="preserve"
+      #Do not know height or width of text only the anchor
+      update_size(x, y)
+      @body << text
     end
 
     def options(opts={})
@@ -112,7 +126,7 @@ module RubySVGLight
         @options[key] = value
       end
 
-      #return 
+      #return
       @options
     end
 
@@ -135,7 +149,7 @@ module RubySVGLight
 
 
     def components_only_to_s
-      text = ""  
+      text = ""
       @body.each do |section|
         text << section
       end
@@ -146,7 +160,7 @@ module RubySVGLight
 
     # To string includes header and footers
     def to_s
-      text = ""  
+      text = ""
       text << self.header
       @body.each do |section|
         text << section

data/spec/ruby_svg_light_width_spec.rb

@@ -1,12 +1,11 @@
-
-require File.join( '..', 'lib', 'ruby_svg_light')
+require 'spec_helper'
 
 def check_width_height(svg, width, height)
     svg.width.should    == width
     svg.height.should   == height
 end
 
-describe RubySVGLight, "RubySVGLight" do
+describe RubySVGLight do
   it "Check width calculations, objects from origin" do
     canvas = RubySVGLight::Document.new()
     check_width_height(canvas, 0, 0)
@@ -19,6 +18,9 @@ describe RubySVGLight, "RubySVGLight" do
 
     canvas.circle(0,0,100)
     check_width_height(canvas, 100, 100)
+
+    canvas.ellipse(0, 0, 300, 400)
+    check_width_height(canvas, 300, 400)
   end
 
   it "Smaller new component should not shrink size" do
@@ -34,6 +36,9 @@ describe RubySVGLight, "RubySVGLight" do
 
     canvas.rectangle(0,0,10,20)
     check_width_height(canvas, 100, 100)
+
+    canvas.ellipse(0, 0, 10, 20)
+    check_width_height(canvas, 100, 100)
   end
 
   it "Check width calculations, objects not on origin" do
@@ -48,6 +53,9 @@ describe RubySVGLight, "RubySVGLight" do
 
     canvas.circle(10,15,100)
     check_width_height(canvas, 110, 115)
+
+    canvas.ellipse(100, 200, 30, 50)
+    check_width_height(canvas, 130, 250)
   end
 end
 

data/spec/spec_helper.rb

@@ -0,0 +1,4 @@
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
+require 'rspec'
+require 'ruby_svg_light'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby_svg_light
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - Morgan Prior
@@ -35,6 +35,7 @@ files:
 - lib/ruby_svg.rb.original
 - lib/ruby_svg_light.rb
 - spec/ruby_svg_light_width_spec.rb
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://amaras-tech.co.uk/software/RubySVGLight
 licenses: []