html_to_prosemirror 0.2.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b97a5555fbe65c1c4d2473d443120dfc789fdcb008e120887e7d465e43693696
-  data.tar.gz: a391ed8f83a6774c0b0947d9d37eb4a1eabd59b21c2b78c2e6382fbbe20640a6
+  metadata.gz: 15936d0d54eaaa75148d8ef9da299e35c2933904f33e32a61ac89d0199d6dd08
+  data.tar.gz: 60c292097308090f497bd47c24a1d30f70aea6fd1bf797f260bb9c2717d1de0f
 SHA512:
-  metadata.gz: 1bd6eacbf9755bed1ecf969c956805d27a1700b8e464c5f0fad619e80ac778a729ab74b3cfeb2225de907467ab72690fbea01becc29997b6fd68a873cadd8521
-  data.tar.gz: 8ec7c313ba172d7ab08f1f11a5a27dd00e3b7c9e9c0860fe3b3a8bf3e74cf9958528870839aa6f19df15217ec22c02841a4d842e92f8092ad5825ecea39c7ed3
+  metadata.gz: 19545ace09ad128d21c0803dd930be789414c4c049ceb93b55f3b439a552b6a7fae9360d14d22d75cee06754cc0e14fe0fef634353ac8e30f558cc08ac0ce5e3
+  data.tar.gz: f3da452f0b622d24e9c8da25b90583beb56025670f730db596485885548fbbe8324a7d772e1651e42725604f325a49825248450384a158f0894e5c1730a2f3fb

data/Gemfile.lock

@@ -1,41 +1,82 @@
 PATH
   remote: .
   specs:
-    html_to_prosemirror (0.2.0)
+    html_to_prosemirror (0.3.1)
       nokogiri
 
 GEM
   remote: https://rubygems.org/
   specs:
-    diff-lcs (1.3)
-    nokogiri (1.15.4-x86_64-linux)
-      racc (~> 1.4)
-    racc (1.7.1)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    diff-lcs (1.6.2)
+    nokogiri (1.19.1-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.1-aarch64-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.19.1-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.1-arm-linux-musl)
+      racc (~> 1.4)
+    nokogiri (1.19.1-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.1-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.19.1-x86_64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.19.1-x86_64-linux-musl)
+      racc (~> 1.4)
+    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.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.13.0)
+    rspec-mocks (3.13.7)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
-    yard (0.9.34)
+      rspec-support (~> 3.13.0)
+    rspec-support (3.13.7)
+    yard (0.9.38)
 
 PLATFORMS
-  ruby
+  aarch64-linux-gnu
+  aarch64-linux-musl
+  arm-linux-gnu
+  arm-linux-musl
+  arm64-darwin
+  x86_64-darwin
+  x86_64-linux-gnu
+  x86_64-linux-musl
 
 DEPENDENCIES
-  bundler (~> 1.17)
+  bundler (>= 1.17)
   html_to_prosemirror!
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   yard
 
+CHECKSUMS
+  diff-lcs (1.6.2) sha256=9ae0d2cba7d4df3075fe8cd8602a8604993efc0dfa934cff568969efb1909962
+  html_to_prosemirror (0.3.1)
+  nokogiri (1.19.1-aarch64-linux-gnu) sha256=cfdb0eafd9a554a88f12ebcc688d2b9005f9fce42b00b970e3dc199587b27f32
+  nokogiri (1.19.1-aarch64-linux-musl) sha256=1e2150ab43c3b373aba76cd1190af7b9e92103564063e48c474f7600923620b5
+  nokogiri (1.19.1-arm-linux-gnu) sha256=0a39ed59abe3bf279fab9dd4c6db6fe8af01af0608f6e1f08b8ffa4e5d407fa3
+  nokogiri (1.19.1-arm-linux-musl) sha256=3a18e559ee499b064aac6562d98daab3d39ba6cbb4074a1542781b2f556db47d
+  nokogiri (1.19.1-arm64-darwin) sha256=dfe2d337e6700eac47290407c289d56bcf85805d128c1b5a6434ddb79731cb9e
+  nokogiri (1.19.1-x86_64-darwin) sha256=7093896778cc03efb74b85f915a775862730e887f2e58d6921e3fa3d981e68bf
+  nokogiri (1.19.1-x86_64-linux-gnu) sha256=1a4902842a186b4f901078e692d12257678e6133858d0566152fe29cdb98456a
+  nokogiri (1.19.1-x86_64-linux-musl) sha256=4267f38ad4fc7e52a2e7ee28ed494e8f9d8eb4f4b3320901d55981c7b995fc23
+  racc (1.8.1) sha256=4a7f6929691dbec8b5209a0b373bc2614882b55fc5d2e447a21aaa691303d62f
+  rake (13.3.1) sha256=8c9e89d09f66a26a01264e7e3480ec0607f0c497a861ef16063604b1b08eb19c
+  rspec (3.13.2) sha256=206284a08ad798e61f86d7ca3e376718d52c0bc944626b2349266f239f820587
+  rspec-core (3.13.6) sha256=a8823c6411667b60a8bca135364351dda34cd55e44ff94c4be4633b37d828b2d
+  rspec-expectations (3.13.5) sha256=33a4d3a1d95060aea4c94e9f237030a8f9eae5615e9bd85718fe3a09e4b58836
+  rspec-mocks (3.13.7) sha256=0979034e64b1d7a838aaaddf12bf065ea4dc40ef3d4c39f01f93ae2c66c62b1c
+  rspec-support (3.13.7) sha256=0640e5570872aafefd79867901deeeeb40b0c9875a36b983d85f54fb7381c47c
+  yard (0.9.38) sha256=721fb82afb10532aa49860655f6cc2eaa7130889df291b052e1e6b268283010f
+
 BUNDLED WITH
