wcc-contentful 1.5.0 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd731fc709f8ecfcd4ee730a6bc52e693bdd5f160ba00ad4cb5a50978c8a735
-  data.tar.gz: 20b9b0b06f31eace48c3ababb1c4cbbbc6d2a8143bc29677957305c4ce4dfe23
+  metadata.gz: 5599a00c953fc7b5692bc3f3c5b235d621c2d65bb1965e30a5ef89db3006a1c8
+  data.tar.gz: 40731523f1a793e1c85159977e0f3235588fadf82fa2d5b4733f586f33a812fe
 SHA512:
-  metadata.gz: 9d2200e5b8bbb1c4a1b52a9163fa06c48d90049cc03715359610ab2e3b62d776635d174636b275188489da2cea857ca5a001426489513b15b2d31de749340b16
-  data.tar.gz: afb2143f431c139dabfa7139eedb27984f0846e6c377efb2cdea8d61336b1532e97ebba18483ea53ff7826e95b1304afeff99805c5ed750e37b93001cfb9067b
+  metadata.gz: 22ee7a27c1000436dbf3ba622ef1ce412ca62d67bd67e2db0a0cc707a6e85f8e1a62a719729bba7385d8020295ae460779e0e0cc4be7bcac35bea90b855c7baf
+  data.tar.gz: cee9e57b7f192501d5cfe46338a34a8db64be596e7ab64872495eab6ad33408439d024a8ad9a60f9754487b460eae9cb31ea26c908c40fd828d87289443e9170

data/lib/wcc/contentful/rich_text_renderer.rb

@@ -142,7 +142,7 @@ class WCC::Contentful::RichTextRenderer
       # Check the first row - if it's a header row, render a <thead>
       first, *rest = node.content
       if first&.content&.all? { |cell| cell.node_type == 'table-header-cell' }
-        concat(content_tag(:thead) { render_content([first]) })
+        concat(render_table_header(first))
       else
         # Otherwise, render it inside the tbody with the rest
         rest.unshift(first)
@@ -152,6 +152,38 @@ class WCC::Contentful::RichTextRenderer
     end
   end
 
+  def render_table_header(table_row_node)
+    # roll up blank table-header-cells into the previous cell w/ colspan
+    node_contents = []
+    table_row_node.content.each do |node|
+      if node.node_type == 'table-header-cell' &&
+          node_is_blank?(node) &&
+          node_contents.last&.node_type == 'table-header-cell'
+
+        # replace the previous node with a new node with colspan + 1
+        last_node = node_contents.pop
+        node_contents << WCC::Contentful::RichText.tokenize(
+          last_node.as_json.merge(
+            'data' => (last_node['data'] || {}).merge({
+              'colspan' => (last_node['data']&.try('colspan') || 1) + 1
+            })
+          )
+        )
+
+        # And skip adding this blank node
+        next
+      end
+
+      node_contents << node
+    end
+
+    content_tag(:thead) do
+      content_tag(:tr) do
+        render_content(node_contents)
+      end
+    end
+  end
+
   def render_table_row(node)
     content_tag(:tr) do
       render_content(node.content)
@@ -160,16 +192,23 @@ class WCC::Contentful::RichTextRenderer
 
   def render_table_cell(node)
     content_tag(:td) do
-      render_content(node.content)
+      render_table_cell_content(node.content)
     end
   end
 
   def render_table_header_cell(node)
-    content_tag(:th) do
-      render_content(node.content)
+    content_tag(:th, colspan: node.data && node.data['colspan']) do
+      render_table_cell_content(node.content)
     end
   end
 
+  def render_table_cell_content(content)
+    # If the content is a single paragraph, render it without the <p> tag
+    return render_content(content.first.content) if content.size == 1 && content.first.node_type == 'paragraph'
+
+    render_content(content)
+  end
+
   def render_hyperlink(node)
     content_tag(:a,
       href: node.data['uri'],
@@ -249,6 +288,15 @@ class WCC::Contentful::RichTextRenderer
 
   private
 
+  def node_is_blank?(node)
+    case node.node_type
+    when 'text'
+      node.value.blank?
+    else
+      node.content.all? { |n| node_is_blank?(n) }
+    end
+  end
+
   def resolve_target(target)
     unless store.present?
       raise NotConnectedError,

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '1.5.0'
+    VERSION = '1.5.1'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.1
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug