prawn-svg 0.16.1 → 0.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2449844e10f3fe6f77f03c24f71b85dc6499335e
-  data.tar.gz: f793df7dcc8504d0fa38b24e9dbd1a253e323aba
+  metadata.gz: aa682df73b98546f5b1bb627b79cdc21151b0b2c
+  data.tar.gz: e1a1f7f04ca5d3c3954fbd9e4c3ddb36aaafd2f5
 SHA512:
-  metadata.gz: 6974bd07c2dcb81694b5b24ab4401ac6cedb8667806f808c8766a974d93dbdb16f3246d2dfa76aebb491866a8fc18e609fa736b153a9b8df95cb00899aa174a3
-  data.tar.gz: 89f35cac3ee7551995f7fd3dbba228157c9651a1a213a535bc226c378238715b18d6359050c96adff5418088fbc131ccecc391938c5c6be44235f2d20739ecc0
+  metadata.gz: 1e139a25230e0402cde88e8f5271f767d2bc3a0f2d34e52b0524de70b6a7e981ac53abbd3a4c2b5e7f868b75c825565b2fed697e2153dbf0f98da53524704407
+  data.tar.gz: 3c0864a2d2b56460c62014f06d9cb5d90911a6aed2a22c81966f1fdbf66ba7c11c631e0aa8e8c3f1d5357c2f81d76831646fa57e3237787e439b81d98bfe93c4

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

@@ -10,6 +10,7 @@ module Prawn
       VALUES_REGEXP = /^#{INSIDE_REGEXP}/
       COMMAND_REGEXP = /^#{OUTSIDE_SPACE_REGEXP}([A-Za-z])((?:#{INSIDE_REGEXP})*)#{OUTSIDE_SPACE_REGEXP}/
 
+      FLOAT_ERROR_DELTA = 1e-10
 
       #
       # Parses an SVG path and returns a Prawn-compatible call tree.
@@ -180,10 +181,21 @@ module Prawn
               y2 += y1
             end
 
+            # Normalise values as per F.6.2
             rx = rx.abs
             ry = ry.abs
             phi = (phi % 360) * 2 * Math::PI / 360.0
 
+            # F.6.2: If the endpoints (x1, y1) and (x2, y2) are identical, then this is equivalent to omitting the elliptical arc segment entirely.
+            return if within_float_delta?(x1, x2) && within_float_delta?(y1, y2)
+
+            # F.6.2: If rx = 0 or ry = 0 then this arc is treated as a straight line segment (a "lineto") joining the endpoints.
+            if within_float_delta?(rx, 0) || within_float_delta?(ry, 0)
+              @last_point = [x2, y2]
+              @calls << ["line_to", @last_point]
+              return
+            end
+
             # We need to get the center co-ordinates, as well as the angles from the X axis to the start and end
             # points.  To do this, we use the algorithm documented in the SVG specification section F.6.5.
 
@@ -204,7 +216,7 @@ module Prawn
             r2x = rx * rx
             r2y = ry * ry
             square = (r2x * r2y - r2x * yp1 * yp1 - r2y * xp1 * xp1) / (r2x * yp1 * yp1 + r2y * xp1 * xp1)
-            square = 0 if square < 0 && square > -1e-10 # catch rounding errors
+            square = 0 if square < 0 && square > -FLOAT_ERROR_DELTA # catch rounding errors
             base = Math.sqrt(square)
             base *= -1 if fa == fs
             cpx = base * rx * yp1 / ry
@@ -254,6 +266,10 @@ module Prawn
         @previous_quadratic_control_point = nil unless %w(Q T).include?(upcase_command)
       end
 
+      def within_float_delta?(a, b)
+        (a - b).abs < FLOAT_ERROR_DELTA
+      end
+
       def match_all(string, regexp) # regexp must start with ^
         result = []
         while string != ""

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Svg
-    VERSION = '0.16.1'
+    VERSION = '0.16.2'
   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.add_runtime_dependency "prawn", ">= 0.8.4", "< 2"
+  gem.add_runtime_dependency "prawn", ">= 0.8.4", "< 3"
   gem.add_development_dependency "rspec", "~> 2.14"
   gem.add_development_dependency "rake", "~> 10.1"
 end

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

@@ -1,15 +1,13 @@
 require 'spec_helper'
 
 describe Prawn::Svg::Parser::Path do
-  before :each do
-    @path = Prawn::Svg::Parser::Path.new
-  end
+  let(:path) { Prawn::Svg::Parser::Path.new }
 
   describe "command parsing" do
     it "correctly parses a valid path" do
       calls = []
