wcc-contentful 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3fd731fc709f8ecfcd4ee730a6bc52e693bdd5f160ba00ad4cb5a50978c8a735
-  data.tar.gz: 20b9b0b06f31eace48c3ababb1c4cbbbc6d2a8143bc29677957305c4ce4dfe23
+  metadata.gz: d67d393afd50ea2c1ab321eea762d18111df439d4058f4cdf2281d43418b9b86
+  data.tar.gz: 64b7149e4a25410576287ea71692bccb23878e7c9b12b3b013cdaf08f4d1c79c
 SHA512:
-  metadata.gz: 9d2200e5b8bbb1c4a1b52a9163fa06c48d90049cc03715359610ab2e3b62d776635d174636b275188489da2cea857ca5a001426489513b15b2d31de749340b16
-  data.tar.gz: afb2143f431c139dabfa7139eedb27984f0846e6c377efb2cdea8d61336b1532e97ebba18483ea53ff7826e95b1304afeff99805c5ed750e37b93001cfb9067b
+  metadata.gz: 8458a30bd45a736ce11777e43c1376c887515f2870db10511cffd4361675506fa723fc400e280b68f19c0fb74d340c452c3a055ecf06032424337c2f14425dd7
+  data.tar.gz: 27b2af13bfad415a2f385fb1d641178ea5496e1e9080ae21071807cc3a3c662422675f6943422b9e7824b87f0eca1a8e4c4c64743a898e732637ecebf23345ab

data/README.md

@@ -74,10 +74,14 @@ We have successfully created caching layers using Memcached, Postgres, and an in
 
 ### Better Rails Integration
 
-When we initially got started with the Contentful ruby models, we encountered one problem that was more frustrating than all others: If a field exists in the content model, but the particular entry we're working with does not have that field populated, then accessing that field raised a `NoMethodError`.  This caused us to litter our code with `if defined?(entry.my_field)` which is bad practice.  (Note: this has since been fixed in contentful.rb v2).
+When we initially got started with the Contentful ruby models, we encountered one problem that was more frustrating than all others: If a field exists in the content model, but the particular entry we're working with does not have that field populated, then accessing that field raised a `NoMethodError`.  This caused us to litter our code with `if defined?(entry.my_field)` which is bad practice.  
 
 We decided it was better to not rely on `method_missing?` (what contentful.rb does), and instead to use `define_method` in an initializer to generate the methods for our models.  This has the advantage that calling `.instance_methods` on a model class includes all the fields present in the content model.
 
+Note: it appears that [contentful_rb has added an opt-in configuration to return `nil`](https://github.com/contentful/contentful_model#returning-nil-for-fields-which-arent-defined).
+instead of raising `NoMethodError. We think this should be the default setting,
+rather than being opt-in.
+
 We also took advantage of Rails' naming conventions to automatically infer the content type name based on the class name.  Thus in our code, we have `app/models/page.rb` which defines `class Page << WCC::Contentful::Model::Page`, and is automatically linked to the `page` content type ID.  (Note: this is overridable on a per-model basis)
 
 All our models are automatically generated at startup which improves response times at the expense of initialization time.  In addition, our content model registry allows easy definition of custom models in your `app/models` directory to override fields.  This plays nice with other gems like algoliasearch-rails, which allows you to declaratively manage your Algolia indexes.  Another example from our flagship watermark.org:

data/lib/wcc/contentful/engine.rb

@@ -2,36 +2,38 @@
 
 module WCC::Contentful
   class Engine < ::Rails::Engine
-    initializer 'enable webhook' do
-      config = WCC::Contentful.configuration
+    initializer 'enable webhook' do |app|
+      app.config.to_prepare do
+        config = WCC::Contentful.configuration
 
-      jobs = []
-      jobs << WCC::Contentful::SyncEngine::Job if WCC::Contentful::Services.instance.sync_engine&.should_sync?
-      jobs.push(*WCC::Contentful.configuration.webhook_jobs)
+        jobs = []
+        jobs << WCC::Contentful::SyncEngine::Job if WCC::Contentful::Services.instance.sync_engine&.should_sync?
+        jobs.push(*WCC::Contentful.configuration.webhook_jobs)
 
-      jobs.each do |job|
-        WCC::Contentful::WebhookController.subscribe(
-          ->(event) do
-            begin
-              if job.respond_to?(:perform_later)
-                job.perform_later(event.to_h)
-              else
-                Rails.logger.error "Misconfigured webhook job: #{job} does not respond to " \
-                                   ':perform_later'
+        jobs.each do |job|
+          WCC::Contentful::WebhookController.subscribe(
+            ->(event) do
+              begin
+                if job.respond_to?(:perform_later)
+                  job.perform_later(event.to_h)
+                else
+                  Rails.logger.error "Misconfigured webhook job: #{job} does not respond to " \
+                                     ':perform_later'
+                end
+              rescue StandardError => e
+                warn "Error in job #{job}: #{e}"
+                Rails.logger.error "Error in job #{job}: #{e}"
               end
-            rescue StandardError => e
-              warn "Error in job #{job}: #{e}"
-              Rails.logger.error "Error in job #{job}: #{e}"
-            end
-          end,
-          with: :call
-        )
-      end
+            end,
+            with: :call
+          )
+        end
 
-      next unless config&.management_token.present?
-      next unless config.app_url.present?
+        next unless config&.management_token.present?
+        next unless config.app_url.present?
 
-      WebhookEnableJob.set(wait: 10.seconds).perform_later if Rails.env.production?
+        WebhookEnableJob.set(wait: 10.seconds).perform_later if Rails.env.production?
+      end
     end
 
     config.generators do |g|

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/test/double.rb

@@ -48,8 +48,8 @@ module WCC::Contentful::Test::Double
         },
         id: SecureRandom.urlsafe_base64,
         type: 'Asset',
-        createdAt: Time.now.to_s(:iso8601),
-        updatedAt: Time.now.to_s(:iso8601),
+        createdAt: Time.now.to_formatted_s(:iso8601),
+        updatedAt: Time.now.to_formatted_s(:iso8601),
         environment: {
           sys: {
             id: 'master',

data/lib/wcc/contentful/test/factory.rb

@@ -62,8 +62,8 @@ module WCC::Contentful::Test::Factory
       },
       id: id || SecureRandom.urlsafe_base64,
       type: 'Entry',
-      createdAt: Time.now.to_s(:iso8601),
-      updatedAt: Time.now.to_s(:iso8601),
+      createdAt: Time.now.to_formatted_s(:iso8601),
+      updatedAt: Time.now.to_formatted_s(:iso8601),
       environment: {
         sys: {
           id: 'master',

data/lib/wcc/contentful/version.rb

@@ -2,6 +2,6 @@
 
 module WCC
   module Contentful
-    VERSION = '1.5.0'
+    VERSION = '1.6.0'
   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.6.0
 platform: ruby
 authors:
 - Watermark Dev
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-08 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -499,7 +499,7 @@ homepage: https://github.com/watermarkchurch/wcc-contentful/wcc-contentful
 licenses:
 - MIT
 metadata:
-  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.5/wcc-contentful
+  documentation_uri: https://watermarkchurch.github.io/wcc-contentful/1.6/wcc-contentful
   rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
@@ -516,7 +516,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://rubygems.org/gems/wcc-contentful)
@@ -576,14 +576,16 @@ summary: '[![Gem Version](https://badge.fury.io/rb/wcc-contentful.svg)](https://
   models, we encountered one problem that was more frustrating than all others: If
   a field exists in the content model, but the particular entry we''re working with
   does not have that field populated, then accessing that field raised a `NoMethodError`.  This
-  caused us to litter our code with `if defined?(entry.my_field)` which is bad practice.  (Note:
-  this has since been fixed in contentful.rb v2).  We decided it was better to not
-  rely on `method_missing?` (what contentful.rb does), and instead to use `define_method`
-  in an initializer to generate the methods for our models.  This has the advantage
-  that calling `.instance_methods` on a model class includes all the fields present
-  in the content model.  We also took advantage of Rails'' naming conventions to automatically
-  infer the content type name based on the class name.  Thus in our code, we have
-  `app/models/page.rb` which defines `class Page << WCC::Contentful::Model::Page`,
+  caused us to litter our code with `if defined?(entry.my_field)` which is bad practice.    We
+  decided it was better to not rely on `method_missing?` (what contentful.rb does),
+  and instead to use `define_method` in an initializer to generate the methods for
+  our models.  This has the advantage that calling `.instance_methods` on a model
+  class includes all the fields present in the content model.  Note: it appears that
+  [contentful_rb has added an opt-in configuration to return `nil`](https://github.com/contentful/contentful_model#returning-nil-for-fields-which-arent-defined).
+  instead of raising `NoMethodError. We think this should be the default setting,
+  rather than being opt-in.  We also took advantage of Rails'' naming conventions
+  to automatically infer the content type name based on the class name.  Thus in our
+  code, we have `app/models/page.rb` which defines `class Page << WCC::Contentful::Model::Page`,
   and is automatically linked to the `page` content type ID.  (Note: this is overridable
   on a per-model basis)  All our models are automatically generated at startup which
   improves response times at the expense of initialization time.  In addition, our