svgplot 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1362ed73c8432a4d47876d69af1d926045cc8650
-  data.tar.gz: 9de3d7f372a01012cdd48a9b4f5612da0a0be8ad
+  metadata.gz: c34bf4dae7c76286d0c33dcd17be373d8bd786fe
+  data.tar.gz: dc246aa266b423d779bea78b735995cfc0c21cc8
 SHA512:
-  metadata.gz: 4e490f441c1323f48dc42dd7031590285fd88c0353eca35839f1de9637fceeeef5c28ae470227a22bec368d3b2e61dd3b77606652cd29ca9f0765349e58d4a33
-  data.tar.gz: ece9f1a0bf6fc7c539f6777aa62cdc849d76aae33c52f9c150dc00501620a8af177e4c8f448caad925c002986bf59c67845fcaad506e31b2dd60d71fad0dc668
+  metadata.gz: 6164dafb06d5e99a8c8bfd93dc7ce0f2891f9a65375ec466e8fec25011e8581318b5571d77b28199a3f5157067498cb245a08d68511c85827310cbfc15f5c44c
+  data.tar.gz: 05b792cd73ad32864c3a97dd417d7f9b612cf1908189abdc9d557d4099311fbe68fbf3b5373e11a8684746ba12b1ad93841813c28df86de6578e8cb29bb52c18

data/dev/update_spec.rb

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'rubygems'
 require 'nokogiri'
 require 'open-uri'
 require 'pp'

data/lib/svgplot.rb

@@ -14,4 +14,10 @@ end
 require 'svgplot/spec'
 require 'svgplot/application'
 require 'svgplot/meta'
+require 'svgplot/parsers'
+require 'svgplot/transform'
+require 'svgplot/defaults'
+require 'svgplot/tag'
+require 'svgplot/path'
+require 'svgplot/gradient'
 require 'svgplot/plot'

data/lib/svgplot/application.rb

@@ -10,20 +10,19 @@ module SVGPlot
     def run!
       @files.each do |file|
         output = file.sub(/\.svgplot/, '') + '.svg'
-        File.open(output, 'w') do |fh|
-          build file, fh
-        end
+        File.open(output, 'w') { |fh| build file, fh }
       end
     end
 
     private
 
     def build(file, fh)
-      SVGPlot::Plot.new({ width: '100%', height: '100%' }, fh) do
+      SVGPlot.new({ width: '100%', height: '100%' }, fh) do
         begin
           instance_eval File.read(file), file
         rescue StandardError => e
-          backtrace = e.backtrace.grep(Regexp.new(File.expand_path(file)))
+          regexp = Regexp.new(File.expand_path(file))
+          backtrace = e.backtrace.grep regexp
           raise e.class, e.message, backtrace
         end
       end

data/lib/svgplot/defaults.rb

@@ -0,0 +1,17 @@
+module SVGPlot
+  ##
+  # Adds default attributes helpers for Tags
+  module Defaults
+    attr_writer :defaults
+
+    def defaults
+      @defaults ||= {}
+    end
+
+    def with(defaults, &block)
+      @defaults = defaults
+      instance_exec(&block)
+      @defaults = {}
+    end
+  end
+end

data/lib/svgplot/gradient.rb

@@ -0,0 +1,35 @@
+module SVGPlot
+  ##
+  # SVG base gradient element, with ruby methods to describe the gradient
+  class Gradient < ChildTag
+    def fill
+      "url(##{@attributes[:id]})"
+    end
+
+    def stop(offset, color, opacity)
+      append_child(ChildTag.new(
+        @img,
+        'stop',
+        'offset' => offset,
+        'stop-color' => color,
+        'stop-opacity' => opacity
+      ))
+    end
+  end
+
+  ##
+  # linear gradient element
+  class LinearGradient < Gradient
+    def initialize(img, attributes = {}, &block)
+      super(img, 'linearGradient', attributes, &block)
+    end
+  end
+
+  ##
+  # radial gradient element
+  class RadialGradient < Gradient
+    def initialize(img, attributes = {}, &block)
+      super(img, 'radialGradient', attributes, &block)
+    end
+  end
+end

data/lib/svgplot/meta.rb

@@ -1,52 +1,59 @@
-SVGPlot::SVG_ALIAS = {
-  group: :g,
-  rectangle: :rect
-}
+##
+# Define additional spec pieces outside the generated data
+module SVGPlot
+  ##
+  # Aliases for common tags
+  SVG_ALIAS = {
+    group: :g,
+    rectangle: :rect
+  }
 
-SVGPlot::SVG_EXPANSION = {
-  line: [:x1, :y1, :x2, :y2],
-  circle: [:cx, :cy, :r],
-  image: [:x, :y, :width, :height, :'xlink:href'],
-  ellipse: [:cx, :cy, :rx, :ry],
-  text: [:x, :y],
-  rect: lambda do |args|
-    unless [4, 5, 6].include? args.size
-      fail ArgumentError 'Wrong unnamed argument count'
-    end
-    result = {
-      x: args[0],
-      y: args[1],
-      width: args[2],
-      height: args[3]
-    }
-    if args.size > 4
-      result[:rx] = args[4]
-      result[:ry] = (args[5] || args[4])
-    end
-    result
-  end,
-  polygon: lambda do |args|
-    args.flatten!
-    if args.length.odd?
-      fail ArgumentError 'Illegal number of coordinates (should be even)'
-    end
-    { points: args }
-  end,
-  polyline: lambda do |args|
-    args.flatten!
+  ##
+  # Generic lambda for adding points, used below
+  POINT_LAMBDA = lambda do |args|
     if args.length.odd?
       fail ArgumentError 'Illegal number of coordinates (should be even)'
     end
-    { points: args }
+    { points: args.each_slice(2).map { |x| x.join(',') }.join(' ') }
   end
-}
 
-# TODO: move to documentation?
-SVGPlot::SVG_TRANSFORM = [
-  :matrix,    # expects an array of 6 elements
-  :translate, # [tx, ty?]
-  :scale,     # [sx, sy?]
-  :rotate,    # [angle, (cx, cy)?]
-  :skewX,     # angle
-  :skewY      # angle
-]
+  ##
+  # Expansion definitions for unnamed args
+  SVG_EXPANSION = {
+    line: [:x1, :y1, :x2, :y2],
+    circle: [:cx, :cy, :r],
+    image: [:x, :y, :width, :height, :'xlink:href'],
+    ellipse: [:cx, :cy, :rx, :ry],
+    text: [:x, :y],
+    rect: lambda do |args|
+      unless [4, 5, 6].include? args.size
+        fail ArgumentError 'Wrong unnamed argument count'
+      end
+      result = Hash[[:x, :y, :width, :height].zip(args)]
+      if args.size > 4
+        result[:rx] = args[4]
+        result[:ry] = args[5] || args[4]
+      end
+      result
+    end,
+    polygon: POINT_LAMBDA,
+    polyline: POINT_LAMBDA
+  }
+
+  ##
+  # Define processing for Expansion constants
+  module Expansion
+    def expand(tag, args)
+      expansion = SVG_EXPANSION[tag.to_sym]
+      fail("Unnamed parameters for #{tag} are not allowed!") unless expansion
+
+      if expansion.is_a? Array
+        parse_args(tag, expansion, args)
+      elsif expansion.is_a? Proc
+        expansion.call(args)
+      else
+        fail "Unexpected expansion mechanism: #{expansion.class}"
+      end
+    end
+  end
+end

data/lib/svgplot/parsers.rb

@@ -0,0 +1,80 @@
+module SVGPlot
+  module Parsers
+    ##
+    # Add parsing methods for various attributes
+    module Tag
+      private
+
+      def parse_tag(tag)
+        return tag.to_sym if SVGPlot::SVG_ELEMENTS.include?(tag.to_sym)
+        fail "#{tag} is not a valid tag"
+      end
+
+      def parse_args(tag, keys, values)
+        if keys.size != values.size
+          fail("Arg mismatch for #{tag}: got #{values.size}, not #{keys.size}")
+        end
+        Hash[keys.zip(values)]
+      end
+
+      def valid_attribute?(attribute)
+        allowed = SVGPlot::SVG_STRUCTURE[@tag.to_sym][:attributes]
+        return true if allowed.include?(attribute.to_sym)
+        false
+      end
+
+      def validate_attribute(attribute)
+        return attribute.to_sym if valid_attribute? attribute
+        fail "#{@tag} does not support attribute #{attribute}"
+      end
+
+      def parse_attributes(raw)
+        clean = {
+          transform: parse_transforms(raw.delete(:transform)),
+          style: parse_styles(raw.delete(:style))
+        }
+        raw.delete(:data) { Hash.new }.each do |key, value|
+          clean["data-#{key}".to_sym] = value
+        end
+        raw.each_key { |k| validate_attribute k }
+        clean.reject { |_, v| v.nil? }.merge raw
+      end
+
+      def parse_transforms(transforms)
+        return nil unless transforms && valid_attribute?(:transform)
+        transforms.each_with_object('') do |(attr, value), str|
+          str << "#{attr}(#{value.is_a?(Array) ? value.join(',') : value }) "
+        end
+      end
+
+      def parse_styles(styles)
+        return nil unless styles && valid_attribute?(:style)
+        styles.each_with_object('') { |(k, v), str| str << "#{k}:#{v};" }
+      end
+
+      def parse_method_name(method)
+        check = /^(?<name>.*)(?<op>=|\?)$/.match(method)
+        return check if check && valid_attribute?(check[:name])
+      end
+
+      def parse_method_op(op, attr, args, &block)
+        fail('Invalid attribute name') unless valid_attribute? attr
+        fail('Passing a block to setter or getter is not permitted') if block
+        return @attributes[attr] if op == '?'
+        return @attributes[attr] = args.first if args.size == 1
+        fail('Setting an attribute with multiple values is not permitted!')
+      end
+
+      def parse_child_name(name)
+        name = SVG_ALIAS[name.to_sym] if SVG_ALIAS[name.to_sym]
+
+        if SVG_STRUCTURE[@tag.to_sym][:elements].include?(name.to_sym)
+          return name.to_sym
+        elsif SVG_ELEMENTS.include?(name.to_sym)
+          fail "#{@tag} should not contain child #{name}"
+        end
+        nil
+      end
+    end
+  end
+end

