prawn-svg 0.34.1 → 0.35.0

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

@@ -17,30 +17,31 @@ RSpec.describe Prawn::SVG::Elements::Marker do
     SVG
   end
 
-  let(:document) { Prawn::SVG::Document.new(svg, [800, 600], {width: 800, height: 600}) }
-  let(:state) { Prawn::SVG::State.new }
+  let(:document) { Prawn::SVG::Document.new(svg, [800, 600], { width: 800, height: 600 }) }
 
-  let(:line_element) do
-    Prawn::SVG::Elements::Line.new(document, document.root.elements[2], [], state)
+  def new_state
+    state = Prawn::SVG::State.new
+    state.viewport_sizing = document.sizing
+    state
   end
 
-  subject do
-    Prawn::SVG::Elements::Marker.new(document, document.root.elements[1], [], state)
+  let(:line_element) do
+    Prawn::SVG::Elements::Line.new(document, document.root.elements[2], [], new_state)
   end
 
-  before do
-    state.viewport_sizing = document.sizing
+  subject do
+    Prawn::SVG::Elements::Marker.new(document, document.root.elements[1], [], new_state)
   end
 
-  describe "#parse" do
-    it "forces display none" do
+  describe '#parse' do
+    it 'forces display none' do
       subject.parse
       expect(subject.properties.display).to eq 'none'
     end
   end
 
-  describe "#apply_marker" do
-    it "adds the line and its marker to the call stack" do
+  describe '#apply_marker' do
+    it 'adds the line and its marker to the call stack' do
       subject.process
       line_element.process
 
@@ -54,41 +55,37 @@ RSpec.describe Prawn::SVG::Elements::Marker do
       # in section 11.6.3.
 
       expect(line_element.base_calls).to eq [
-        ["stroke_color", ["000000"], {}, []],
-        ["line_width", [100.0], {}, []],
-        ["stroke", [], {}, [
-            ["move_to", [[0.0, 600.0]], {}, []],
-            ["line_to", [[10.0, 590.0]], {}, []]
-          ]
-        ],
-        ["save", [], {}, []],
-        ["transformation_matrix", [1, 0, 0, 1, 10, -10], {}, []],
-        ["rotate", [-45], {origin: [0, 600.0]}, [
-            ["transformation_matrix", [100.0, 0, 0, 100.0, 0, 0], {}, []],
-            ["transformation_matrix", [1, 0, 0, 1, -0.0, 1.5], {}, []],
-            ["rectangle", [[-0.5, 600.0], 4.0, 3.0], {}, []],
-            ["clip", [], {}, []],
-            ["transformation_matrix", [0.3, 0, 0, 0.3, 0, 0], {}, []],
-            ["transparent", [1.0, 1.0], {}, [
-                ["stroke_color", ["000000"], {}, []],
-                ["line_width", [100.0], {}, []],
-                ["cap_style", [:butt], {}, []],
-                ["join_style", [:miter], {}, []],
-                ["undash", [], {}, []],
-                ["save", [], {}, []],
-                ["fill", [], {}, [
-                    ["move_to", [[0.0, 600.0]], {}, []],
-                    ["line_to", [[10.0, 595.0]], {}, []],
-                    ["line_to", [[0.0, 590.0]], {}, []],
-                    ["close_path", [], {}, []]
-                  ]
-                ],
-                ["restore", [], {}, []],
-              ]
-            ]
-          ]
-        ],
-        ["restore", [], {}, []]
+        ['stroke_color', ['000000'], {}, []],
+        ['line_width', [100.0], {}, []],
+        ['stroke', [], {}, [
+          ['move_to', [[0.0, 600.0]], {}, []],
+          ['line_to', [[10.0, 590.0]], {}, []]
+        ]],
+        ['save', [], {}, []],
+        ['transformation_matrix', [1, 0, 0, 1, 10, -10], {}, []],
+        ['rotate', [-45], { origin: [0, 600.0] }, [
+          ['transformation_matrix', [100.0, 0, 0, 100.0, 0, 0], {}, []],
+          ['transformation_matrix', [1, 0, 0, 1, -0.0, 1.5], {}, []],
+          ['rectangle', [[-0.5, 600.0], 4.0, 3.0], {}, []],
+          ['clip', [], {}, []],
+          ['transformation_matrix', [0.3, 0, 0, 0.3, 0, 0], {}, []],
+          ['transparent', [1.0, 1.0], {}, [
+            ['fill_color', ['000000'], {}, []],
+            ['line_width', [1.0], {}, []],
+            ['cap_style', [:butt], {}, []],
+            ['join_style', [:miter], {}, []],
+            ['undash', [], {}, []],
+            ['save', [], {}, []],
+            ['fill', [], {}, [
+              ['move_to', [[0.0, 600.0]], {}, []],
+              ['line_to', [[10.0, 595.0]], {}, []],
+              ['line_to', [[0.0, 590.0]], {}, []],
+              ['close_path', [], {}, []]
+            ]],
+            ['restore', [], {}, []]
+          ]]
+        ]],
+        ['restore', [], {}, []]
       ]
     end
   end

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

@@ -1,45 +1,45 @@
 require 'spec_helper'
 
 describe Prawn::SVG::Elements::Path do
-  let(:source) { double(name: "path", attributes: {}) }
+  let(:source) { double(name: 'path', attributes: {}) }
   let(:state) { Prawn::SVG::State.new }
   let(:path) { Prawn::SVG::Elements::Path.new(nil, source, [], state) }
 
   before do
-    allow(path).to receive(:attributes).and_return("d" => d)
+    allow(path).to receive(:attributes).and_return('d' => d)
   end
 
-  describe "command parsing" do
-    context "with a valid path" do
-      let(:d) { "m12.34 -56.78 1 2M4 5 12-34 -.5.7+3 2.3e3 4e4 4e+4 L31,-2e-5L  6,7 Z ZZa50 50 0 100 100" }
+  describe 'command parsing' do
+    context 'with a valid path' do
+      let(:d) { 'm12.34 -56.78 1 2M4 5 12-34 -.5.7+3 2.3e3 4e4 4e+4 L31,-2e-5L  6,7 Z ZZa50 50 0 100 100' }
 
-      it "correctly parses" do
+      it 'correctly parses' do
         calls = []
-        allow(path).to receive(:parse_path_command) {|*args| calls << args}
+        allow(path).to receive(:parse_path_command) { |*args| calls << args }
         path.parse
 
         expect(calls).to eq [
-          ["m", [[12.34, -56.78], [1, 2]]],
-          ["M", [[4, 5], [12, -34], [-0.5, 0.7], [3, 2.3e3], [4e4, 4e4]]],
-          ["L", [[31, -2e-5]]],
-          ["L", [[6, 7]]],
-          ["Z", []],
-          ["Z", []],
-          ["Z", []],
-          ["a", [[50, 50, 0, 1, 0, 0, 100]]],
+          ['m', [[12.34, -56.78], [1, 2]]],
+          ['M', [[4, 5], [12, -34], [-0.5, 0.7], [3, 2.3e3], [4e4, 4e4]]],
+          ['L', [[31, -2e-5]]],
+          ['L', [[6, 7]]],
+          ['Z', []],
+          ['Z', []],
+          ['Z', []],
+          ['a', [[50, 50, 0, 1, 0, 0, 100]]]
         ]
       end
     end
 
-    context "with m and M commands" do
-      let(:d) { "M 1,2 3,4 m 5,6 7,8" }
+    context 'with m and M commands' do
+      let(:d) { 'M 1,2 3,4 m 5,6 7,8' }
 
-      it "treats subsequent points to m/M command as relative/absolute depending on command" do
+      it 'treats subsequent points to m/M command as relative/absolute depending on command' do
         [
-          ["M", [[1,2],[3,4]]],
-          ["L", [[3,4]]],
-          ["m", [[5,6],[7,8]]],
-          ["l", [[7,8]]]
+          ['M', [[1, 2], [3, 4]]],
+          ['L', [[3, 4]]],
+          ['m', [[5, 6], [7, 8]]],
+          ['l', [[7, 8]]]
         ].each do |args|
           expect(path).to receive(:parse_path_command).with(*args).and_call_original
         end
@@ -48,61 +48,64 @@ describe Prawn::SVG::Elements::Path do
       end
     end
 
-    context "with an empty path" do
-      let(:d) { "" }
+    context 'with an empty path' do
+      let(:d) { '' }
 
-      it "correctly parses" do
+      it 'correctly parses' do
         expect(path).not_to receive(:run_path_command)
         path.parse
       end
     end
 
