prawn-svg 0.26.0 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc43729a870492246519b983633bc96720650d74
-  data.tar.gz: d577a115a0cf7fcb8fc8d9f389d83755dbc5acda
+  metadata.gz: 05bd5082f2d3bfb40a2776b9b8239ec0d345e826
+  data.tar.gz: 77c9df1c4f8bab6198ea45a0531314deac6e7a59
 SHA512:
-  metadata.gz: 97c5a9deaf6d7429c9f6f532ca97044d2bd73658009dbb16dd396d5c5b37b8465e9c2366f35e6eee7156b4f9e8450a44e5e284fe65f8b3c4b273515fc86bbb01
-  data.tar.gz: ddc2a03914c5614d9ddb3c90e70a71983546b6e554cfe073ad6faca81e6a1afed7293de0b906f0eda3af02f8b14a775eedd9e5d69de7737aaee23751052d1a2f
+  metadata.gz: 8d429c038aade4dad263441309d48f43e8ea185f67f85de9e556cbb1b2f50dd19af4bc6345e0a62388eaca504caea8d00506404630be11efea206a28a3b680f3
+  data.tar.gz: 83bc2528c2ba901523e3d54e32098852d354d35c07fc7bacbbc2583526422e8d2f613195e94145efeb56eeeb0d2db427b59bd0f1da19f888cc21f0b2cb7fbb7f

data/.travis.yml

@@ -1,6 +1,6 @@
 language: ruby
 rvm:
-  - 2.0.0
-  - 2.1.8
-  - 2.2.4
-  - 2.3.0
+  - 2.1.10
+  - 2.2.7
+  - 2.3.3
+  - 2.4.0

data/README.md

@@ -10,7 +10,7 @@ This will take an SVG document as input and render it into your PDF.  Find out m
   http://github.com/prawnpdf/prawn
 
 prawn-svg is compatible with all versions of Prawn from 0.11.1 onwards, including the 1.x and 2.x series.
-The minimum Ruby version required is 2.0.0.
+The minimum Ruby version required is 2.1.0.
 
 ## Using prawn-svg
 
@@ -76,8 +76,7 @@ prawn-svg supports most but not all of the full SVG 1.1 specification.  It curre
 
  - `<marker>`
 
- - <tt>&lt;linearGradient&gt;</tt> is implemented but not currently working as we are waiting for a pull request to be accepted
-   into Prawn. (gradientTransform, spreadMethod and stop-opacity are unimplemented.)
+ - `<linearGradient>` is implemented with Prawn 2.2.0+ (gradientTransform, spreadMethod and stop-opacity are unimplemented.)
 
  - `<switch>` and `<foreignObject>`, although prawn-svg cannot handle any data that is not SVG so `<foreignObject>`
    tags are always ignored.
