prawn-svg 0.20.0 → 0.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fb790776a1eaf53a702045a42ea22fce3e8afa51
-  data.tar.gz: d90d2245d141bc749ec04d0b6e9239a9e2d8b48c
+  metadata.gz: 40c0c884ffef68848fa7314e085647ffc907a003
+  data.tar.gz: 87341061bdfcb99e9cf8157cfb3c84f72ec3bb2b
 SHA512:
-  metadata.gz: a0a11f3a0a93c36d838ed2bcb012cfa010f4968de481795e8f46fde61460c71c1f491586e477c24d1c55792f9293d2d52f4dfb9f28c7447cd4c3f87623e17c7f
-  data.tar.gz: 5885cb0acea63c8edd59fe563e4b6859f0d536537324026e8e18bb390fe1a0e335be7c2eaf07ef1d529ea752804a4fa8387a0f61d3b7ea362f76df60b13f0d5c
+  metadata.gz: 002745c7063d0013609343b4e383372058cde46835e240496f813855ea489287d6aad117ab98d89c3367e02d64a502deb038cdf00a7d9d381238e9d02f66149f
+  data.tar.gz: ce3f448a22be98027ad0be5e154924839e080969cfeeb27322c57e017d249c767b4a073b2faed164a290d102cda0e18c80aa9665840385a6cbfc124714f76808

data/lib/prawn/svg/color.rb

@@ -1,17 +1,164 @@
 class Prawn::Svg::Color
