prawn-svg 0.23.1 → 0.24.0

data/spec/prawn/svg/pathable_spec.rb

@@ -0,0 +1,92 @@
+require 'spec_helper'
+
+RSpec.describe Prawn::SVG::Pathable do
+  class FakeElement < Prawn::SVG::Elements::Base
+    include Prawn::SVG::Pathable
+
+    def initialize(*args)
+      super
+      @properties = Struct.new(:marker_start, :marker_mid, :marker_end).new
+    end
+
+    public :apply_commands
+    public :apply_markers
+
+    def commands
+      @commands ||= [
+        Prawn::SVG::Pathable::Move.new([10, 10]),
+        Prawn::SVG::Pathable::Line.new([20, 20]),
+        Prawn::SVG::Pathable::Curve.new([30, 30], [25, 20], [25, 25]),
+        Prawn::SVG::Pathable::Close.new([10, 10])
+      ]
+    end
+  end
+
+  let(:document) { Prawn::SVG::Document.new("<svg></svg>", [800, 600], {width: 800, height: 600}) }
+  let(:state) { Prawn::SVG::State.new }
+
+  subject do
+    FakeElement.new(document, document.root, [], state)
+  end
+
+  describe "#bounding_box" do
+    it "determines the bounding box using the translated commands" do
+      expect(subject.bounding_box).to eq [10, 590, 30, 570]
+    end
+  end
+
+  describe "#apply_commands" do
+    it "applies the commands to the call stack" do
+      subject.apply_commands
+
+      expect(subject.base_calls).to eq [
+        ["move_to", [[10.0, 590.0]], []],
+        ["line_to", [[20.0, 580.0]], []],
+        ["curve_to", [[30.0, 570.0], {bounds: [[25.0, 580.0], [25.0, 575.0]]}], []],
+        ["close_path", [], []]
+      ]
+    end
+  end
+
+  describe "#apply_markers" do
+    let(:marker) { instance_double(Prawn::SVG::Elements::Marker, name: "marker") }
+
+    before do
+      document.elements_by_id["triangle"] = marker
+    end
+
+    context "with marker-start attribute specified" do
+      before do
+        subject.properties.marker_start = "url(#triangle)"
+      end
+
+      it "calls apply_marker on the marker" do
+        expect(marker).to receive(:apply_marker).with(subject, point: [10, 10], angle: 45)
+        subject.apply_markers
+      end
+    end
+
+    context "with marker-mid attribute specified" do
+      before do
+        subject.properties.marker_mid = "url(#triangle)"
+      end
+
+      it "calls apply_marker on the marker" do
+        expect(marker).to receive(:apply_marker).with(subject, point: [20, 20], angle: 45)
+        expect(marker).to receive(:apply_marker).with(subject, point: [30, 30], angle: -45)
+        subject.apply_markers
+      end
+    end
+
+    context "with marker-end attribute specified" do
+      before do
+        subject.properties.marker_end = "url(#triangle)"
+      end
+
+      it "calls apply_marker on the marker" do
+        expect(marker).to receive(:apply_marker).with(subject, point: [10, 10], angle: -45)
+        subject.apply_markers
+      end
+    end
+  end
+end

data/spec/prawn/svg/properties_spec.rb