@@ -119,6 +118,9 @@ Mac OS X and Debian Linux users.  You can add to the font path:
   Prawn::SVG::FontRegistry.font_path << "/my/font/directory"
 ```
 
+### Using with prawn-rails
+
+In your Gemfile, put `gem 'prawn-svg'` before `gem 'prawn-rails'` so that prawn-rails can see the prawn-svg extension.
 
 --
 Copyright Roger Nesbitt <roger@seriousorange.com>.  MIT licence.

data/lib/prawn/svg/calculators/document_sizing.rb

@@ -1,7 +1,5 @@
 module Prawn::SVG::Calculators
   class DocumentSizing
-    DEFAULT_WIDTH = 300
-    DEFAULT_HEIGHT = 150
     DEFAULT_ASPECT_RATIO = "xMidYMid meet"
 
     attr_writer :document_width, :document_height
@@ -30,17 +28,14 @@ module Prawn::SVG::Calculators
       container_width = @requested_width || @bounds[0]
       container_height = @requested_height || @bounds[1]
 
-      @output_width = Pixels::Measurement.to_pixels(@document_width || @requested_width, container_width)
-      @output_height = Pixels::Measurement.to_pixels(@document_height || @requested_height, container_height)
+      @output_width = Pixels::Measurement.to_pixels(@document_width || container_width, container_width)
+      @output_height = Pixels::Measurement.to_pixels(@document_height || container_height, container_height)
 
       if @view_box
         values = @view_box.strip.split(Prawn::SVG::Elements::COMMA_WSP_REGEXP)
         @x_offset, @y_offset, @viewport_width, @viewport_height = values.map {|value| value.to_f}
 
         if @viewport_width > 0 && @viewport_height > 0
-          @output_width ||= container_width
-          @output_height ||= @output_width * @viewport_height / @viewport_width
-
           aspect = AspectRatio.new(@preserve_aspect_ratio, [@output_width, @output_height], [@viewport_width, @viewport_height])
           @x_scale = aspect.width / @viewport_width
           @y_scale = aspect.height / @viewport_height
@@ -48,9 +43,6 @@ module Prawn::SVG::Calculators
           @y_offset -= aspect.y / @y_scale
         end
       else
-        @output_width ||= Pixels::Measurement.to_pixels(DEFAULT_WIDTH, container_width)
-        @output_height ||= Pixels::Measurement.to_pixels(DEFAULT_HEIGHT, container_height)
-
         @viewport_width = @output_width
         @viewport_height = @output_height
       end

data/lib/prawn/svg/elements/gradient.rb

@@ -42,12 +42,9 @@ class Prawn::SVG::Elements::Gradient < Prawn::SVG::Elements::Base
   end
 
   def assert_compatible_prawn_version
-    # At the moment, the patch required for this functionality to work in prawn has not been merged.
-    raise SkipElementError, "We are unfortunately still waiting on the Prawn project to merge a pull request that is required for this feature to correctly function"
-
-#    if (Prawn::VERSION.split(".").map(&:to_i) <=> [2, 0, 4]) == -1
-#      raise SkipElementError, "Prawn 2.0.4+ must be used if you'd like prawn-svg to render gradients"
-#    end
+    if (Prawn::VERSION.split(".").map(&:to_i) <=> [2, 2, 0]) == -1
+      raise SkipElementError, "Prawn 2.2.0+ must be used if you'd like prawn-svg to render gradients"
+    end
   end
 
   def load_gradient_configuration

data/lib/prawn/svg/elements/line.rb

@@ -2,6 +2,9 @@ class Prawn::SVG::Elements::Line < Prawn::SVG::Elements::Base
   include Prawn::SVG::Pathable
 
   def parse
+    # Lines are one dimensional, so cannot be filled.
+    computed_properties.fill = 'none'
+
     @x1 = x_pixels(attributes['x1'] || 0)
     @y1 = y_pixels(attributes['y1'] || 0)
     @x2 = x_pixels(attributes['x2'] || 0)

data/lib/prawn/svg/elements/path.rb

@@ -22,12 +22,14 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
     matched_commands = match_all(data, COMMAND_REGEXP)
     raise SkipElementError, "Invalid/unsupported syntax for SVG path data" if matched_commands.nil?
 
-    matched_commands.each do |matched_command|
-      command = matched_command[1]
-      matched_values = match_all(matched_command[2], VALUES_REGEXP)
-      raise "should be impossible to have invalid inside data, but we ended up here" if matched_values.nil?
-      values = matched_values.collect {|value| value[1].to_f}
-      parse_path_command(command, values)
+    catch :invalid_command do
+      matched_commands.each do |matched_command|
+        command = matched_command[1]
+        matched_values = match_all(matched_command[2], VALUES_REGEXP)
+        raise "should be impossible to have invalid inside data, but we ended up here" if matched_values.nil?
+        values = matched_values.collect {|value| value[1].to_f}
+        parse_path_command(command, values)
+      end
     end
   end
 
@@ -46,8 +48,8 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
     case upcase_command
     when 'M' # moveto
-      x = values.shift
-      y = values.shift
+      x = values.shift or throw :invalid_command
+      y = values.shift or throw :invalid_command
 
       if relative && @last_point
         x += @last_point.first
@@ -67,7 +69,7 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
     when 'L' # lineto
       while values.any?
         x = values.shift
-        y = values.shift
+        y = values.shift or throw :invalid_command
         if relative && @last_point
           x += @last_point.first
           y += @last_point.last
@@ -92,7 +94,9 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
     when 'C' # curveto
       while values.any?
-        x1, y1, x2, y2, x, y = (1..6).collect {values.shift}
+        x1, y1, x2, y2, x, y = values.shift(6)
+        throw :invalid_command unless y
+
         if relative && @last_point
           x += @last_point.first
           x1 += @last_point.first
@@ -108,7 +112,9 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
 
     when 'S' # shorthand/smooth curveto
       while values.any?
-        x2, y2, x, y = (1..4).collect {values.shift}
+        x2, y2, x, y = values.shift(4)
+        throw :invalid_command unless y
+
         if relative && @last_point
           x += @last_point.first
           x2 += @last_point.first
@@ -130,11 +136,13 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
     when 'Q', 'T' # quadratic curveto
       while values.any?
         if shorthand = upcase_command == 'T'
-          x, y = (1..2).collect {values.shift}
+          x, y = values.shift(2)
         else
-          x1, y1, x, y = (1..4).collect {values.shift}
+          x1, y1, x, y = values.shift(4)
         end
 
+        throw :invalid_command unless y
+
         if relative && @last_point
           x += @last_point.first
           x1 += @last_point.first if x1
@@ -166,7 +174,9 @@ class Prawn::SVG::Elements::Path < Prawn::SVG::Elements::Base
       return unless @last_point
 
       while values.any?
-        rx, ry, phi, fa, fs, x2, y2 = (1..7).collect {values.shift}
+        rx, ry, phi, fa, fs, x2, y2 = values.shift(7)
+        throw :invalid_command unless y2
+
         x1, y1 = @last_point
 
         return if rx.zero? && ry.zero?

data/lib/prawn/svg/font.rb

@@ -21,9 +21,11 @@ class Prawn::SVG::Font
   end
 
   def initialize(name, weight, style, font_registry: nil)
-    name = GENERIC_CSS_FONT_MAPPING.fetch(name, name) # If it's a standard CSS font name, map it to one of the standard PDF fonts.
-
     @font_registry = font_registry
+    unless font_registry.installed_fonts.key?(name)
+      # map generic font name to one of the built-in PDF fonts if not already mapped
+      name = GENERIC_CSS_FONT_MAPPING[name] || name
+    end
     @name = font_registry.correctly_cased_font_name(name) || name
     @weight = weight
     @style = style

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module SVG
-    VERSION = '0.26.0'
+    VERSION = '0.27.0'
   end
 end

data/prawn-svg.gemspec

@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |gem|
   gem.name          = "prawn-svg"
   gem.require_paths = ["lib"]
 
-  gem.required_ruby_version = '>= 2.0.0'
+  gem.required_ruby_version = '>= 2.1.0'
 
   gem.add_runtime_dependency "prawn", ">= 0.11.1", "< 3"
   gem.add_runtime_dependency "css_parser", "~> 1.3"

data/spec/prawn/svg/calculators/document_sizing_spec.rb

@@ -74,12 +74,12 @@ describe Prawn::SVG::Calculators::DocumentSizing do
       context "when a viewBox is specified" do
         let(:attributes) { {"viewBox" => "0 0 100 200"} }
 
-        it "defaults to 100% width and the width times aspect ratio in height" do
+        it "defaults to 100% width and height" do
           sizing.calculate
           expect(sizing.viewport_width).to eq 100
           expect(sizing.viewport_height).to eq 200
           expect(sizing.output_width).to eq 1200
-          expect(sizing.output_height).to eq 2400
+          expect(sizing.output_height).to eq 800
         end
       end
 
@@ -116,11 +116,11 @@ describe Prawn::SVG::Calculators::DocumentSizing do
       context "when neither viewBox nor requested width/height specified" do
         let(:attributes) { {} }
 
-        it "defaults to 300x150, because that's what HTML does" do
+        it "defaults to 100%" do
           sizing.calculate
 
-          expect(sizing.output_width).to eq 300
-          expect(sizing.output_height).to eq 150
+          expect(sizing.output_width).to eq 1200
+          expect(sizing.output_height).to eq 800
         end
       end
     end

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

@@ -32,7 +32,7 @@ describe Prawn::SVG::Elements::Base do
       it "appends the relevant calls" do
         element.process
         expect(element.base_calls).to eq [
-          ["rotate", [-90.0, {origin: [0, 150.0]}], [
+          ["rotate", [-90.0, {origin: [0, 600.0]}], [
             ["transparent", [0.5, 1], [
               ["fill_color", ["ff0000"], []],
               ["stroke_color", ["0000ff"], []],

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

@@ -8,12 +8,13 @@ RSpec.describe Prawn::SVG::Elements::Line do
   end
 
   context "with attributes specified" do
-    let(:svg) { '<line x1="5" y1="10" x2="15" y2="20" />' }
+    let(:svg) { '<line x1="5" y1="10" x2="15" y2="20" stroke="black" />' }
 
     it "renders the line" do
       subject.process
       expect(subject.base_calls).to eq [
-        ["fill", [], [
+        ["stroke_color", ["000000"], []],
+        ["stroke", [], [
           ["move_to", [[5.0, 590.0]], []],
           ["line_to", [[15.0, 580.0]], []]]
         ]
@@ -21,17 +22,34 @@ RSpec.describe Prawn::SVG::Elements::Line do
     end
   end
 
-  context "with no attributes specified" do
+  context "with no attributes nor stroke specified" do
     let(:svg) { '<line />' }
 
-    it "draws a line 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 [
-        ["fill", [], [
+        ["end_path", [], [
           ["move_to", [[0, 600]], []],
           ["line_to", [[0, 600]], []]]
         ]
       ]
     end
   end
+
+  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
+      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]], []]]
+        ]
+      ]
+    end
+  end
 end

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

@@ -12,7 +12,7 @@ RSpec.describe Prawn::SVG::Elements::Marker do
           <path d="M 0 0 L 10 5 L 0 10 z" />
         </marker>
 
-        <line x2="10" y2="10" stroke-width="100" />
+        <line x2="10" y2="10" stroke="black" stroke-width="100" />
       </svg>
     SVG
   end
@@ -54,8 +54,9 @@ 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], []],
-        ["fill", [], [
+        ["stroke", [], [
             ["move_to", [[0.0, 600.0]], []],
             ["line_to", [[10.0, 590.0]], []]
           ]
@@ -69,7 +70,7 @@ RSpec.describe Prawn::SVG::Elements::Marker do
             ["clip", [], []],
             ["transformation_matrix", [0.3, 0, 0, 0.3, 0, 0], []],
             ["transparent", [1.0, 1.0], [
-                ["fill_color", ["000000"], []],
+                ["stroke_color", ["000000"], []],
                 ["line_width", [100.0], []],
                 ["cap_style", [:butt], []],
                 ["undash", [], []],

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

@@ -74,6 +74,168 @@ describe Prawn::SVG::Elements::Path do
     end
   end
 
+  context "when given an M path" do
+    subject { path.parse; path.commands }
+
+    context "with typical arguments" do
+      let(:d) { "M 100 200 M 200 300 m 10 20" }
+
+      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]),
+        ]
+      end
+    end
+
+    context "with only one argument" do
+      let(:d) { "M 100 200 M 100" }
+
+      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" }
+
+      it "bails out" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
+        ]
+      end
+    end
+  end
+
+  context "when given an L path" do
+    subject { path.parse; path.commands }
+
+    context "with typical arguments" do
+      let(:d) { "M 100 200 L 200 300 l 10 20" }
+
+      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]),
+        ]
+      end
+    end
+
+    context "with only one argument" do
+      let(:d) { "M 100 200 L 100" }
+
+      it "bails out" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
+        ]
+      end
+    end
+  end
+
+  context "when given a C path" do
+    subject { path.parse; path.commands }
+
+    context "with typical arguments" do
+      let(:d) { "M 100 200 C 10 20 30 40 200 300" }
+
+      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]),
+        ]
+      end
+    end
+
+    context "with incomplete arguments" do
+      let(:d) { "M 100 200 C 10 20 30 40 50" }
+
+      it "bails out" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
+        ]
+      end
+    end
+  end
+
+  context "when given an S path" do
+    subject { path.parse; path.commands }
+
+    context "with typical arguments" do
+      let(:d) { "M 100 200 S 30 40 200 300" }
+
+      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]),
+        ]
+      end
+    end
+
+    context "with incomplete arguments" do
+      let(:d) { "M 100 200 S 30 40 50" }
+
+      it "bails out" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
+        ]
+      end
+    end
+  end
+
+  context "when given a Q path" do
+    subject { path.parse; path.commands }
+
+    context "with typical arguments" do
+      let(:d) { "M 0 0 Q 600 300 300 600" }
+
+      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])
+        ]
+      end
+    end
+
+    context "with incomplete arguments" do
+      let(:d) { "M 100 200 Q 30 40 50" }
+
+      it "bails out" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
+        ]
+      end
+    end
+  end
+
+  context "when given a T path" do
+    subject { path.parse; path.commands }
+
+    context "with typical arguments" do
+      let(:d) { "M 0 0 T 300 600" }
+
+      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])
+        ]
+      end
+    end
+
+    context "with incomplete arguments" do
+      let(:d) { "M 100 200 T 30" }
+
+      it "bails out" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
+        ]
+      end
+    end
+  end
+
   context "when given an A path" do
     subject { path.parse; path.commands }
 
@@ -98,7 +260,7 @@ describe Prawn::SVG::Elements::Path do
         ]
       end
     end
-    
+
     context "with an rx of 0" do
       let(:d) { "M 100 200 A 0 10 0 0 1 200 200" }
 
@@ -120,5 +282,15 @@ 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" }
+
+      it "bails out" do
+        expect(subject).to eq [
+          Prawn::SVG::Elements::Path::Move.new([100.0, 200.0])
+        ]
+      end
+    end
   end
 end

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

@@ -65,7 +65,7 @@ Even more
 
     it "should inherit text-anchor from parent element" do
       element.process
-      expect(element.calls.flatten).to include(:size => 12.0, :style => :normal, :text_anchor => "middle", :at => [50.0, 136.0], :offset => [0,0])
+      expect(element.calls.flatten).to include(:size => 12.0, :style => :normal, :text_anchor => "middle", :at => [50.0, 586.0], :offset => [0,0])
     end
   end
 

data/spec/prawn/svg/font_spec.rb

@@ -1,4 +1,17 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe Prawn::SVG::Font do
+  describe "#initialize" do
+    it "maps generic font name to built-in font" do
+      font_registry = Prawn::SVG::FontRegistry.new({})
+      font = Prawn::SVG::Font.new('sans-serif', :normal, :normal, font_registry: font_registry)
+      font.name.should == 'Helvetica'
+    end
+
+    it "preserves generic font name if mapped" do
+      font_registry = Prawn::SVG::FontRegistry.new('sans-serif' => { normal: 'Times-Roman' })
+      font = Prawn::SVG::Font.new('sans-serif', :normal, :normal, font_registry: font_registry)
+      font.name.should == 'sans-serif'
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.27.0
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -236,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="