prawn-svg 0.16.0 → 0.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d7cbba75e8c3a5128d1c5136977b4b91d091407
-  data.tar.gz: e1996ddcb667032eae7777fea1decb58b470a600
+  metadata.gz: 2449844e10f3fe6f77f03c24f71b85dc6499335e
+  data.tar.gz: f793df7dcc8504d0fa38b24e9dbd1a253e323aba
 SHA512:
-  metadata.gz: 3fc7f25cb50723695bcb95485daad73b89e158662f5c0af06f10a062395d8c903b8bea7447c7dca2b4ed15c58bcbcc8115e3dc564b62ae8b6b22af62d2907f9b
-  data.tar.gz: 312b2b093fec372fa444c61175b843592cac404c233f54cd3ec156ea85f4615337b5e8d7bb1372819c457df9476fca1ece3fbefff41a3415ae733676e92706c6
+  metadata.gz: 6974bd07c2dcb81694b5b24ab4401ac6cedb8667806f808c8766a974d93dbdb16f3246d2dfa76aebb491866a8fc18e609fa736b153a9b8df95cb00899aa174a3
+  data.tar.gz: 89f35cac3ee7551995f7fd3dbba228157c9651a1a213a535bc226c378238715b18d6359050c96adff5418088fbc131ccecc391938c5c6be44235f2d20739ecc0

data/lib/prawn/svg/element.rb

@@ -57,12 +57,13 @@ class Prawn::Svg::Element
     draw_types = parse_fill_and_stroke_attributes_and_call
     parse_stroke_width_attribute_and_call
     parse_font_attributes_and_call
+    parse_display_attribute
     apply_drawing_call(draw_types)
   end
 
   def apply_drawing_call(draw_types)
     if !@state[:disable_drawing] && !container?
-      if draw_types.empty?
+      if draw_types.empty? || @state[:display] == "none"
         add_call_and_enter("end_path")
       else
         add_call_and_enter(draw_types.join("_and_"))
@@ -193,6 +194,9 @@ class Prawn::Svg::Element
     end
   end
 
+  def parse_display_attribute
+    @state[:display] = @attributes['display'].strip if @attributes['display']
+  end
 
   def parse_css_method_calls(string)
     string.scan(/\s*(\w+)\(([^)]+)\)\s*/).collect do |call|

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

@@ -18,6 +18,8 @@ class Prawn::Svg::Parser::Image
   end
 
   def parse(element)
+    return if element.state[:display] == "none"
+
     attrs = element.attributes
     url = attrs['xlink:href'] || attrs['href']
     if url.nil?

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

@@ -173,6 +173,8 @@ module Prawn
             rx, ry, phi, fa, fs, x2, y2 = (1..7).collect {values.shift}
             x1, y1 = @last_point
 
+            return if rx.zero? && ry.zero?
+
             if relative
               x2 += x1
               y2 += y1

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

@@ -6,6 +6,8 @@ class Prawn::Svg::Parser::Text
 
   protected
   def internal_parse(element, x_positions, y_positions, relative)
+    return if element.state[:display] == "none"
+
     attrs = element.attributes
 
     if attrs['x'] || attrs['y']

data/lib/prawn/svg/parser.rb

@@ -123,26 +123,35 @@ class Prawn::Svg::Parser
       element.add_call "polygon", *points
 
     when 'circle'
+      xy, r = [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], distance(attrs['r'])
+
+      return if zero_argument?(r)
+
       if USE_NEW_CIRCLE_CALL
-        element.add_call "circle",
-          [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], distance(attrs['r'])
+        element.add_call "circle", xy, r
       else
-        element.add_call "circle_at",
-          [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], :radius => distance(attrs['r'])
+        element.add_call "circle_at", xy, :radius => r
       end
 
     when 'ellipse'
-      element.add_call USE_NEW_ELLIPSE_CALL ? "ellipse" : "ellipse_at",
-        [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], distance(attrs['rx']), distance(attrs['ry'])
+      xy, rx, ry = [x(attrs['cx'] || "0"), y(attrs['cy'] || "0")], distance(attrs['rx']), distance(attrs['ry'])
+
+      return if zero_argument?(rx, ry)
+
+      element.add_call USE_NEW_ELLIPSE_CALL ? "ellipse" : "ellipse_at", xy, rx, ry
 
     when 'rect'