@@ -0,0 +1,186 @@
+require 'spec_helper'
+
+RSpec.describe Prawn::SVG::Properties do
+  subject { Prawn::SVG::Properties.new }
+
+  describe "#load_default_stylesheet" do
+    it "loads in the defaults and returns self" do
+      expect(subject.load_default_stylesheet).to eq subject
+      expect(subject.font_family).to eq 'sans-serif'
+    end
+  end
+
+  describe "#set" do
+    it "sets a property" do
+      result = subject.set('color', 'red')
+      expect(result).to be
+      expect(subject.color).to eq 'red'
+    end
+
+    it "handles property names that are not lower case" do
+      result = subject.set('COLor', 'red')
+      expect(result).to be
+      expect(subject.color).to eq 'red'
+    end
+
+    it "right-cases and strips keywords" do
+      subject.set('stroke-linecap', ' Round ')
+      expect(subject.stroke_linecap).to eq 'round'
+    end
+
+    it "doesn't right-case values that aren't recognised as keywords" do
+      subject.set('color', 'Red')
+      expect(subject.color).to eq 'Red'
+    end
+
+    it "sets a 'keyword restricted' property to its default if the value doesn't match a keyword" do
+      subject.set('stroke-linecap', 'invalid')
+      expect(subject.stroke_linecap).to eq 'butt'
+    end
+  end
+
+  describe "#load_hash" do
+    it "uses #set to load in a hash of properties" do
+      subject.load_hash("stroke" => "blue", "fill" => "green", 'stroke-linecap' => "Round")
+      expect(subject.stroke).to eq 'blue'
+      expect(subject.fill).to eq 'green'
+      expect(subject.stroke_linecap).to eq 'round'
+    end
+  end
+
+  describe "#compute_properties" do
+    let(:other) { Prawn::SVG::Properties.new }
+
+    it "auto-inherits inheritable properties when the property is not supplied" do
+      subject.set('color', 'green')
+      subject.compute_properties(other)
+      expect(subject.color).to eq 'green'
+    end
+
+    it "doesn't auto-inherit non-inheritable properties" do
+      subject.set('display', 'none')
+      subject.compute_properties(other)
+      expect(subject.display).to eq 'inline'
+    end
+
+    it "inherits non-inheritable properties when specifically asked to" do
+      subject.set('display', 'none')
+      other.set('display', 'inherit')
+      subject.compute_properties(other)
+      expect(subject.display).to eq 'none'
+    end
+
+    it "uses the new property value" do
+      subject.set('color', 'green')
+      other.set('color', 'red')
+      subject.compute_properties(other)
+      expect(subject.color).to eq 'red'
+    end
+
+    describe "font size" do
+      before do
+        subject.font_size = "15"
+        other.font_size = font_size
+      end
+
+      context "when given a % as a font-size" do
+        let(:font_size) { "120%" }
+
+        it "calculates the new font size" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "18.0"
+        end
+      end
+
+      context "when given 'larger' as a font-size" do
+        let(:font_size) { "larger" }
+
+        it "calculates the new font size" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "19.0"
+        end
+      end
+
+      context "when given 'smaller' as a font-size" do
+        let(:font_size) { "smaller" }
+
+        it "calculates the new font size" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "11.0"
+        end
+      end
+
+      context "when given a value in 'em' as a font-size" do
+        let(:font_size) { "2.5em" }
+
+        it "calculates the new font size" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "37.5"
+        end
+      end
+
+      context "when given a value in 'rem' as a font-size" do
+        let(:font_size) { "2.5rem" }
+
+        it "calculates the new font size" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "40.0"
+        end
+      end
+
+      context "when given a value in 'px' as a font-size" do
+        let(:font_size) { "19.5px" }
+
+        it "uses the font size specified" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "19.5"
+        end
+      end
+
+      context "when given a value in 'pt' as a font-size" do
+        let(:font_size) { "19.5pt" }
+
+        it "uses the font size specified" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "19.5"
+        end
+      end
+
+      context "when given a value without units as a font-size" do
+        let(:font_size) { "19.5" }
+
+        it "uses the font size specified" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "19.5"
+        end
+      end
+
+      context "when given the keyword 'inherit' as a font-size" do
+        let(:font_size) { "inherit" }
+
+        it "uses the font size specified by the parent" do
+          subject.compute_properties(other)
+          expect(subject.font_size).to eq "15"
+        end
+      end
+    end
+  end
+
+  describe "#numerical_font_size" do
+    context "when the font size is a number" do
+      before { subject.font_size = "16.5" }
+
+      it "returns the number as a float" do
+        expect(subject.numerical_font_size).to eq 16.5
+      end
+    end
+
+    context "when the font size is one of the keyword size specifiers" do
+      before { subject.font_size = "x-large" }
+
+      it "returns the font size number corresponding with the keyword" do
+        expect(subject.numerical_font_size).to eq 24
+      end
+    end
+  end
+end

