protos-markdown 0.1.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 725d04f7f6f71d4cd033090733acba1127e4eee5917de42dcc284a8c087f0000
-  data.tar.gz: b9d342cd4c13282f3828a385f991aba32d08ce1fe929d6a074b90b7f26440870
+  metadata.gz: ef97dcc38918f4650f93eecd010522e60f435326b1c5330855b277063bf91c2d
+  data.tar.gz: 45986e32975fb362c82c1c7428450d6a64b6237c1e722039b1bc91ca24d57d1e
 SHA512:
-  metadata.gz: fbdb805c8651cbf0ec99bc4eb59b86f9001cffb80e8136ea2330a9ae25f2bf6107b949ea039178dda962f469a31a2609c6f083239dd888998e78fe5d3413a45d
-  data.tar.gz: 67435c7bf853286c7ce68fc184ac78f51af806254bec68612a140c5494dc0162a459bf5fd0efd744e9b4d84c524a57bd923c2e6d700f2ece833e8048039ce5ca
+  metadata.gz: edde7fdbe9ed89febeb5fe007bd5f7a3bc382277fe68a02949f0054d68ac427daa281a208f66eae358b29479c4c782f9759206dde3ad1f32a51a5be3870e2102
+  data.tar.gz: f8baa177b747fea06e86452a221ad39042cec9a43c699f9159e4840c9e9170cd7c7950c8d97c05c468136112f94303fbca030f4671a6423ef6a1cdca1ce4ec28

data/README.md

@@ -22,8 +22,8 @@ using the standard protos conventions:
 
 ```ruby
 class Markdown < Protos::Markdown
-  def h1 = super(class: css[:title])
-  def ul = super(class: "ml-4 pt-2")
+  def h1(**) = super(class: css[:title], **)
+  def ul(**) = super(class: "ml-4 pt-2", **)
 
   private
 
@@ -52,7 +52,7 @@ output = Markdown.new(content).call
 Which outputs the following html:
 
 ```html
-<h1 class="font-bold text-xl">Hello World</h1>
+<h1 class="font-bold text-xl" id="hello-world">Hello World</h1>
 <ul class="ml-4 pt-2">
   <li>A</li>
   <li>B</li>

data/lib/protos/markdown/ast.rb

@@ -17,9 +17,15 @@ module Protos
         end
       end
 
-      def self.parse(content)
-        Markly
-          .parse(content, flags: Markly::GITHUB_PRE_LANG, extensions: [:table])
+      def self.parse(content, markdown_options: {})
+        options = {
+          render: { gfm_quirks: true },
+          extension: { table: true },
+          **markdown_options
+        }
+
+        Commonmarker
+          .parse(content, options:)
           .then { |node| new(Node.new(node)) }
       end
 

data/lib/protos/markdown/table.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 module Protos
   class Markdown
     class Table < Protos::Table
-      option :inside_header, default: -> { false }, reader: false
+      option :inside_header, default: -> { true }, reader: false
 
       def visit_table(node)
         visit_children(node)
@@ -28,11 +30,11 @@ module Protos
       end
 
       def visit_table_row(node)
-        @inside_header = false
-
         row do
           visit_children(node)
         end
+
+        @inside_header = false
       end
 
       def visit_code(node)

data/lib/protos/markdown.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require "protos"
-require "markly"
+require "commonmarker"
 require "rouge"
 require "delegate"
 
@@ -12,6 +12,27 @@ module Protos
   class Markdown < ::Protos::Component # rubocop:disable Metrics/ClassLength
     param :content, reader: false
     option :sanitize, default: -> { true }, reader: false
+    option :markdown_options, default: -> { {} }, reader: false
+
+    Heading = Data.define(:node) do
+      def id
+        text.downcase.gsub(/[^a-z0-9]+/, "-").chomp("-")
+      end
+
+      def text
+        buffer = +""
+        node.walk do |node|
+          buffer << node.string_content
+        rescue TypeError
+          # Ignore non-text nodes
+        end
+        buffer
+      end
+
+      def header_level
+        node.header_level
+      end
+    end
 
     def view_template
       return unless root
@@ -37,14 +58,16 @@ module Protos
       plain(node.string_content)
     end
 
-    def visit_header(node)
-      case node.header_level
-      in 1 then h1 { visit_children(node) }
-      in 2 then h2 { visit_children(node) }
-      in 3 then h3 { visit_children(node) }
-      in 4 then h4 { visit_children(node) }
-      in 5 then h5 { visit_children(node) }
-      in 6 then h6 { visit_children(node) }
+    def visit_heading(node)
+      heading = Heading.new(node)
+
+      case heading.header_level
+      in 1 then h1(id: heading.id) { visit_children(node) }
+      in 2 then h2(id: heading.id) { visit_children(node) }
+      in 3 then h3(id: heading.id) { visit_children(node) }
+      in 4 then h4(id: heading.id) { visit_children(node) }
+      in 5 then h5(id: heading.id) { visit_children(node) }
+      in 6 then h6(id: heading.id) { visit_children(node) }
       end
     end
 
@@ -80,12 +103,13 @@ module Protos
 
     def visit_list(node)
       case node.list_type
-      when :ordered_list then ol { visit_children(node) }
-      when :bullet_list then ul { visit_children(node) }
+      when :ordered then ol { visit_children(node) }
+      when :bullet then ul { visit_children(node) }
+      else raise ArgumentError, "Unknown list type: #{node.list_type}"
       end
     end
 
-    def visit_list_item(node)
+    def visit_item(node)
       li { visit_children(node) }
     end
 
@@ -99,36 +123,44 @@ module Protos
       code_block(node.string_content, node.fence_info) do |**attributes|
         pre(**attributes) do
           code(class: "highlight language-#{node.fence_info}") do
-            unsafe_raw lex(node.string_content, node.fence_info)
+            raw safe(lex(node.string_content, node.fence_info))
           end
         end
       end
     end
 
-    def visit_hrule(_node)
+    def visit_thematic_break(_node)
       hr
     end
 
-    def visit_blockquote(node)
+    def visit_block_quote(node)
       blockquote { visit_children(node) }
     end
 
     def visit_html(node)
       return if @sanitize
 
-      unsafe_raw(node.string_content)
+      raw safe(node.string_content)
     end
 
-    def visit_inline_html(node)
+    def visit_html_inline(node)
       return if @sanitize
 
-      unsafe_raw(node.string_content)
+      raw safe(node.to_html(options: { render: { unsafe: true } }))
+    end
+
+    def visit_html_block(_node)
+      nil
+    end
+
+    def visit_escaped(node)
+      plain(node.first_child&.string_content)
     end
 
     private
 
     def root
-      AST.parse(@content)
+      AST.parse(@content, markdown_options: @markdown_options)
     end
 
     def formatter
@@ -146,7 +178,7 @@ module Protos
       yield(**attributes)
     end
 
-    def code_block(code, language, **attributes) # rubocop:disable Lint/UnusedMethodArgument, Metrics/ParameterLists
+    def code_block(code, language, **attributes) # rubocop:disable Lint/UnusedMethodArgument
       yield(**attributes)
     end
 

data/protos-markdown.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name = "protos-markdown"
-  spec.version = "0.1.1"
+  spec.version = "1.1.0"
   spec.authors = ["Nolan Tait"]
   spec.email = ["nolanjtait@gmail.com"]
 
@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_dependency "markly", "~> 0.7"
-  spec.add_dependency "protos", ">= 0.4"
-  spec.add_dependency "rouge", "~> 4.3"
+  spec.add_dependency "commonmarker", "~> 2.3"
+  spec.add_dependency "protos", "~> 1"
+  spec.add_dependency "rouge", "~> 4"
 
   spec.metadata["rubygems_mfa_required"] = "true"
 end

metadata

@@ -1,57 +1,56 @@
 --- !ruby/object:Gem::Specification
 name: protos-markdown
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Nolan Tait
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-15 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: markly
+  name: commonmarker
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: protos
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.4'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rouge
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '4'
 description: A markdown renderer with Phlex and Protos
 email:
 - nolanjtait@gmail.com
@@ -79,7 +78,6 @@ metadata:
   changelog_uri: https://github.com/inhouse-work/protos-markdown
   funding_uri: https://github.com/inhouse-work/protos-markdown
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -94,8 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A markdown renderer with Phlex and Protos
 test_files: []