draftjs_html 0.12.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 64964e629da00518122848b73f2d233df3ccf36ad70b01df292a9f3d6596b35d
-  data.tar.gz: 4e17e6825b69e260d3e6e08e7391037be69940ae39a28a06ea689ead498da010
+  metadata.gz: b708c9dfd4a3d4b6cdf22de377edd9a271e6eb527c70648d11337c1d090613e5
+  data.tar.gz: e472de0d6b79d5b7cf7380d6ed89f8c85aedf79d30d329a42550b1cf94eb7dd7
 SHA512:
-  metadata.gz: cc2162d612c85e58a26a91ec25412fcca1d780609563d9032bc4108b8e015198da53cbf39f0cd7cf91b25b03f2bf9e9f566e083f4fc981703f7adef81a6c3368
-  data.tar.gz: 1ae9b058c647284138228d54a503766c4a16a94c15b0060598577ab45cdf07af25ddce9b2fa6cfc118c0d1d9e0e7bb04fc2e77609eaf2b3478d1f78e31134409
+  metadata.gz: 6511068eab5eb7c99f7815c85bb6b40bd998f80cee7ed8b41a418d9295bf467f4ed4a1de47049342aa27ec02e0e29207031f1f3cfa9e853da13acc79d98e21b1
+  data.tar.gz: bd939bb048b11692d520cfef3202b7e9d7106f36cac901cd4171f82991ccf24981b8cc610f0e61626231c463c84202d5dbb80b26221cecf1f68b9f48b435b32a

data/lib/draftjs_html/draftjs/raw_builder.rb

@@ -0,0 +1,65 @@
+require 'securerandom'
+
+module DraftjsHtml
+  module Draftjs
+    class RawBuilder
+      def self.build(&block)
+        instance = new
+        instance.instance_eval(&block)
+        instance.to_h
+      end
+
+      def initialize
+        @blocks = []
+        @entity_map = {}
+      end
+
+      def text_block(text)
+        typed_block('unstyled', text)
+      end
+
+      def typed_block(type, text, depth: 0)
+        @blocks << { 'key' => SecureRandom.urlsafe_base64(10), 'text' => text, 'type' => type, 'depth' => depth }
+      end
+
+      def inline_style(style_name, range)
+        (@blocks.last['inlineStyleRanges'] ||= []) << { 'style' => style_name, 'offset' => range.begin, 'length' => range.size }
+      end
+
+      def entity_range(key, range)
+        (@blocks.last['entityRanges'] ||= []) << { 'key' => key, 'offset' => range.begin, 'length' => range.size }
+      end
+
+      def apply_entity(type, range, data: {}, mutability: 'IMMUTABLE', key: SecureRandom.uuid)
+        @entity_map[key] = {
+          'type' => type,
+          'mutability' => mutability,
+          'data' => deep_stringify_keys(data),
+        }
+
+        entity_range(key, range)
+      end
+
+      def to_h
+        {
+          'blocks' => @blocks,
+          'entityMap' => @entity_map,
+        }
+      end
+
+      private
+
+      def deep_stringify_keys(object)
+        case object
+        when Hash
+          object.each_with_object({}) do |(key, value), result|
+            result[key.to_s] = deep_stringify_keys(value)
+          end
+        when Array then object.map { |e| deep_stringify_keys(e) }
+        else
+          object
+        end
+      end
+    end
+  end
+end

data/lib/draftjs_html/draftjs.rb

@@ -7,6 +7,7 @@ require_relative 'draftjs/block'
 require_relative 'draftjs/entity_map'
 require_relative 'draftjs/entity'
 require_relative 'draftjs/to_raw'
+require_relative 'draftjs/raw_builder'
 
 module DraftjsHtml
   module Draftjs

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.12.0"
+  VERSION = "0.14.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.14.0
 platform: ruby
 authors:
 - TJ Taylor
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-12 00:00:00.000000000 Z
+date: 2022-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -64,6 +64,7 @@ files:
 - lib/draftjs_html/draftjs/content.rb
 - lib/draftjs_html/draftjs/entity.rb
 - lib/draftjs_html/draftjs/entity_map.rb
+- lib/draftjs_html/draftjs/raw_builder.rb
 - lib/draftjs_html/draftjs/to_raw.rb
 - lib/draftjs_html/html_defaults.rb
 - lib/draftjs_html/html_depth.rb
@@ -79,7 +80,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 +95,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: []