-  # TODO : use http://www.w3.org/TR/SVG11/types.html#ColorKeywords
+  UnresolvableURLWithNoFallbackError = Class.new(StandardError)
+
   HTML_COLORS = {
-    'black' => "000000", 'green' => "008000", 'silver' => "c0c0c0", 'lime' => "00ff00",
-    'gray' => "808080", 'olive' => "808000", 'white' => "ffffff", 'yellow' => "ffff00",
-    'maroon' => "800000", 'navy' => "000080", 'red' => "ff0000", 'blue' => "0000ff",
-    'purple' => "800080", 'teal' => "008080", 'fuchsia' => "ff00ff", 'aqua' => "00ffff"
+    'aliceblue' => 'f0f8ff',
+    'antiquewhite' => 'faebd7',
+    'aqua' => '00ffff',
+    'aquamarine' => '7fffd4',
+    'azure' => 'f0ffff',
+    'beige' => 'f5f5dc',
+    'bisque' => 'ffe4c4',
+    'black' => '000000',
+    'blanchedalmond' => 'ffebcd',
+    'blue' => '0000ff',
+    'blueviolet' => '8a2be2',
+    'brown' => 'a52a2a',
+    'burlywood' => 'deb887',
+    'cadetblue' => '5f9ea0',
+    'chartreuse' => '7fff00',
+    'chocolate' => 'd2691e',
+    'coral' => 'ff7f50',
+    'cornflowerblue' => '6495ed',
+    'cornsilk' => 'fff8dc',
+    'crimson' => 'dc143c',
+    'cyan' => '00ffff',
+    'darkblue' => '00008b',
+    'darkcyan' => '008b8b',
+    'darkgoldenrod' => 'b8860b',
+    'darkgray' => 'a9a9a9',
+    'darkgreen' => '006400',
+    'darkgrey' => 'a9a9a9',
+    'darkkhaki' => 'bdb76b',
+    'darkmagenta' => '8b008b',
+    'darkolivegreen' => '556b2f',
+    'darkorange' => 'ff8c00',
+    'darkorchid' => '9932cc',
+    'darkred' => '8b0000',
+    'darksalmon' => 'e9967a',
+    'darkseagreen' => '8fbc8f',
+    'darkslateblue' => '483d8b',
+    'darkslategray' => '2f4f4f',
+    'darkslategrey' => '2f4f4f',
+    'darkturquoise' => '00ced1',
+    'darkviolet' => '9400d3',
+    'deeppink' => 'ff1493',
+    'deepskyblue' => '00bfff',
+    'dimgray' => '696969',
+    'dimgrey' => '696969',
+    'dodgerblue' => '1e90ff',
+    'firebrick' => 'b22222',
+    'floralwhite' => 'fffaf0',
+    'forestgreen' => '228b22',
+    'fuchsia' => 'ff00ff',
+    'gainsboro' => 'dcdcdc',
+    'ghostwhite' => 'f8f8ff',
+    'gold' => 'ffd700',
+    'goldenrod' => 'daa520',
+    'gray' => '808080',
+    'grey' => '808080',
+    'green' => '008000',
+    'greenyellow' => 'adff2f',
+    'honeydew' => 'f0fff0',
+    'hotpink' => 'ff69b4',
+    'indianred' => 'cd5c5c',
+    'indigo' => '4b0082',
+    'ivory' => 'fffff0',
+    'khaki' => 'f0e68c',
+    'lavender' => 'e6e6fa',
+    'lavenderblush' => 'fff0f5',
+    'lawngreen' => '7cfc00',
+    'lemonchiffon' => 'fffacd',
+    'lightblue' => 'add8e6',
+    'lightcoral' => 'f08080',
+    'lightcyan' => 'e0ffff',
+    'lightgoldenrodyellow' => 'fafad2',
+    'lightgray' => 'd3d3d3',
+    'lightgreen' => '90ee90',
+    'lightgrey' => 'd3d3d3',
+    'lightpink' => 'ffb6c1',
+    'lightsalmon' => 'ffa07a',
+    'lightseagreen' => '20b2aa',
+    'lightskyblue' => '87cefa',
+    'lightslategray' => '778899',
+    'lightslategrey' => '778899',
+    'lightsteelblue' => 'b0c4de',
+    'lightyellow' => 'ffffe0',
+    'lime' => '00ff00',
+    'limegreen' => '32cd32',
+    'linen' => 'faf0e6',
+    'magenta' => 'ff00ff',
+    'maroon' => '800000',
+    'mediumaquamarine' => '66cdaa',
+    'mediumblue' => '0000cd',
+    'mediumorchid' => 'ba55d3',
+    'mediumpurple' => '9370db',
+    'mediumseagreen' => '3cb371',
+    'mediumslateblue' => '7b68ee',
+    'mediumspringgreen' => '00fa9a',
+    'mediumturquoise' => '48d1cc',
+    'mediumvioletred' => 'c71585',
+    'midnightblue' => '191970',
+    'mintcream' => 'f5fffa',
+    'mistyrose' => 'ffe4e1',
+    'moccasin' => 'ffe4b5',
+    'navajowhite' => 'ffdead',
+    'navy' => '000080',
+    'oldlace' => 'fdf5e6',
+    'olive' => '808000',
+    'olivedrab' => '6b8e23',
+    'orange' => 'ffa500',
+    'orangered' => 'ff4500',
+    'orchid' => 'da70d6',
+    'palegoldenrod' => 'eee8aa',
+    'palegreen' => '98fb98',
+    'paleturquoise' => 'afeeee',
+    'palevioletred' => 'db7093',
+    'papayawhip' => 'ffefd5',
+    'peachpuff' => 'ffdab9',
+    'peru' => 'cd853f',
+    'pink' => 'ffc0cb',
+    'plum' => 'dda0dd',
+    'powderblue' => 'b0e0e6',
+    'purple' => '800080',
+    'red' => 'ff0000',
+    'rosybrown' => 'bc8f8f',
+    'royalblue' => '4169e1',
+    'saddlebrown' => '8b4513',
+    'salmon' => 'fa8072',
+    'sandybrown' => 'f4a460',
+    'seagreen' => '2e8b57',
+    'seashell' => 'fff5ee',
+    'sienna' => 'a0522d',
+    'silver' => 'c0c0c0',
+    'skyblue' => '87ceeb',
+    'slateblue' => '6a5acd',
+    'slategray' => '708090',
+    'slategrey' => '708090',
+    'snow' => 'fffafa',
+    'springgreen' => '00ff7f',
+    'steelblue' => '4682b4',
+    'tan' => 'd2b48c',
+    'teal' => '008080',
+    'thistle' => 'd8bfd8',
+    'tomato' => 'ff6347',
+    'turquoise' => '40e0d0',
+    'violet' => 'ee82ee',
+    'wheat' => 'f5deb3',
+    'white' => 'ffffff',
+    'whitesmoke' => 'f5f5f5',
+    'yellow' => 'ffff00',
+    'yellowgreen' => '9acd32'
   }.freeze
 
   RGB_VALUE_REGEXP = "\s*(-?[0-9.]+%?)\s*"
   RGB_REGEXP = /\Argb\(#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP},#{RGB_VALUE_REGEXP}\)\z/i
+  URL_REGEXP = /\Aurl\([^)]*\)\z/i
 
   def self.color_to_hex(color_string)
-    color_string.scan(/([^(\s]+(\([^)]*\))?)/).detect do |color, *_|
+    url_specified = false
+
+    result = color_string.strip.scan(/([^(\s]+(\([^)]*\))?)/).detect do |color, *_|
       if m = color.match(/\A#([0-9a-f])([0-9a-f])([0-9a-f])\z/i)
         break "#{m[1] * 2}#{m[2] * 2}#{m[3] * 2}"
       elsif color.match(/\A#[0-9a-f]{6}\z/i)
@@ -24,8 +171,16 @@ class Prawn::Svg::Color
           value *= 2.55 if m[n][-1..-1] == '%'
           "%02x" % clamp(value.round, 0, 255)
         end.join
+      elsif color.match(URL_REGEXP)
+        url_specified = true
+        nil # we can't handle these so we find the next thing that matches
       end
     end
+
+    # http://www.w3.org/TR/SVG/painting.html section 11.2
+    raise UnresolvableURLWithNoFallbackError if result.nil? && url_specified
+
+    result
   end
 
   protected

data/lib/prawn/svg/element.rb

@@ -82,14 +82,17 @@ class Prawn::Svg::Element
       case name
       when 'translate'
         x, y = arguments
-        add_call_and_enter name, @document.distance(x, :x), -@document.distance(y, :y)
+        add_call_and_enter name, @document.distance(x.to_f, :x), -@document.distance(y.to_f, :y)
 
       when 'rotate'
         r, x, y = arguments.collect {|a| a.to_f}
-        if arguments.length == 3
+        case arguments.length
+        when 1
+          add_call_and_enter name, -r, :origin => [0, @document.y('0')]
+        when 3
           add_call_and_enter name, -r, :origin => [@document.x(x), @document.y(y)]
         else
-          add_call_and_enter name, -r, :origin => [0, @document.y('0')]
+          @document.warnings << "transform 'rotate' must have either one or three arguments"
         end
 
       when 'scale'
@@ -142,13 +145,21 @@ class Prawn::Svg::Element
 
   def parse_fill_and_stroke_attributes_and_call
     ["fill", "stroke"].select do |type|
-      dec = @attributes[type]
-      if dec == "none"
+      case keyword = attribute_value_as_keyword(type)
+      when nil
+      when 'inherit'
+      when 'none'
         state[type.to_sym] = false
-      elsif dec
-        state[type.to_sym] = true
-        if color = Prawn::Svg::Color.color_to_hex(dec)
-          add_call "#{type}_color", color
+      else
+        color_attribute = keyword == 'currentcolor' ? 'color' : type
+        color = @attributes[color_attribute]
+
+        begin
+          hex = Prawn::Svg::Color.color_to_hex(color)
+          state[type.to_sym] = true
+          add_call "#{type}_color", hex || '000000'
+        rescue Prawn::Svg::Color::UnresolvableURLWithNoFallbackError
+          state[type.to_sym] = false
         end
       end
 
@@ -206,6 +217,9 @@ class Prawn::Svg::Element
       font_updated = true
       @state[:font_family] = family
     end
+    if (anchor = @attributes['text-anchor'])
+      @state[:text_anchor] = anchor
+    end
 
     if @state[:font_family] && font_updated
       usable_font_families = [@state[:font_family], document.fallback_font_name]

data/lib/prawn/svg/parser/text.rb

@@ -35,7 +35,8 @@ class Prawn::Svg::Parser::Text
 
     # This is not a prawn option but we can't work out how to render it here -
     # it's handled by Svg#rewrite_call_arguments
-    if anchor = attrs['text-anchor']
+    if (anchor = attrs['text-anchor'] || element.state[:text_anchor]) &&
+        ['start', 'middle', 'end'].include?(anchor)
       opts[:text_anchor] = anchor
     end
 

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Svg
-    VERSION = '0.20.0'
+    VERSION = '0.21.0'
   end
 end

data/spec/prawn/svg/color_spec.rb

@@ -22,5 +22,19 @@ describe Prawn::Svg::Color do
     it "scans the string and finds the first colour it can parse" do
       Prawn::Svg::Color.color_to_hex("function(#someurl, 0) nonexistent rgb( 3 ,4,5 ) white").should == "030405"
     end
+
+    it "ignores url()s" do
+      expect(Prawn::Svg::Color.color_to_hex("url(#someplace) red")).to eq 'ff0000'
+    end
+
+    it "returns nil if the color doesn't exist" do
+      expect(Prawn::Svg::Color.color_to_hex("blurble")).to be nil
+    end
+
+    it "raises UnresolvableURLWithNoFallbackError if there's no fallback after a url()" do
+      expect {
+        Prawn::Svg::Color.color_to_hex("url(#someplace)")
+      }.to raise_error(Prawn::Svg::Color::UnresolvableURLWithNoFallbackError)
+    end
   end
 end

data/spec/prawn/svg/element_spec.rb

@@ -1,14 +1,16 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Prawn::Svg::Element do
-  before :each do
-    e = double(:attributes => {}, :name => "path")
+  let(:document) { double(css_parser: nil) }
+  let(:e) { double(:attributes => {}, :name => "path") }
+  let(:element) { Prawn::Svg::Element.new(document, e, [], {}) }
 
-    @document = Struct.new(:fallback_font_name, :css_parser, :warnings).new("Courier", nil, [])
-    @element = Prawn::Svg::Element.new(@document, e, [], {})
-  end
+  describe "#parse_font_attributes_and_call" do
+    before do
+      @document = Struct.new(:fallback_font_name, :css_parser, :warnings).new("Courier", nil, [])
+      @element = Prawn::Svg::Element.new(@document, e, [], {})
+    end
 
-  describe :parse_font_attributes_and_call do
     it "uses a font if it can find it" do
       @element.should_receive(:add_call_and_enter).with('font', 'Helvetica', :style => :normal)
 
@@ -33,4 +35,93 @@ describe Prawn::Svg::Element do
       @document.warnings.length.should == 1
     end
   end
+
+  describe "#parse_fill_and_stroke_attributes_and_call" do
+    subject { element.send :parse_fill_and_stroke_attributes_and_call }
+
+    it "doesn't change anything if no fill attribute provided" do
+      subject
+      expect(element.state[:fill]).to be nil
+    end
+
+    it "doesn't change anything if 'inherit' fill attribute provided" do
+      element.attributes['fill'] = 'inherit'
+      subject
+      expect(element.state[:fill]).to be nil
+    end
+
+    it "turns off filling if 'none' fill attribute provided" do
+      element.attributes['fill'] = 'none'
+      subject
+      expect(element.state[:fill]).to be false
+    end
+
+    it "uses the fill attribute's color" do
+      expect(element).to receive(:add_call).with('fill_color', 'ff0000')
+      element.attributes['fill'] = 'red'
+      subject
+      expect(element.state[:fill]).to be true
+    end
+
+    it "uses black if the fill attribute's color is unparseable" do
+      expect(element).to receive(:add_call).with('fill_color', '000000')
+      element.attributes['fill'] = 'blarble'
+      subject
+      expect(element.state[:fill]).to be true
+    end
+
+    it "uses the color attribute if 'currentColor' fill attribute provided" do
+      expect(element).to receive(:add_call).with('fill_color', 'ff0000')
+      element.attributes['fill'] = 'currentColor'
+      element.attributes['color'] = 'red'
+      subject
+      expect(element.state[:fill]).to be true
+    end
+
+    it "turns off filling if UnresolvableURLWithNoFallbackError is raised" do
+      element.attributes['fill'] = 'url()'
+      subject
+      expect(element.state[:fill]).to be false
+    end
+  end
+
+  describe "#parse_transform_attribute_and_call" do
+    subject { element.send :parse_transform_attribute_and_call }
+
+    describe "translate" do
+      it "handles a missing y argument" do
+        expect(element).to receive(:add_call_and_enter).with('translate', -5.5, 0)
+        expect(document).to receive(:distance).with(-5.5, :x).and_return(-5.5)
+        expect(document).to receive(:distance).with(0.0, :y).and_return(0.0)
+
+        element.attributes['transform'] = 'translate(-5.5)'
+        subject
+      end
+    end
+
+    describe "rotate" do
+      it "handles a single angle argument" do
+        expect(element).to receive(:add_call_and_enter).with('rotate', -5.5, :origin => [0, 0])
+        expect(document).to receive(:y).with('0').and_return(0)
+
+        element.attributes['transform'] = 'rotate(5.5)'
+        subject
+      end
+
+      it "handles three arguments" do
+        expect(element).to receive(:add_call_and_enter).with('rotate', -5.5, :origin => [1.0, 2.0])
+        expect(document).to receive(:x).with(1.0).and_return(1.0)
+        expect(document).to receive(:y).with(2.0).and_return(2.0)
+
+        element.attributes['transform'] = 'rotate(5.5 1 2)'
+        subject
+      end
+
+      it "does nothing and warns if two arguments" do
+        expect(document).to receive(:warnings).and_return([])
+        element.attributes['transform'] = 'rotate(5.5 1)'
+        subject
+      end
+    end
+  end
 end

data/spec/prawn/svg/parser/text_spec.rb

@@ -33,6 +33,15 @@ describe Prawn::Svg::Parser::Text do
     end
   end
 
+  describe "when text-anchor is specified" do
+    let(:svg) { '<g text-anchor="middle" font-family="sans-serif" font-size="12"><text x="50" y="14">Text</text></g>' }
+
+    it "should inherit text-anchor from parent element" do
+      parser.parse(element)
+      expect(element.state[:text_anchor]).to eq 'middle'
+    end
+  end
+
   describe "letter-spacing" do
     let(:svg) { '<text letter-spacing="5">spaced</text>' }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.21.0
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-20 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn