dato-rails 0.11.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 99e4d154a2bfbaafddf661cf61fdb093eb93e2270809e5628b367500a5a6d382
-  data.tar.gz: 9d7a872b53ce27aceb1b9865bff5124642711cf4a757a130b1d592eb1087cf48
+  metadata.gz: 8deafc18f10be673f5349ce8eee374fd4d2cffda9935d9ba1d5809b464e7daec
+  data.tar.gz: 6ff76199a809434bf91d4f9db8db9766bdb21a8d1385123cb4a2a985b345a20a
 SHA512:
-  metadata.gz: ce096652ef057e9a4f24ef857034b07215be0a797376f2de03e6a66b1a5048d75521da6637c0ff4a0f3b62d33425780cea6c9052a6c6d9f95efa41a1688f93a2
-  data.tar.gz: 8a8a0bab330cfe44805f57b51062c83adcff8fc919d3f278c081ad1731d7140fd554159111d229fa0ba4d1139b5ddf3a389ef5d4deff059a64a4524936839f9d
+  metadata.gz: 1c3a256fc03848d9366dd73b447cc6f7e34bfb72e88a8ac406c19aad8625606cb9eb72ca173e3ccc80556c6efc0387de152b33eccb4a87740f50f631c8e1e6ac
+  data.tar.gz: d806381a4158cdcba8d3655c2cf606a95d315c318009f6cdbc21b009a320d8db206a5f60a15b8fd025e7072394fb184c2a5b9b0c74c727a10ed643bc751ee888

data/app/components/dato/block.md.erb

@@ -0,0 +1,20 @@
+<% block = blocks&.find { |b| b.id == @node.item } %>
+<% if block.nil? %>
+
+> ! There is a block with id <code><%= @node.item %></code> that has not been retrieved by the GraphQL Query.<br>
+> ! It's possible that your query is returning a structured text without blocks.
+
+<% elsif block.__typename.nil? %>
+
+> !  In order to render a block, you need to return its <code>__typename</code>.<br>
+> !  In your GraphQL query, add <code>__typename</code> to the list of fields returned for the blocks.<br>
+> !  For example:
+> !  ```
+> !    blocks {
+> !      __typename
+> !    }
+> !  ```
+
+<% else %>
+  <%= render class_for_block(block).new(block, root) %>
+<% end  %>

data/app/components/dato/block.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Dato::Block < Dato::DastNode
-  def initialize(node, root)
-    super(node, "block", root)
+  def initialize(node, root, parent = nil)
+    super(node, "block", root, parent)
   end
 end

data/app/components/dato/blockquote.md.erb

@@ -0,0 +1,4 @@
+<% @node.children&.each do |node| -%>
+> <%= render_node(node) -%>
+<% end -%>
+> *<%= @node.attribution %>*

data/app/components/dato/blockquote.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Dato::Blockquote < Dato::DastNode
-  def initialize(node, root)
-    super(node, "blockquote", root)
+  def initialize(node, root, parent = nil)
+    super(node, "blockquote", root, parent)
   end
 end

data/app/components/dato/code.md.erb

@@ -0,0 +1,3 @@
+```
+<%== @node.code %>
+```

data/app/components/dato/code.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Dato::Code < Dato::DastNode
-  def initialize(node, root)
-    super(node, "code", root)
+  def initialize(node, root, parent = nil)
+    super(node, "code", root, parent)
   end
 
   def generated_tag

data/app/components/dato/dast_node.md.erb

@@ -0,0 +1 @@
+<%= @node.value -%><%= @node.children&.map { |node| render_node(node) }&.join(" ") -%>

data/app/components/dato/dast_node.rb

@@ -2,8 +2,8 @@
 
 module Dato
   class DastNode < Node
-    def initialize(node, type, root = nil)
-      super(node, root)
+    def initialize(node, type, root = nil, parent = nil)
+      super(node, root, parent)
       unless node.type == type
         raise ArgumentError.new("The node type is '#{node.type}' instead of '#{type}'")
       end

data/app/components/dato/heading.html.erb

@@ -0,0 +1,6 @@
+<%= content_tag generated_tag, class: "dato-cms-#{@node.type}" do -%>
+<%= @node.value -%>
+<% @node.children&.each do |node| -%>
+<%= render_node(node) -%>
+<% end -%>
+<% end -%>

data/app/components/dato/heading.md.erb

@@ -0,0 +1,5 @@
+<%= "#{("#" * level)} #{@node.value}" -%>
+<% @node.children&.each do |node| -%>
+<%= render_node(node) %>
+<% end %>
+

data/app/components/dato/heading.rb

@@ -1,11 +1,15 @@
 # frozen_string_literal: true
 
 class Dato::Heading < Dato::DastNode
-  def initialize(node, root)
-    super(node, "heading", root)
+  def initialize(node, root, parent = nil)
+    super(node, "heading", root, parent)
+  end
+
+  def level
+    @node.level
   end
 
   def generated_tag
-    "h#{@node.level}"
+    "h#{level}"
   end
 end

data/app/components/dato/image_block_record.md.erb

@@ -0,0 +1,2 @@
+![](<%= @node.image.responsiveImage.src %>)
+<%= @node %>

data/app/components/dato/inline_block.md.erb

@@ -0,0 +1,20 @@
+<% block = blocks&.find { |b| b.id == @node.item } %>
+<% if block.nil? %>
+
+> ! There is an inline block with id <code><%= @node.item %></code> that has not been retrieved by the GraphQL Query.<br>
+> ! It's possible that your query is returning a structured text without blocks.
+
+<% elsif block.__typename.nil? %>
+
+> ! In order to render an inline block, you need to return its <code>__typename</code>.<br>
+> ! In your GraphQL query, add <code>__typename</code> to the list of fields returned for the blocks.<br>
+> ! For example:<br><br>
+> ! <code>
+> !   blocks {
+> !     __typename
+> !   }
+> ! </code>
+
+<% else %>
+<%= render class_for_block(block).new(block, root) %>
+<% end  %>

data/app/components/dato/link.md.erb

@@ -0,0 +1,2 @@
+[<% @node.children&.each do |node| -%><%= render_node(node) -%>
+<% end -%>](<%= link_attributes["href"] %>)

data/app/components/dato/link.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Dato::Link < Dato::DastNode
-  def initialize(node, root)
-    super(node, "link", root)
+  def initialize(node, root, parent = nil)
+    super(node, "link", root, parent)
   end
 
   def generated_tag

data/app/components/dato/list.html.erb

@@ -0,0 +1,6 @@
+<%= content_tag generated_tag, class: "dato-cms-#{@node.type}" do -%>
+<%= @node.value -%>
+<% @node.children&.each do |node| -%>
+<%= render_node(node) -%>
+<% end -%>
+<% end -%>

data/app/components/dato/list.md.erb

@@ -0,0 +1,6 @@
+<%= @node.value -%>
+<% @node.children&.each do |node| -%>
+<% node["style"] ||= @node.style %>
+<%= render_node(node) -%>
+<% end -%>
+

data/app/components/dato/list.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Dato::List < Dato::DastNode
-  def initialize(node, root)
-    super(node, "list", root)
+  def initialize(node, root, parent = nil)
+    super(node, "list", root, parent)
   end
 
   def generated_tag

data/app/components/dato/list_item.html.erb

@@ -0,0 +1,6 @@
+<%= content_tag generated_tag, class: "dato-cms-#{@node.type}" do -%>
+<%= @node.value -%>
+<% @node.children&.each do |node| -%>
+<%= render_node(node) -%>
+<% end -%>
+<% end -%>

data/app/components/dato/list_item.md.erb

@@ -0,0 +1,2 @@
+<%= (find_ancestor("list")&.node&.style == "bulleted") ? "*" : "1." -%> <%= @node.value -%>
+<% @node.children&.each do |node| -%><%= render_node(node) -%><% end -%>

data/app/components/dato/list_item.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Dato::ListItem < Dato::DastNode
-  def initialize(node, root)
-    super(node, "listItem", root)
+  def initialize(node, root, parent = nil)
+    super(node, "listItem", root, parent)
   end
 
   def generated_tag

data/app/components/dato/node.rb

@@ -2,17 +2,36 @@
 
 module Dato
   class Node < ViewComponent::Base
-    attr_reader :root
+    attr_reader :root, :node, :parent
 
-    def initialize(node, root = nil)
+    def initialize(node, root = nil, parent = nil)
       @node = node
       @root = root
+      @parent = parent
     end
 
     def render_node(node)
-      render class_for_node(node).new(node, root)
+      render class_for_node(node).new(node, root, self)
     end
 
+    # Find the first ancestor of a specific type
+    # @param type [String] the type to search for (e.g., "list", "structuredText")
+    # @return [Node, nil] the first ancestor matching the type or nil
+    def find_ancestor(type)
+      current = parent
+      while current
+        return current if current.node_type == type
+        current = current.parent
+      end
+      nil
+    end
+
+    # Get the type of the immediate parent node
+    # @return [String, nil] the parent's type or nil if no parent
+    def node_type = node&.type
+
+    def parent_type = parent&.node_type
+
     def blocks
       root.blocks
     end

data/app/components/dato/paragraph.html.erb

@@ -0,0 +1,6 @@
+<%= content_tag generated_tag, class: "dato-cms-#{@node.type}" do -%>
+<%= @node.value -%>
+<% @node.children&.each do |node| -%>
+<%= render_node(node) -%>
+<% end -%>
+<% end -%>

data/app/components/dato/paragraph.md.erb

@@ -0,0 +1,8 @@
+<%= @node.value -%><%== @node.children&.map { |node| render_node(node) }&.join -%>
+<% if parent_type.nil? %>
+
+
+<% elsif "listItem" == parent_type %>
+<% else %>
+
+<% end %>

data/app/components/dato/paragraph.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Dato::Paragraph < Dato::DastNode
-  def initialize(node, root)
-    super(node, "paragraph", root)
+  def initialize(node, root, parent = nil)
+    super(node, "paragraph", root, parent)
   end
 
   def generated_tag

data/app/components/dato/span.md.erb

@@ -0,0 +1 @@
+<% unless @node.value.nil? %><%== wrap_styles do -%><%== @node.value -%><% end -%><% end -%>

data/app/components/dato/span.rb

@@ -1,8 +1,16 @@
 # frozen_string_literal: true
 
 class Dato::Span < Dato::DastNode
-  def initialize(node, root = nil)
-    super(node, "span", root)
+  def initialize(node, root = nil, parent = nil)
+    super(node, "span", root, parent)
+  end
+
+  def wrap_styles(&block)
+    wrapping_symbols = ""
+    wrapping_symbols += "**" if @node.marks&.include?("strong")
+    wrapping_symbols += "`" if @node.marks&.include?("code")
+    wrapping_symbols += "_" if @node.marks&.include?("emphasis")
+    "#{wrapping_symbols}#{capture(&block)}#{wrapping_symbols.reverse}"
   end
 
   def styles
