draftjs_html 0.5.1 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9194cbbbe5e94b79dd386efd86e23774128659b74fb40c98ddf43bc9b62fd9a9
-  data.tar.gz: 121e6900da99a52b8a5e0cf5b1cae7206492e979939b214d9ef3a112ebdc471d
+  metadata.gz: 0e6d6f1d7f1c978841fe029f93f5db47688459ec70f2b33de5ed7c9cfa6d2758
+  data.tar.gz: 40ee34b8ba65efaf7c3c627046c06bd1e03c32547a17b111cfc661b7bd7a0a7f
 SHA512:
-  metadata.gz: e574a85e36eb144f9f5b4e56a766cb3c83385fad293c311627d1ae5974408c8bd5ce39dc6a2081e9d7b9e695ce08dea54ef2050768c1f5660ef478d992e10671
-  data.tar.gz: 0dc0ce686a9d476a93c24e392d02ee7180b4fd556636cce72695562936acb2e5c3dec581c3151e9d8fd3ed32b9aa026d644cb524c2579925479fa8d4f8927e1e
+  metadata.gz: 4427355fcb9c1578edc43d67c7fd04ba9c64001dae800996c7124938c0fe2c28d5e4da29e35fda0f2b4659656f829c62dd16b9e482a0e4b6fc780cffe8a1223c
+  data.tar.gz: 1277ff4825ce7a8bb972c4c0cbca2b3b0f440eceee3e6c00346b78b99d9bc900f8497f4a562b56d2cc8427b545418f578c64358d90618dcb7ce39fff5e196b43

data/lib/draftjs_html/node.rb

@@ -3,12 +3,34 @@ module DraftjsHtml
     def to_nokogiri(_document)
       node
     end
+
+    def wrap(tagname, attrs = {})
+      Node.new(tagname, attrs, self)
+    end
+
+    def to_s
+      node.to_s
+    end
   end
 
   StringNode = Struct.new(:raw) do
     def to_nokogiri(document)
-      raw
-      Nokogiri::XML::Text.new(raw, document)
+      lines = raw.lines
+      text_nodes = lines.flat_map.with_index do |text, i|
+        nodes = [Nokogiri::XML::Text.new(text.chomp, document)]
+        nodes << Nokogiri::XML::Node.new('br', document) if i < lines.size - 1
+        nodes
+      end
+
+      Nokogiri::XML::NodeSet.new(document, text_nodes)
+    end
+
+    def wrap(tagname, attrs = {})
+      Node.new(tagname, attrs, self)
+    end
+
+    def to_s
+      raw.to_s
     end
   end
 
@@ -24,9 +46,17 @@ module DraftjsHtml
 
     def to_nokogiri(document)
       Nokogiri::XML::Node.new(element_name, document).tap do |node|
-        node.content = content
+        node << content.to_nokogiri(document) if content
         (attributes || {}).each { |k, v| node[k] = v }
       end
     end
+
+    def wrap(tagname, attrs = {})
+      Node.new(tagname, attrs, self)
+    end
+
+    def to_s
+      content.to_s
+    end
   end
 end

data/lib/draftjs_html/to_html.rb

@@ -70,7 +70,7 @@ module DraftjsHtml
               block.each_range do |char_range|
                 content = try_apply_entity_to(draftjs, char_range)
 
-                apply_styles_to(block_body, char_range.style_names, content)
+                apply_styles_to(block_body, char_range.style_names, Node.of(content))
               end
             end
           end
@@ -124,7 +124,7 @@ module DraftjsHtml
       content = char_range.text
       if entity
         style_fn = (@options[:entity_style_mappings][entity.type] || DEFAULT_ENTITY_STYLE_FN)
-        content = style_fn.call(entity, content, @document.parent)
+        content = style_fn.call(entity, Node.of(content), @document.parent)
       end
 
       content

data/lib/draftjs_html/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: draftjs_html
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.7.0
 platform: ruby
 authors:
 - TJ Taylor
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-10-06 00:00:00.000000000 Z
+date: 2022-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri