prosemirror_to_html 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f284982bc72b18c9ef678e23833febc9f5326f7c02fa5fcd0f24d2b3b01a068c
-  data.tar.gz: 72026340795ebd8a342be9693ebf401f2c37fb75bcdf44c740cec2c351a046e3
+  metadata.gz: 32c2b7bb3c4e6605b5be4eeb87d5529b3457400f335a4cb581a2fae039cbd47b
+  data.tar.gz: b64c662ea99e41371edf715e830aea49390c35dc546b197b10c98dbc8246632d
 SHA512:
-  metadata.gz: 364d04e54e3c17755dca5365798cbb75f72b9b5597d8dda3c513a2a43e9092f90e45764fb06dda0626adc6b78bcc8af8962bf8c54bec74956716e22fff97e35c
-  data.tar.gz: 91a7c87d2527b9cf4350722e1f4d454405b7e88b1e8a3ab04524b60d1c76c19d89b527105a7c704c3cfbcdeef938a9a6245a13ffdadc29d098ddba260730b067
+  metadata.gz: 771cebd6d454024922deb4c937b26ae624c2b5ee754ab74e74c24d6e8197ee8cfd8531ae75cff8fa96273e2f2f8f43d4fe99e24301a1b464649660f58c749ef9
+  data.tar.gz: 8de0c80c0c76f7ca9b87d641796b77d98982d915876663cea5d204e47e4b759026ead473c64c9dc572162661e8300c1c3dc291e73fe98753f186c678d81fb4d9

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## [0.3.0] - 2026-02-18
+
+### Changed
+
+- Remove dependency to `OpenStruct`
+
+### Fixed
+
+- Fix mark grouping: marks shared across adjacent text nodes (e.g. a `link` spanning multiple runs) are now correctly rendered as a single wrapping tag instead of being reopened for each node
+
+## [0.2.1] - 2025-11-05
+
+- Escape attributes values [CVE-2025-64501]
+
 ## [0.2.0] - 2023-07-03
 
 Hans Lemuet (@Spone) is the new maintainer. The fork is now hosted at https://github.com/etaminstudio/prosemirror_to_html

data/Gemfile.lock

@@ -1,43 +1,43 @@
 PATH
   remote: .
   specs:
-    prosemirror_to_html (0.2.0)
+    prosemirror_to_html (0.3.0)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.5.0)
-    mini_portile2 (2.8.2)
-    nokogiri (1.15.2)
+    diff-lcs (1.6.2)
+    mini_portile2 (2.8.9)
+    nokogiri (1.19.1)
       mini_portile2 (~> 2.8.2)
       racc (~> 1.4)
-    racc (1.7.1)
-    rake (13.0.6)
-    rspec (3.12.0)
-      rspec-core (~> 3.12.0)
-      rspec-expectations (~> 3.12.0)
-      rspec-mocks (~> 3.12.0)
-    rspec-core (3.12.2)
-      rspec-support (~> 3.12.0)
-    rspec-expectations (3.12.3)
+    racc (1.8.1)
+    rake (13.3.1)
+    rspec (3.13.2)
+      rspec-core (~> 3.13.0)
+      rspec-expectations (~> 3.13.0)
+      rspec-mocks (~> 3.13.0)
+    rspec-core (3.13.6)
+      rspec-support (~> 3.13.0)
+    rspec-expectations (3.13.5)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-mocks (3.12.5)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.12.0)
-    rspec-support (3.12.1)
-    yard (0.9.34)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    yard (0.9.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  bundler (~> 2.1.4)
+  bundler (~> 2.3)
   prosemirror_to_html!
   rake (~> 13.0)
   rspec (~> 3.0)
   yard
 
 BUNDLED WITH
-   2.1.4
+   2.7.2

data/lib/prosemirror_to_html/marks/link.rb

@@ -5,18 +5,10 @@ module ProsemirrorToHtml
       @tag_name = 'a'
 
       def tag
-        attrs = {}
-
-        attrs['href'] = @mark.attrs.href
-
-        attrs['target'] = @mark.attrs.target if @mark.attrs.target
-        attrs['title'] = @mark.attrs.title if @mark.attrs.title
-        attrs['rel'] = @mark.attrs.rel if @mark.attrs.rel
-
         [
           {
             tag: self.class.tag_name,
-            attrs: attrs
+            attrs: @mark[:attrs]
           }
         ]
       end

data/lib/prosemirror_to_html/marks/mark.rb

@@ -13,7 +13,7 @@ module ProsemirrorToHtml
       end
 
       def matching
-        return @mark.type == self.class.mark_type if @mark.type
+        return @mark[:type] == self.class.mark_type if @mark[:type]
 
         false
       end

data/lib/prosemirror_to_html/nodes/heading.rb

@@ -6,7 +6,7 @@ module ProsemirrorToHtml
       def tag
         [
           {
-            tag: "h#{@node.attrs.level}",
+            tag: "h#{@node[:attrs][:level]}",
             attrs: tag_attrs
           }
         ]
@@ -15,7 +15,7 @@ module ProsemirrorToHtml
       private
 
       def tag_attrs
-        attrs_hash = @node.attrs.to_h
+        attrs_hash = @node[:attrs].to_h
         attrs_hash.slice(*attrs_hash.keys - %i[level])
       end
     end

data/lib/prosemirror_to_html/nodes/image.rb

@@ -8,7 +8,7 @@ module ProsemirrorToHtml
         [
           {
             tag: self.class.tag_name,
-            attrs: @node.attrs
+            attrs: @node[:attrs]
           }
         ]
       end

data/lib/prosemirror_to_html/nodes/node.rb

@@ -13,7 +13,7 @@ module ProsemirrorToHtml
       end
 
       def matching
-        return underscore(@node.type) == self.class.node_type if @node.type
+        return underscore(@node[:type]) == self.class.node_type if @node[:type]
 
         false
       end

data/lib/prosemirror_to_html/nodes/ordered_list.rb

@@ -8,7 +8,7 @@ module ProsemirrorToHtml
         [
           {
             tag: self.class.tag_name,
-            attrs: @node.attrs
+            attrs: @node[:attrs]
           }
         ]
       end

data/lib/prosemirror_to_html/nodes/table_cell.rb

@@ -8,7 +8,7 @@ module ProsemirrorToHtml
         [
           {
             tag: self.class.tag_name,
-            attrs: @node.attrs
+            attrs: @node[:attrs]
           }
         ]
       end

data/lib/prosemirror_to_html/nodes/table_header.rb

@@ -8,7 +8,7 @@ module ProsemirrorToHtml
         [
           {
             tag: self.class.tag_name,
-            attrs: @node.attrs
+            attrs: @node[:attrs]
           }
         ]
       end

data/lib/prosemirror_to_html/version.rb

@@ -1,3 +1,3 @@
 module ProsemirrorToHtml
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

data/lib/prosemirror_to_html.rb

@@ -25,7 +25,6 @@ require "prosemirror_to_html/nodes/table_header"
 require "prosemirror_to_html/nodes/table_row"
 require 'nokogiri'
 require 'json'
-require "ostruct"
 
 module ProsemirrorToHtml
   class Error < StandardError; end
@@ -82,14 +81,14 @@ module ProsemirrorToHtml
              else raise Error
              end
 
-      @document = JSON.parse(json, object_class: OpenStruct)
+      @document = JSON.parse(json, symbolize_names: true)
 
       html = ''
 
-      content = @document.content.is_a?(Array) ? @document.content : []
+      content = @document[:content].is_a?(Array) ? @document[:content] : []
 
       content.each_with_index do |node, index|
-        prev_node = content[index - 1]
+        prev_node = index > 0 ? content[index - 1] : nil
         next_node = content[index + 1]
 
         html << render_node(node, prev_node, next_node)
@@ -148,14 +147,12 @@ module ProsemirrorToHtml
       html = ''
       render_klass = nil
 
-      if node&.marks
-        node.marks.each do |mark|
-          @marks.each do |klass|
-            render_klass = klass.new(mark)
+      node[:marks]&.each do |mark|
+        @marks.each do |klass|
+          render_klass = klass.new(mark)
 
-            if render_klass.matching && mark_should_open(mark, prev_node)
-              html << render_opening_tag(render_klass.tag)
-            end
+          if render_klass.matching && mark_should_open(mark, prev_node)
+            html << render_opening_tag(render_klass.tag)
           end
         end
       end
@@ -169,17 +166,16 @@ module ProsemirrorToHtml
         end
       end
 
-      if node&.content
-        node.content.each_with_index do |nested_node, index|
-          prev_nested_node = node.content[index - 1]
-          next_nested_node = node.content[index + 1]
+      if node[:content]
+        node[:content].each_with_index do |nested_node, index|
+          prev_nested_node = index > 0 ? node[:content][index - 1] : nil
+          next_nested_node = node[:content][index + 1]
 
           html << render_node(nested_node, prev_nested_node, next_nested_node)
-          prev_node = nested_node
         end
-      elsif node&.text
-        html << CGI.escapeHTML(node.text)
-      elsif text = render_klass.text
+      elsif node[:text]
+        html << CGI.escapeHTML(node[:text])
+      elsif (text = render_klass.text)
         html << text
       end
 
@@ -195,14 +191,12 @@ module ProsemirrorToHtml
         end
       end
 
-      if node&.marks
-        node.marks.reverse.each do |mark|
-          @marks.each do |klass|
-            render_klass = klass.new(mark)
+      node[:marks]&.reverse&.each do |mark|
+        @marks.each do |klass|
+          render_klass = klass.new(mark)
 
-            if render_klass.matching && mark_should_close(mark, next_node)
-              html << render_closing_tag(render_klass.tag)
-            end
+          if render_klass.matching && mark_should_close(mark, next_node)
+            html << render_closing_tag(render_klass.tag)
           end
         end
       end
@@ -220,14 +214,9 @@ module ProsemirrorToHtml
 
     def node_has_mark(node, mark)
       return true unless node
-      return true if node.respond_to?(:marks)
 
-      # Other node has same mark
-      node.marks&.each do |other_mark|
-        if mark == other_mark
-          return false
-        end
-      end
+      # Don't open/close if the adjacent node shares the same mark
+      return false if node[:marks]&.map(&:to_json)&.include?(mark.to_json)
 
       true
     end
@@ -241,22 +230,20 @@ module ProsemirrorToHtml
         if tag.is_a? String
           "<#{tag}>"
         else
-          tag = OpenStruct.new(tag) unless tag.is_a?(OpenStruct)
-
           attrs = ''
-          if tag&.attrs
-            tag.attrs.each_pair do |attr, value|
-              attrs << " #{attr}=\"#{value}\""
-            end
+          tag[:attrs]&.each_pair do |attr, value|
+            escaped_value = CGI.escapeHTML(value.to_s)
+            attrs << " #{attr}=\"#{escaped_value}\""
           end
 
-          "<#{tag.tag}#{attrs}>"
+          "<#{tag[:tag]}#{attrs}>"
         end
       end.join
     end
 
     def render_closing_tag(tags)
       tags = array_wrap(tags).reverse
+      p ["render_closing_tag", tags]
 
       return nil if tags.empty?
 
@@ -264,9 +251,7 @@ module ProsemirrorToHtml
         if tag.is_a? String
           "</#{tag}>"
         else
-          tag = OpenStruct.new(tag) unless tag.is_a?(OpenStruct)
-
-          "</#{tag.tag}>"
+          "</#{tag[:tag]}>"
         end
       end.join
     end

data/prosemirror_to_html.gemspec

@@ -37,7 +37,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 2.1.4"
+  spec.add_development_dependency "bundler", "~> 2.3"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard"

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: prosemirror_to_html
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Hans Lemuet
 - Brian Kimball
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-07-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -17,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.4
+        version: '2.3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -135,7 +134,6 @@ homepage: https://github.com/etaminstudio/prosemirror_to_html
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -150,8 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: Takes ProseMirror compatible JSON and outputs HTML.
 test_files: []