data/spec/sample_svg/arrows.svg

@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="200"
+   height="200"
+   id="svg2"
+   version="1.1">
+  <defs
+     id="defs4">
+    <marker
+       style="overflow:visible;"
+       id="Arrow1Lend"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1Lend">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="fill-rule:evenodd;stroke:#000000;stroke-width:1.0pt;"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path3762" />
+    </marker>
+    <marker
+       style="overflow:visible;"
+       id="Arrow1LendK"
+       refX="0.0"
+       refY="0.0"
+       orient="auto"
+       inkscape:stockid="Arrow1LendK">
+      <path
+         transform="scale(0.8) rotate(180) translate(12.5,0)"
+         style="stroke:#ff0000;stroke-width:1.0pt;fill:#ff0000;fill-rule:evenodd"
+         d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+         id="path4230" />
+    </marker>
+  </defs>
+  <metadata
+     id="metadata7">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     transform="translate(0,-852.36218)"
+     id="layer1"
+     inkscape:groupmode="layer"
+     inkscape:label="Layer 1">
+    <path
+       transform="translate(0,852.36218)"
+       inkscape:connector-curvature="0"
+       id="path2985"
+       d="M 26.263966,144.94669 122.22846,94.439059"
+       style="fill:none;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow1Lend)" />
+    <path
+       inkscape:connector-curvature="0"
+       id="path2985-7"
+       d="M 40.406101,953.8723 136.3706,903.36467"
+       style="stroke-linejoin:miter;marker-end:url(#Arrow1LendK);stroke-opacity:1;stroke:#ff0000;stroke-linecap:butt;stroke-width:1px;fill:#ff0000" />
+  </g>
+</svg>

data/spec/sample_svg/marker.svg

@@ -0,0 +1,32 @@
+<?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">
+<svg width="4in" height="2in"
+     viewBox="0 0 4000 2000" version="1.1"
+     xmlns="http://www.w3.org/2000/svg">
+  <defs>
+    <g stroke="red" fill="cyan" stroke-dasharray="3 3" stroke-opacity="0.5">
+      <marker id="Triangle"
+        viewBox="0 0 20 20" refX="0" refY="5"
+        markerUnits="strokeWidth"
+        markerWidth="4" markerHeight="3"
+        stroke-width="4"
+        fill="blue"
+        orient="auto">
+        <path d="M 0 0 L 20 5 L 0 10 z" />
+      </marker>
+    </g>
+  </defs>
+  <rect x="10" y="10" width="3980" height="1980" fill="none" stroke="blue" stroke-width="10" />
+  <path d="M 1000 750 L 2000 750 L 2500 1250"
+        fill="none" stroke="green" stroke-width="100"
+        marker-mid="url(#Triangle)"  />
+
+  <g transform="scale(12) translate(50 40)">
+  <path d="M10 80 Q 52.5 10, 95 80 L 115 80 T 180 80" stroke="yellow" fill="none" stroke-width="8"
+  marker-start="url(#Triangle)"
+  marker-mid="url(#Triangle)"
+  marker-end="url(#Triangle)" />
+  </g>
+
+</svg>

data/spec/sample_svg/polygon01.svg

@@ -1,17 +1,37 @@
 <?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" 
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
   "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
 <svg width="12cm" height="4cm" viewBox="0 0 1200 400"
      xmlns="http://www.w3.org/2000/svg" version="1.1">
