prawn-markup 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f381738eb8b0791ae8943bce4028ca3578249aa25269d887f3953e6de2ed0075
-  data.tar.gz: 45fd2e6656f9b50a2a3bc40ac67ed52dae462d134a4aa201e3459d00d10226ac
+  metadata.gz: e2a68c2f0773fd3769437fcee6aed0cba929e95808c6618b8e36dc2f7624c8fe
+  data.tar.gz: d379eb9ed4e28cbdbeca6048b06019d5dd4d8e741cb41ebd304a65a3a05be034
 SHA512:
-  metadata.gz: 14b1b72017fe9fb5b2ed0b0529eb8026203c21a7ec653ec50d25f1cd20533dd72827f97b27f5eff711f08c64b8d6b971105931e3fb645eb0c0a5e8e7ac45c2b0
-  data.tar.gz: f6f8a9a2cdebceece5946f31780d918d63981ff9ad0de5d5db5ecf8e20dc02df26fb2b27da46f98ec50b9c13ef1e4c82017d52f9549dec4229a07e61dbeba4f1
+  metadata.gz: 0da58a2bcd5b700753ae0f59f0c68c4014af194c74d2946e61e5028e29e8263fba91b255b023f2e9db5246a44a05cf5798b6808831309936091c7cdf53ff6c8f
+  data.tar.gz: 9129eaba7c308464c68c501dab041e2e54f79618734b0fd29c53554320b12cb6b2c18c25aa02bd77108eb3c17728720f95dce3412a4664f5fcc1d9c37beefccf

data/.rubocop.yml

@@ -15,10 +15,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Severity: error
 
-Metrics/LineLength:
-  Max: 100
-  Severity: error
-
 Metrics/MethodLength:
   Max: 10
   Severity: error
@@ -31,32 +27,36 @@ Metrics/ParameterLists:
   Max: 4
   Severity: warning
 
-# Keep for now, easier with superclass definitions
-ClassAndModuleChildren:
+Layout/LineLength:
+  Max: 100
+  Severity: error
+
+# We thinks that's fine for specs
+Layout/EmptyLinesAroundBlockBody:
   Enabled: false
 
-# The ones we use must exist for the entire class hierarchy.
-ClassVars:
+# We thinks that's fine
+Layout/EmptyLinesAroundClassBody:
   Enabled: false
 
-# Well, well, well
-Documentation:
+# We thinks that's fine
+Layout/EmptyLinesAroundModuleBody:
   Enabled: false
 
-# Keep single line bodys for if and unless
-IfUnlessModifier:
+# Keep for now, easier with superclass definitions
+Style/ClassAndModuleChildren:
   Enabled: false
 
-# We thinks that's fine for specs
-Layout/EmptyLinesAroundBlockBody:
+# The ones we use must exist for the entire class hierarchy.
+Style/ClassVars:
   Enabled: false
 
-# We thinks that's fine
-Layout/EmptyLinesAroundClassBody:
+# Well, well, well
+Style/Documentation:
   Enabled: false
 
-# We thinks that's fine
-Layout/EmptyLinesAroundModuleBody:
+# Keep single line bodys for if and unless
+Style/IfUnlessModifier:
   Enabled: false
 
 # We think that's the developers choice

data/.travis.yml

@@ -1,18 +1,12 @@
-sudo: false
-
 language: ruby
 
 rvm:
-  - 2.5.1
+  - 2.5.7
 
 env:
   global:
     - CC_TEST_REPORTER_ID=d70fe39ffb8f2f7c5f837f0133d10a3a1c6784d0dd189153111577b60f74c603
 
-before_install:
-  - gem update --system
-  - gem install bundler
-
 before_script:
   - curl -L https://codeclimate.com/downloads/test-reporter/test-reporter-latest-linux-amd64 > ./cc-test-reporter
   - chmod +x ./cc-test-reporter

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    prawn-markup (0.2.1)
+    prawn-markup (0.2.2)
       nokogiri
       prawn
       prawn-table
@@ -12,17 +12,16 @@ GEM
     Ascii85 (1.0.3)
     afm (0.2.2)
     ast (2.4.0)
-    byebug (11.0.1)
+    byebug (11.1.1)
     diff-lcs (1.3)
     docile (1.3.2)
     hashery (2.1.2)
     jaro_winkler (1.5.4)
-    json (2.2.0)
     mini_portile2 (2.4.0)
-    nokogiri (1.10.5)
+    nokogiri (1.10.9)
       mini_portile2 (~> 2.4.0)
     parallel (1.19.1)
-    parser (2.6.5.0)
+    parser (2.7.0.4)
       ast (~> 2.4.0)
     pdf-core (0.7.0)
     pdf-inspector (1.3.0)
@@ -40,35 +39,36 @@ GEM
       prawn (>= 1.3.0, < 3.0.0)
     rainbow (3.0.0)
     rake (13.0.1)
+    rexml (3.2.4)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
       rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rspec-core (3.9.1)
+      rspec-support (~> 3.9.1)
+    rspec-expectations (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-mocks (3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.77.0)
+    rspec-support (3.9.2)
+    rubocop (0.80.1)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
+      rexml
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 1.7)
     ruby-progressbar (1.10.1)
     ruby-rc4 (0.1.5)
-    simplecov (0.17.1)
+    simplecov (0.18.5)
       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.6.0)
+      simplecov-html (~> 0.11)
+    simplecov-html (0.12.2)
+    ttfunk (1.6.2.1)
+    unicode-display_width (1.6.1)
 
 PLATFORMS
   ruby

data/README.md

