prawn-markup 0.3.3 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 064fb432004ce75eb3de1f626e08b1b5eba66de34fee0c1279eeb658d761a055
-  data.tar.gz: 0ea8ce592534b0b4f10480981374c66ff1ba09c9deb799f3e9f53214a9a3b831
+  metadata.gz: df28b18b9cd1867a3ddf1b3d0a38be2bc6a222ba3162b7c030cec7e4819dabae
+  data.tar.gz: 707f1c55495e420935df46b7d8430c03155a67fefe5b5feeb2e8fa5a5acc5539
 SHA512:
-  metadata.gz: 534a234950b2df218bb111563730b18b9e1e2cb22c3393da53ae3d70412283139e9bec5e57e7aeb2ae0638132a6ab023b602c7cb9c9dcedf97e27e92371a8565
-  data.tar.gz: 8d7e1f43b928f9861b9b885eaf39692f8678b6e955845daf8859da60a95cdd76da72f1f2062dff8ef461dd0a9bd614509fb3903ba0ecada86546af7b1771460b
+  metadata.gz: 80702b603383f5613368db4ee66a6a1b3d3eb287f1d9ee90a941361638023dc90876df0f7faf91eb65d42cfca271670eecdbcdf28d525434ed4874bb550ad800
+  data.tar.gz: 803c32a2293ff0b6c73cda474a301af6a3ecdaadd0a85f84639aad4ecd2783386185a2c309f6d95286bcec1156833f87b92a7ca36d51320c1c86af82f39031af

data/README.md

@@ -38,13 +38,13 @@ doc.markup('<p>Hello World</p><hr/><p>KTHXBYE</p>')
 This gem parses the given HTML and layouts the following elements in a vertical order:
 
 * Text blocks: `p`, `div`, `ol`, `ul`, `li`, `hr`, `br`
-* Text semantics: `a`, `b`, `strong`, `i`, `em`, `u`, `s`, `del`, `sub`, `sup`
+* Text semantics: `a`, `b`, `strong`, `i`, `em`, `u`, `s`, `del`, `sub`, `sup`, `color`
 * Headings: `h1`, `h2`, `h3`, `h4`, `h5`, `h6`
 * Tables: `table`, `tr`, `td`, `th`
 * Media: `img`, `iframe`
 * Inputs: `type=checkbox`, `type=radio`
 
-All other elements are ignored, their content is added to the parent element. With a few exceptions, no CSS is processed. One exception is the `width` property of `img`, `td` and `th`, which may contain values in `cm`, `mm`, `px`, `pt`, `%` or `auto`.
+All other elements are ignored, their content is added to the parent element. With a few exceptions, no CSS is processed. One exception is the `width` property of `img`, `td` and `th`, which may contain values in `cm`, `mm`, `px`, `pt`, `%` or `auto`. Another exception is the `rgb` or `cmyk` properties of the Prawn-specific `color` tag.
 
 If no explicit loader is given (see above), images are loaded from `http(s)` addresses or may be contained in the `src` attribute as base64 encoded data URIs. Prawn only supports `PNG` and `JPG`.
 

data/lib/prawn/markup/builders/list_builder.rb

@@ -69,7 +69,7 @@ module Prawn
         def list_item_table(item)
           data = item.nodes.map { |n| [normalize_list_item_node(n)] }
           style = column_cell_style(:content)
-                  .merge(borders: [], padding: [0, 0, padding_bottom, 0])
+                  .merge(borders: [], padding: [0, 0, padding_bottom, 0], inline_format: true)
           pdf.make_table(data, cell_style: style, column_widths: [content_width]) do
             rows(-1).padding = [0, 0, 0, 0]
           end
@@ -98,7 +98,7 @@ module Prawn
         end
 
         def content_width
-          column_widths.last && column_widths.last - content_margin
+          column_widths.last && (column_widths.last - content_margin)
         end
 
         def compute_column_widths

data/lib/prawn/markup/builders/table_builder.rb

@@ -131,7 +131,7 @@ module Prawn
 
         def normalize_cell_hash(node, width, style_options)
           if width.nil? && total_width
-            width = total_width - column_width_sum - (columns_without_width - 1) * MIN_COL_WIDTH
+            width = total_width - column_width_sum - ((columns_without_width - 1) * MIN_COL_WIDTH)
           end
           super(node, width, style_options)
         end
@@ -190,13 +190,13 @@ module Prawn
 
         def increase_widths(sum)
           diff = total_width - sum
-          column_widths.map! { |w| w + w / sum * diff }
+          column_widths.map! { |w| w + (w / sum * diff) }
         end
 
         def decrease_widths(sum)
           sum += columns_without_width * MIN_COL_WIDTH
           diff = sum - total_width
-          column_widths.map! { |w| w ? [w - w / sum * diff, 0].max : nil }
+          column_widths.map! { |w| w ? [w - (w / sum * diff), 0].max : nil }
         end
 
         def failover_on_error
@@ -210,7 +210,7 @@ module Prawn
 
         def horizontal_padding
           @horizontal_padding ||= begin
-            padding = table_options[:cell][:padding] || [DEFAULT_CELL_PADDING] * 4
+            padding = table_options[:cell][:padding] || ([DEFAULT_CELL_PADDING] * 4)
             padding.is_a?(Array) ? padding[1] + padding[3] : padding
           end
         end

data/lib/prawn/markup/processor/headings.rb

@@ -57,7 +57,7 @@ module Prawn
       def default_options_with_size(level)
         default = text_options.dup
         default[:size] ||= pdf.font_size
-        default[:size] *= 2.5 - level * 0.25
+        default[:size] *= 2.5 - (level * 0.25)
         HashMerger.deep(default, options[:"heading#{level}"] || {})
       end
 

data/lib/prawn/markup/processor/images.rb

@@ -75,7 +75,7 @@ module Prawn
         if src =~ %r{^https?:/}
           begin
             URI.parse(src).open
-          rescue OpenURI::HTTPError, SocketError
+          rescue StandardError # OpenURI::HTTPError, SocketError or anything else
             nil
           end
         end

data/lib/prawn/markup/processor/tables.rb

@@ -90,9 +90,12 @@ module Prawn
       end
 
       def add_cell_image(cell)
+        src = current_attrs['src']
+        return if src.to_s.strip.empty?
+
         add_cell_text_node(cell)
-        img = image_properties(current_attrs['src'])
-        cell.nodes << img || invalid_image_placeholder
+        img = image_properties(src)
+        (cell.nodes << img) || invalid_image_placeholder
       end
 
       def add_table(cells)

data/lib/prawn/markup/processor/text.rb

@@ -6,7 +6,7 @@ module Prawn
       def self.prepended(base)
         base.known_elements.push(
           'a', 'b', 'strong', 'i', 'em', 'u', 'strikethrough', 'strike', 's', 'del',
-          'sub', 'sup'
+          'sub', 'sup', 'color', 'font'
         )
       end
 
@@ -78,6 +78,31 @@ module Prawn
         append_text('</sup>')
       end
 
+      def start_color
+        rgb, c, m, y, k = current_attrs.values_at('rgb', 'c', 'm', 'y', 'k')
+
+        if [c, m, y, k].all?
+          append_text("<color c=\"#{c}\" m=\"#{m}\" y=\"#{y}\" k=\"#{k}\">")
+        else
+          append_text("<color rgb=\"#{rgb}\">")
+        end
+      end
+
+      def end_color
+        append_text('</color>')
+      end
+
+      def start_font
+        font_attrs = current_attrs
+                     .slice('size', 'name', 'character_spacing')
+                     .reduce('') { |acc, (key, val)| "#{acc} #{key}=\"#{val}\"" }
+
+        append_text("<font #{font_attrs}>")
+      end
+
+      def end_font
+        append_text('</font>')
+      end
     end
   end
 end

data/lib/prawn/markup/support/size_converter.rb

@@ -19,7 +19,7 @@ module Prawn
       def convert(string)
         value = string.to_f
         if string.end_with?('%')
-          value * max / 100.0
+          max ? value * max / 100.0 : nil
         elsif string.end_with?('cm')
           value.cm
         elsif string.end_with?('mm')

data/lib/prawn/markup/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Markup
-    VERSION = '0.3.3'
+    VERSION = '0.3.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.6
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-11-16 00:00:00.000000000 Z
+date: 2022-05-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri