prawn-markup 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 17db8afa6a062ac1cac8322276b7f013e2d9ba7c
-  data.tar.gz: 03a009820c6851a0d06ca2812487757e1a142056
+SHA256:
+  metadata.gz: b195d6ff3dfeacfc8e8112f17323bfdc8981b955a994862d9609b07184dd229f
+  data.tar.gz: 33113b2d2db4aedae4eb7c412f65d7d2400d89f4dc94f30d9f4a700ea6598164
 SHA512:
-  metadata.gz: b9d20fb86722b5ade3804c648116b84e3d423b39a3ffcdeadd2340b6b5d886e1ba80a98fa0a570bf1b448d2e0f1a88058781ccf5330cb6f9c218e7c8467da770
-  data.tar.gz: 8fdce13e68ce84ccbace42d051ffc5d66f3888ad9094af6aa79abc62a0251e386088ccc81e627dc0a3be67ef746c5d6e82575af4455f14121cf50ec3d89a54f6
+  metadata.gz: 912de36400986c54d00f4ca94fa5e37207236e79152490370278f2c11895da5e75041b1bd528e6c179c11b145723a7ee1a4fdee8da05f384f4054d711a589117
+  data.tar.gz: 3f03640c1d82f6a46f2d5c74e9fcb8ff16287a0b83ad6a6e273f55ba03f2d4a716e0a549e7e6c9b64551062522e04ae2108678b048163fb21b5554a327c6b6fa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prawn-markup (0.1.0)
+    prawn-markup (0.2.0)
       nokogiri
       prawn
       prawn-table
@@ -14,63 +14,61 @@ GEM
     ast (2.4.0)
     byebug (10.0.2)
     diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
     hashery (2.1.2)
-    jaro_winkler (1.5.1)
-    json (2.1.0)
-    mini_portile2 (2.3.0)
-    nokogiri (1.8.4)
-      mini_portile2 (~> 2.3.0)
-    parallel (1.12.1)
-    parser (2.5.1.2)
+    jaro_winkler (1.5.3)
+    json (2.2.0)
+    mini_portile2 (2.4.0)
+    nokogiri (1.9.1)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.17.0)
+    parser (2.6.3.0)
       ast (~> 2.4.0)
     pdf-core (0.7.0)
     pdf-inspector (1.3.0)
       pdf-reader (>= 1.0, < 3.0.a)
-    pdf-reader (2.1.0)
+    pdf-reader (2.2.0)
       Ascii85 (~> 1.0.0)
       afm (~> 0.2.1)
       hashery (~> 2.0)
       ruby-rc4
       ttfunk
-    powerpack (0.1.2)
     prawn (2.2.2)
       pdf-core (~> 0.7.0)
       ttfunk (~> 1.5)
     prawn-table (0.2.2)
       prawn (>= 1.3.0, < 3.0.0)
     rainbow (3.0.0)
-    rake (12.3.1)
+    rake (12.3.2)
     rspec (3.8.0)
       rspec-core (~> 3.8.0)
       rspec-expectations (~> 3.8.0)
       rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
       rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.1)
+    rspec-expectations (3.8.4)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    rubocop (0.58.2)
+    rspec-support (3.8.2)
+    rubocop (0.68.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.5, != 2.5.1.1)
-      powerpack (~> 0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    ruby-progressbar (1.10.0)
+      unicode-display_width (>= 1.4.0, < 1.6)
+    ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
-    simplecov (0.16.1)
+    simplecov (0.17.0)
       docile (~> 1.1)
       json (>= 1.8, < 3)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.2)
     ttfunk (1.5.1)
-    unicode-display_width (1.4.0)
+    unicode-display_width (1.5.0)
 
 PLATFORMS
   ruby
@@ -86,4 +84,4 @@ DEPENDENCIES
   simplecov
 
 BUNDLED WITH
-   1.16.2
+   1.17.3

data/README.md

@@ -74,15 +74,15 @@ A callable gets the URL of the IFrame as an argument. Defaults to ignore iframes
 
 This gem parses the given HTML and layouts the following elements in a vertical order:
 
-* Text content: `p`, `div`, `ol`, `ul`, `li`, `hr`
-* Text semantics: `b`, `strong`, `i`, `em`, `u`, `a`, `br`
+* 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`
 
 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`.
 
-If no explicit loader is given (see above), images are loaded from `http(s)` addresses are may be contained in the `src` attribute as base64 encoded data URIs. Prawn only supports `PNG` and `JPG`.
+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`.
 
 
 ## Development

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

@@ -170,6 +170,7 @@ module Prawn
         def distribute_remaing_width(count)
           equal_width = (total_width - column_width_sum) / count.to_f
           return if equal_width < 0
+
           column_widths.map! { |width| width || equal_width }
         end
 

data/lib/prawn/markup/processor.rb

@@ -21,12 +21,14 @@ module Prawn
       self.logger = defined?(Rails) ? Rails.logger : nil
 
       require 'prawn/markup/processor/text'
+      require 'prawn/markup/processor/blocks'
       require 'prawn/markup/processor/headings'
       require 'prawn/markup/processor/images'
       require 'prawn/markup/processor/tables'
       require 'prawn/markup/processor/lists'
 
       prepend Prawn::Markup::Processor::Text
+      prepend Prawn::Markup::Processor::Blocks
       prepend Prawn::Markup::Processor::Headings
       prepend Prawn::Markup::Processor::Images
       prepend Prawn::Markup::Processor::Tables
@@ -39,6 +41,7 @@ module Prawn
 
       def parse(html)
         return if html.to_s.strip.empty?
+
         reset
         html = Prawn::Markup::Normalizer.new(html).normalize
         Nokogiri::HTML::SAX::Parser.new(self).parse(html) { |ctx| ctx.recovery = true }
@@ -62,11 +65,11 @@ module Prawn
       end
 
       def error(string)
-        logger.debug('SAX parsing error: ' + string) if logger
+        logger.info('SAX parsing error: ' + string.strip) if logger
       end
 
       def warning(string)
-        logger.warn(string) if logger
+        logger.info('SAX parsing warning: ' + string.strip) if logger
       end
 
       private

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

@@ -0,0 +1,148 @@
+module Prawn
+  module Markup
+    module Processor::Blocks
+      def self.prepended(base)
+        base.known_elements.push('p', 'br', 'div', 'hr')
+      end
+
+      def start_br
+        append_text("\n")
+      end
+
+      def start_p
+        handle_text_element
+      end
+
+      def end_p
+        if inside_container?
+          append_new_line
+          append_text("\n")
+        else
+          add_paragraph
+        end
+      end
+
+      def start_div
+        handle_text_element
+      end
+
+      def end_div
+        handle_text_element
+      end
+
+      def start_hr
+        return if inside_container?
+
+        put_bottom_margin(nil)
+        add_current_text
+        pdf.move_down(hr_vertical_margin_top)
+        pdf.stroke_horizontal_rule
+        pdf.move_down(hr_vertical_margin_bottom)
+      end
+
+      def end_document
+        add_current_text
+      end
+
+      private
+
+      def handle_text_element
+        if inside_container?
+          append_new_line
+        else
+          add_current_text
+        end
+      end
+
+      def append_new_line
+        append_text("\n") if buffered_text? && text_buffer[-1] != "\n"
+      end
+
+      def add_paragraph
+        text = dump_text
+        text.gsub!(/[^\n]/, '') if text.strip.empty?
+        unless text.empty?
+          add_bottom_margin
+          add_formatted_text(text, text_options)
+          put_bottom_margin(text_margin_bottom)
+        end
+      end
+
+      def add_current_text(options = text_options)
+        add_bottom_margin
+        return unless buffered_text?
+
+        string = dump_text
+        string.strip!
+        add_formatted_text(string, options)
+      end
+
+      def add_bottom_margin
+        if @bottom_margin
+          pdf.move_down(@bottom_margin)
+          @bottom_margin = nil
+        end
+      end
+
+      def add_formatted_text(string, options = text_options)
+        with_font(options) do
+          pdf.text(string, options)
+        end
+      end
+
+      def with_font(options)
+        pdf.font(options[:font] || pdf.font.family,
+                 size: options[:size],
+                 style: options[:style]) do
+          return yield
+        end
+      end
+
+      def hr_vertical_margin_top
+        @hr_vertical_margin_top ||=
+          (text_options[:size] || pdf.font_size) / 2.0
+      end
+
+      def hr_vertical_margin_bottom
+        @hr_vertical_margin_bottom ||= with_font(text_options) do
+          hr_vertical_margin_top +
+            pdf.font.descender +
+            text_leading -
+            pdf.line_width
+        end
+      end
+
+      def reset
+        super
+        text_margin_bottom # pre-calculate
+      end
+
+      def text_margin_bottom
+        options[:text] ||= {}
+        options[:text][:margin_bottom] ||= default_text_margin_bottom
+      end
+
+      def default_text_margin_bottom
+        with_font(text_options) do
+          pdf.font.line_gap +
+            pdf.font.descender +
+            text_leading
+        end
+      end
+
+      def text_leading
+        text_options[:leading] || pdf.default_leading
+      end
+
+      def text_options
+        @text_options ||= HashMerger.deep(default_text_options, options[:text] || {})
+      end
+
+      def default_text_options
+        {
+          inline_format: true
+        }
+      end
+    end
+  end
+end

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

@@ -32,10 +32,14 @@ module Prawn
       alias end_ul end_list
 
       def start_li
+        return unless inside_container?
+
         current_list.items << Elements::Item.new
       end
 
       def end_li
+        return unless inside_container?
+
         add_cell_text_node(current_list_item)
       end
 

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

@@ -73,6 +73,7 @@ module Prawn
 
       def add_cell_text_node(cell, options = {})
         return unless buffered_text?
+
         cell.nodes << options.merge(content: dump_text.strip)
       end
 

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

@@ -2,41 +2,21 @@ module Prawn
   module Markup
     module Processor::Text
       def self.prepended(base)
-        base.known_elements.push('p', 'br', 'div', 'b', 'strong', 'i', 'em', 'u', 'a', 'hr')
-      end
-
-      def start_br
-        append_text("\n")
-      end
-
-      def start_p
-        handle_text_element
-      end
-
-      def end_p
-        if inside_container?
-          append_new_line
-          append_text("\n")
-        else
-          add_paragraph
-        end
-      end
-
-      def start_div
-        handle_text_element
-      end
-
-      def end_div
-        handle_text_element
+        base.known_elements.push(
+          'a', 'b', 'strong', 'i', 'em', 'u', 'strikethrough', 'strike', 's', 'del',
+          'sub', 'sup'
+        )
       end
 
       def start_a
         append_text("<link href=\"#{current_attrs['href']}\">")
       end
+      alias start_link start_a
 
       def end_a
         append_text('</link>')
       end
+      alias end_link end_a
 
       def start_b
         append_text('<b>')
@@ -58,119 +38,44 @@ module Prawn
       end
       alias end_em end_i
 
-      def start_hr
-        return if inside_container?
-
-        put_bottom_margin(nil)
-        add_current_text
-        pdf.move_down(hr_vertical_margin_top)
-        pdf.stroke_horizontal_rule
-        pdf.move_down(hr_vertical_margin_bottom)
-      end
-
-      def end_document
-        add_current_text
-      end
-
-      private
-
-      def handle_text_element
-        if inside_container?
-          append_new_line
-        else
-          add_current_text
-        end
-      end
-
-      def append_new_line
-        append_text("\n") if buffered_text? && text_buffer[-1] != "\n"
-      end
-
-      def add_paragraph
-        text = dump_text
-        text.gsub!(/[^\n]/, '') if text.strip.empty?
-        unless text.empty?
-          add_bottom_margin
-          add_formatted_text(text, text_options)
-          put_bottom_margin(text_margin_bottom)
-        end
-      end
-
-      def add_current_text(options = text_options)
-        add_bottom_margin
-        return unless buffered_text?
-
-        string = dump_text
-        string.strip!
-        add_formatted_text(string, options)
+      def start_u
+        append_text('<u>')
       end
 
-      def add_bottom_margin
-        if @bottom_margin
-          pdf.move_down(@bottom_margin)
-          @bottom_margin = nil
-        end
+      def end_u
+        append_text('</u>')
       end
 
-      def add_formatted_text(string, options = text_options)
-        with_font(options) do
-          pdf.text(string, options)
-        end
+      def start_strikethrough
+        append_text('<strikethrough>')
       end
+      alias start_s start_strikethrough
+      alias start_strike start_strikethrough
+      alias start_del start_strikethrough
 
-      def with_font(options)
-        pdf.font(options[:font] || pdf.font.family,
-                 size: options[:size],
-                 style: options[:style]) do
-          return yield
-        end
+      def end_strikethrough
+        append_text('</strikethrough>')
       end
+      alias end_s end_strikethrough
+      alias end_strike end_strikethrough
+      alias end_del end_strikethrough
 
-      def hr_vertical_margin_top
-        @hr_vertical_margin_top ||=
-          (text_options[:size] || pdf.font_size) / 2.0
+      def start_sub
+        append_text('<sub>')
       end
 
-      def hr_vertical_margin_bottom
-        @hr_vertical_margin_bottom ||= with_font(text_options) do
-          hr_vertical_margin_top +
-            pdf.font.descender +
-            text_leading -
-            pdf.line_width
-        end
+      def end_sub
+        append_text('</sub>')
       end
 
-      def reset
-        super
-        text_margin_bottom # pre-calculate
+      def start_sup
+        append_text('<sup>')
       end
 
-      def text_margin_bottom
-        options[:text] ||= {}
-        options[:text][:margin_bottom] ||= default_text_margin_bottom
+      def end_sup
+        append_text('</sup>')
       end
 
-      def default_text_margin_bottom
-        with_font(text_options) do
-          pdf.font.line_gap +
-            pdf.font.descender +
-            text_leading
-        end
-      end
-
-      def text_leading
-        text_options[:leading] || pdf.default_leading
-      end
-
-      def text_options
-        @text_options ||= HashMerger.deep(default_text_options, options[:text] || {})
-      end
-
-      def default_text_options
-        {
-          inline_format: true
-        }
-      end
     end
   end
 end

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

@@ -22,7 +22,7 @@ module Prawn
         close_self_closing_elements
         normalize_spaces
         replace_html_entities
-        "<root>#{html}</root>"
+        "<body>#{html}</body>"
       end
 
       private
@@ -43,6 +43,7 @@ module Prawn
           html.gsub!(/&#{entity};/, string)
         end
       end
+
     end
   end
 end

data/lib/prawn/markup/version.rb

@@ -1,5 +1,5 @@
 module Prawn
   module Markup
-    VERSION = '0.1.0'.freeze
+    VERSION = '0.2.0'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -180,6 +180,7 @@ files:
 - lib/prawn/markup/elements/list.rb
 - lib/prawn/markup/interface.rb
 - lib/prawn/markup/processor.rb
+- lib/prawn/markup/processor/blocks.rb
 - lib/prawn/markup/processor/headings.rb
 - lib/prawn/markup/processor/images.rb
 - lib/prawn/markup/processor/lists.rb
@@ -210,7 +211,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Parse simple HTML markup to include in Prawn PDFs