-    context "with a path with invalid characters" do
-      let(:d) { "M 10 % 20" }
+    context 'with a path with invalid characters' do
+      let(:d) { 'M 10 % 20' }
 
-      it "raises" do
+      it 'raises' do
         expect { path.parse }.to raise_error(Prawn::SVG::Elements::Base::SkipElementError)
       end
     end
 
-    context "with a path with numerical data before a command letter" do
-      let(:d) { "M 10 % 20" }
+    context 'with a path with numerical data before a command letter' do
+      let(:d) { 'M 10 % 20' }
 
-      it "raises" do
+      it 'raises' do
         expect { path.parse }.to raise_error(Prawn::SVG::Elements::Base::SkipElementError)
       end
     end
   end
 
-  context "when given an M path" do
-    subject { path.parse; path.commands }
+  context 'when given an M path' do
+    subject do
+      path.parse
+      path.commands
+    end
 
-    context "with typical arguments" do
-      let(:d) { "M 100 200 M 200 300 m 10 20" }
+    context 'with typical arguments' do
+      let(:d) { 'M 100 200 M 200 300 m 10 20' }
 
-      it "issues a move command" do
+      it 'issues a move command' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
           Prawn::SVG::Elements::Path::Move.new([200.0, 300.0]),
-          Prawn::SVG::Elements::Path::Move.new([210.0, 320.0]),
+          Prawn::SVG::Elements::Path::Move.new([210.0, 320.0])
         ]
       end
     end
 
-    context "with only one argument" do
-      let(:d) { "M 100 200 M 100" }
+    context 'with only one argument' do
+      let(:d) { 'M 100 200 M 100' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
       end
     end
 
-    context "with no arguments" do
-      let(:d) { "M 100 200 M" }
+    context 'with no arguments' do
+      let(:d) { 'M 100 200 M' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
@@ -110,25 +113,28 @@ describe Prawn::SVG::Elements::Path do
     end
   end
 
-  context "when given an L path" do
-    subject { path.parse; path.commands }
+  context 'when given an L path' do
+    subject do
+      path.parse
+      path.commands
+    end
 
-    context "with typical arguments" do
-      let(:d) { "M 100 200 L 200 300 l 10 20" }
+    context 'with typical arguments' do
+      let(:d) { 'M 100 200 L 200 300 l 10 20' }
 
-      it "issues a line command" do
+      it 'issues a line command' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
           Prawn::SVG::Elements::Path::Line.new([200.0, 300.0]),
-          Prawn::SVG::Elements::Path::Line.new([210.0, 320.0]),
+          Prawn::SVG::Elements::Path::Line.new([210.0, 320.0])
         ]
       end
     end
 
-    context "with only one argument" do
-      let(:d) { "M 100 200 L 100" }
+    context 'with only one argument' do
+      let(:d) { 'M 100 200 L 100' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
@@ -136,24 +142,27 @@ describe Prawn::SVG::Elements::Path do
     end
   end
 
-  context "when given a C path" do
-    subject { path.parse; path.commands }
+  context 'when given a C path' do
+    subject do
+      path.parse
+      path.commands
+    end
 
-    context "with typical arguments" do
-      let(:d) { "M 100 200 C 10 20 30 40 200 300" }
+    context 'with typical arguments' do
+      let(:d) { 'M 100 200 C 10 20 30 40 200 300' }
 
-      it "issues a curve command" do
+      it 'issues a curve command' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
-          Prawn::SVG::Elements::Path::Curve.new([200.0, 300.0], [10, 20], [30, 40]),
+          Prawn::SVG::Elements::Path::Curve.new([200.0, 300.0], [10, 20], [30, 40])
         ]
       end
     end
 
-    context "with incomplete arguments" do
-      let(:d) { "M 100 200 C 10 20 30 40 50" }
+    context 'with incomplete arguments' do
+      let(:d) { 'M 100 200 C 10 20 30 40 50' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
@@ -161,24 +170,27 @@ describe Prawn::SVG::Elements::Path do
     end
   end
 
-  context "when given an S path" do
-    subject { path.parse; path.commands }
+  context 'when given an S path' do
+    subject do
+      path.parse
+      path.commands
+    end
 
-    context "with typical arguments" do
-      let(:d) { "M 100 200 S 30 40 200 300" }
+    context 'with typical arguments' do
+      let(:d) { 'M 100 200 S 30 40 200 300' }
 
-      it "issues a curve command" do
+      it 'issues a curve command' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
-          Prawn::SVG::Elements::Path::Curve.new([200.0, 300.0], [100, 200], [30, 40]),
+          Prawn::SVG::Elements::Path::Curve.new([200.0, 300.0], [100, 200], [30, 40])
         ]
       end
     end
 
-    context "with incomplete arguments" do
-      let(:d) { "M 100 200 S 30 40 50" }
+    context 'with incomplete arguments' do
+      let(:d) { 'M 100 200 S 30 40 50' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
@@ -186,13 +198,16 @@ describe Prawn::SVG::Elements::Path do
     end
   end
 
-  context "when given a Q path" do
-    subject { path.parse; path.commands }
+  context 'when given a Q path' do
+    subject do
+      path.parse
+      path.commands
+    end
 
-    context "with typical arguments" do
-      let(:d) { "M 0 0 Q 600 300 300 600" }
+    context 'with typical arguments' do
+      let(:d) { 'M 0 0 Q 600 300 300 600' }
 
-      it "issues a curve command" do
+      it 'issues a curve command' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([0, 0]),
           Prawn::SVG::Elements::Path::Curve.new([300.0, 600.0], [400, 200], [500, 400])
@@ -200,10 +215,10 @@ describe Prawn::SVG::Elements::Path do
       end
     end
 
-    context "with incomplete arguments" do
-      let(:d) { "M 100 200 Q 30 40 50" }
+    context 'with incomplete arguments' do
+      let(:d) { 'M 100 200 Q 30 40 50' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
@@ -211,13 +226,16 @@ describe Prawn::SVG::Elements::Path do
     end
   end
 
-  context "when given a T path" do
-    subject { path.parse; path.commands }
+  context 'when given a T path' do
+    subject do
+      path.parse
+      path.commands
+    end
 
-    context "with typical arguments" do
-      let(:d) { "M 0 0 T 300 600" }
+    context 'with typical arguments' do
+      let(:d) { 'M 0 0 T 300 600' }
 
-      it "issues a curve command" do
+      it 'issues a curve command' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([0, 0]),
           Prawn::SVG::Elements::Path::Curve.new([300.0, 600.0], [0, 0], [100, 200])
@@ -225,10 +243,10 @@ describe Prawn::SVG::Elements::Path do
       end
     end
 
-    context "with incomplete arguments" do
-      let(:d) { "M 100 200 T 30" }
+    context 'with incomplete arguments' do
+      let(:d) { 'M 100 200 T 30' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
@@ -236,35 +254,40 @@ describe Prawn::SVG::Elements::Path do
     end
   end
 
-  context "when given an A path" do
-    subject { path.parse; path.commands }
+  context 'when given an A path' do
+    subject do
+      path.parse
+      path.commands
+    end
 
-    context "that is pretty normal" do
-      let(:d) { "M 100 200 A 10 10 0 0 1 200 200" }
+    context 'that is pretty normal' do
+      let(:d) { 'M 100 200 A 10 10 0 0 1 200 200' }
 
-      it "uses bezier curves to approximate an arc path" do
+      it 'uses bezier curves to approximate an arc path' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
-          Prawn::SVG::Elements::Path::Curve.new([150.0, 150.0], [100.0, 172.57081148225683], [122.57081148225683, 150.0]),
-          Prawn::SVG::Elements::Path::Curve.new([200.0, 200.0], [177.42918851774317, 150.0], [200.0, 172.57081148225683])
+          Prawn::SVG::Elements::Path::Curve.new([150.0, 150.0], [100.0, 172.57081148225683],
+            [122.57081148225683, 150.0]),
+          Prawn::SVG::Elements::Path::Curve.new([200.0, 200.0], [177.42918851774317, 150.0],
+            [200.0, 172.57081148225683])
         ]
       end
     end
 
-    context "with an identical start and end point" do
-      let(:d) { "M 100 200 A 30 30 0 0 1 100 200" }
+    context 'with an identical start and end point' do
+      let(:d) { 'M 100 200 A 30 30 0 0 1 100 200' }
 
-      it "ignores the path" do
+      it 'ignores the path' do
         expect(subject).to eq [
-          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
       end
     end
 
-    context "with an rx of 0" do
-      let(:d) { "M 100 200 A 0 10 0 0 1 200 200" }
+    context 'with an rx of 0' do
+      let(:d) { 'M 100 200 A 0 10 0 0 1 200 200' }
 
-      it "substitutes a line_to" do
+      it 'substitutes a line_to' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
           Prawn::SVG::Elements::Path::Line.new([200.0, 200.0])
@@ -272,10 +295,10 @@ describe Prawn::SVG::Elements::Path do
       end
     end
 
-    context "with an ry of 0" do
-      let(:d) { "M 100 200 A 10 0 0 0 1 200 200" }
+    context 'with an ry of 0' do
+      let(:d) { 'M 100 200 A 10 0 0 0 1 200 200' }
 
-      it "substitutes a line_to" do
+      it 'substitutes a line_to' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0]),
           Prawn::SVG::Elements::Path::Line.new([200.0, 200.0])
@@ -283,24 +306,25 @@ describe Prawn::SVG::Elements::Path do
       end
     end
 
-    context "with incomplete arguments" do
-      let(:d) { "M 100 200 A 10 20 30 L 10 20" }
+    context 'with incomplete arguments' do
+      let(:d) { 'M 100 200 A 10 20 30 L 10 20' }
 
-      it "bails out" do
+      it 'bails out' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
         ]
       end
     end
 
-    context "with highly-compressed flags" do
-      let(:d) { "M100,100a50 50 0 100 100" }
+    context 'with highly-compressed flags' do
+      let(:d) { 'M100,100a50 50 0 100 100' }
 
-      it "correctly parses them" do
+      it 'correctly parses them' do
         expect(subject).to eq [
           Prawn::SVG::Elements::Path::Move.new([100.0, 100.0]),
           Prawn::SVG::Elements::Path::Curve.new([50.0, 150.0], [72.57081148225681, 100.0], [50.0, 122.57081148225681]),
-          Prawn::SVG::Elements::Path::Curve.new([99.99999999999999, 200.0], [50.0, 177.42918851774317], [72.5708114822568, 200.0])
+          Prawn::SVG::Elements::Path::Curve.new([99.99999999999999, 200.0], [50.0, 177.42918851774317],
+            [72.5708114822568, 200.0])
         ]
       end
     end

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

@@ -1,47 +1,47 @@
 require 'spec_helper'
 
 RSpec.describe Prawn::SVG::Elements::Polygon 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::Polygon.new(document, document.root, [], Prawn::SVG::State.new)
   end
 
-  context "with a valid points attribute" do
+  context 'with a valid points attribute' do
     let(:svg) { '<polygon points="10 10 20,20 30,30" />' }
 
-    it "renders the polygon" do
+    it 'renders the polygon' do
       subject.process
       expect(subject.base_calls).to eq [
-        ["fill", [], {}, [
-          ["move_to", [[10.0, 590.0]], {}, []],
-          ["line_to", [[20.0, 580.0]], {}, []],
-          ["line_to", [[30.0, 570.0]], {}, []],
-          ["close_path", [], {}, []]]
-        ]
+        ['fill', [], {}, [
+          ['move_to', [[10.0, 590.0]], {}, []],
+          ['line_to', [[20.0, 580.0]], {}, []],
+          ['line_to', [[30.0, 570.0]], {}, []],
+          ['close_path', [], {}, []]
+        ]]
       ]
     end
   end
 
-  context "with a polygon that has an odd number of arguments" do
+  context 'with a polygon that has an odd number of arguments' do
     let(:svg) { '<polygon points="10 10 20,20 30" />' }
 
-    it "ignores the last one" do
+    it 'ignores the last one' do
       subject.process
       expect(subject.base_calls).to eq [
-        ["fill", [], {}, [
-          ["move_to", [[10.0, 590.0]], {}, []],
-          ["line_to", [[20.0, 580.0]], {}, []],
-          ["close_path", [], {}, []]]
-        ]
+        ['fill', [], {}, [
+          ['move_to', [[10.0, 590.0]], {}, []],
+          ['line_to', [[20.0, 580.0]], {}, []],
+          ['close_path', [], {}, []]
+        ]]
       ]
     end
   end
 
-  context "with a polygon that has no arguments" do
+  context 'with a polygon that has no arguments' do
     let(:svg) { '<polygon points="" />' }
 
-    it "renders nothing" do
+    it 'renders nothing' do
       subject.process
       expect(subject.base_calls).to eq []
     end