wcc-contentful 1.5.0.rc1 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81257133691833969ac9f77447b91d2698aa0738964b56f80e8533dd403e90d1
-  data.tar.gz: 424597dcc95a76513d70226d82aafbea7baf614dcc7c5ee55c405e2dc75d4337
+  metadata.gz: 5599a00c953fc7b5692bc3f3c5b235d621c2d65bb1965e30a5ef89db3006a1c8
+  data.tar.gz: 40731523f1a793e1c85159977e0f3235588fadf82fa2d5b4733f586f33a812fe
 SHA512:
-  metadata.gz: 23e37d1e5e4271c0f0a13f8e0aa495473b55164b855b58df1638de5fc88f50e00499a4726908f1bb59856075833ab275fa3a893233fc484ff6c839fd42f023b0
-  data.tar.gz: 139b207faa2d1f6a3ae44ddff0421d4572f7b93aab04c2fc63bd6136e05faa72886d639ac023c0009af0934a74d8c70b79d7ce23876903706dd9702c04fb5f8a
+  metadata.gz: 22ee7a27c1000436dbf3ba622ef1ce412ca62d67bd67e2db0a0cc707a6e85f8e1a62a719729bba7385d8020295ae460779e0e0cc4be7bcac35bea90b855c7baf
+  data.tar.gz: cee9e57b7f192501d5cfe46338a34a8db64be596e7ab64872495eab6ad33408439d024a8ad9a60f9754487b460eae9cb31ea26c908c40fd828d87289443e9170

data/lib/wcc/contentful/rich_text_renderer.rb

@@ -39,11 +39,11 @@ class WCC::Contentful::RichTextRenderer
   end
 
   attr_reader :document
-  attr_accessor :config, :store, :model_namespace
+  attr_accessor :configuration, :store, :model_namespace
 
-  def initialize(document, config: nil, store: nil, model_namespace: nil)
+  def initialize(document, configuration: nil, store: nil, model_namespace: nil)
     @document = document
-    @config = config if config.present?
+    @configuration = configuration if configuration.present?
     @store = store if store.present?
     @model_namespace = model_namespace if model_namespace.present?
   end
@@ -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,
@@ -274,9 +322,9 @@ class WCC::Contentful::RichTextRenderer
     return false unless uri&.host.present?
 
     app_uri =
-      if config&.app_url.present?
+      if configuration&.app_url.present?
         begin
-          URI(config.app_url)
+          URI(configuration.app_url)
         rescue StandardError
           nil
         end

data/lib/wcc/contentful/rich_text_renderer_factory.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+# Constructs new connected RichTextRenderer instances w/ needed dependencies
+class RichTextRendererFactory
+  def initialize(implementation_class, services: WCC::Contentful::Services.instance)
+    @implementation_class = implementation_class
+    @services = services
+  end
+
+  def new(document)
+    @implementation_class.new(document).tap do |renderer|
+      # Inject any dependencies that the renderer needs (except itself to avoid infinite recursion)
+      @services.inject_into(renderer, except: [:rich_text_renderer])
+    end
+  end
+
+  def call(document)
+    new(document).call
+  end
+end

data/lib/wcc/contentful/services.rb

@@ -11,6 +11,10 @@ module WCC::Contentful
 
     attr_reader :configuration
 
+    def model_namespace
+      @model_namespace || WCC::Contentful::Model
+    end
+
     def initialize(configuration, model_namespace: nil)
       raise ArgumentError, 'Not yet configured!' unless configuration
 
@@ -131,20 +135,7 @@ module WCC::Contentful
     def rich_text_renderer
       @rich_text_renderer ||=
         if implementation_class = configuration&.rich_text_renderer
-          store = self.store
-          config = configuration
-          model_namespace = @model_namespace || WCC::Contentful::Model
-
-          # Wrap the implementation in a subclass that injects the services
-          Class.new(implementation_class) do
-            define_method :initialize do |document, *args, **kwargs|
-              # Implementation might choose to override these, so call super last
-              @store = store
-              @config = config
-              @model_namespace = model_namespace
-              super(document, *args, **kwargs)
-            end
-          end
+          RichTextRendererFactory.new(implementation_class, services: self)
         else
           # Create a renderer that renders a more helpful error message, but delay the error message until #to_html
           # is actually invoked in case the user never actually uses the renderer.

data/lib/wcc/contentful/version.rb

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

data/lib/wcc/contentful.rb

@@ -22,6 +22,7 @@ require 'wcc/contentful/model_singleton_methods'
 require 'wcc/contentful/model_builder'
 require 'wcc/contentful/rich_text'
 require 'wcc/contentful/rich_text_renderer'
+require 'wcc/contentful/rich_text_renderer_factory'
 require 'wcc/contentful/sync_engine'
 require 'wcc/contentful/events'
 require 'wcc/contentful/middleware'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wcc-contentful
 version: !ruby/object:Gem::Version
-  version: 1.5.0.rc1
+  version: 1.5.1
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-07 00:00:00.000000000 Z
+date: 2023-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -454,6 +454,7 @@ files:
 - lib/wcc/contentful/rich_text.rb
 - lib/wcc/contentful/rich_text/node.rb
 - lib/wcc/contentful/rich_text_renderer.rb
+- lib/wcc/contentful/rich_text_renderer_factory.rb
 - lib/wcc/contentful/rspec.rb
 - lib/wcc/contentful/services.rb
 - lib/wcc/contentful/simple_client.rb
@@ -511,9 +512,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.3.7
 signing_key: