prawn-markup 0.3.4 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5217761bc64b6cf5ae6697d326934a9b87d3e54a3a65428f9c7025d3a03f043
-  data.tar.gz: c3274d3dfd6ab699f4d9fe17db8148305c9b4c4c7da8cd3b2a8b834735380583
+  metadata.gz: 3224b605102e828f529ef5acdd6ba99910237a58e7a609a631c670b1bb025559
+  data.tar.gz: fc939e927be4748051a2ab4d9f0b8c4155aacd1234c3c7dc41eb1e9861d5533c
 SHA512:
-  metadata.gz: 728da10a3ce7d80aca95a3b9d54d9122c9c791567ab150188c6f459bb0de15863524322d091ed01900e844661aa0e5337542fd191f03eb97d080e27b905cc394
-  data.tar.gz: c701c14bcc7fd0baa8cb17179f5096caef7a8f8ce829f8d548d9667d5ce78f2ec2248a1848eca32e01cb0e52e94befb0a845a9d6da0f14c851fb195420e9c90f
+  metadata.gz: 5099a48640adb9c06a706cd63bf70767365f74361e1c80dc0501fda5c0e23999d6d7ff1264edfe8aaf45aa05af06dfb285d8d9324f8e6a750b9817184c676dcc
+  data.tar.gz: b6725ba940801a114a41d3645605406f947c4f6dcb0e35bc7901ee12cc10241591aee889bfae956ab11f26e7a835e45aa5a18395f712748b4cd0d08e14b7c838

data/README.md

@@ -37,14 +37,14 @@ 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`
-* Headings: `h1`, `h2`, `h3`, `h4`, `h5`, `h6`
-* Tables: `table`, `tr`, `td`, `th`
-* Media: `img`, `iframe`
-* Inputs: `type=checkbox`, `type=radio`
+- Text blocks: `p`, `div`, `ol`, `ul`, `li`, `hr`, `br`
+- 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`.
 
@@ -75,40 +75,40 @@ Tables and lists are rendered with [prawn-table](https://github.com/prawnpdf/pra
 
 Beside these options handled by Prawn / prawn-table, the following values may be customized:
 
-* `:text`
-  * `:preprocessor`: A proc/callable that is called each time before a chunk of text is rendered.
-  * `:margin_bottom`: Margin after each `<p>`, `<ol>`, `<ul>` or `<table>`. Defaults to about half a line.
-* `:heading1-6`
-  * `:margin_top`: Margin before a heading. Default is 0.
-  * `:margin_bottom`: Margin after a heading. Default is 0.
-* `:table`
-  * `:placeholder`
-    * `:too_large`: If the table content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[table content too large]'.
-    * `:subtable_too_large`: If the content of a subtable cannot be fitted into the table, this text is rendered instead. Defaults to '[nested tables with automatic width are not supported]'.
-* `:list`
-  * `:vertical_margin`: Margin at the top and the bottom of a list. Default is 5.
-  * `:bullet`
-    * `:char`: The text used as bullet in unordered lists. Default is '•'.
-    * `:margin`: Margin before the bullet. Default is 10.
-  * `:content`
-    * `:margin`: Margin between the bullet and the content. Default is 10.
-  * `:placeholder`
-    * `:too_large`: If the list content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[list content too large]'.
-* `:image`
-  * `:loader`: A callable that accepts the `src` attribute as an argument an returns a value understood by Prawn's `image` method. Loads `http(s)` URLs and base64 encoded data URIs by default.
-  * `:placeholder`: If an image is not supported, this text/callable is rendered instead. Defaults to '[unsupported image]'.
-* `:iframe`
-  * `:placeholder`: If the HTML contains IFrames, this text/callable is rendered instead.
-  A callable gets the URL of the IFrame as an argument. Defaults to ignore iframes.
-* `:input`
-  * `:symbol_font`: A special font to print checkboxes and radios. Prawn's standard fonts do not support special unicode characters. Do not forget to update the document's `font_families`.
-  * `:symbol_font_size`: The size of the special font to print checkboxes and radios.
-  * `:checkbox`
-    * `:checked`: The char to print for a checked checkbox. Default is '☑'.
-    * `:unchecked`: The char to print for an unchecked checkbox. Default is '☐'.
-  * `:radio`
-    * `:checked`: The char to print for a checked radio. Default is '◉'.
-    * `:unchecked`: The char to print for an unchecked radio. Default is '○'.
+- `:text`
+  - `:preprocessor`: A proc/callable that is called each time before a chunk of text is rendered.
+  - `:margin_bottom`: Margin after each `<p>`, `<ol>`, `<ul>` or `<table>`. Defaults to about half a line.
+- `:heading1-6`
+  - `:margin_top`: Margin before a heading. Default is 0.
+  - `:margin_bottom`: Margin after a heading. Default is 0.
+- `:table`
+  - `:placeholder`
+    - `:too_large`: If the table content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[table content too large]'.
+    - `:subtable_too_large`: If the content of a subtable cannot be fitted into the table, this text is rendered instead. Defaults to '[nested tables with automatic width are not supported]'.
+- `:list`
+  - `:vertical_margin`: Margin at the top and the bottom of a list. Default is 5.
+  - `:bullet`
+    - `:char`: The text used as bullet in unordered lists. Default is '•'.
+    - `:margin`: Margin before the bullet. Default is 10.
+  - `:content`
+    - `:margin`: Margin between the bullet and the content. Default is 10.
+  - `:placeholder`
+    - `:too_large`: If the list content does not fit into the current bounding box, this text/callable is rendered instead. Defaults to '[list content too large]'.
+- `:image`
+  - `:loader`: A callable that accepts the `src` attribute as an argument an returns a value understood by Prawn's `image` method. Loads `http(s)` URLs and base64 encoded data URIs by default.
+  - `:placeholder`: If an image is not supported, this text/callable is rendered instead. Defaults to '[unsupported image]'.
+- `:iframe`
+  - `:placeholder`: If the HTML contains IFrames, this text/callable is rendered instead.
+    A callable gets the URL of the IFrame as an argument. Defaults to ignore iframes.
+- `:input`
+  - `:symbol_font`: A special font to print checkboxes and radios. Prawn's standard fonts do not support special unicode characters. Do not forget to update the document's `font_families`.
+  - `:symbol_font_size`: The size of the special font to print checkboxes and radios.
+  - `:checkbox`
+    - `:checked`: The char to print for a checked checkbox. Default is '☑'.
+    - `:unchecked`: The char to print for an unchecked checkbox. Default is '☐'.
+  - `:radio`
+    - `:checked`: The char to print for a checked radio. Default is '◉'.
+    - `:unchecked`: The char to print for an unchecked radio. Default is '○'.
 
 ## Development
 
@@ -128,4 +128,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the Prawn::Markup project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/puzzle/prawn-markup/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Prawn::Markup project’s codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/puzzle/prawn-markup/blob/main/CODE_OF_CONDUCT.md).

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

@@ -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
@@ -110,9 +110,10 @@ module Prawn
         end
 
         def bullet_text_width
+          largest_string = bullet('0' * list.items.size.digits.size)
           font = bullet_font
+          encoded = font.normalize_encoding(largest_string)
           font_size = column_cell_style(:bullet)[:size] || pdf.font_size
-          encoded = font.normalize_encoding(bullet(list.items.size))
           font.compute_width_of(encoded, size: font_size)
         end
 

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

@@ -34,10 +34,12 @@ module Prawn
           hash.dup.tap do |image_hash|
             image_hash.delete(:width)
             image_hash[:image_width] = SizeConverter.new(max_width).parse(hash[:width])
-            if max_width
-              natural_width, _height = natural_image_dimensions(image_hash)
-              image_hash[:fit] = [max_width, 999_999] if max_width < natural_width
+            natural_width, _height = natural_image_dimensions(image_hash)
+            if max_width && (max_width < natural_width)
+              image_hash[:fit] = [max_width, 999_999]
             end
+          rescue Prawn::Errors::UnsupportedImageType
+            image_hash.clear
           end
         end
 

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/processor.rb

@@ -125,7 +125,11 @@ module Prawn
       def style_properties
         style = current_attrs['style']
         if style
-          style.split(';').map { |p| p.split(':', 2).map(&:strip) }.to_h
+          style
+            .split(';')
+            .map { |p| p.split(':', 2).map(&:strip) }
+            .select { |tuple| tuple.size == 2 }
+            .to_h
         else
           {}
         end

data/lib/prawn/markup/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Markup
-    VERSION = '0.3.4'
+    VERSION = '0.3.7'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.7
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 2022-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -202,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.3.19
 signing_key: 
 specification_version: 4
 summary: Parse simple HTML markup to include in Prawn PDFs