draftjs_html 0.11.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97e119deceb20067af8250c02562af382ec70c22842ecba90030f869f96d72ff
-  data.tar.gz: 22dcc02184bd9bd7a8076b221035bc4d77e83d04a683d6b790a33692c8a6b0b3
+  metadata.gz: 050fd09294a00e0826e07a04238cf197b5d8ff0bbe39afc643400ddda3222bcc
+  data.tar.gz: a3fa4a939eb34470bfc9f3f0e00cccfbb28257a101bc32e8cdcbcd94a2246fac
 SHA512:
-  metadata.gz: 5c52bb41b0d401101e711e9ab9661ae427b20a6fb42579f1fe6030ed319a712878161ef57866dbde9901acaa7ef58ea644ce0ee4b8fc2ffe7308a0c1f49429fc
-  data.tar.gz: 5f1cc51bea08ee82bc8e2f6ff34226dffad2fc51666dd88bbb15d37bd4de093d5e10441a5bbb39c2c9498193ed8dd50d6d5e2ef0b8f9867bc73998c2626aae3c
+  metadata.gz: 9d9625eb7f4752c9f1f62a0cbf26f90d99835ec7dfd4ac133b4fdd7a67348b2aeb0c9e62b1187bc3b9a48ee3b0887fb24261e5f8daa139b3e570c7c1797ad71f
+  data.tar.gz: 4be2ef23835b8d614ea53359d01650ce881404dd3cf69db9bc65b99063157dbee515aa6670d668b0d0f3a0817141a943457cc3bd11bfac3b24d2edac00fe423c

data/lib/draftjs_html/draftjs/block.rb

@@ -8,7 +8,7 @@ module DraftjsHtml
           key: raw['key'],
           text: raw['text'],
           type: raw['type'],
-          depth: raw['depth'],
+          depth: raw.fetch('depth', 0).to_i,
           inline_style_ranges: Array(raw['inlineStyleRanges']),
           raw_entity_ranges: Array(raw['entityRanges']),
         )

data/lib/draftjs_html/html_depth.rb

@@ -8,58 +8,88 @@ module DraftjsHtml
       'unordered-list-item' => 'ul',
     }.freeze
 
-    attr_reader :body
-
     def initialize(body)
       @current_depth = 0
       @body = body
       @previous_parents = [body.parent]
+      @nesting_roots = [body.parent.name]
     end
 
     def apply(block)
-      new_wrapper_tag = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
-      if body.parent.name != new_wrapper_tag || block.depth != @current_depth
-        if @current_depth < block.depth
-          push_depth(body, new_wrapper_tag)
-        elsif @current_depth > block.depth
-          pop_depth(body, times: @current_depth - block.depth)
-          pop_nesting(body) unless new_wrapper_tag
-        elsif new_wrapper_tag
-          push_nesting(body, new_wrapper_tag)
-        elsif @previous_parents.size > 1
-          pop_nesting(body)
-        end
-        @current_depth = block.depth
+      return unless nesting_root_changed?(block) || depth_changed?(block)
+
+      if deepening?(block)
+        deepen(block)
+      elsif rising?(block) && still_nested?(block)
+        rise(times: @current_depth - block.depth)
+      elsif rising?(block)
+        rise(times: @current_depth - block.depth)
+        pop_parent
+      elsif still_nested?(block)
+        push_parent(block)
+      elsif nested?
+        pop_parent
       end
+
+      @current_depth = block.depth
     end
 
     private
 
-    def push_depth(builder, tagname)
-      @previous_parents << builder.parent
-      builder.parent = builder.parent.last_element_child
-      push_nesting(builder, tagname)
+    def deepen(block)
+      tagname = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
+      @previous_parents << @body.parent
+      @nesting_roots << tagname
+      @body.parent = @body.parent.last_element_child
+      push_parent(block)
     end
 
-    def push_nesting(builder, tagname)
-      node = create_child(builder, tagname)
-      @previous_parents << builder.parent
-      builder.parent = node
+    def push_parent(block)
+      tagname = BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
+      node = create_child(tagname)
+      @previous_parents << @body.parent
+      @body.parent = node
     end
 
-    def pop_depth(builder, times:)
+    def rise(times:)
       times.times do
-        pop_nesting(builder)
-        pop_nesting(builder)
+        begin
+          pop_parent
+        end while @body.parent.name != @nesting_roots.last
+        @nesting_roots.pop
       end
     end
 
-    def pop_nesting(builder)
-      builder.parent = @previous_parents.pop
+    def pop_parent
+      @body.parent = @previous_parents.pop
+    end
+
+    def create_child(tagname)
+      @body.parent.add_child(@body.doc.create_element(tagname))
+    end
+
+    def nested?
+      @body.parent.name != 'body'
+    end
+
+    def still_nested?(block)
+      BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
+    end
+
+    def depth_changed?(block)
+      block.depth != @current_depth
+    end
+
+    def nesting_root_changed?(block)
+      @body.parent.name != BLOCK_TYPE_TO_HTML_WRAPPER[block.type]
+    end
+
+    def rising?(block)
+      @current_depth > block.depth
     end
 
-    def create_child(builder, tagname)
-      builder.parent.add_child(builder.doc.create_element(tagname))
+    def deepening?(block)
+      @current_depth < block.depth
     end
   end
-end
+end

data/lib/draftjs_html/to_html.rb

@@ -9,7 +9,6 @@ module DraftjsHtml
     def initialize(options)
       @options = ensure_options!(options)
       @document = Nokogiri::HTML::Builder.new(encoding: @options.fetch(:encoding, 'UTF-8'))
-      @html_depth = HtmlDepth.new(@document)
     end
 
     def convert(raw_draftjs)
@@ -17,7 +16,7 @@ module DraftjsHtml
 
       @document.html do |html|
         html.body do |body|
-          @previous_parents = [body.parent]
+          @html_depth = HtmlDepth.new(body)
 
           draftjs.blocks.each do |block|
             @html_depth.apply(block)

data/lib/draftjs_html/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DraftjsHtml
-  VERSION = "0.11.0"
+  VERSION = "0.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.13.0
 platform: ruby
 authors:
 - TJ Taylor
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -79,7 +79,7 @@ metadata:
   homepage_uri: https://github.com/dugancathal/draftjs_html
   source_code_uri: https://github.com/dugancathal/draftjs_html
   changelog_uri: https://github.com/dugancathal/draftjs_html/tree/main/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -94,8 +94,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: A tool for converting DraftJS JSON to HTML (and back again)
 test_files: []