prawn-svg 0.34.1 → 0.35.0

data/spec/prawn/svg/css/stylesheets_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 RSpec.describe Prawn::SVG::CSS::Stylesheets do
-  describe "typical usage" do
+  describe 'typical usage' do
     let(:svg) { <<-SVG }
       <svg>
         <style>
@@ -57,65 +57,73 @@ RSpec.describe Prawn::SVG::CSS::Stylesheets do
       </svg>
     SVG
 
-    it "associates styles with elements" do
+    it 'associates styles with elements' do
       result = Prawn::SVG::CSS::Stylesheets.new(CssParser::Parser.new, REXML::Document.new(svg)).load
-      width_and_styles = result.map { |k, v| [k.attributes["width"].to_i, v] }.sort_by(&:first)
+      width_and_styles = result.map { |k, v| [k.attributes['width'].to_i, v] }.sort_by(&:first)
 
       expected = [
-        [1, [["fill", "#ff0000", false]]],
-        [2, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#440000", false], ["fill", "#220000", false]]],
-        [3, [["fill", "#ff0000", false], ["fill", "#00ff00", false]]],
-        [4, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#440000", false], ["fill", "#00ff00", false]]],
+        [0, [['overflow', 'hidden', false]]],
+        [1, [['fill', '#ff0000', false]]],
+        [2,
+         [['fill', '#ff0000', false], ['fill', '#330000', false], ['fill', '#440000', false],
+          ['fill', '#220000', false]]],
+        [3, [['fill', '#ff0000', false], ['fill', '#00ff00', false]]],
+        [4,
+         [['fill', '#ff0000', false], ['fill', '#330000', false], ['fill', '#440000', false],
+          ['fill', '#00ff00', false]]]
       ]
 
-      expected << [5, [["fill", "#ff0000", false], ["fill", "#330000", false], ["fill", "#330000", false], ["fill", "#440000", false], ["fill", "#00ff00", false]]]
-
-      expected.concat [
-        [6, [["fill", "#ff0000", false], ["fill", "#441234", false], ["fill", "#0000ff", false]]],
-        [7, [["fill", "#550000", false]]],
-        [8, [["fill", "#660000", false]]],
-        [9, [["fill", "#770000", false]]],
-        [10, [["fill", "#880000", false]]],
-        [11, [["fill", "#990000", false]]],
-        [12, [["fill", "#aa0000", false]]],
-        [13, [["fill", "#bb0000", false]]],
-        [14, [["fill", "#cc0000", false]]],
-        [15, [["fill", "#dd0000", false]]],
-        [16, [["fill", "#ee0000", false]]],
-      ]
+      expected << [5,
+                   [['fill', '#ff0000', false], ['fill', '#330000', false], ['fill', '#330000', false], ['fill', '#440000', false],
+                    ['fill', '#00ff00', false]]]
+
+      expected.push(
+        [6, [['fill', '#ff0000', false], ['fill', '#441234', false], ['fill', '#0000ff', false]]],
+        [7, [['fill', '#550000', false]]],
+        [8, [['fill', '#660000', false]]],
+        [9, [['fill', '#770000', false]]],
+        [10, [['fill', '#880000', false]]],
+        [11, [['fill', '#990000', false]]],
+        [12, [['fill', '#aa0000', false]]],
+        [13, [['fill', '#bb0000', false]]],
+        [14, [['fill', '#cc0000', false]]],
+        [15, [['fill', '#dd0000', false]]],
+        [16, [['fill', '#ee0000', false]]]
+      )
 
       expect(width_and_styles).to eq(expected)
     end
   end
 
-  describe "style tag parsing" do
+  describe 'style tag parsing' do
     let(:svg) do
-      <<-SVG
-<svg>
-  <some-tag>
-    <style>a
-  before&gt;
-  x <![CDATA[ y
-  inside <>&gt;
-  k ]]> j
-  after
-z</style>
-  </some-tag>
-
-  <other-tag>
-    <more-tag>
-      <style>hello</style>
-    </more-tag>
-  </other-tag>
-</svg>
+      <<~SVG
+        <svg>
+          <some-tag>
+            <style>a
+          before&gt;
+          x <![CDATA[ y
+          inside <>&gt;
+          k ]]> j
+          after
+        z</style>
+          </some-tag>
+
+          <other-tag>
+            <more-tag>
+              <style>hello</style>
+            </more-tag>
+          </other-tag>
+        </svg>
       SVG
     end
 
-    it "scans the document for style tags and adds the style information to the css parser" do
+    it 'scans the document for style tags and adds the style information to the css parser' do
       css_parser = instance_double(CssParser::Parser)
 
+      expect(css_parser).to receive(:add_block!).with('svg, symbol, image, marker, pattern, foreignObject { overflow: hidden }')
       expect(css_parser).to receive(:add_block!).with("a\n  before>\n  x  y\n  inside <>&gt;\n  k  j\n  after\nz")
-      expect(css_parser).to receive(:add_block!).with("hello")
+      expect(css_parser).to receive(:add_block!).with('hello')
       allow(css_parser).to receive(:each_rule_set)
 
       Prawn::SVG::CSS::Stylesheets.new(css_parser, REXML::Document.new(svg)).load

data/spec/prawn/svg/css/values_parser_spec.rb

@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+RSpec.describe Prawn::SVG::CSS::ValuesParser do
+  it 'parses specified values' do
+    values = 'hello world url("#myid") no-quote(very good) escaping(")\\")ok") rgb( 1,4,  5 )'
+
+    expect(described_class.parse(values)).to eq [
+      'hello',
+      'world',
+      ['url', ['#myid']],
+      ['no-quote', ['very good']],
+      ['escaping', [')")ok']],
+      ['rgb', %w[1 4 5]]
+    ]
+  end
+end

data/spec/prawn/svg/document_spec.rb

@@ -1,15 +1,15 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require "#{File.dirname(__FILE__)}/../../spec_helper"
 
 describe Prawn::SVG::Document do
   let(:bounds) { [100, 100] }
   let(:options) { {} }
 
-  describe "#initialize" do
-    context "with a well-formed document" do
-      let(:svg) { "<svg></svg>" }
-      let(:options) { {color_mode: :cmyk} }
+  describe '#initialize' do
+    context 'with a well-formed document' do
+      let(:svg) { '<svg></svg>' }
+      let(:options) { { color_mode: :cmyk } }
 
-      it "parses the XML and yields itself to its block" do
+      it 'parses the XML and yields itself to its block' do
         yielded = nil
 
         document = Prawn::SVG::Document.new(svg, bounds, options) do |doc|
@@ -22,23 +22,24 @@ describe Prawn::SVG::Document do
       end
     end
 
-    context "when unparsable XML is provided" do
+    context 'when unparsable XML is provided' do
       let(:svg) { "this isn't SVG data" }
 
-      it "raises an exception" do
-        expect {
+      it 'raises an exception' do
+        expect do
           Prawn::SVG::Document.new(svg, bounds, options)
-        }.to raise_error Prawn::SVG::Document::InvalidSVGData, "The data supplied is not a valid SVG document."
+        end.to raise_error Prawn::SVG::Document::InvalidSVGData, 'The data supplied is not a valid SVG document.'
       end
     end
 
-    context "when the user passes in a filename instead of SVG data" do
-      let(:svg) { "some_file.svg" }
+    context 'when the user passes in a filename instead of SVG data' do
+      let(:svg) { 'some_file.svg' }
 
       it "raises an exception letting them know what they've done" do
-        expect {
+        expect do
           Prawn::SVG::Document.new(svg, bounds, options)
-        }.to raise_error Prawn::SVG::Document::InvalidSVGData, "The data supplied is not a valid SVG document.  It looks like you've supplied a filename instead; use IO.read(filename) to get the data before you pass it to prawn-svg."
+        end.to raise_error Prawn::SVG::Document::InvalidSVGData,
+          "The data supplied is not a valid SVG document.  It looks like you've supplied a filename instead; use IO.read(filename) to get the data before you pass it to prawn-svg."
       end
     end
   end

data/spec/prawn/svg/elements/base_spec.rb

@@ -1,104 +1,107 @@
 require 'spec_helper'
 
 describe Prawn::SVG::Elements::Base do
-  let(:svg) { "<svg></svg>" }
-  let(:document) { Prawn::SVG::Document.new(svg, [800, 600], {}, font_registry: Prawn::SVG::FontRegistry.new("Helvetica" => {:normal => nil})) }
+  let(:svg) { '<svg></svg>' }
+  let(:document) do
+    Prawn::SVG::Document.new(svg, [800, 600], {},
+      font_registry: Prawn::SVG::FontRegistry.new('Helvetica' => { normal: nil }))
+  end
   let(:parent_calls) { [] }
   let(:element) { Prawn::SVG::Elements::Base.new(document, document.root, parent_calls, fake_state) }
 
-  describe "#initialize" do
+  describe '#initialize' do
     let(:svg) { '<something id="hello"/>' }
 
-    it "adds itself to the elements_by_id hash if an id attribute is supplied" do
+    it 'adds itself to the elements_by_id hash if an id attribute is supplied' do
       element
-      expect(document.elements_by_id["hello"]).to eq element
+      expect(document.elements_by_id['hello']).to eq element
     end
   end
 
-  describe "#process" do
-    it "calls #parse and #apply so subclasses can parse the element" do
+  describe '#process' do
+    it 'calls #parse and #apply so subclasses can parse the element' do
       expect(element).to receive(:parse).ordered
       expect(element).to receive(:apply).ordered
       element.process
     end
 
-    describe "applying calls from the standard attributes" do
+    describe 'applying calls from the standard attributes' do
       let(:svg) do
         <<-SVG
           <something transform="scale(2)" fill-opacity="0.5" fill="red" stroke="blue" stroke-width="5"/>
         SVG
       end
 
-      it "appends the relevant calls" do
+      it 'appends the relevant calls' do
         element.process
         expect(element.base_calls).to eq [
-          ["transformation_matrix", [2, 0, 0, 2, 0, 0], {}, [
-            ["transparent", [0.5, 1], {}, [
-              ["fill_color", ["ff0000"], {}, []],
-              ["stroke_color", ["0000ff"], {}, []],
-              ["line_width", [5.0], {}, []],
-              ["fill_and_stroke", [], {}, []]
+          ['transformation_matrix', [2, 0, 0, 2, 0, 0], {}, [
+            ['transparent', [0.5, 1], {}, [
+              ['fill_color', ['ff0000'], {}, []],
+              ['stroke_color', ['0000ff'], {}, []],
+              ['line_width', [5.0], {}, []],
+              ['fill_and_stroke', [], {}, []]
             ]]
           ]]
         ]
       end
     end
 
-    describe "fills and strokes" do
+    describe 'fills and strokes' do
       before { element.process }
       subject { element.base_calls.last }
 
-      context "with neither fill nor stroke" do
+      context 'with neither fill nor stroke' do
         let(:svg) { '<rect style="fill: none;"></rect>' }
         it        { is_expected.to eq ['end_path', [], {}, []] }
       end
 
-      context "with a fill only" do
+      context 'with a fill only' do
         let(:svg) { '<rect style="fill: black;"></rect>' }
         it        { is_expected.to eq ['fill', [], {}, []] }
       end
 
-      context "with a stroke only" do
+      context 'with a stroke only' do
         let(:svg) { '<rect style="fill: none; stroke: black;"></rect>' }
         it        { is_expected.to eq ['stroke', [], {}, []] }
       end
 
-      context "with fill and stroke" do
+      context 'with fill and stroke' do
         let(:svg) { '<rect style="fill: black; stroke: black;"></rect>' }
         it        { is_expected.to eq ['fill_and_stroke', [], {}, []] }
       end
 
-      context "with fill with evenodd fill rule" do
+      context 'with fill with evenodd fill rule' do
         let(:svg) { '<rect style="fill: black; fill-rule: evenodd;"></rect>' }
-        it        { is_expected.to eq ['fill', [], {fill_rule: :even_odd}, []] }
+        it        { is_expected.to eq ['fill', [], { fill_rule: :even_odd }, []] }
       end
     end
 
-    it "appends calls to the parent element" do
+    it 'appends calls to the parent element' do
       expect(element).to receive(:apply) do
-        element.send :add_call, "test", "argument", kw: 'argument'
+        element.send :add_call, 'test', 'argument', kw: 'argument'
       end
 
       element.process
-      expect(element.parent_calls).to eq [["fill", [], {}, [["test", ["argument"], {kw: 'argument'}, []]]]]
+      expect(element.parent_calls).to eq [['fill', [], {}, [['test', ['argument'], { kw: 'argument' }, []]]]]
     end
 
-    it "quietly absorbs a SkipElementQuietly exception" do
+    it 'quietly absorbs a SkipElementQuietly exception' do
       expect(element).to receive(:parse).and_raise(Prawn::SVG::Elements::Base::SkipElementQuietly)
       expect(element).to_not receive(:apply)
       element.process
       expect(document.warnings).to be_empty
     end
 
-    it "absorbs a SkipElementError exception, logging a warning" do
-      expect(element).to receive(:parse).and_raise(Prawn::SVG::Elements::Base::SkipElementError, "hello")
+    it 'absorbs a SkipElementError exception, logging a warning' do
+      expect(element).to receive(:parse).and_raise(Prawn::SVG::Elements::Base::SkipElementError, 'hello')
       expect(element).to_not receive(:apply)
       element.process
-      expect(document.warnings).to eq ["hello"]
+      expect(document.warnings).to eq ['hello']
     end
   end
 
-  describe "#apply_colors" do
+  describe '#apply_colors' do
     before do
       element.send(:extract_attributes_and_properties)
     end
@@ -141,8 +144,10 @@ describe Prawn::SVG::Elements::Base do
       subject
     end
 
-    context "with a color attribute defined on a parent element" do
-      let(:svg) { '<svg style="color: green;"><g style="color: red;"><rect width="10" height="10" style="fill: currentColor;"></rect></g></svg>' }
+    context 'with a color attribute defined on a parent element' do
+      let(:svg) do
+        '<svg style="color: green;"><g style="color: red;"><rect width="10" height="10" style="fill: currentColor;"></rect></g></svg>'
+      end
       let(:element) { Prawn::SVG::Elements::Root.new(document, document.root, parent_calls) }
       let(:flattened_calls) { flatten_calls(element.base_calls) }
 
@@ -162,7 +167,7 @@ describe Prawn::SVG::Elements::Base do
     end
   end
 
-  describe "stylesheets" do
+  describe 'stylesheets' do
     let(:svg) { <<-SVG }
       <svg>
         <style>
@@ -177,7 +182,7 @@ describe Prawn::SVG::Elements::Base do
       </svg>
     SVG
 
-    it "applies stylesheet styling but style attributes take precedence" do
+    it 'applies stylesheet styling but style attributes take precedence' do
       document = Prawn::SVG::Document.new(svg, [100, 100], {})
       calls = []
       element = Prawn::SVG::Elements::Root.new(document, document.root, calls)

data/spec/prawn/svg/elements/gradient_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Prawn::SVG::Elements::Gradient do
-  let(:document) { Prawn::SVG::Document.new(svg, [800, 600], {width: 800, height: 600}) }
+  let(:document) { Prawn::SVG::Document.new(svg, [800, 600], { width: 800, height: 600 }) }
   let(:element)  { Prawn::SVG::Elements::Gradient.new(document, document.root, [], fake_state) }
 
   before do
@@ -9,7 +9,7 @@ describe Prawn::SVG::Elements::Gradient do
     element.process
   end
 
-  describe "object bounding box with linear gradient" do
+  describe 'object bounding box with linear gradient' do
     let(:svg) do
       <<-SVG
         <linearGradient id="flag" x1="0" x2="0.2" y1="0" y2="1">
@@ -20,17 +20,17 @@ describe Prawn::SVG::Elements::Gradient do
       SVG
     end
 
-    it "is stored in the document gradients table" do
-      expect(document.gradients["flag"]).to eq element
+    it 'is stored in the document gradients table' do
+      expect(document.gradients['flag']).to eq element
     end
 
-    it "returns correct gradient arguments for an element" do
+    it 'returns correct gradient arguments for an element' do
       arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
       expect(arguments).to eq(
-        from: [100.0, 100.0],
-        to:   [120.0, 0.0],
-        stops: [[0, "ff0000"], [0.25, "ff0000"], [0.5, "ffffff"], [0.75, "0000ff"], [1, "0000ff"]],
-        apply_transformations: true,
+        from:                  [100.0, 100.0],
+        to:                    [120.0, 0.0],
+        stops:                 [[0, 'ff0000'], [0.25, 'ff0000'], [0.5, 'ffffff'], [0.75, '0000ff'], [1, '0000ff']],
+        apply_transformations: true
       )
     end
 
@@ -40,7 +40,7 @@ describe Prawn::SVG::Elements::Gradient do
     end
   end
 
-  describe "object bounding box with radial gradient" do
+  describe 'object bounding box with radial gradient' do
     let(:svg) do
       <<-SVG
         <radialGradient id="flag" cx="0" cy="0.2" fx="0.5" r="0.8">
@@ -51,24 +51,24 @@ describe Prawn::SVG::Elements::Gradient do
       SVG
     end
 
-    it "is stored in the document gradients table" do
-      expect(document.gradients["flag"]).to eq element
+    it 'is stored in the document gradients table' do
+      expect(document.gradients['flag']).to eq element
     end
 
-    it "returns correct gradient arguments for an element" do
+    it 'returns correct gradient arguments for an element' do
       arguments = element.gradient_arguments(double(bounding_box: [100, 100, 200, 0]))
       expect(arguments).to eq(
-        from: [150, 80],
-        to:   [100, 80],
-        r1:   0,
-        r2:   Math.sqrt((0.8 * 100) ** 2 + (0.8 * 100) ** 2),
-        stops: [[0, "ff0000"], [0.25, "ff0000"], [0.5, "ffffff"], [0.75, "0000ff"], [1, "0000ff"]],
-        apply_transformations: true,
+        from:                  [150, 80],
+        to:                    [100, 80],
+        r1:                    0,
+        r2:                    Math.sqrt(((0.8 * 100)**2) + ((0.8 * 100)**2)),
+        stops:                 [[0, 'ff0000'], [0.25, 'ff0000'], [0.5, 'ffffff'], [0.75, '0000ff'], [1, '0000ff']],
+        apply_transformations: true
       )
     end
   end
 
-  describe "user space on use with linear gradient" do
+  describe 'user space on use with linear gradient' do
     let(:svg) do
       <<-SVG
         <linearGradient id="flag" gradientUnits="userSpaceOnUse" x1="100" y1="500" x2="200" y2="600">
@@ -78,18 +78,18 @@ describe Prawn::SVG::Elements::Gradient do
       SVG
     end
 
-    it "returns correct gradient arguments for an element" do
+    it 'returns correct gradient arguments for an element' do
       arguments = element.gradient_arguments(double)
       expect(arguments).to eq(
-        from: [100.0, 100.0],
-        to:   [200.0, 0.0],
-        stops: [[0, "ff0000"], [1, "0000ff"]],
-        apply_transformations: true,
+        from:                  [100.0, 100.0],
+        to:                    [200.0, 0.0],
+        stops:                 [[0, 'ff0000'], [1, '0000ff']],
+        apply_transformations: true
       )
     end
   end
 
-  describe "user space on use with radial gradient" do
+  describe 'user space on use with radial gradient' do
     let(:svg) do
       <<-SVG
         <radialGradient id="flag" gradientUnits="userSpaceOnUse" fx="100" fy="500" cx="200" cy="600" r="150">
@@ -99,20 +99,20 @@ describe Prawn::SVG::Elements::Gradient do
       SVG
     end
 
-    it "returns correct gradient arguments for an element" do
+    it 'returns correct gradient arguments for an element' do
       arguments = element.gradient_arguments(double)
       expect(arguments).to eq(
-        from: [100.0, 100.0],
-        to:   [200.0, 0.0],
-        r1:   0,
-        r2:   150,
-        stops: [[0, "ff0000"], [1, "0000ff"]],
-        apply_transformations: true,
+        from:                  [100.0, 100.0],
+        to:                    [200.0, 0.0],
+        r1:                    0,
+        r2:                    150,
+        stops:                 [[0, 'ff0000'], [1, '0000ff']],
+        apply_transformations: true
       )
     end
   end
 
-  context "when gradientTransform is specified" do
+  context 'when gradientTransform is specified' do
     let(:svg) do
       <<-SVG
         <linearGradient id="flag" gradientTransform="translateX(10) scale(2)" x1="0" y1="0" x2="10" y2="10">
@@ -122,14 +122,14 @@ describe Prawn::SVG::Elements::Gradient do
       SVG
     end
 
-    it "passes in the transform via the apply_transformations option" do
+    it 'passes in the transform via the apply_transformations option' do
       arguments = element.gradient_arguments(double(bounding_box: [0, 0, 10, 10]))
 
       expect(arguments).to eq(
-        from: [0, 0],
-        to:   [10, 10],
-        stops: [[0, "ff0000"], [1, "0000ff"]],
-        apply_transformations: [2, 0, 0, 2, 10, 0],
+        from:                  [0, 0],
+        to:                    [10, 10],
+        stops:                 [[0, 'ff0000'], [1, '0000ff']],
+        apply_transformations: [2, 0, 0, 2, 10, 0]
       )
     end
   end

data/spec/prawn/svg/elements/line_spec.rb

@@ -1,54 +1,54 @@
 require 'spec_helper'
 
 RSpec.describe Prawn::SVG::Elements::Line do
-  let(:document) { Prawn::SVG::Document.new(svg, [800, 600], {width: 800, height: 600}) }
+  let(:document) { Prawn::SVG::Document.new(svg, [800, 600], { width: 800, height: 600 }) }
 
   subject do
     Prawn::SVG::Elements::Line.new(document, document.root, [], fake_state)
   end
 
-  context "with attributes specified" do
+  context 'with attributes specified' do
     let(:svg) { '<line x1="5" y1="10" x2="15" y2="20" stroke="black" />' }
 
-    it "renders the line" do
+    it 'renders the line' do
       subject.process
       expect(subject.base_calls).to eq [
-        ["stroke_color", ["000000"], {}, []],
-        ["stroke", [], {}, [
-          ["move_to", [[5.0, 590.0]], {}, []],
-          ["line_to", [[15.0, 580.0]], {}, []]]
-        ]
+        ['stroke_color', ['000000'], {}, []],
+        ['stroke', [], {}, [
+          ['move_to', [[5.0, 590.0]], {}, []],
+          ['line_to', [[15.0, 580.0]], {}, []]
+        ]]
       ]
     end
   end
 
-  context "with no attributes nor stroke specified" do
+  context 'with no attributes nor stroke specified' do
     let(:svg) { '<line />' }
 
-    it "outlines a path from 0,0 to 0,0" do
+    it 'outlines a path from 0,0 to 0,0' do
       subject.process
       expect(subject.base_calls).to eq [
-        ["end_path", [], {}, [
-          ["move_to", [[0, 600]], {}, []],
-          ["line_to", [[0, 600]], {}, []]]
-        ]
+        ['end_path', [], {}, [
+          ['move_to', [[0, 600]], {}, []],
+          ['line_to', [[0, 600]], {}, []]
+        ]]
       ]
     end
   end
 
-  context "with a fill specified" do
+  context 'with a fill specified' do
     let(:svg) { '<line x1="0" y1="0" x2="15" y2="20" style="stroke: red; fill: blue;" />' }
 
-    it "ignores the fill" do
+    it 'ignores the fill' do
       subject.process
 
       expect(subject.base_calls).to eq [
-        ["fill_color", ["0000ff"], {}, []],
-        ["stroke_color", ["ff0000"], {}, []],
-        ["stroke", [], {}, [
-          ["move_to", [[0, 600]], {}, []],
-          ["line_to", [[15.0, 580.0]], {}, []]]
-        ]
+        ['fill_color', ['0000ff'], {}, []],
+        ['stroke_color', ['ff0000'], {}, []],
+        ['stroke', [], {}, [
+          ['move_to', [[0, 600]], {}, []],
+          ['line_to', [[15.0, 580.0]], {}, []]
+        ]]
       ]
     end
   end