draftjs_html 0.34.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1e459d7be8ecac2000e78f00451ca17bf8004999bc552386b61b50b6425a211
-  data.tar.gz: 0c9703d28c9209c817ee895952021296428bc96af013ebb09c38edc9ac5803ee
+  metadata.gz: 1e387f747a717be70bd28676124ef2fe207666ad5c351bf49af1169b922d4b93
+  data.tar.gz: 13f2be9739e90a5dba546b36672f19620bd3ec97a6d4a3456a5d0bf4f4640ad8
 SHA512:
-  metadata.gz: a7bb25d1069b54594c8c4746528e867cee782d87e4df0957220bc93fd24423ccb778f33c3ebd6910deaae38ac6c66c605147aa8eca91c10ebc2f7d8b00a0a1eb
-  data.tar.gz: c9627eea02a1de4de1b044de3b56f439072da198d3a64e7a288fc97f5ae989e2445e8fb73570f0987ee6b339d75ffa516efb310710b2c04fdfa5b6061c8a6871
+  metadata.gz: f90c1e856259dae2d18b1585d4789d94327711c1dfc0d69e16b98d908a2fc5595b3b2eb8ddf31d9ff070e486b0bfd494661748f5d40633bcd0ebc2e5db7de624
+  data.tar.gz: 000bfb152cec564de907970839eabb90505fd3d62047171e7b61818e4e92f92b583bb03705d2ac26bee4704cb632ae9df637e1a3a4a2eefec1266ed46e66bfae

data/README.md

@@ -204,6 +204,18 @@ There are some known limitations with this approach, but, if you're just trying
 to get started, it may be good enough for you. Contributions and issue reports
 are welcome and encouraged.
 
+### FromHtml Options
+
+#### `:encoding`
+
+Specify the HTML parsing encoding.
+Defaults to `UTF-8`.
+
+#### `:squeeze_whitespace_blocks`
+
+Removes whitespace only blocks from the generated DraftJS.
+Defaults to `false`.
+
 #### `:node_to_entity:`
 
 This `FromHtml` option allows the user to specify how a particular node is

data/lib/draftjs_html/from_html/depth_stack.rb

@@ -34,12 +34,13 @@ module DraftjsHtml
 
       def pop(draftjs)
         return if @stack.empty?
+        return merge_current_into_parent! if current_is_block_content_inside_list_item?
         return if inside_parent?
 
         if @nodes.last == current.tagname && current.flushable?
           flush_to(draftjs)
-        elsif @stack[-2]
-          @stack[-2].consume(current)
+        elsif parent
+          parent.consume(current)
         end
 
         @stack.pop
@@ -98,13 +99,34 @@ module DraftjsHtml
         @nodes << name
       end
 
+      def merge_current_into_parent!
+        parent.consume(current)
+        @stack.pop
+      end
+
+      def current_is_block_content_inside_list_item?
+        block_content? && inside_parent? && inside_list_item?
+      end
+
       def inside_parent?
         (FromHtml::LIST_PARENT_ELEMENTS & @nodes).any?
       end
 
+      def inside_list_item?
+        (FromHtml::LIST_ITEM_ELEMENTS & @nodes).any?
+      end
+
+      def block_content?
+        BLOCK_CONTENT_ELEMENTS.include?(current.tagname)
+      end
+
       def current
         @stack.last
       end
+
+      def parent
+        @stack[-2]
+      end
     end
   end
 end

data/lib/draftjs_html/from_html/elements.rb

@@ -2,6 +2,7 @@ module DraftjsHtml
   class FromHtml < Nokogiri::XML::SAX::Document
     INLINE_STYLE_ELEMENTS = HtmlDefaults::HTML_STYLE_TAGS_TO_STYLE.keys.freeze
     LIST_PARENT_ELEMENTS = %w[ol ul].freeze
+    LIST_ITEM_ELEMENTS = %w[li].freeze
     INLINE_NON_STYLE_ELEMENTS = %w[a abbr cite font img output q samp span table thead tbody td time var].freeze
     BLOCK_CONTENT_ELEMENTS = %w[p dl h1 h2 h3 h4 h5 h6].freeze
     FLUSH_BOUNDARIES = %w[OPENING div ol ul li tr].freeze

data/lib/draftjs_html/from_html.rb

@@ -10,7 +10,8 @@ module DraftjsHtml
 
     def initialize(options = {})
       @draftjs = Draftjs::RawBuilder.new
-      @parser = Nokogiri::HTML4::SAX::Parser.new(self)
+      encoding = options.key?(:encoding) ? options.delete(:encoding) : 'UTF-8'
+      @parser = Nokogiri::HTML4::SAX::Parser.new(self, encoding)
       @options = ensure_options!(options.dup)
       @depth_stack = DepthStack.new(@options)
     end

data/lib/draftjs_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.36.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-01-11 00:00:00.000000000 Z
+date: 2025-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: A tool for converting DraftJS JSON to HTML (and back again)