-   1.17.2
+  4.0.6

data/README.md

@@ -36,7 +36,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/inputhq/html_to_prosemirror. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
+Bug reports and pull requests are welcome on GitHub at https://github.com/etaminstudio/html_to_prosemirror. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [Contributor Covenant](http://contributor-covenant.org) code of conduct.
 
 ## License
 

data/RELEASE.md

@@ -1,7 +1,7 @@
 # Releasing a new version of html_to_prosemirror
 
 1. Create a list of all the changes since the prior release
-    1. Compare the latest release to master using https://github.com/inputhq/html_to_prosemirror/compare/`${latest}`...master
+    1. Compare the latest release to master using https://github.com/etaminstudio/html_to_prosemirror/compare/`${latest}`...master
     1. Open the linked pull requests from all the `Merge pull request #...` commits
     1. For all non-documentation PRs, copy title (including pull request number) into markdown list items
     1. (optional, but nice) Sort into logical buckets, like "support for additional endpoints", "enhancements", "bugfixes"
@@ -11,7 +11,7 @@
     1. Update the constant in `lib/html_to_prosemirror/version.rb`
     1. Commit and push directly to master
 1. Run the `script/release` script to cut a release
-1. Draft a new release at https://github.com/inputhq/html_to_prosemirror.rb/releases/new containing the curated changelog
+1. Draft a new release at https://github.com/etaminstudio/html_to_prosemirror.rb/releases/new containing the curated changelog
 
 ## Prerequisites
 

data/html_to_prosemirror.gemspec

@@ -11,7 +11,7 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Takes HTML and outputs ProseMirror compatible JSON.}
   spec.description   = %q{Takes HTML and outputs ProseMirror compatible JSON.}
-  spec.homepage      = "https://github.com/inputhq/html_to_prosemirror"
+  spec.homepage      = "https://github.com/etaminstudio/html_to_prosemirror"
   spec.license       = "MIT"
 
   # Prevent pushing this gem to RubyGems.org. To allow pushes either set the 'allowed_push_host'
@@ -36,8 +36,8 @@ 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", "~> 1.17"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "bundler", ">= 1.17"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "yard"
   spec.add_dependency "nokogiri"

data/lib/html_to_prosemirror/nodes/blockquote.rb

@@ -0,0 +1,16 @@
+module HtmlToProsemirror
+  module Nodes
+    class Blockquote < Node
+
+      def matching
+        @node.name === 'blockquote'
+      end
+
+      def data
+        {
+          type: "blockquote"
+        }
+      end
+    end
+  end
+end

data/lib/html_to_prosemirror/version.rb

@@ -1,3 +1,3 @@
 module HtmlToProsemirror
-  VERSION = "0.2.0"
+  VERSION = "0.3.1"
 end

data/lib/html_to_prosemirror.rb

@@ -5,6 +5,7 @@ require "html_to_prosemirror/marks/code"
 require "html_to_prosemirror/marks/italic"
 require "html_to_prosemirror/marks/link"
 require "html_to_prosemirror/nodes/node"
+require "html_to_prosemirror/nodes/blockquote"
 require "html_to_prosemirror/nodes/bullet_list"
 require "html_to_prosemirror/nodes/code_block_wrapper"
 require "html_to_prosemirror/nodes/code_block"