+  <defs>
+      <marker id="a"
+        viewBox="0 0 20 20" refX="0" refY="5"
+        markerUnits="strokeWidth"
+        markerWidth="4" markerHeight="3"
+        orient="auto">
+        <path d="M 0 0 L 20 5 L 0 10 z" fill="yellow" />
+      </marker>
+      <marker id="Triangle"
+        viewBox="0 0 20 20" refX="0" refY="5"
+        markerUnits="strokeWidth"
+        markerWidth="4" markerHeight="3"
+        orient="auto">
+        <path d="M 0 0 L 20 5 L 0 10 z" />
+      </marker>
+    <g stroke="red" fill="none" stroke-dasharray="3 3" stroke-opacity="0.3">
+    </g>
+  </defs>
   <desc>Example polygon01 - star and hexagon</desc>
   <!-- Show outline of canvas using 'rect' element -->
   <rect x="1" y="1" width="1198" height="398"
         fill="none" stroke="blue" stroke-width="2" />
-  <polygon fill="red" stroke="blue" stroke-width="10" 
+  <polygon fill="red" stroke="blue" stroke-width="10"
             points="350,75  379,161 469,161 397,215
                     423,301 350,250 277,301 303,215
-                    231,161 321,161" />
-  <polygon fill="lime" stroke="blue" stroke-width="10" 
+                    231,161 321,161"
+                    marker-mid="url(#Triangle)" marker-start="url(#a)" marker-end="url(#a)" />
+  <polygon fill="lime" stroke="blue" stroke-width="10"
             points="850,75  958,137.5 958,262.5
-                    850,325 742,262.6 742,137.5" />
+                    850,325 742,262.6 742,137.5"
+                    marker-mid="url(#Triangle)" marker-start="url(#a)" marker-end="url(#a)" />
 </svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.23.1
+  version: 0.24.0
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-02 00:00:00.000000000 Z
+date: 2016-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -90,12 +90,10 @@ files:
 - lib/prawn-svg.rb
 - lib/prawn/svg/attributes.rb
 - lib/prawn/svg/attributes/clip_path.rb
-- lib/prawn/svg/attributes/color.rb
-- lib/prawn/svg/attributes/display.rb
-- lib/prawn/svg/attributes/font.rb
 - lib/prawn/svg/attributes/opacity.rb
 - lib/prawn/svg/attributes/stroke.rb
 - lib/prawn/svg/attributes/transform.rb
+- lib/prawn/svg/calculators/arc_to_bezier_curve.rb
 - lib/prawn/svg/calculators/aspect_ratio.rb
 - lib/prawn/svg/calculators/document_sizing.rb
 - lib/prawn/svg/calculators/pixels.rb
@@ -111,6 +109,7 @@ files:
 - lib/prawn/svg/elements/ignored.rb
 - lib/prawn/svg/elements/image.rb
 - lib/prawn/svg/elements/line.rb
+- lib/prawn/svg/elements/marker.rb
 - lib/prawn/svg/elements/path.rb
 - lib/prawn/svg/elements/polygon.rb
 - lib/prawn/svg/elements/polyline.rb
@@ -126,13 +125,14 @@ files:
 - lib/prawn/svg/loaders/data.rb
 - lib/prawn/svg/loaders/file.rb
 - lib/prawn/svg/loaders/web.rb
+- lib/prawn/svg/pathable.rb
+- lib/prawn/svg/properties.rb
 - lib/prawn/svg/state.rb
 - lib/prawn/svg/ttf.rb
 - lib/prawn/svg/url_loader.rb
 - lib/prawn/svg/version.rb
 - prawn-svg.gemspec
 - spec/integration_spec.rb
-- spec/prawn/svg/attributes/font_spec.rb
 - spec/prawn/svg/attributes/transform_spec.rb
 - spec/prawn/svg/calculators/aspect_ratio_spec.rb
 - spec/prawn/svg/calculators/document_sizing_spec.rb
@@ -141,7 +141,11 @@ files:
 - spec/prawn/svg/document_spec.rb
 - spec/prawn/svg/elements/base_spec.rb
 - spec/prawn/svg/elements/gradient_spec.rb