data/lib/svgplot/path.rb

@@ -0,0 +1,132 @@
+# rubocop:disable Metrics/ParameterLists
+module SVGPlot
+  # SVG Path element, with ruby methods to describe the path
+  class Path < ChildTag
+    def initialize(img, attributes = {})
+      attributes[:d] ||= ''
+      super(img, 'path', attributes)
+    end
+
+    ##
+    # Moves pen to specified point x,y without drawing.
+    def move_to(x, y)
+      add_d("m#{x},#{y}")
+    end
+
+    def move_to_a(x, y)
+      add_d("M#{x},#{y}")
+    end
+
+    ##
+    # Draws a line from current pen location to specified point x,y.
+    def line_to(x, y)
+      add_d("l#{x},#{y}")
+    end
+
+    def line_to_a(x, y)
+      add_d("L#{x},#{y}")
+    end
+
+    ##
+    # Draws a horizontal line to the point defined by x.
+    def hline_to(x)
+      add_d("h#{x}")
+    end
+
+    def hline_to_a(x)
+      add_d("H#{x}")
+    end
+
+    ##
+    # Draws a vertical line to the point defined by y.
+    def vline_to(y)
+      add_d("v#{y}")
+    end
+
+    def vline_to_a(y)
+      add_d("V#{y}")
+    end
+
+    ##
+    # Draws a cubic Bezier curve from current pen point to dx,dy.
+    # x1,y1 and x2,y2 are start and end control points of the curve,
+    # controlling how it bends.
+    def curve_to(dx, dy, x1, y1, x2, y2)
+      add_d("c#{x1},#{y1} #{x2},#{y2} #{dx},#{dy}")
+    end
+
+    def curve_to_a(dx, dy, x1, y1, x2, y2)
+      add_d("C#{x1},#{y1} #{x2},#{y2} #{dx},#{dy}")
+    end
+
+    ##
+    # Draws a cubic Bezier curve from current pen point to dx,dy. x2,y2 is the
+    # end control point. The start control point is is assumed to be the same
+    # as the end control point of the previous curve.
+    def scurve_to(dx, dy, x2, y2)
+      add_d("s#{x2},#{y2} #{dx},#{dy}")
+    end
+
+    def scurve_to_a(dx, dy, x2, y2)
+      add_d("S#{x2},#{y2} #{dx},#{dy}")
+    end
+
+    ##
+    # Draws a quadratic Bezier curve from current pen point to dx,dy. x1,y1 is
+    # the control point controlling how the curve bends.
+    def qcurve_to(dx, dy, x1, y1)
+      add_d("q#{x1},#{y1} #{dx},#{dy}")
+    end
+
+    def qcurve_to_a(dx, dy, x1, y1)
+      add_d("Q#{x1},#{y1} #{dx},#{dy}")
+    end
+
+    ##
+    # Draws a quadratic Bezier curve from current pen point to dx,dy. The
+    # control point is assumed to be the same as the last control point used.
+    def sqcurve_to(dx, dy)
+      add_d("t#{dx},#{dy}")
+    end
+
+    def sqcurve_to_a(dx, dy)
+      add_d("T#{dx},#{dy}")
+    end
+
+    ##
+    # Draws an elliptical arc from the current point to the point x,y. rx and ry
+    # are the elliptical radius in x and y direction.
+    # The x-rotation determines how much the arc is to be rotated around the
+    # x-axis. It only has an effect when rx and ry have different values.
+    # The large-arc-flag doesn't seem to be used (can be either 0 or 1). Neither
+    # value (0 or 1) changes the arc.
+    # The sweep-flag determines the direction to draw the arc in.
+    def arc_to(dx, dy, rx, ry, axis_rot, large_arc_flag, sweep_flag)
+      add_d(
+        "a#{rx},#{ry} #{axis_rot} #{large_arc_flag},#{sweep_flag} #{dx},#{dy}"
+      )
+    end
+
+    def arc_to_a(dx, dy, rx, ry, axis_rot, large_arc_flag, sweep_flag)
+      add_d(
+        "A#{rx},#{ry} #{axis_rot} #{large_arc_flag},#{sweep_flag} #{dx},#{dy}"
+      )
+    end
+
+    ##
+    # close path command
+    #
+    # Closes the path by drawing a line from current point to first point.
+    #
+    ##
+    def close
+      add_d('Z')
+    end
+
+    private
+
+    def add_d(op)
+      @attributes[:d] << " #{op}"
+    end
+  end
+end

data/lib/svgplot/plot.rb

