prawn-markup 0.3.2 → 0.3.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 83dd2ffa7203c8b28be3282663d21c5b2476c42df3b76dc18eae813da119deca
-  data.tar.gz: aa58d34136f86e9d810a7735c6976573b128f078ad42143037f3995e241b1a9a
+  metadata.gz: c3e26315f0588069e152aea5344bb9e79523b71aed0a574875036802ccb3a3d0
+  data.tar.gz: 1c9f31e0e3d19c4bc0c9811d1c0043512a11fa5ca9b15e864919c3ab4d633402
 SHA512:
-  metadata.gz: d0d52868e2fad2b0af5d762cf8424c8db25452ebec7176a34c200557b4a6bb4b72e8c8d314910bbcb0fd2d732e2b80f76ff07365fb61ec46150f4aafdff18059
-  data.tar.gz: d76133ccb760e0de761592be9f8a5c950ffad696213d0ae0ca01350f6d3ef6e5ed6df3c29bfb09e52e5b90b8d9a36398fd7be5846a9ce54a381230e7219abd44
+  metadata.gz: 4251fb1e5ea67b00c9e8281712f3bfe6a866c5ec2054c972de9be13d56939c3342e3cebc23a0cbe3164aa93b2fd6a59fa85de83487a8690413ebaad747b16ff1
+  data.tar.gz: b9900e07d2636efe47842bf2ca9b8a6445cdfe3cee1d9fb92149f9c7e6c80956081cf4bebce79be9245a7c7968892abbe6563af8df5b5ff762bfdb4fb680d4d4

data/README.md

@@ -1,6 +1,6 @@
 # Prawn::Markup
 
-[![Build Status](https://travis-ci.org/puzzle/prawn-markup.svg?branch=master)](https://travis-ci.org/puzzle/prawn-markup)
+[![Build Status](https://github.com/puzzle/prawn-markup/actions/workflows/build.yml/badge.svg)](https://github.com/puzzle/prawn-markup/actions/workflows/build.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/52a462f9d65e33352d4e/maintainability)](https://codeclimate.com/github/puzzle/prawn-markup/maintainability)
 [![Test Coverage](https://api.codeclimate.com/v1/badges/52a462f9d65e33352d4e/test_coverage)](https://codeclimate.com/github/puzzle/prawn-markup/test_coverage)
 
@@ -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

@@ -12,8 +12,11 @@ module Prawn
       end
 
       def start_img
+        src = current_attrs['src']
+        return if src.to_s.strip.empty?
+
         add_current_text
-        add_image_or_placeholder(current_attrs['src'])
+        add_image_or_placeholder(src)
       end
 
       def start_iframe
@@ -70,7 +73,11 @@ module Prawn
 
       def load_remote_image(src)
         if src =~ %r{^https?:/}
-          URI.parse(src).open
+          begin
+            URI.parse(src).open
+          rescue OpenURI::HTTPError, SocketError
+            nil
+          end
         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'
         )
       end
 
@@ -78,6 +78,19 @@ 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
     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.2'
+    VERSION = '0.3.5'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.5
 platform: ruby
 authors:
 - Pascal Zumkehr
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-05-03 00:00:00.000000000 Z
+date: 2022-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -187,7 +187,7 @@ homepage: https://github.com/puzzle/prawn-markup
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -202,8 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.4
+signing_key: 
 specification_version: 4
 summary: Parse simple HTML markup to include in Prawn PDFs
 test_files: []