prawn-svg 0.37.0 → 0.38.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5c28b2e706923d04785979a68f0e457f14df7c71b519d16db6e0bb45e3458bc
-  data.tar.gz: 3ade59453c7005f624b4dcd36d9930f27285291c410b00fe57b3d3d278673e4c
+  metadata.gz: 48e3c463c4c8684671c20e26e701c51d07fd58322f2a7557d03b1ccccd1621c3
+  data.tar.gz: 12e77f6409d625d9e2682f1efdd9519f983a8dc24e8dcc7371ff79febe2a43ea
 SHA512:
-  metadata.gz: 250c187430ff8042898b9ee55a595162824613e13a9760a8e32dd21e5a026dfabe012a80f3c19442b3a97635ab020aa1eb113cd70dcc86ffef888f6bc2d39fa1
-  data.tar.gz: 1d79258d401547d57dd694878e08d9a50d0166cce4fefd9351cfda0ef6a7c3096910a88a29650993f0eeadd44d7f2fba21d25f438e31660750cc4b847cacc760
+  metadata.gz: 9f212b78477d9211a1ca009f7667d05f27f0138e467939d19d1c252a017a416e2a0267e613426142c50b77e83a613cc12e2e65af8d38e3e7c71bcf0816cc062a
+  data.tar.gz: fb5f095597da89d3d6127429b51f4fe8cc125ef14c01f3046bd0a7fced4379abb9ad2bf89a35ec2f38c96e4d06775a2c8dd7edec85bca947e385c90e00b6435a

data/Gemfile.lock

@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    prawn-svg (0.37.0)
+    prawn-svg (0.38.1)
       css_parser (~> 1.6)
       matrix (~> 0.4.2)
       prawn (>= 0.11.1, < 3)
-      rexml (>= 3.3.9, < 4)
+      rexml (>= 3.4.2, < 4)
 
 GEM
   remote: http://rubygems.org/
@@ -34,7 +34,7 @@ GEM
     rainbow (3.1.1)
     rake (13.2.1)
     regexp_parser (2.9.2)
-    rexml (3.4.0)
+    rexml (3.4.4)
     rspec (3.13.0)
       rspec-core (~> 3.13.0)
       rspec-expectations (~> 3.13.0)

data/lib/prawn/svg/attributes/transform.rb

@@ -1,5 +1,7 @@
 module Prawn::SVG::Attributes::Transform
   def parse_transform_attribute_and_call
+    # Some elements do not support transforms
+    return unless transformable?
     return unless (transform = attributes['transform'])
 
     matrix = matrix_for_pdf(parse_transform_attribute(transform))

data/lib/prawn/svg/css/stylesheets.rb

@@ -119,7 +119,7 @@ module Prawn::SVG::CSS
           when '^='
             result << "[starts-with(@#{key}, #{xpath_quote value})]"
           when '$='
-            result << "[substring(@#{key}, string-length(@#{key}) - #{value.length - 1}) = #{xpath_quote value})]"
+            result << "[substring(@#{key}, string-length(@#{key}) - #{value.length - 1}) = #{xpath_quote value}]"
           when '*='
             result << "[contains(@#{key}, #{xpath_quote value})]"
           when '~='

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

@@ -36,7 +36,7 @@ class Prawn::SVG::Elements::Base
     @attributes = {}
     @properties = Prawn::SVG::Properties.new
 
-    if source && !state.inside_use
+    if source && add_to_elements_by_id? && !state.inside_use
       id = source.attributes['id']
       id = id.strip if id
 
@@ -114,6 +114,10 @@ class Prawn::SVG::Elements::Base
     @calls.concat duplicate_calls(other.base_calls)
   end
 
+  def add_yield_call(&block)
+    add_call('svg:yield', block)
+  end
+
   def new_call_context_from_base
     old_calls = @calls
     @calls = @base_calls
@@ -269,6 +273,14 @@ class Prawn::SVG::Elements::Base
     ['hidden', 'scroll'].include?(computed_properties.overflow)
   end
 
+  def transformable?
+    true
+  end
+
+  def add_to_elements_by_id?
+    true
+  end
+
   def stroke_width
     if computed_properties.stroke.none?
       0

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

@@ -0,0 +1,27 @@
+#
+# This element base class is used for elements that render directly to the Prawn canvas.
+#
+# Initially when I wrote prawn-svg, I was expecting to have multiple renderers and thought separating the codebase
+# from the Prawn renderer would be a good idea.  However, it turns out that the Prawn renderer was the only one
+# that was targeted, and it ended up being tightly coupled with the Prawn library.
+#
+# This class is probably how I should have written it.  Direct render is required to do text rendering properly
+# because we need to know the width of all the things we print.  As of the time of this comment it's the only
+# system that uses DirectRenderBase in prawn-svg.
+#
+class Prawn::SVG::Elements::DirectRenderBase < Prawn::SVG::Elements::Base
+  # Called by Renderer when it finds the svg:render call added below.
+  def render(prawn, renderer); end
+
+  protected
+
+  def parse_and_apply
+    parse_standard_attributes
+    parse
+    apply_calls_from_standard_attributes
+    @parent_calls << ['svg:render', [self], [], []] unless computed_properties.display == 'none'
+  rescue SkipElementQuietly
+  rescue SkipElementError => e
+    @document.warnings << e.message
+  end
+end

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

@@ -16,9 +16,9 @@ class Prawn::SVG::Elements::Polygon < Prawn::SVG::Elements::Base
   def commands
     @commands ||= [
       Prawn::SVG::Pathable::Move.new(@points[0])
-    ] + @points[1..].map { |point|
+    ] + @points[1..].map do |point|
       Prawn::SVG::Pathable::Line.new(point)
-    } + [
+    end + [
       Prawn::SVG::Pathable::Close.new(@points[0])
     ]
   end

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

@@ -1,70 +1,74 @@
-class Prawn::SVG::Elements::Text < Prawn::SVG::Elements::DepthFirstBase
-  private
+module Prawn::SVG
+  class Elements::Text < Elements::DirectRenderBase
+    Cursor = Struct.new(:x, :y)
 
-  # This class doesn't represent an element in the SVG document; it's here
-  # to hold together text information.  Because of this, we overload the
-  # parse_step and apply_step methods, and bypass all the normal processing
-  # of the element, delegating it to our root text component.
+    def parse
+      @root_component = Elements::TextComponent.new(document, source, [], state.dup)
+      @root_component.process
 
-  def parse_step
-    state.text = Prawn::SVG::Elements::TextComponent::TextState.new
+      reintroduce_trailing_and_leading_whitespace if @root_component.children
+    end
 
-    @text_root = Prawn::SVG::Elements::TextComponent.new(document, source, nil, state.dup)
-    @text_root.parse_step
+    def render(prawn, renderer)
+      return unless @root_component.children
 
-    reintroduce_trailing_and_leading_whitespace
-  end
+      @root_component.lay_out(prawn)
 
-  def apply_step(calls)
-    @base_calls = @calls = calls
-    add_call_and_enter 'text_group'
-    @text_root.apply_step(@calls)
-  end
+      translate_x =
+        case @root_component.computed_properties.text_anchor
+        when 'middle'
+          -@root_component.calculated_width / 2.0
+        when 'end'
+          -@root_component.calculated_width
+        end
 
-  def drawable?
-    false
-  end
+      cursor = Cursor.new(0, document.sizing.output_height)
+      @root_component.render_component(prawn, renderer, cursor, translate_x)
+    end
 
-  def reintroduce_trailing_and_leading_whitespace
-    printables = []
-    built_printable_queue(printables, @text_root)
+    private
 
-    remove_whitespace_only_printables_and_start_and_end(printables)
-    remove_printables_that_are_completely_empty(printables)
-    apportion_leading_and_trailing_spaces(printables)
-  end
+    def reintroduce_trailing_and_leading_whitespace
+      text_nodes = []
+      build_text_node_queue(text_nodes, @root_component)
 
-  def built_printable_queue(queue, component)
-    component.commands.each do |command|
-      case command
-      when Prawn::SVG::Elements::TextComponent::Printable
-        queue << command
-      else
-        built_printable_queue(queue, command)
+      remove_whitespace_only_text_nodes_and_start_and_end(text_nodes)
+      remove_text_nodes_that_are_completely_empty(text_nodes)
+      apportion_leading_and_trailing_spaces(text_nodes)
+    end
+
+    def build_text_node_queue(queue, component)
+      component.children.each do |element|
+        case element
+        when Elements::TextNode
+          queue << element
+        else
+          build_text_node_queue(queue, element)
+        end
       end
     end
-  end
 
-  def remove_whitespace_only_printables_and_start_and_end(printables)
-    printables.pop   while printables.last  && printables.last.text.empty?
-    printables.shift while printables.first && printables.first.text.empty?
-  end
+    def remove_whitespace_only_text_nodes_and_start_and_end(text_nodes)
+      text_nodes.pop   while text_nodes.last  && text_nodes.last.text.empty?
+      text_nodes.shift while text_nodes.first && text_nodes.first.text.empty?
+    end
 
-  def remove_printables_that_are_completely_empty(printables)
-    printables.reject! do |printable|
-      printable.text.empty? && !printable.trailing_space? && !printable.leading_space?
+    def remove_text_nodes_that_are_completely_empty(text_nodes)
+      text_nodes.reject! do |text_node|
+        text_node.text.empty? && !text_node.trailing_space? && !text_node.leading_space?
+      end
     end
-  end
 
-  def apportion_leading_and_trailing_spaces(printables)
-    printables.each_cons(2) do |a, b|
-      if a.text.empty?
-        # Empty strings can only get a leading space from the previous non-empty text,
-        # and never get a trailing space
-      elsif a.trailing_space?
-        a.text += ' '
-      elsif b.leading_space?
-        b.text = " #{b.text}"
+    def apportion_leading_and_trailing_spaces(text_nodes)
+      text_nodes.each_cons(2) do |a, b|
+        if a.text.empty?
+          # Empty strings can only get a leading space from the previous non-empty text,
+          # and never get a trailing space
+        elsif a.trailing_space?
+          a.text += ' '
+        elsif b.leading_space?
+          b.text = " #{b.text}"
+        end
       end
     end
   end