-      radius = distance(attrs['rx'] || attrs['ry'])
-      args = [[x(attrs['x'] || '0'), y(attrs['y'] || '0')], distance(attrs['width']), distance(attrs['height'])]
+      xy            = [x(attrs['x'] || '0'), y(attrs['y'] || '0')]
+      width, height = distance(attrs['width']), distance(attrs['height'])
+      radius        = distance(attrs['rx'] || attrs['ry'])
+
+      return if zero_argument?(width, height)
+
       if radius
         # n.b. does not support both rx and ry being specified with different values
-        element.add_call "rounded_rectangle", *(args + [radius])
+        element.add_call "rounded_rectangle", xy, width, height, radius
       else
-        element.add_call "rectangle", *args
+        element.add_call "rectangle", xy, width, height
       end
 
     when 'path'
@@ -240,6 +249,10 @@ class Prawn::Svg::Parser
     missing_attrs.empty?
   end
 
+  def zero_argument?(*args)
+    args.any? {|arg| arg.nil? || arg <= 0}
+  end
+
   %w(x y distance).each do |method|
     define_method(method) {|*a| @document.send(method, *a)}
   end

data/lib/prawn/svg/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Svg
-    VERSION = '0.16.0'
+    VERSION = '0.16.1'
   end
 end

data/prawn-svg.gemspec

@@ -5,7 +5,7 @@ spec = Gem::Specification.new do |gem|
   gem.name = 'prawn-svg'
   gem.version = Prawn::Svg::VERSION
   gem.summary = "SVG renderer for Prawn PDF library"
-  gem.description = "SVG renderer for Prawn PDF library"
+  gem.description = "This gem allows you to render SVG directly into a PDF using the 'prawn' gem.  Since PDF is vector-based, you'll get nice scaled graphics if you use SVG instead of an image."
   gem.has_rdoc = false
   gem.author = "Roger Nesbitt"
   gem.email = "roger@seriousorange.com"
@@ -18,7 +18,7 @@ spec = Gem::Specification.new do |gem|
   gem.name          = "prawn-svg"
   gem.require_paths = ["lib"]
 
-  gem.add_dependency "prawn", ">= 0.8.4"
-  gem.add_development_dependency "rspec", "~> 2.14.1"
-  gem.add_development_dependency "rake"
+  gem.add_runtime_dependency "prawn", ">= 0.8.4", "< 2"
+  gem.add_development_dependency "rspec", "~> 2.14"
+  gem.add_development_dependency "rake", "~> 10.1"
 end

data/spec/sample_svg/pie_piece.svg

@@ -0,0 +1,7 @@
+<svg xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" style="font-family:'lucida grande', 'lucida sans unicode', arial, helvetica, sans-serif;font-size:12px;" xmlns="http://www.w3.org/2000/svg" width="850" height="300">
+  <g transform="translate(10,10) scale(1 1)">
+    <path fill="#009ACB" d="M 414.97698492798247 39.00000234377684 A 113 113 0 1 1 311.39206002954353
+197.10426559737175 L 415 152 A 0 0 0 1 0 415 152 Z" stroke="#FFFFFF" stroke-width="1" stroke-linejoin="round"
+transform="translate(0,0)"></path>
+  </g>
+</svg>

metadata

@@ -1,65 +1,73 @@
 --- !ruby/object:Gem::Specification
 name: prawn-svg
 version: !ruby/object:Gem::Version
-  version: 0.16.0
+  version: 0.16.1
 platform: ruby
 authors:
 - Roger Nesbitt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-05 00:00:00.000000000 Z
+date: 2014-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: prawn
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.8.4
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.1
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: SVG renderer for Prawn PDF library
+        version: '10.1'
+description: This gem allows you to render SVG directly into a PDF using the 'prawn'
+  gem.  Since PDF is vector-based, you'll get nice scaled graphics if you use SVG
+  instead of an image.
 email: roger@seriousorange.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
+- ".gitignore"
+- ".rspec"
 - Gemfile
 - LICENSE
 - README.md
@@ -115,6 +123,7 @@ files:
 - spec/sample_svg/negminy.svg
 - spec/sample_svg/omnigraffle.svg
 - spec/sample_svg/opacity01.svg
+- spec/sample_svg/pie_piece.svg
 - spec/sample_svg/polygon01.svg
 - spec/sample_svg/polyline01.svg
 - spec/sample_svg/quad01.svg
@@ -144,17 +153,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.11
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: SVG renderer for Prawn PDF library
@@ -193,6 +202,7 @@ test_files:
 - spec/sample_svg/negminy.svg
 - spec/sample_svg/omnigraffle.svg
 - spec/sample_svg/opacity01.svg
+- spec/sample_svg/pie_piece.svg
 - spec/sample_svg/polygon01.svg
 - spec/sample_svg/polyline01.svg
 - spec/sample_svg/quad01.svg