+- spec/prawn/svg/elements/line_spec.rb
+- spec/prawn/svg/elements/marker_spec.rb
 - spec/prawn/svg/elements/path_spec.rb
+- spec/prawn/svg/elements/polygon_spec.rb
+- spec/prawn/svg/elements/polyline_spec.rb
 - spec/prawn/svg/elements/style_spec.rb
 - spec/prawn/svg/elements/text_spec.rb
 - spec/prawn/svg/font_registry_spec.rb
@@ -150,12 +154,15 @@ files:
 - spec/prawn/svg/loaders/data_spec.rb
 - spec/prawn/svg/loaders/file_spec.rb
 - spec/prawn/svg/loaders/web_spec.rb
+- spec/prawn/svg/pathable_spec.rb
+- spec/prawn/svg/properties_spec.rb
 - spec/prawn/svg/ttf_spec.rb
 - spec/prawn/svg/url_loader_spec.rb
 - spec/sample_images/mushroom-long.jpg
 - spec/sample_images/mushroom-wide.jpg
 - spec/sample_output/directory
 - spec/sample_svg/arcs01.svg
+- spec/sample_svg/arrows.svg
 - spec/sample_svg/cap_styles.svg
 - spec/sample_svg/circle01.svg
 - spec/sample_svg/clip_path.svg
@@ -174,6 +181,7 @@ files:
 - spec/sample_svg/image02_base64.svg
 - spec/sample_svg/image03.svg
 - spec/sample_svg/line01.svg
+- spec/sample_svg/marker.svg
 - spec/sample_svg/maths.svg
 - spec/sample_svg/matrix_transform.svg
 - spec/sample_svg/matrix_transform_3.svg
@@ -225,13 +233,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: SVG renderer for Prawn PDF library
 test_files:
 - spec/integration_spec.rb
-- spec/prawn/svg/attributes/font_spec.rb
 - spec/prawn/svg/attributes/transform_spec.rb
 - spec/prawn/svg/calculators/aspect_ratio_spec.rb
 - spec/prawn/svg/calculators/document_sizing_spec.rb
@@ -240,7 +247,11 @@ test_files:
 - spec/prawn/svg/document_spec.rb
 - spec/prawn/svg/elements/base_spec.rb
 - spec/prawn/svg/elements/gradient_spec.rb
+- spec/prawn/svg/elements/line_spec.rb
+- spec/prawn/svg/elements/marker_spec.rb
 - spec/prawn/svg/elements/path_spec.rb
+- spec/prawn/svg/elements/polygon_spec.rb
+- spec/prawn/svg/elements/polyline_spec.rb
 - spec/prawn/svg/elements/style_spec.rb
 - spec/prawn/svg/elements/text_spec.rb
 - spec/prawn/svg/font_registry_spec.rb
@@ -249,12 +260,15 @@ test_files:
 - spec/prawn/svg/loaders/data_spec.rb
 - spec/prawn/svg/loaders/file_spec.rb
 - spec/prawn/svg/loaders/web_spec.rb
+- spec/prawn/svg/pathable_spec.rb
+- spec/prawn/svg/properties_spec.rb
 - spec/prawn/svg/ttf_spec.rb
 - spec/prawn/svg/url_loader_spec.rb
 - spec/sample_images/mushroom-long.jpg
 - spec/sample_images/mushroom-wide.jpg
 - spec/sample_output/directory
 - spec/sample_svg/arcs01.svg
+- spec/sample_svg/arrows.svg
 - spec/sample_svg/cap_styles.svg
 - spec/sample_svg/circle01.svg
 - spec/sample_svg/clip_path.svg
@@ -273,6 +287,7 @@ test_files:
 - spec/sample_svg/image02_base64.svg
 - spec/sample_svg/image03.svg
 - spec/sample_svg/line01.svg
+- spec/sample_svg/marker.svg
 - spec/sample_svg/maths.svg
 - spec/sample_svg/matrix_transform.svg
 - spec/sample_svg/matrix_transform_3.svg