@@ -24,7 +25,6 @@ module HtmlToProsemirror
   class Renderer
     def initialize(case_type: :snake)
       @case_type = case_type
-      @stored_marks = []
       @marks = [
         HtmlToProsemirror::Marks::Bold,
         HtmlToProsemirror::Marks::Code,
@@ -32,6 +32,7 @@ module HtmlToProsemirror
         HtmlToProsemirror::Marks::Link
       ]
       @nodes = [
+        HtmlToProsemirror::Nodes::Blockquote,
         HtmlToProsemirror::Nodes::BulletList,
         HtmlToProsemirror::Nodes::CodeBlockWrapper,
         HtmlToProsemirror::Nodes::CodeBlock,
@@ -61,7 +62,7 @@ module HtmlToProsemirror
     #   return @document.search('body')[0];
     # end
 
-    def render_children(node)
+    def render_children(node, inherited_marks = [])
       nodes = []
       node.children.each do |child|
         child_node = get_matching_node(child)
@@ -69,20 +70,19 @@ module HtmlToProsemirror
           item = child_node.data()
           if (item === nil)
             if (child.children.length > 0)
-              nodes = nodes + render_children(child)
+              nodes = nodes + render_children(child, inherited_marks)
             end
             next
           end
           if (child.children.length > 0)
             item = item.merge({
-              content: render_children(child),
+              content: render_children(child, inherited_marks),
             })
           end
-          if (@stored_marks.count > 0)
-              item = item.merge({
-                marks: @stored_marks,
-              })
-              @stored_marks = [];
+          if (inherited_marks.count > 0)
+            item = item.merge({
+              marks: inherited_marks,
+            })
           end
           if (@case_type === :lower_camel)
             item = item.merge(type: item[:type].gsub(/_([a-z])/) { $1.upcase })
@@ -99,9 +99,8 @@ module HtmlToProsemirror
 
         child_mark = get_matching_mark(child)
         if (child_mark)
-          @stored_marks.push(child_mark.data())
           if (child.children.length > 0)
-            nodes = nodes + render_children(child)
+            nodes = nodes + render_children(child, inherited_marks + [child_mark.data()])
           end
         end
       end
@@ -132,11 +131,12 @@ module HtmlToProsemirror
       # 1.2. Remove javascript comments e.g. /* */ and // \/\*[^\*]*\*\/ and ^(\t|\s)*\/\/.*
       # 3. Replace all carrier return and all tabs by a single space gsub(/(\n|\t)/, ' ').
       # 4. Replace any consecutive spaces by a single space gsub(/\s{2,}/, ' ')
-      # 5. Remove space between tags gsub(/>\s+</, '><').strip.
+      # 5. Collapse space between tags to a single space gsub(/>\s+</, '> <').strip.
       html.gsub(/(<!--(\w|\s|:|!|#|<|>|'|"|=|;|,|\.|\?)*-->|\/\*[^\*]*\*\/|^(\t|\s)*\/\/.*)/, '').
         gsub(/(\n|\t)/, ' ').
         gsub(/\s{2,}/, ' ').
-        gsub(/>\s+</, '><').strip
+        gsub(/>(\s+)<(?!\/?(a|abbr|b|bdi|br|cite|code|dfn|em|i|img|kbd|mark|q|s|samp|small|span|strong|sub|sup|time|u|var))/i) { '><' }.
+        gsub(/>\s+</, '> <').strip
     end
   end
 end

metadata

@@ -1,27 +1,26 @@
 --- !ruby/object:Gem::Specification
 name: html_to_prosemirror
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Brian Kimball
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-21 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.17'
 - !ruby/object:Gem::Dependency
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -107,6 +106,7 @@ files:
 - lib/html_to_prosemirror/marks/italic.rb
 - lib/html_to_prosemirror/marks/link.rb
 - lib/html_to_prosemirror/marks/mark.rb
+- lib/html_to_prosemirror/nodes/blockquote.rb
 - lib/html_to_prosemirror/nodes/bullet_list.rb
 - lib/html_to_prosemirror/nodes/code_block.rb
 - lib/html_to_prosemirror/nodes/code_block_wrapper.rb
@@ -122,11 +122,10 @@ files:
 - lib/html_to_prosemirror/version.rb
 - scripts/package
 - scripts/release
-homepage: https://github.com/inputhq/html_to_prosemirror
+homepage: https://github.com/etaminstudio/html_to_prosemirror
 licenses:
 - MIT
 metadata: {}
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -141,8 +140,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 HTML and outputs ProseMirror compatible JSON.
 test_files: []