-      @path.stub(:run_path_command) {|*args| calls << args}
-      @path.parse("A12.34 -56.78 89B4 5 12-34 -.5.7+3 2.3e3 4e4 4e+4 c31,-2e-5C  6,7 T QX 0 Z")
+      path.stub(:run_path_command) {|*args| calls << args}
+      path.parse("A12.34 -56.78 89B4 5 12-34 -.5.7+3 2.3e3 4e4 4e+4 c31,-2e-5C  6,7 T QX 0 Z")
 
       calls.should == [
         ["A", [12.34, -56.78, 89]],
@@ -24,31 +22,68 @@ describe Prawn::Svg::Parser::Path do
     end
 
     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]]
       ].each do |args|
-        @path.should_receive(:run_path_command).with(*args).and_call_original
+        path.should_receive(:run_path_command).with(*args).and_call_original
       end
 
-      @path.parse("M 1,2 3,4 m 5,6 7,8")
+      path.parse("M 1,2 3,4 m 5,6 7,8")
     end
 
     it "correctly parses an empty path" do
-      @path.should_not_receive(:run_path_command)
-      @path.parse("").should == []
-      @path.parse("   ").should == []
+      path.should_not_receive(:run_path_command)
+      path.parse("").should == []
+      path.parse("   ").should == []
     end
 
     it "raises on invalid characters in the path" do
-      lambda {@path.parse("M 10 % 20")}.should raise_error(Prawn::Svg::Parser::Path::InvalidError)
+      lambda {path.parse("M 10 % 20")}.should raise_error(Prawn::Svg::Parser::Path::InvalidError)
     end
 
     it "raises on numerical data before a command letter" do
-      lambda {@path.parse("10 P")}.should raise_error(Prawn::Svg::Parser::Path::InvalidError)
+      lambda {path.parse("10 P")}.should raise_error(Prawn::Svg::Parser::Path::InvalidError)
+    end
+  end
+
+  context "when given an A path" do
+    it "uses bezier curves to approximate an arc path" do
+      result = path.parse("M 100 200 A 10 10 0 0 1 200 200")
+
+      expect(result).to eq [
+        ["move_to", [100.0, 200.0]],
+        ["curve_to", [150.0, 150.0, 100.0, 172.57081148225683, 122.57081148225683, 150.0]],
+        ["curve_to", [200.0, 200.0, 177.42918851774317, 150.0, 200.0, 172.57081148225683]]
+      ]
+    end
+
+    it "ignores a path that has an identical start and end point" do
+      result = path.parse("M 100 200 A 30 30 0 0 1 100 200")
+
+      expect(result).to eq [
+        ["move_to", [100.0, 200.0]]
+      ]
+    end
+
+    it "substitutes a line_to when rx is 0" do
+      result = path.parse("M 100 200 A 0 10 0 0 1 200 200")
+
+      expect(result).to eq [
+        ["move_to", [100.0, 200.0]],
+        ["line_to", [200.0, 200.0]]
+      ]
+    end
+
+    it "substitutes a line_to when ry is 0" do
+      result = path.parse("M 100 200 A 10 0 0 0 1 200 200")
+
+      expect(result).to eq [
+        ["move_to", [100.0, 200.0]],
+        ["line_to", [200.0, 200.0]]
+      ]
     end
   end
 end

data/spec/sample_svg/display_none.svg

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" version="1.1" width="800" height="600">
+    <g id="layer1" style="display:none">
+       <rect x="350" y="200" width="20" height="20" fill="green" />
+       <text x="361.80859" y="200" id="text2986" xml:space="preserve" style="font-size:24px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica">
+         <tspan x="361.80859" y="200" id="tspan2988">Hidden</tspan>
+       </text>
+    </g>
+    <g id="layer2">
+        <text x="365.24805" y="300" id="text2990" xml:space="preserve" style="font-size:24px;font-style:normal;font-variant:normal;font-weight:500;font-stretch:normal;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;font-family:Helvetica">
+       <tspan x="365.24805" y="300" id="tspan2992">Visible</tspan></text>
+    </g>
+</svg>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.16.1
+  version: 0.16.2
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-21 00:00:00.000000000 Z
+date: 2015-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
@@ -19,7 +19,7 @@ dependencies:
         version: 0.8.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 0.8.4
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -110,6 +110,7 @@ files:
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
+- spec/sample_svg/display_none.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/google_charts.svg
 - spec/sample_svg/hidden_paths.svg
@@ -189,6 +190,7 @@ test_files:
 - spec/sample_svg/cubic01.svg
 - spec/sample_svg/cubic01a.svg
 - spec/sample_svg/cubic02.svg
+- spec/sample_svg/display_none.svg
 - spec/sample_svg/ellipse01.svg
 - spec/sample_svg/google_charts.svg
 - spec/sample_svg/hidden_paths.svg