@@ -1,636 +1,66 @@
-# rubocop:disable all
 module SVGPlot
-  class SVGTag
-    attr_reader :tag, :attributes, :children
-
-    def initialize(tag, attributes={}, &block)
-      @tag = validate_tag(tag)
-      @attributes = validate_attributes(attributes)
-      @children = []
-
-      if block
-        instance_exec &block
-      end
-    end
-
-    ##
-    # Provide methods for SVG transformations
-    ##
-
-    def translate(tx, ty = 0)
-      add_transform(:translate, "#{tx}, #{ty}")
-      self
-    end
-
-    def scale(sx, sy = 1)
-      add_transform(:scale, "#{sx}, #{sy}")
-      self
-    end
-
-    def rotate(angle, cx = nil, cy = nil)
-      add_transform(:rotate, "#{angle}#{(cx.nil? or cy.nil?) ? "" : ", #{cx}, #{cy}"}")
-      self
-    end
-
-    def skewX(angle)
-      add_transform(:skewX, "#{angle}")
-      self
-    end
-
-    def skewY(angle)
-      add_transform(:skewY, "#{angle}")
-      self
-    end
-
-    def matrix(a, b, c, d, e, f)
-      add_transform(:matrix, "#{a}, #{b}, #{c}, #{d}, #{e}, #{f}")
-      self
-    end
-
-    def validate_tag(tag)
-      raise "#{tag} is not a valid tag" unless SVGPlot::SVG_ELEMENTS.include?(tag.to_sym)
-      tag.to_sym
-    end
-
-    def validate_attributes(attributes)
-      clean_attributes = {}
-
-      transforms = {}
-      attributes.delete(:transform) { Hash.new }.each do |key, value|
-        transforms[key] = value
-      end
-      unless transforms.empty?
-        str = ""
-        write_transforms(transforms, str)
-        clean_attributes[validate_attribute(:transform)] = str
-      end
-
-      styles = {}
-      attributes.delete(:style) { Hash.new }.each { |k, v| styles[k] = v }
-      unless styles.empty?
-        clean_attributes[validate_attribute(:style)] = styles
-      end
-
-      attributes.delete(:data) { Hash.new }.each do |key, value|
-        clean_attributes["data-#{key.to_s}".to_sym] = value
-      end
-
-      attributes.each do |key, value|
-        clean_attributes[validate_attribute(key)] = value
-      end
-
-      clean_attributes
-    end
-
-    def validate_attribute(attribute)
-      raise "#{@tag} does not support attribute #{attribute}" unless SVGPlot::SVG_STRUCTURE[@tag.to_sym][:attributes].include?(attribute.to_sym)
-      attribute.to_sym
-    end
-
-    def write_styles(styles, output)
-      styles.each do |attribute, value|
-        attribute = attribute.to_s
-        attribute.gsub!('_','-')
-        output << "#{attribute}:#{value};"
-      end
-    end
-
-    def write_transforms(transforms, output)
-      transforms.each do |attribute, value|
-        value = [value] unless value.is_a?(Array)
-        output << "#{attribute.to_s}(#{value.join(',')}) "
-      end
-    end
-
-    def write_points(points, output)
-      points.each_with_index do |value, index|
-        output << value.to_s
-        output << ',' if index.even?
-        output << ' ' if (index.odd? and (index != points.size-1))
-      end
-    end
-
-    #special case for raw blocks.
-    def raw(data)
-      append_child SVGPlot::SVGRaw.new(@img, data)
-    end
-
-    #special case for path block
-    def path(attributes = {}, &block)
-      append_child SVGPlot::SVGPath.new(@img, attributes, &block)
-    end
-
-    #special case for use block
-    def use(id, attributes = {})
-      id = id.attributes[:id] if id.is_a? SVGPlot::SVGTag
-      append_child SVGPlot::SVGTagWithParent.new(@img, "use", attributes.merge("xlink:href" => "##{id}"))
-    end
-
-
-    #special case for linearGradient
-    def linearGradient(id, attributes={}, if_exists = :skip, &block)
-      raise "image reference isn't set, cannot use 'defs' (and thus linearGradient) !" if @img.nil?
-      @img.add_def(id, SVGPlot::SVGLinearGradient.new(@img, attributes), if_exists, &block)
-    end
-
-    
-    #special case for radialGradient
-    def radialGradient(id, attributes={}, if_exists = :skip, &block)
-      raise "image reference isn't set, cannot use 'defs' (and thus radialGradient) !" if @img.nil?
-      @img.add_def(id, SVGPlot::SVGRadialGradient.new(@img, attributes), if_exists, &block)
-    end
-
-
-
-
-    def spawn_child(tag, *args, &block)
-      #expected args: nil, [hash], [...]
-      parameters = {} if args.size == 0
-
-      unless parameters #are empty
-        parameters = args[0] if args[0].is_a? Hash
-      end
-
-      unless parameters #are set
-        #try to find args expansion rule
-        expansion = SVGPlot::SVG_EXPANSION[tag.to_sym]
-        raise "Unnamed parameters for #{tag} are not allowed!" unless expansion
-      
-        if expansion.is_a? Array
-          raise "Bad unnamed parameter count for #{tag}, expecting #{expansion.size} got #{if args.last.is_a? Hash then args.size-1 else args.size end}" unless (args.size == expansion.size and not args.last.is_a? Hash) or (args.size - 1 == expansion.size and args.last.is_a? Hash)
-          parameters = Hash[expansion.zip(args)]
-          if args.last.is_a? Hash
-            parameters.merge! args.last
-          end
-        elsif expansion.is_a? Proc
-          hash = args.pop if args.last.is_a? Hash
-          parameters = expansion.call(args)
-          parameters.merge! hash if hash
-        else
-          raise "Unexpected expansion mechanism: #{expansion.class}"
-        end
-      end
-
-      # add default parameters if they are not overwritten
-      merge_defaults().each do |key, value|
-        parameters[key] = value unless parameters[key]
-      end if @defaults
-
-      append_child(SVGPlot::SVGTagWithParent.new(@img, tag, parameters, &block))
-    end
-
-
-    def append_child(child)
-      @children.push(child)
-      child.push_defaults(merge_defaults()) if @defaults
-      child
-    end
-
-
-    def merge_defaults()
-      result = {}
-      return result if @defaults.empty?
-      @defaults.each { |d| result.merge!(d) }
-      result
-    end
-
-    
-    def push_defaults(defaults)
-      @defaults = [] unless @defaults
-      @defaults.push(defaults)
-    end
-
-    
-    def pop_defaults()
-      @defaults.pop()
-    end
-
-    
-    def with_style(style={}, &proc)
-      push_defaults(style)
-      # Call the block
-      self.instance_exec(&proc)
-      # Pop style again to revert changes
-      pop_defaults()
-    end
-
-    
-    def validate_child_name(name)
-      #aliases the name (like, group instead of g)
-      name = SVGPlot::SVG_ALIAS[name.to_sym] if SVGPlot::SVG_ALIAS[name.to_sym]
-
-      #raises only if given name is an actual svg tag. In other case -- assumes user just mistyped.
-      if SVGPlot::SVG_STRUCTURE[@tag.to_sym][:elements].include?(name.to_sym)
-        name.to_sym
-      elsif SVGPlot::SVG_ELEMENTS.include?(name.to_sym)
-        raise "#{@tag} should not contain child #{name}" 
-      end
-    end
-
-
-    def method_missing(meth, *args, &block)
-      #if method is a setter or a getter, check valid attributes:
-      check = /^(?<name>.*)(?<op>=|\?)$/.match(meth)
-      if check
-        raise "Passing a code block to setter or getter is not permited!" if block
-        name = validate_attribute(check[:name].to_sym)
-        if check[:op] == '?'
-          @attributes[name]
-        elsif check[:op] == '='
-          raise "Setting an attribute with multiple values is not permited!" if args.size > 1
-          @attributes[name] = args[0]
-        end
-      elsif child = validate_child_name(meth)
-        spawn_child(child, *args, &block)
-      else
-        super
-      end
-    end
-    
-
-    def write(output)
-      raise "Can not write to given output!" unless output.respond_to?(:<<)
-      output << "<#{@tag.to_s}"
-      @attributes.each do
-        |attribute, value|
-        output << " #{attribute.to_s}=\""
-        if attribute == :style
-          write_styles(value, output)
-        elsif attribute == :points
-          write_points(value, output)
-        else
-          output << "#{value.to_s}"
-        end
-        output << "\""
-      end
-
-      if @children.empty?
-        output << "/>"
-      else
-        output << ">"
-        @children.each { |c| c.write(output) }
-        output << "</#{@tag.to_s}>"
-      end  
-    end
-
-    def to_s
-      str = ""
-      write(str)
-      return str
-    end
-
-
-  private
-
-    def add_transform(type, params)
-      attr_name = validate_attribute(:transform)
-      @attributes[attr_name] = "" if @attributes[attr_name].nil?
-      @attributes[attr_name] = @attributes[attr_name] + "#{type}(#{params})"
-    end
-
-  end
-end
-
-
-#Extension of SVGTag to provide a reference to the parent img (used for defs)
-module SVGPlot
-  class SVGTagWithParent < SVGPlot::SVGTag
-    attr_reader :img
-
-    def initialize(img, tag, params = {}, output=nil, &block)
-      @img = img
-      super(tag, params, &block)
-    end
-  end
-end
-
-
-
-#inherit from tag for basic functionality, control raw data using the write method
-module SVGPlot
-  class SVGRaw < SVGPlot::SVGTagWithParent
-
-    def initialize(img, data)
-      @img = img
-      @data = data
-    end
-
-    def write(output)
-      output << @data.to_s
-    end
-  end
-end
-
-
-
-module SVGPlot
-  class Plot < SVGPlot::SVGTagWithParent
-    def initialize(params = {}, output=nil, &block)
-      @defs = nil
-      @defs_ids = {}
-
-      params[:"version"] = "1.1" unless params[:"version"]
-      params[:"xmlns"] = "http://www.w3.org/2000/svg" unless params[:"xmlns"]
-      params[:"xmlns:xlink"] = "http://www.w3.org/1999/xlink" unless params[:"xmlns:xlink"]
-      super(self, "svg", params, &block)
-
-      @output = (output or "")
-      validate_output(@output) if output
+  ##
+  # Main Plot object
+  class Plot < ChildTag
+    DEFAULTS = {
+      version: 1.1,
+      xmlns: 'http://www.w3.org/2000/svg',
+      :'xmlns:xlink' => 'http://www.w3.org/1999/xlink'
+    }
 
-      if block
-        write(@output)
-      end
+    def initialize(params = {}, output = nil, &block)
+      params = DEFAULTS.dup.merge params
+      super(self, 'svg', params, &block)
+      @output = output || ''
+      write(@output) if block
     end
 
     def add_def(id, child, if_exists = :skip, &block)
-      #init on the fly if needed
-      @defs = SVGPlot::SVGTagWithParent.new(@img, "defs") if @defs.nil?
-
-      #raise an error if id is already present and if_exists is :fail
-      raise "Definition '#{id}' already exists" if @defs_ids.has_key? id and if_exists == :fail
+      @defs ||= ChildTag.new(@img, 'defs')
+      old_id = check_conflicts(id, if_exists) if @defs_ids.key? id
+      return old_id if old_id
 
-      #return the existing element if id is already present and if_exists is :skip
-      return @defs_ids[id] if if_exists == :skip and @defs_ids.has_key? id
-
-      #search for the existing element
-      if @defs_ids[id]
-        old_idx = nil
-        @defs.children.each_with_index { |c,i| if c.attributes[:id] == id then old_idx = i ; break end }
-      end
-
-      #force the id, append the child to definitions and call the given block to fill the group
       child.attributes[:id] = id
       @defs.append_child child
       @defs_ids[id] = child
-      child.instance_exec block
-
-      #remove the old element if present
-      @defs.children.delete_at old_idx if old_idx
+      child.instance_exec block if block
 
-      return child
+      child
     end
 
     def def_group(id, if_exists = :skip, &block)
-      g = SVGPlot::SVGTagWithParent.new(@img, "g", :id => id)
-      return add_def(id, g, if_exists, &block)
+      g = SVGPlot::SVGTagWithParent.new(@img, 'g', id: id)
+      add_def(id, g, if_exists, &block)
     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
-
-
     def write(output)
-      validate_output(output)
-      write_header(output)
-
+      fail("Illegal output: #{@output.inspect}") unless @output.respond_to? :<<
+      output << header
       @children.unshift @defs if @defs
       super(output)
       @children.shift if @defs
     end
 
-
-    # how to define output << image ?
-    #def <<(output)
-    #  write(output)
-    #end
-
     private
 
-    def validate_output(output)
-      raise "Illegal output object: #{output.inspect}" unless output.respond_to?(:<<)
+    def check_conflicts(id, if_exists)
+      case if_exists
+      when :fail
+        fail("Definition '#{id}' already exists")
+      when :skip
+        return @defs_ids[id]
+      else
+        @defs.children.reject! { |x| x.attributes[:id] == id }
+        nil
+      end
     end
 
-    # Writes file header
-    def write_header(output)
-      output << <<-HEADER
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-      HEADER
+    def header
+      [
+        %(<?xml version="1.0" standalone="no"?>\n),
+        %(<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" ),
+        %("http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">)
+      ].join
     end
   end
 end
-
-#SVG Path element, with ruby methods to describe the path
-class SVGPlot::SVGPath < SVGPlot::SVGTagWithParent
-  def initialize(img = nil, attributes={}, &block)
-    attributes.merge!(:d => "") unless attributes.has_key? :d
-    super(img, "path", attributes)
-  end
-
-  ##
-  # moveTo commands
-  #
-  # Moves pen to specified point x,y without drawing.
-  #
-  ##
-  def moveTo(x, y)
-    add_d("m#{x},#{y}")
-  end
-
-
-  def moveToA(x, y)
-    add_d("M#{x},#{y}")
-  end
-
-
-  ##
-  # lineTo commands
-  #
-  # Draws a line from current pen location to specified point x,y.
-  #
-  ##
-  def lineTo(x, y)
-    add_d("l#{x},#{y}")
-  end
-
-
-  def lineToA(x, y)
-    add_d("L#{x},#{y}")
-  end
-
-
-  ##
-  # horizontal lineTo commands
-  #
-  # Draws a horizontal line to the point defined by x.
-  #
-  ##
-  def hlineTo(x)
-    add_d("h#{x}")
-  end
-
-
-  def hlineToA(x)
-    add_d("H#{x}")
-  end
-
-
-  ##
-  # vertical lineTo commands
-  #
-  # Draws a vertical line to the point defined by y.
-  #
-  ##
-  def vlineTo(y)
-    add_d("v#{y}")
-  end
-
-
-  def vlineToA(y)
-    add_d("V#{y}")
-  end
-
-
-  ##
-  # curveTo commands
-  #
-  # Draws a cubic Bezier curve from current pen point to dx,dy. x1,y1 and x2,y2
-  # are start and end control points of the curve, controlling how it bends.
-  #
-  ##
-  def curveTo(dx, dy, x1, y1, x2, y2)
-    add_d("c#{x1},#{y1} #{x2},#{y2} #{dx},#{dy}")
-  end
-
-
-  def curveToA(dx, dy, x1, y1, x2, y2)
-    add_d("C#{x1},#{y1} #{x2},#{y2} #{dx},#{dy}")
-  end
-
-
-  ##
-  # smooth curveTo commands
-  #
-  # Draws a cubic Bezier curve from current pen point to dx,dy. x2,y2 is the
-  # end control point. The start control point is is assumed to be the same
-  # as the end control point of the previous curve.
-  #
-  ##
-  def scurveTo(dx, dy, x2, y2)
-    add_d("s#{x2},#{y2} #{dx},#{dy}")
-  end
-
-
-  def scurveToA(dx, dy, x2, y2)
-    add_d("S#{x2},#{y2} #{dx},#{dy}")
-  end
-
-
-  ##
-  # quadratic Bezier curveTo commands
-  # 
-  # Draws a quadratic Bezier curve from current pen point to dx,dy. x1,y1 is the
-  # control point controlling how the curve bends.
-  #
-  ##
-  def qcurveTo(dx, dy, x1, y1)
-    add_d("q#{x1},#{y1} #{dx},#{dy}")
-  end
-
-
-  def qcurveToA(dx, dy, x1, y1)
-    add_d("Q#{x1},#{y1} #{dx},#{dy}")
-  end
-
-
-  ##
-  # smooth quadratic Bezier curveTo commands
-  #
-  # Draws a quadratic Bezier curve from current pen point to dx,dy. The control
-  # point is assumed to be the same as the last control point used.
-  #
-  ##
-  def sqcurveTo(dx, dy)
-    add_d("t#{dx},#{dy}")
-  end
-
-
-  def sqcurveToA(dx, dy)
-    add_d("T#{dx},#{dy}")
-  end
-
-
-  ##
-  # elliptical arc commands
-  #
-  # Draws an elliptical arc from the current point to the point x,y. rx and ry
-  # are the elliptical radius in x and y direction.
-  # The x-rotation determines how much the arc is to be rotated around the
-  # x-axis. It only seems to have an effect when rx and ry have different values.
-  # The large-arc-flag doesn't seem to be used (can be either 0 or 1). Neither
-  # value (0 or 1) changes the arc. 
-  # The sweep-flag determines the direction to draw the arc in.
-  #
-  ##
-  def arcTo(dx, dy, rx, ry, axis_rotation, large_arc_flag, sweep_flag)
-    add_d("a#{rx},#{ry} #{axis_rotation} #{large_arc_flag},#{sweep_flag} #{dx},#{dy}")
-  end
-
-
-  def arcToA(dx, dy, rx, ry, axis_rotation, large_arc_flag, sweep_flag)
-    add_d("A#{rx},#{ry} #{axis_rotation} #{large_arc_flag},#{sweep_flag} #{dx},#{dy}")
-  end
-
-
-  ##
-  # close path command
-  #
-  # Closes the path by drawing a line from current point to first point.
-  #
-  ##
-  def close
-    add_d("Z")
-  end
-
-
-  private 
-  def add_d(op)
-    @attributes[:d] = @attributes[:d] + " " + op
-  end
-end
-
-#SVG base gradient element, with ruby methods to describe the gradient
-class SVGPlot::SVGGradient < SVGPlot::SVGTagWithParent
-
-  def fill
-    "url(##{@attributes[:id]})"
-  end
-
-
-  def stop(offset, color, opacity)
-    append_child(SVGPlot::SVGTag.new("stop", "offset" => offset, "stop-color" => color, "stop-opacity" => opacity))
-  end
-
-end
-
-#SVG linear gradient element
-class SVGPlot::SVGLinearGradient < SVGPlot::SVGGradient
-
-  def initialize(img, attributes={}, &block)
-    super(img, "linearGradient", attributes, &block)
-  end
-
-end
-
-#SVG radial gradient element
-class SVGPlot::SVGRadialGradient < SVGPlot::SVGGradient
-
-  def initialize(img, attributes={}, &block)
-    super(img, "radialGradient", attributes, &block)
-  end
-
-end

data/lib/svgplot/tag.rb

@@ -0,0 +1,117 @@
+module SVGPlot
+  ##
+  # Tag object, represents a single SVG tag
+  class Tag
+    include Parsers::Tag
+    include Transform
+    include Defaults
+    include Expansion
+
+    attr_reader :tag, :attributes, :children
+
+    def initialize(tag, attributes = {}, &block)
+      @tag = parse_tag tag
+      @attributes = parse_attributes attributes
+      @children = []
+
+      instance_exec(&block) if block
+    end
+
+    def raw(data)
+      append_child Raw.new(@img, data)
+    end
+
+    def path(attributes = {}, &block)
+      append_child Path.new(@img, attributes, &block)
+    end
+
+    def use(id, attributes = {})
+      id = id.attributes[:id] if id.is_a? Tag
+      attributes.merge!('xlink:href' => "##{id}")
+      append_child ChildTag.new(@img, 'use', attributes)
+    end
+
+    def append_child(child)
+      @children.push(child)
+      child.defaults = defaults
+      child
+    end
+
+    def to_s
+      str = ''
+      write(str)
+      str
+    end
+
+    def write(output)
+      output << "<#{@tag}"
+      @attributes.each { |attr, value| output << %( #{attr}="#{value}") }
+      if @children.empty?
+        output << '/>'
+      else
+        output << '>'
+        @children.each { |c| c.write(output) }
+        output << "</#{@tag}>"
+      end
+    end
+
+    def spawn_child(tag, *args, &block)
+      parameters = args.first.is_a?(Hash) ? args.unshift : {}
+      if parameters.empty?
+        parameters = args.last.is_a?(Hash) ? args.pop : {}
+        parameters.merge! expand(tag, args)
+      end
+      parameters = defaults.dup.merge! parameters
+
+      append_child ChildTag.new(@img, tag, parameters, &block)
+    end
+
+    def respond_to?(method)
+      return true if parse_method_name(method) || parse_child_name(meth)
+      super
+    end
+
+    def method_missing(method, *args, &block)
+      check = parse_method_name(method)
+      if check
+        return parse_method_op(check[:op], check[:name], args, &block)
+      else
+        child_name = parse_child_name(method)
+        return spawn_child(child_name, *args, &block) if child_name
+      end
+      super
+    end
+  end
+
+  ##
+  # Child tag, used for tags within another tag
+  class ChildTag < Tag
+    attr_reader :img
+
+    def initialize(img, tag, params = {}, &block)
+      @img = img
+      super(tag, params, &block)
+    end
+
+    def linear_gradient(id, attributes = {}, if_exists = :skip, &block)
+      @img.add_def(id, LinearGradient.new(@img, attributes), if_exists, &block)
+    end
+
+    def radial_gradient(id, attributes = {}, if_exists = :skip, &block)
+      @img.add_def(id, RadialGradient.new(@img, attributes), if_exists, &block)
+    end
+  end
+
+  ##
+  # Raw child, just prints data provided
+  class Raw < ChildTag
+    def initialize(img, data)
+      @img = img
+      @data = data
+    end
+
+    def write(output)
+      output << @data.to_s
+    end
+  end
+end

data/lib/svgplot/transform.rb

@@ -0,0 +1,45 @@
+module SVGPlot
+  ##
+  # Provide methods for SVG transformations
+  module Transform
+    def translate(tx, ty = 0)
+      add_transform(:translate, "#{tx}, #{ty}")
+      self
+    end
+
+    def scale(sx, sy = 1)
+      add_transform(:scale, "#{sx}, #{sy}")
+      self
+    end
+
+    def rotate(angle, cx = nil, cy = nil)
+      string = [cx, cy].any?(&:nil?) ?  "#{angle}" : "#{angle}, #{cx}, #{cy}"
+      add_transform(:rotate, string)
+      self
+    end
+
+    def skew_x(angle)
+      add_transform(:skewX, "#{angle}")
+      self
+    end
+
+    def skew_y(angle)
+      add_transform(:skewY, "#{angle}")
+      self
+    end
+
+    def matrix(*args)
+      fail('matrix takes 6 args') unless args.size == 6
+      add_transform(:matrix, args.join(', '))
+      self
+    end
+
+    private
+
+    def add_transform(type, params)
+      validate_attribute(:transform)
+      @attributes[:transform] ||= ''
+      @attributes[:transform] << "#{type}(#{params})"
+    end
+  end
+end

data/svgplot.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'svgplot'
-  s.version     = '0.1.1'
+  s.version     = '0.2.0'
   s.date        = Time.now.strftime("%Y-%m-%d")
 
   s.summary     = 'SVG Generation Library'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: svgplot
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Les Aker
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-05 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
@@ -116,9 +116,15 @@ files:
 - dev/update_spec.rb
 - lib/svgplot.rb
 - lib/svgplot/application.rb
+- lib/svgplot/defaults.rb
+- lib/svgplot/gradient.rb
 - lib/svgplot/meta.rb
+- lib/svgplot/parsers.rb
+- lib/svgplot/path.rb
 - lib/svgplot/plot.rb
 - lib/svgplot/spec.rb
+- lib/svgplot/tag.rb
+- lib/svgplot/transform.rb
 - spec/spec_helper.rb
 - spec/svgplot_spec.rb
 - svgplot.gemspec