panda_cms 0.6.0 → 0.6.2

data/app/lib/panda_cms/editor_js/blocks/image.rb

@@ -0,0 +1,34 @@
+module PandaCms
+  module EditorJs
+    module Blocks
+      class Image < Base
+        def render
+          url = data["url"]
+          caption = sanitize(data["caption"])
+          with_border = data["withBorder"]
+          with_background = data["withBackground"]
+          stretched = data["stretched"]
+
+          css_classes = ["prose"]
+          css_classes << "border" if with_border
+          css_classes << "bg-gray-100" if with_background
+          css_classes << "w-full" if stretched
+
+          html_safe(<<~HTML)
+            <figure class="#{css_classes.join(" ")}">
+              <img src="#{url}" alt="#{caption}" />
+              #{caption_element(caption)}
+            </figure>
+          HTML
+        end
+
+        private
+
+        def caption_element(caption)
+          return "" if caption.blank?
+          "<figcaption>#{caption}</figcaption>"
+        end
+      end
+    end
+  end
+end

data/app/lib/panda_cms/editor_js/blocks/list.rb

@@ -0,0 +1,30 @@
+module PandaCms
+  module EditorJs
+    module Blocks
+      class List < Base
+        def render
+          list_type = (data["style"] == "ordered") ? "ol" : "ul"
+          html_safe(
+            "<#{list_type}>" \
+            "#{render_items(data["items"])}" \
+            "</#{list_type}>"
+          )
+        end
+
+        private
+
+        def render_items(items)
+          items.map do |item|
+            content = item.is_a?(Hash) ? item["content"] : item
+            nested = (item.is_a?(Hash) && item["items"].present?) ? render_nested(item["items"]) : ""
+            "<li>#{sanitize(content)}#{nested}</li>"
+          end.join
+        end
+
+        def render_nested(items)
+          self.class.new({"items" => items, "style" => data["style"]}).render
+        end
+      end
+    end
+  end
+end

data/app/lib/panda_cms/editor_js/blocks/paragraph.rb

@@ -0,0 +1,13 @@
+module PandaCms
+  module EditorJs
+    module Blocks
+      class Paragraph < Base
+        def render
+          content = sanitize(data["text"])
+          return "" if content.blank?
+          html_safe("<p>#{content}</p>")
+        end
+      end
+    end
+  end
+end

data/app/lib/panda_cms/editor_js/blocks/quote.rb

@@ -0,0 +1,27 @@
+module PandaCms
+  module EditorJs
+    module Blocks
+      class Quote < Base
+        def render
+          text = sanitize(data["text"])
+          caption = sanitize(data["caption"])
+          alignment = data["alignment"] || "left"
+
+          html_safe(
+            "<figure class=\"text-#{alignment}\">" \
+              "<blockquote><p>#{text}</p></blockquote>" \
+              "#{caption_element(caption)}" \
+            "</figure>"
+          )
+        end
+
+        private
+
+        def caption_element(caption)
+          return "" if caption.blank?
+          "<figcaption>#{caption}</figcaption>"
+        end
+      end
+    end
+  end
+end

data/app/lib/panda_cms/editor_js/blocks/table.rb

@@ -0,0 +1,48 @@
+module PandaCms
+  module EditorJs
+    module Blocks
+      class Table < Base
+        def render
+          content = data["content"]
+          with_headings = data["withHeadings"]
+
+          html_safe(<<~HTML)
+            <div class="overflow-x-auto">
+              <table class="min-w-full">
+                #{render_rows(content, with_headings)}
+              </table>
+            </div>
+          HTML
+        end
+
+        private
+
+        def render_rows(content, with_headings)
+          rows = []
+          index = 0
+
+          while index < content.length
+            rows << if index == 0 && with_headings
+              render_header_row(content[index])
+            else
+              render_data_row(content[index])
+            end
+            index += 1
+          end
+
+          rows.join("\n")
+        end
+
+        def render_header_row(row)
+          cells = row.map { |cell| "<th>#{sanitize(cell)}</th>" }
+          "<tr>#{cells.join}</tr>"
+        end
+
+        def render_data_row(row)
+          cells = row.map { |cell| "<td>#{sanitize(cell)}</td>" }
+          "<tr>#{cells.join}</tr>"
+        end
+      end
+    end
+  end
+end