@@ -46,9 +46,9 @@ doc.markup_options = {
 doc.markup('<p>Hello World</p><hr/><p>KTHXBYE</p>', text: { align: :center })
 ```
 
-Options may be set for `text`, `table` (`cell` and `header`) and `list` (`content` and `bullet`).
+Options may be set for `text`, `heading[1-6]`, `table` (subkeys `cell` and `header`) and `list` (subkeys `content` and `bullet`).
 
-Text options include all keys from Prawns [#text](http://prawnpdf.org/api-docs/2.0/Prawn/Text.html#text-instance_method) method: `font`, `size`, `color`, `style`, `align`, `valign`, `leading`,`direction`, `character_spacing`, `indent_paragraphs`, `kerning`, `mode`.
+Text and heading options include all keys from Prawns [#text](http://prawnpdf.org/api-docs/2.0/Prawn/Text.html#text-instance_method) method: `font`, `size`, `color`, `style`, `align`, `valign`, `leading`,`direction`, `character_spacing`, `indent_paragraphs`, `kerning`, `mode`.
 
 Tables and lists are rendered with [prawn-table](https://github.com/prawnpdf/prawn-table) and have the following additional options: `padding`, `borders`, `border_width`, `border_color`, `background_color`, `border_lines`, `rotate`, `overflow`, `min_font_size`. Options from `text` may be overridden.
 
@@ -84,6 +84,9 @@ All other elements are ignored, their content is added to the parent element. Wi
 
 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`.
 
+## Example
+
+Have a look at [showcase.html](spec/fixtures/showcase.html), which is rendered by the corresponding [spec](spec/prawn/markup/showcase_spec.rb). Uncomment the `lookatit` call there to directly open the generated PDF when running the spec with `spec spec/prawn/markup/showcase_spec.rb`.
 
 ## Development
 

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

@@ -24,7 +24,10 @@ module Prawn
         end
 
         def draw
-          make(true).draw
+          # fix https://github.com/prawnpdf/prawn-table/issues/120
+          pdf.font_size(column_cell_style(:content)[:size] || pdf.font_size) do
+            make(true).draw
+          end
         end
 
         private

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

@@ -49,10 +49,12 @@ module Prawn
         def extract_text_cell_style(hash)
           TEXT_STYLE_OPTIONS
             .each_with_object({}) { |key, h| h[key] = hash[key] }
-            .tap do |options|
-            options[:font_style] ||= options.delete(:style)
-            options[:text_color] ||= options.delete(:color)
-          end
+            .tap { |options| convert_style_options(options) }
+        end
+
+        def convert_style_options(hash)
+          hash[:font_style] ||= hash.delete(:style)
+          hash[:text_color] ||= hash.delete(:color)
         end
 
         def type_key(object)

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

@@ -22,7 +22,10 @@ module Prawn
         end
 
         def draw
-          make.draw
+          # fix https://github.com/prawnpdf/prawn-table/issues/120
+          pdf.font_size(table_options[:cell][:size] || pdf.font_size) do
+            make.draw
+          end
         rescue Prawn::Errors::CannotFit => e
           if failover_on_error
             draw
@@ -233,11 +236,6 @@ module Prawn
           convert_style_options(opts[:header])
         end
 
-        def convert_style_options(hash)
-          hash[:font_style] ||= hash.delete(:style)
-          hash[:text_color] ||= hash.delete(:color)
-        end
-
         def default_table_options
           {
             cell: {

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

@@ -125,11 +125,17 @@ module Prawn
       end
 
       def default_text_margin_bottom
-        with_font(text_options) do
-          pdf.font.line_gap +
-            pdf.font.descender +
-            text_leading
-        end
+        text_line_gap +
+          text_descender +
+          text_leading
+      end
+
+      def text_line_gap
+        @text_line_gap ||= with_font(text_options) { pdf.font.line_gap }
+      end
+
+      def text_descender
+        @text_descender ||= with_font(text_options) { pdf.font.descender }
       end
 
       def text_leading

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

@@ -87,12 +87,17 @@ module Prawn
       end
 
       def add_list(list)
-        Builders::ListBuilder.new(pdf, list, pdf.bounds.width, options).draw
-        put_bottom_margin(text_margin_bottom)
+        pdf.move_up(additional_cell_padding_top)
+        draw_list(list)
+        put_bottom_margin(text_margin_bottom + additional_cell_padding_top)
       rescue Prawn::Errors::CannotFit => e
         append_text(list_too_large_placeholder(e))
       end
 
+      def draw_list(list)
+        Builders::ListBuilder.new(pdf, list, pdf.bounds.width, options).draw
+      end
+
       def list_too_large_placeholder(error)
         placeholder_value(%i[list placeholder too_large], error) || '[list content too large]'
       end

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

@@ -96,15 +96,24 @@ module Prawn
       end
 
       def add_table(cells)
-        Builders::TableBuilder.new(pdf, cells, pdf.bounds.width, options).draw
-        put_bottom_margin(text_margin_bottom)
+        draw_table(cells)
+        put_bottom_margin(text_margin_bottom + additional_cell_padding_top + text_leading)
       rescue Prawn::Errors::CannotFit => e
         append_text(table_too_large_placeholder(e))
       end
 
+      def draw_table(cells)
+        Builders::TableBuilder.new(pdf, cells, pdf.bounds.width, options).draw
+      end
+
       def table_too_large_placeholder(error)
         placeholder_value(%i[table placeholder too_large], error) || '[table content too large]'
       end
+
+      def additional_cell_padding_top
+        # as used in Prawn::Table::Cell::Text#draw_content move_down
+        (text_line_gap + text_descender) / 2
+      end
     end
   end
 end

data/lib/prawn/markup/version.rb

@@ -2,6 +2,6 @@
 
 module Prawn
   module Markup
-    VERSION = '0.2.1'
+    VERSION = '0.2.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prawn-markup
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2020-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -210,8 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Parse simple HTML markup to include in Prawn PDFs