caracal 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7539fa972b10d2c7af3de21bb8f9787eecb0e0c3867326afd4cdedd2ec3dd5a
-  data.tar.gz: 8356897d9cb7e54c9816497f0297cc635afb2267f42cba57fac009b3819791f0
+  metadata.gz: 07032410054f6b6e5b8d640aa391c24382eda9461832b7f3fb0fe2bb9203164f
+  data.tar.gz: 780ae708802f68185d556d6ec0dc28b5fdb86adefc6043ec18bf32027440278b
 SHA512:
-  metadata.gz: b8542dfdc09c07f78f7bf63714d681b1f8a0d93c6718f14f3d1e53ef6b055e6549df94b95fddb93390f89e6d300063566b9d71d7584b104c453caa4dadf0e023
-  data.tar.gz: '009ca4e19a83ec60c60bc3dc9e009da724a0768f50ebfba2b2e4045bf98e658689386495e3f59fd639eb2da1bb1fcfd059ada4f517353707647799c3d9c12be6'
+  metadata.gz: 136540cd7409584e274462d2f43b7b21f4533a4351611ea41f0db03fd6282a366d01c0a5d1f6b4d05d7674d9bdd9f939b536ba569189407abcfe253e8fc524c8
+  data.tar.gz: d9c61a1f362f43625aaa3160639f903ebd003df993dc8e78c17e456bb1a1205aef94b5e1dc8cdf9b69136ba71786bb2eeee03f8e26ae35c1862ea329d1fe9162

data/README.md

@@ -628,6 +628,10 @@ the simplest solution to both problems.*
 
 ### Tables
 
+```
+Release v1.4.0 deprecated the behaviour of automatically adding an empty paragraph tag after every table. If you are upgrading from an older version of the library, you will need to control such spacing in your own code.
+```
+
 Tables can be added using the `table` method.  The method accepts several optional paramters to control the layout and style of the table cells.
 
 The `table` command accepts data in the form of a two-dimensional arrays. This corresponds to rows and column cells within those rows.  Each array item can be a string, a Hash of options, a Proc (which will be passed as a block), or a `TableCellModel`.  The command will normalize all array contents into a two-dimensional array of `TableCellModel` instances.

data/lib/caracal/renderers/document_renderer.rb

@@ -351,7 +351,8 @@ module Caracal
           rowspan_hash = {}
           model.rows.each do |row|
             xml['w'].tr do
-              row.each_with_index do |tc, tc_index|
+              tc_index = 0
+              row.each do |tc|
                 xml['w'].tc do
                   xml['w'].tcPr do
                     xml['w'].shd({ 'w:fill' => tc.cell_background })
@@ -380,30 +381,13 @@ module Caracal
                     send(method, xml, m)
                   end
                 end
-              end
-            end
 
-            # we need to adjust rowspan indexes as they depend on previous row colspans
-            adjusted_rowspan_hash = {}
-            rowspan_hash.each do |rowspan_cell_index, rowspan_value|
-              adjusted_rowspan_cell_index = rowspan_cell_index
-              row.each_with_index do |tc, tc_index|
-                if tc.cell_colspan && tc.cell_colspan >= 1
-                  if tc_index < rowspan_cell_index
-                    adjusted_rowspan_cell_index += tc.cell_colspan - 1
-                  end
-                end
+                # adjust tc_index for next cell taking into account current cell's colspan
+                tc_index += (tc.cell_colspan && tc.cell_colspan > 0) ? tc.cell_colspan : 1
               end
-              adjusted_rowspan_hash[adjusted_rowspan_cell_index] = rowspan_value
             end
-
-            rowspan_hash = adjusted_rowspan_hash
           end
         end
-
-        # don't know why this is needed, but it prevents a
-        # rendering error.
-        # render_paragraph(xml, Caracal::Core::Models::ParagraphModel.new)
       end
 
 
@@ -419,23 +403,6 @@ module Caracal
           opts['mc:Ignorable'] = v
         end
         opts
-        # {
-        #   'xmlns:mc'   => 'http://schemas.openxmlformats.org/markup-compatibility/2006',
-        #   'xmlns:o'    => 'urn:schemas-microsoft-com:office:office',
-        #   'xmlns:r'    => 'http://schemas.openxmlformats.org/officeDocument/2006/relationships',
-        #   'xmlns:m'    => 'http://schemas.openxmlformats.org/officeDocument/2006/math',
-        #   'xmlns:v'    => 'urn:schemas-microsoft-com:vml',
-        #   'xmlns:wp'   => 'http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing',
-        #   'xmlns:w10'  => 'urn:schemas-microsoft-com:office:word',
-        #   'xmlns:w'    => 'http://schemas.openxmlformats.org/wordprocessingml/2006/main',
-        #   'xmlns:wne'  => 'http://schemas.microsoft.com/office/word/2006/wordml',
-        #   'xmlns:sl'   => 'http://schemas.openxmlformats.org/schemaLibrary/2006/main',
-        #   'xmlns:a'    => 'http://schemas.openxmlformats.org/drawingml/2006/main',
-        #   'xmlns:pic'  => 'http://schemas.openxmlformats.org/drawingml/2006/picture',
-        #   'xmlns:c'    => 'http://schemas.openxmlformats.org/drawingml/2006/chart',
-        #   'xmlns:lc'   => 'http://schemas.openxmlformats.org/drawingml/2006/lockedCanvas',
-        #   'xmlns:dgm'  => 'http://schemas.openxmlformats.org/drawingml/2006/diagram'
-        # }
       end
 
       def page_margin_options

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.4.0'
+  VERSION = '1.4.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracal
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Trade Infomatics
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-31 00:00:00.000000000 Z
+date: 2019-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri