caracal 1.1.2 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1f3944130ad07554a021682f7365b9b6db126c8d
-  data.tar.gz: 358849a03c5e6806f77590a4eb3ce86de6c6a68e
+SHA256:
+  metadata.gz: 5e775f349922d6591347d38de57b4211581c75d1b1b1fe08f67d887d68833a6b
+  data.tar.gz: 635e787f52491c8f06ff3dcb32cd0d573a4abc7b44aa693dc8421a74108942e0
 SHA512:
-  metadata.gz: c84b97f6fbbf1038db085d86205e2f50f74eb4c09f3aff1391ed65b8c111c1def9f05fba78027a36a7a626a6ecc2b95543e9737949d3190bd6cfdc1e7940f9d1
-  data.tar.gz: 2643cfcd452911dce56bb8cf96884021cd0d11ea4e041e35cc1af8a5ba45147b444237413d69c501d2d8e1acf8d23e06a579a69806e93eb4a3e24b4b052c3e60
+  metadata.gz: 20b0fd3d486e99180c7a871610ba7d619d75cefc2116cb54e3920ed8bf2c036a6d93789df6570dde608cc68ece8693e272da093ad5ac26dad8962804c35f2171
+  data.tar.gz: d69653b8075ec87ab191cf07d4bc1090fb0822b3ae05a1f24d9edfd8ac3476efa2291c46a21c8194dca4d99505fee569cf1ddaf85a4f03dce7ae1de3857cc486

data/CHANGELOG.md

@@ -1,8 +1,15 @@
+#### v1.2.0
+
+* Enhancements
+  * Added colspan and rowspan functionality to table styling feature. (@ViktorKopychko)
+
+
 #### v1.1.2
 
 * Enhancements
   * Added font size options for page numbers. (@cfacello)
 
+
 #### v1.1.1
 
 * Enhancements

data/README.md

@@ -639,6 +639,17 @@ docx.table [['Header 1','Header 2'],['Cell 1', 'Cell 2']], border_size: 4 do
 end
 ```
 
+It is possible to merge cells vertically and horizontally using the `rowspan` and `colspan` options in `cell_style` method e.g.
+
+```ruby
+docx.table [['11', '1213', '14'], ['21', '22', '23', '24']] do
+  cell_style rows[0][0], rowspan: 2 
+  cell_style rows[0][1], colspan: 2 
+  cell_style rows[0][2], rowspan: 2 
+end
+```
+
+*Note: content of cells 21 and 24 will disappear*
 
 ### Table Cells
 

data/lib/caracal/core/models/table_cell_model.rb

@@ -25,6 +25,8 @@ module Caracal
         attr_reader :cell_width
         attr_reader :cell_margins
         attr_reader :cell_vertical_align
+        attr_reader :cell_rowspan
+        attr_reader :cell_colspan
 
         # initialization
         def initialize(options={}, &block)
@@ -118,7 +120,7 @@ module Caracal
         #=============== SETTERS ==============================
 
         # integers
-        [:width].each do |m|
+        [:width, :colspan, :rowspan].each do |m|
           define_method "#{ m }" do |value|
             instance_variable_set("@cell_#{ m }", value.to_i)
           end
@@ -145,7 +147,6 @@ module Caracal
           end
         end
 
-
         #=============== VALIDATION ===========================
 
         def valid?
@@ -159,7 +160,7 @@ module Caracal
         private
 
         def option_keys
-          [:background, :margins, :width, :vertical_align]
+          [:background, :margins, :width, :vertical_align, :rowspan, :colspan]
         end
 
       end

data/lib/caracal/core/models/table_model.rb

@@ -95,7 +95,7 @@ module Caracal
         # end
         #
         def cell_style(models, options={})
-          [models].flatten.each do |m|
+          [models].flatten.compact.each do |m|
             m.apply_styles(options)
           end  
         end

data/lib/caracal/renderers/document_renderer.rb

@@ -319,23 +319,42 @@ module Caracal
           end
           xml['w'].tblGrid do
             model.rows.first.each do |tc|
-              xml['w'].gridCol({ 'w:w' => tc.cell_width })
+              (tc.cell_colspan || 1).times do
+                xml['w'].gridCol({ 'w:w' => tc.cell_width })
+              end
             end
             xml['w'].tblGridChange({ 'w:id' => '0' }) do
               xml['w'].tblGrid do
                 model.rows.first.each do |tc|
-                  xml['w'].gridCol({ 'w:w' => tc.cell_width })
+                  (tc.cell_colspan || 1).times do
+                    xml['w'].gridCol({ 'w:w' => tc.cell_width })
+                  end
                 end
               end
             end
           end
+
+          rowspan_hash = {}
           model.rows.each do |row|
             xml['w'].tr do
-              row.each do |tc|
+              row.each_with_index do |tc, tc_index|
                 xml['w'].tc do
                   xml['w'].tcPr do
                     xml['w'].shd({ 'w:fill' => tc.cell_background })
                     xml['w'].vAlign({ 'w:val' => tc.cell_vertical_align })
+
+                    # applying rowspan
+                    if tc.cell_rowspan && tc.cell_rowspan > 0
+                      rowspan_hash[tc_index] = tc.cell_rowspan - 1
+                      xml['w'].vMerge({ 'w:val' => 'restart' })
+                    elsif rowspan_hash[tc_index] && rowspan_hash[tc_index] > 0
+                      xml['w'].vMerge({ 'w:val' => 'continue' })
+                      rowspan_hash[tc_index] -= 1
+                    end
+
+                    # applying colspan
+                    xml['w'].gridSpan({ 'w:val' => tc.cell_colspan }) if tc.cell_colspan
+
                     xml['w'].tcMar do
                       %w(top left bottom right).each do |d|
                         xml['w'].method_missing "#{ d }", { 'w:w' => tc.send("cell_margin_#{ d }").to_f, 'w:type' => 'dxa' }
@@ -349,6 +368,22 @@ module Caracal
                 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
+              end
+              adjusted_rowspan_hash[adjusted_rowspan_cell_index] = rowspan_value
+            end
+
+            rowspan_hash = adjusted_rowspan_hash
           end
         end
 

data/lib/caracal/version.rb

@@ -1,3 +1,3 @@
 module Caracal
-  VERSION = '1.1.2'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caracal
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.2.0
 platform: ruby
 authors:
 - Trade Infomatics
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -231,7 +231,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Fast, professional Microsoft Word (docx) writer for Ruby.