@@ -11,7 +19,7 @@ class Dato::Span < Dato::DastNode
     mapping = {
       emphasis: "font-style: italic",
       strong: "font-weight: bold",
-      highlight: "background-color: var(--dato-highlight-color, yellow)",
+      highlight: "background-color: var(--dato-highlight-color, yellow)"
     }.with_indifferent_access
 
     text_decoration_mappings = {

data/app/components/dato/structured_text.md.erb

@@ -0,0 +1,3 @@
+<% @structured_text_node.value.document.children.each do |node| -%>
+<%= render_node(node) -%>
+<% end -%>

data/app/components/dato/thematic_break.html.erb

@@ -0,0 +1 @@
+<hr>

data/app/components/dato/thematic_break.md.erb

@@ -0,0 +1,3 @@
+
+---
+

data/app/components/dato/thematic_break.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 class Dato::ThematicBreak < Dato::DastNode
-  def initialize(node, root)
-    super(node, "thematicBreak", root)
+  def initialize(node, root, parent = nil)
+    super(node, "thematicBreak", root, parent)
   end
 
   def generated_tag

data/app/controllers/dato/live_controller.rb

@@ -2,6 +2,9 @@ module Dato
   class LiveController < ActionController::Base
     def create
       @data = Hashie::Mash.new(JSON.parse(params[:data], symbolize_names: true).dig(:response, :data))
+      # Ensure HTML format is available for ViewComponent template resolution
+      # ViewComponent 4 requires explicit format matching
+      lookup_context.formats |= [:html]
     end
   end
 end

data/app/views/home/show.html.erb

@@ -0,0 +1 @@
+<%= render Dato::StructuredText.new(@content) %>

data/app/views/home/show.md.erb

@@ -0,0 +1 @@
+<%= render Dato::StructuredText.new(@content) %>

data/lib/dato/config.rb

@@ -1,16 +1,18 @@
 module Dato
   class Config
-    include ActiveSupport::Configurable
+    class_attribute :overrides, default: {}
+    class_attribute :links_mapping, default: {}
+    class_attribute :blocks, default: {}
+    class_attribute :cache, default: false
+    class_attribute :cache_namespace, default: "dato-rails"
+    class_attribute :api_token, default: ENV.fetch("DATO_API_TOKEN", Rails.application.credentials.dig(:dato, :api_token))
+    class_attribute :publish_key, default: ENV.fetch("DATO_PUBLISH_KEY", Rails.application.credentials.dig(:dato, :publish_key))
+    class_attribute :build_trigger_id, default: ENV.fetch("DATO_BUILD_TRIGGER_ID", Rails.application.credentials.dig(:dato, :build_trigger_id))
+    class_attribute :base_editing_url, default: ENV.fetch("DATO_BASE_EDITING_URL", Rails.application.credentials.dig(:dato, :base_editing_url))
+    class_attribute :mount_path, default: "/dato"
 
-    config_accessor(:overrides) { {} }
-    config_accessor(:links_mapping) { {} }
-    config_accessor(:blocks) { {} }
-    config_accessor(:cache) { false }
-    config_accessor(:cache_namespace) { "dato-rails" }
-    config_accessor(:api_token) { ENV.fetch("DATO_API_TOKEN", Rails.application.credentials.dig(:dato, :api_token)) }
-    config_accessor(:publish_key) { ENV.fetch("DATO_PUBLISH_KEY", Rails.application.credentials.dig(:dato, :publish_key)) }
-    config_accessor(:build_trigger_id) { ENV.fetch("DATO_BUILD_TRIGGER_ID", Rails.application.credentials.dig(:dato, :build_trigger_id)) }
-    config_accessor(:base_editing_url) { ENV.fetch("DATO_BASE_EDITING_URL", Rails.application.credentials.dig(:dato, :base_editing_url)) }
-    config_accessor(:mount_path) { "/dato" }
+    def self.configure
+      yield self
+    end
   end
 end

data/lib/dato/engine.rb

@@ -4,6 +4,10 @@ module Dato
   class Engine < ::Rails::Engine
     isolate_namespace Dato
 
+    initializer "dato_rails.mime_types", before: :load_config_initializers do
+      Mime::Type.register "text/markdown", :md unless Mime::Type.lookup_by_extension(:md)
+    end
+
     initializer "dato_rails.action_controller" do
       ActiveSupport.on_load(:action_controller) do
         include Dato::Railties::ControllerRuntime

data/lib/dato/version.rb

@@ -1,3 +1,3 @@
 module Dato
-  VERSION = "0.11.0"
+  VERSION = "0.12.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dato-rails
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Alessandro Rodi
 bindir: bin
 cert_chain: []
-date: 2025-08-28 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -99,42 +99,42 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6'
+        version: '8'
 - !ruby/object:Gem::Dependency
   name: turbo-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: gqli
   requirement: !ruby/object:Gem::Requirement
@@ -176,37 +176,56 @@ files:
 - app/assets/config/dato_rails_manifest.js
 - app/components/dato/base_component.rb
 - app/components/dato/block.html.erb
+- app/components/dato/block.md.erb
 - app/components/dato/block.rb
 - app/components/dato/blockquote.html.erb
+- app/components/dato/blockquote.md.erb
 - app/components/dato/blockquote.rb
 - app/components/dato/code.html.erb
+- app/components/dato/code.md.erb
 - app/components/dato/code.rb
 - app/components/dato/dast_node.html.erb
+- app/components/dato/dast_node.md.erb
 - app/components/dato/dast_node.rb
+- app/components/dato/heading.html.erb
+- app/components/dato/heading.md.erb
 - app/components/dato/heading.rb
 - app/components/dato/image_block_record.html.erb
+- app/components/dato/image_block_record.md.erb
 - app/components/dato/image_block_record.rb
 - app/components/dato/inline_block.html.erb
+- app/components/dato/inline_block.md.erb
 - app/components/dato/inline_block.rb
 - app/components/dato/inline_item.html.erb
 - app/components/dato/inline_item.rb
 - app/components/dato/item_link.html.erb
 - app/components/dato/item_link.rb
 - app/components/dato/link.html.erb
+- app/components/dato/link.md.erb
 - app/components/dato/link.rb
+- app/components/dato/list.html.erb
+- app/components/dato/list.md.erb
 - app/components/dato/list.rb
+- app/components/dato/list_item.html.erb
+- app/components/dato/list_item.md.erb
 - app/components/dato/list_item.rb
 - app/components/dato/live_stream.html.erb
 - app/components/dato/live_stream.rb
 - app/components/dato/node.rb
 - app/components/dato/not_rendered.rb
+- app/components/dato/paragraph.html.erb
+- app/components/dato/paragraph.md.erb
 - app/components/dato/paragraph.rb
 - app/components/dato/responsive_image.html.erb
 - app/components/dato/responsive_image.rb
 - app/components/dato/span.html.erb
+- app/components/dato/span.md.erb
 - app/components/dato/span.rb
 - app/components/dato/structured_text.html.erb
+- app/components/dato/structured_text.md.erb
 - app/components/dato/structured_text.rb
+- app/components/dato/thematic_break.html.erb
+- app/components/dato/thematic_break.md.erb
 - app/components/dato/thematic_break.rb
 - app/components/dato/unknown_block.html.erb
 - app/components/dato/unknown_block.rb
@@ -217,6 +236,8 @@ files:
 - app/controllers/dato/live_controller.rb
 - app/controllers/dato/publish_controller.rb
 - app/views/dato/live/create.turbo_stream.erb
+- app/views/home/show.html.erb
+- app/views/home/show.md.erb
 - config/routes.rb
 - lib/dato.rb
 - lib/dato/cache.rb
@@ -252,7 +273,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.6.2
+rubygems_version: 4.0.2
 specification_version: 4
 summary: Use Dato CMS in your Rails application.
 test_files: []