data/app/lib/panda_cms/editor_js/renderer.rb

@@ -0,0 +1,120 @@
+module PandaCms
+  module EditorJs
+    class Renderer
+      attr_reader :content, :options, :custom_renderers, :cache_store
+
+      def initialize(content, options = {})
+        @content = content
+        @options = options
+        @custom_renderers = options.delete(:custom_renderers) || {}
+        @cache_store = options.delete(:cache_store) || Rails.cache
+        @validate_html = options.delete(:validate_html) || false
+      end
+
+      def render
+        return "" if content.nil? || !content.is_a?(Hash) || !content["blocks"]
+
+        blocks = remove_empty_paragraphs(content["blocks"])
+        rendered = blocks.map { |block| render_block_with_cache(block) }.join("\n")
+
+        @validate_html ? validate_html(rendered) : rendered
+      end
+
+      def section(blocks)
+        "<section class=\"content-section\">#{render_blocks(blocks)}</section>"
+      end
+
+      def article(blocks, title: nil)
+        content = []
+        content << "<h1>#{title}</h1>" if title
+        content << render_blocks(blocks)
+        "<article>#{content.join("\n")}</article>"
+      end
+
+      private
+
+      def render_blocks(blocks)
+        blocks.map { |block| render_block_with_cache(block) }.join("\n")
+      end
+
+      def validate_html(html)
+        # First check if we have matching numbers of opening and closing tags
+        opening_tags = html.scan(/<([a-z]+)[^>]*>/i)
+        closing_tags = html.scan(/<\/([a-z]+)>/i)
+
+        # Early return if tag counts don't match
+        return "" unless opening_tags.length == closing_tags.length
+
+        # Check tag order and nesting
+        stack = []
+        tag_pattern = /<\/?([a-z]+)[^>]*>/i
+        position = 0
+
+        while (match = html[position..].match(tag_pattern))
+          tag_name = match[1].downcase
+          is_closing = match[0].start_with?("</")
+
+          if is_closing
+            return "" if stack.pop != tag_name
+          else
+            stack.push(tag_name)
+          end
+
+          position += match.begin(0) + match[0].length
+        end
+
+        stack.empty? ? html : ""
+      end
+
+      def render_block_with_cache(block)
+        return "" if @validate_html && has_invalid_html?(block["data"])
+
+        cache_key = "editor_js_block/#{block["type"]}/#{Digest::MD5.hexdigest(block["data"].to_json)}"
+        cache_store.fetch(cache_key) do
+          renderer_for(block).render
+        end
+      end
+
+      def remove_empty_paragraphs(blocks)
+        blocks.reject do |block|
+          block["type"] == "paragraph" &&
+            block["data"]["text"].blank? &&
+            (blocks.last == block || next_block_is_empty?(blocks, block))
+        end
+      end
+
+      def next_block_is_empty?(blocks, current_block)
+        current_index = blocks.index(current_block)
+        next_block = blocks[current_index + 1]
+        next_block && next_block["type"] == "paragraph" && next_block["data"]["text"].blank?
+      end
+
+      def renderer_for(block)
+        if custom_renderers[block["type"]]
+          custom_renderers[block["type"]].new(block["data"], options)
+        else
+          default_renderer_for(block)
+        end
+      end
+
+      def default_renderer_for(block)
+        renderer_class = "PandaCms::EditorJs::Blocks::#{block["type"].classify}".constantize
+        renderer_class.new(block["data"], options)
+      rescue NameError
+        PandaCms::EditorJs::Blocks::Base.new(block["data"], options)
+      end
+
+      private
+
+      def has_invalid_html?(data)
+        data.values.any? do |value|
+          next unless value.is_a?(String)
+          opening_tags = value.scan(/<([a-z]+)[^>]*>/i)
+          closing_tags = value.scan(/<\/([a-z]+)>/i)
+          opening_tags.length != closing_tags.length ||
+            opening_tags.map(&:first) != closing_tags.map(&:first)
+        end
+      end
+    end
+  end
+end

data/app/models/panda_cms/block_content.rb

@@ -1,5 +1,3 @@
-require "redcarpet"
-
 module PandaCms
   class BlockContent < ApplicationRecord
     self.table_name = "panda_cms_block_contents"
@@ -12,5 +10,17 @@ module PandaCms
     belongs_to :block, foreign_key: :panda_cms_block_id, class_name: "PandaCms::Block", inverse_of: :block_contents, optional: false
 
     validates :block, presence: true, uniqueness: {scope: :page}
+
+    before_save :generate_cache
+
+    private
+
+    def generate_cache
+      self.cached_content = if content.is_a?(Hash) && content.dig("source") == "editorJS"
+        EditorJs::Renderer.new(content).render
+      else
+        content
+      end
+    end
   end
 end

data/app/views/panda_cms/admin/pages/edit.html.erb

@@ -16,13 +16,14 @@
       <span class="absolute right-0"><%= render PandaCms::Admin::ButtonComponent.new(text: "Save Changes", action: :save_inactive, icon: "check", link: "#", size: :regular, id: "saveEditableButton") %></span>
     </div>
   </div>
-  <iframe id="editablePageFrame" src="<%= page.path %>?embed_id=<%= page.id %>" class="p-0 m-0 w-full h-full border border-slate-200"></iframe>
-<% end %>
-<% content_for :head do %>
-  <%#= javascript_include_tag "panda_cms_editable", "data-turbo-track": "reload", defer: true %>
-  <!-- <script>
-    document.addEventListener("DOMContentLoaded", function() {
-      const editable = new PandaCmsEditableController("<%= page.id %>", document.getElementById("editablePageFrame"));
-    });
-  </script> -->
+  <%= content_tag :iframe, nil,
+      src: "#{page.path}?embed_id=#{page.id}",
+      class: "p-0 m-0 w-full h-full border border-slate-200",
+      id: "editablePageFrame",
+      data: {
+        controller: "editor",
+        editor_page_id_value: @page.id,
+        editor_admin_path_value: "#{admin_dashboard_url}",
+        editor_autosave_value: false
+      } %>
 <% end %>

data/app/views/panda_cms/shared/_header.html.erb

@@ -4,11 +4,10 @@
     <title><%= title_tag %></title>
     <%= csrf_meta_tags %>
     <%= csp_meta_tag %>
-    <script src="https://kit.fontawesome.com/7835d81e75.js" crossorigin="anonymous"></script>
-    <script async src="https://ga.jspm.io/npm:es-module-shims@1.10.0/dist/es-module-shims.js" crossorigin="anonymous"></script>
+    <script src="https://kit.fontawesome.com/7835d81e75.js" defer="true" crossorigin="anonymous"></script>
+    <script async src="https://ga.jspm.io/npm:es-module-shims@1.10.0/dist/es-module-shims.js" defer="true" crossorigin="anonymous"></script>
     <%= stylesheet_link_tag "panda_cms", "data-turbo-track": "reload", media: "all" %>
     <%= render "panda_cms/shared/importmap" %>
-    <%#= turbo_refreshes_with method: :morph, scroll: :preserve %>
     <%= render "panda_cms/shared/favicons" %>
     <%= yield :head %>
   </head>

data/app/views/panda_cms/shared/_importmap.html.erb

@@ -4,15 +4,25 @@
     # This ended up being the best solution to not drag in the importmap from the host app when we're editing the site
     JSON.pretty_generate({
       imports: {
+        # Main loader
         "application_panda_cms": asset_path("panda_cms/application_panda_cms.js"),
+        # Vendored
         "@hotwired/turbo": asset_path("panda_cms/@hotwired--turbo.js"),
         "@hotwired/stimulus": asset_path("panda_cms/@hotwired--stimulus.js"),
         "@hotwired/stimulus-loading": asset_path("stimulus-loading.js"),
+        "@editorjs/editorjs": asset_path("panda_cms/@editorjs--editorjs.js"),
         "tailwindcss-stimulus-components": asset_path("panda_cms/tailwindcss-stimulus-components.js"),
-        "controllers/dashboard_controller": asset_path("panda_cms/controllers/dashboard_controller.js"),
-        "controllers/slug_controller": asset_path("panda_cms/controllers/slug_controller.js"),
+        # Our controllers
+        "panda_cms_controllers/dashboard_controller": asset_path("panda_cms/controllers/dashboard_controller.js"),
+        "panda_cms_controllers/slug_controller": asset_path("panda_cms/controllers/slug_controller.js"),
         # Add other controllers here
-        "controllers": asset_path("panda_cms/controllers/index.js")
+        # Our page editor
+        "panda_cms_controllers/editor_controller": asset_path("panda_cms/controllers/editor_controller.js"),
+        "panda_cms_editor/plain_text_editor": asset_path("panda_cms/editor/plain_text_editor.js"),
+        "panda_cms_editor/rich_text_editor": asset_path("panda_cms/editor/rich_text_editor.js"),
+        "panda_cms_editor/resource_loader": asset_path("panda_cms/editor/resource_loader.js"),
+        # Main controller loader
+        "controllers": asset_path("panda_cms/controllers/index.js"),
       }
     }).html_safe
   %>

data/config/importmap.rb

@@ -5,8 +5,10 @@ pin "@rails/actioncable/src", to: "@rails--actioncable--src.js", preload: true #
 pin "@hotwired/stimulus", to: "@hotwired--stimulus.js" # @3.2.2
 pin "@hotwired/stimulus-loading", to: "panda_cms/stimulus-loading.js", preload: true
 pin "tailwindcss-stimulus-components" # @6.1.2
+pin "@editorjs/editorjs", to: "@editorjs--editorjs.js" # @2.30.6
 
 # pin "@rails/activestorage", to: "@rails--activestorage.js" # @7.2.100
 # pin "@rails/actioncable", to: "@rails--actioncable.js" # @7.2.100
 
-pin_all_from PandaCms::Engine.root.join("app/javascript/panda_cms/controllers"), under: "controllers", to: "panda_cms/controllers"
+pin_all_from PandaCms::Engine.root.join("app/javascript/panda_cms/controllers"), under: "panda_cms_controllers", to: "panda_cms/controllers"
+pin_all_from PandaCms::Engine.root.join("app/javascript/panda_cms/editor"), under: "editor", to: "panda_cms/editor"

data/db/migrate/20240315125411_add_status_to_panda_cms_pages.rb

@@ -1,7 +1,9 @@
 class AddStatusToPandaCmsPages < ActiveRecord::Migration[7.1]
   def change
-    create_enum :panda_cms_page_status, ["active", "draft", "hidden", "archived"]
-    add_column :panda_cms_pages, :status, :panda_cms_page_status, default: "active", null: false
-    add_index :panda_cms_pages, :status
+    unless column_exists?(:panda_cms_pages, :status)
+      create_enum :panda_cms_page_status, ["active", "draft", "hidden", "archived"]
+      add_column :panda_cms_pages, :status, :panda_cms_page_status, default: "active", null: false
+      add_index :panda_cms_pages, :status
+    end
   end
 end

data/db/migrate/20241031205109_add_cached_content_to_panda_cms_block_contents.rb

@@ -0,0 +1,5 @@
+class AddCachedContentToPandaCmsBlockContents < ActiveRecord::Migration[7.2]
+  def change
+    add_column :panda_cms_block_contents, :cached_content, :jsonb
+  end
+end

data/db/seeds.rb

@@ -2,3 +2,4 @@ generator = PandaCms::DemoSiteGenerator.new
 generator.create_templates
 generator.create_pages
 generator.create_menus
+PandaCms::Template.generate_missing_blocks

data/lib/panda_cms/engine.rb

@@ -1,6 +1,7 @@
 require "importmap-rails"
 require "turbo-rails"
 require "stimulus-rails"
+require "view_component"
 
 module PandaCms
   class Engine < ::Rails::Engine
@@ -31,7 +32,7 @@ module PandaCms
     )
 
     # Custom error handling
-    config.exceptions_app = PandaCms::ExceptionsApp.new(exceptions_app: routes)
+    # config.exceptions_app = PandaCms::ExceptionsApp.new(exceptions_app: routes)
 
     initializer "panda_cms.assets" do |app|
       if Rails.configuration.respond_to?(:assets)
@@ -55,6 +56,9 @@ module PandaCms
         get "/*path", to: "panda_cms/pages#show", as: :panda_cms_page
         root to: "panda_cms/pages#root"
       end
+
+      # Ensure we don't have any missing blocks from new templates
+      PandaCms::Template.generate_missing_blocks
     end
 
     # Add the migrations to the main app
@@ -66,15 +70,43 @@ module PandaCms
       end
     end
 
+    initializer "#{engine_name}.backtrace_cleaner" do |app|
+      engine_root_regex = Regexp.escape(root.to_s + File::SEPARATOR)
+
+      # Clean those ERB lines, we don't need the internal autogenerated
+      # ERB method, what we do need (line number in ERB file) is already there
+      Rails.backtrace_cleaner.add_filter do |line|
+        line.sub(/(\.erb:\d+):in `__.*$/, "\\1")
+      end
+
+      # Remove our own engine's path prefix, even if it's
+      # being used from a local path rather than the gem directory.
+      Rails.backtrace_cleaner.add_filter do |line|
+        line.sub(/^#{engine_root_regex}/, "#{engine_name} ")
+      end
+
+      # Keep Umlaut's own stacktrace in the backtrace -- we have to remove Rails
+      # silencers and re-add them how we want.
+      Rails.backtrace_cleaner.remove_silencers!
+
+      # Silence what Rails silenced, UNLESS it looks like
+      # it's from Umlaut engine
+      Rails.backtrace_cleaner.add_silencer do |line|
+        (line !~ Rails::BacktraceCleaner::APP_DIRS_PATTERN) &&
+          (line !~ /^#{engine_root_regex}/) &&
+          (line !~ /^#{engine_name} /)
+      end
+    end
+
     # Set up ViewComponent and Lookbook
     # config.view_component.component_parent_class = "PandaCms::BaseComponent"
-    config.view_component.view_component_path = PandaCms::Engine.root.join("lib/components").to_s
-    config.eager_load_paths << PandaCms::Engine.root.join("lib/components").to_s
-    config.view_component.generate.sidecar = true
-    config.view_component.generate.preview = true
-    config.view_component.preview_paths ||= []
-    config.view_component.preview_paths << PandaCms::Engine.root.join("lib/component_previews").to_s
-    config.view_component.generate.preview_path = "lib/component_previews"
+    # config.view_component.view_component_path = PandaCms::Engine.root.join("lib/components").to_s
+    # config.eager_load_paths << PandaCms::Engine.root.join("lib/components").to_s
+    # config.view_component.generate.sidecar = true
+    # config.view_component.generate.preview = true
+    # config.view_component.preview_paths ||= []
+    # config.view_component.preview_paths << PandaCms::Engine.root.join("lib/component_previews").to_s
+    # config.view_component.generate.preview_path = "lib/component_previews"
 
     # Set up authentication
     initializer "panda_cms.omniauth", before: "omniauth" do |app|
@@ -177,4 +209,8 @@ module PandaCms
       end
     end
   end
+
+  class MissingBlockError < StandardError; end
+
+  class BlockError < StandardError; end
 end

data/lib/panda_cms/version.rb

@@ -1,3 +1,3 @@
 module PandaCms
-  VERSION = "0.6.0"
+  VERSION = "0.6.2"
 end