lwe_slate_serializer 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2baa0cc32467d4363e5fc73033befb4a9cd79ec838afe6e6753993d2b2c84e86
-  data.tar.gz: ca07a3ecdce7fadbf02cc5959ab9ca236839900483d68b51f4a5e224915bdc4d
+  metadata.gz: 2232f5ea035bdc85504bffb221a0c38e84cabfd0949ac8a8ac55081f2cc5cf88
+  data.tar.gz: 7ecd1b0fcd9dda1504b994c48a68a5d4e8645fef602211dc740eeddd4fb3b265
 SHA512:
-  metadata.gz: 4526ab16ef29cd444bbfc7db268987fe98f0740e35bd6d5f1a6c4f3dab76582bad196f82b4a0d762e5c031692e6b86c701814cdf3f9e9933188ab84723b308bc
-  data.tar.gz: 97f0425e77ef5b752aec8b02b5bf071f3e5d424cfd93bc5e45ac37d2267571120c4bb764ad2040207e054a9ecec8d40368f6ece85f3e5a4df6fdd0ff134ae469
+  metadata.gz: 7b7f0477c6fc57ef813eba6cfe450dfe76a102b14899d4d0c04084ec88263f3239634c8608e07e2d1ab20a8a5748c519cc86cd07af764aecdd6a5cb8d553da5d
+  data.tar.gz: e703ac2a14f633e3462fe8fd65f57c7e6fd2651667f5fc06f60ffb61ea8eb5f1423b9faea5be41f3944776207c4f1ef0f428a2569ffba0b51ab95654b67bbe7b

data/Gemfile.lock

@@ -1,16 +1,14 @@
 PATH
   remote: .
   specs:
-    lwe_slate_serializer (1.0.0)
+    lwe_slate_serializer (1.0.1)
       nokogiri (~> 1.11)
 
 GEM
   remote: https://rubygems.org/
   specs:
     diff-lcs (1.4.4)
-    mini_portile2 (2.8.0)
-    nokogiri (1.13.3)
-      mini_portile2 (~> 2.8.0)
+    nokogiri (1.13.3-x86_64-darwin)
       racc (~> 1.4)
     racc (1.6.0)
     rake (13.0.3)

data/lib/slate_serializer/html.rb

@@ -58,6 +58,10 @@ module SlateSerializer
             "<#{tag}/>" 
           end
         ),
+        SerializerHandler.new(elements: ['text']),
+        SerializerHandler.new(elements: ['i', 'em'], mark: 'italic'),
+        SerializerHandler.new(elements: ['u'], mark: 'underline'),
+        SerializerHandler.new(elements: ['strong', 'b'], mark: 'bold'),
         SerializerHandler.new(elements: ['a'], node: 'link'),
         SerializerHandler.new(elements: ['ol'], node: 'ordered-list'),
         SerializerHandler.new(elements: ['ul'], node: 'unordered-list'),
@@ -76,23 +80,28 @@ module SlateSerializer
 
     def register_handler(handler)
       handler.elements.each do |element|
-        @element_register[element] = handler.deserialize
+        @element_register[element] = handler
       end
       @node_register[handler.node] = handler.serialize
       @tag_register[handler.node] = handler.elements.first
     end
 
     class SerializerHandler
-      attr_reader :elements, :node, :serialize, :deserialize
+      attr_reader :elements, :node, :serialize, :deserialize, :mark
 
-      def initialize(elements: [], node: nil, serialize: nil, deserialize: nil)
+      def initialize(elements: [], node: nil, mark: nil, serialize: nil, deserialize: nil)
         @elements = elements
         @node = node
+        @mark = mark
         @serialize = serialize || ->(node, children, tag) do 
           "<#{tag}>#{children}</#{tag}>"
         end
-        @deserialize = deserialize || ->(node, element) do
-          node.merge(type: @node)
+        @deserialize = deserialize || ->(children, element) do
+          if @node
+            { type: @node, children: children }
+          else 
+            children
+          end
         end
       end
     end
@@ -119,7 +128,7 @@ module SlateSerializer
       return empty_state if html.nil? || html == ''
 
       html = html.gsub('<br>', "\n")
-      Nokogiri::HTML.fragment(html).elements.map do |element|
+      Nokogiri::HTML.fragment(html).elements.flat_map do |element|
         element_to_node(element)
       end
     end
@@ -130,12 +139,12 @@ module SlateSerializer
 
     def element_to_node(element, marks = [])
       handler = @element_register[element.name]
-      
-      mark = convert_name_to_mark(element.name)
-      marks = [*marks, mark].compact
+      marks = [*marks, handler.mark].compact
 
       children = element.children.flat_map do |child|
-        if child.text?
+        if handler.mark
+          element_to_text(child, marks)
+        elsif child.text?
           next if child.text.strip == ''
           element_to_text(child, marks)
         else
@@ -146,30 +155,17 @@ module SlateSerializer
       children << { text: '' } if children.empty?
 
       return children unless handler
-      handler.call({ children: children }, element)
+      handler.deserialize.call(children, element)
     end
 
-    # def element_to_texts(element)
-    #   nodes = []
-    #   mark = convert_name_to_mark(element.name)
-
-    #   if element.class == Nokogiri::XML::Element
-    #     element.children.each do |child|
-    #       nodes << element_to_text(child, mark)
-    #     end
-    #   else
-    #     nodes << element_to_text(element)
-    #   end
-
-    #   nodes
-    # end
-
     def element_to_text(element, marks = [])
+      handler = @element_register[element.name]
+      marks = [*marks, handler.mark].compact
       {
         text: element.text
       }.tap do |text|
         marks.compact.each do |m|
-          text[m[:type].to_sym] = true
+          text[m.to_sym] = true
         end
       end
     end

data/lib/slate_serializer/plain.rb

@@ -58,10 +58,10 @@ module SlateSerializer
       end
 
       def serialize_node(node, options)
-        if node[:text]
-          node[:text]
+        if node["text"]
+          node["text"]
         else
-          node[:children].map { |n| serialize_node(n, options) }.join(options[:delimiter])          
+          node["children"].map { |n| serialize_node(n, options) }.join(options[:delimiter])          
         end
       end
     end

data/lib/slate_serializer/version.rb

@@ -1,3 +1,3 @@
 module SlateSerializer
-  VERSION = '1.0.1'.freeze
+  VERSION = '1.0.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lwe_slate_serializer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Wesley Stam
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-03 00:00:00.000000000 Z
+date: 2022-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri