contentful_converter 0.0.1.21 → 0.0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 480e7aa1a4ac08a0d34be704e52cad378e4eac7cdbc0d5b3ed8ec59ba0469248
-  data.tar.gz: 40b848df177728953954d4e840ac5bfe7dfdbefcd2df66c0179236f90486bfb3
+  metadata.gz: ff50772e7cf3d60d6587047360fd5f2aa1f87eb3e7110c731b1fdf6862b70cbe
+  data.tar.gz: 82c222abe96c9d3ac4ccf0e1e0f95f9dcc9d1e11dfda819bbd24737007b3512b
 SHA512:
-  metadata.gz: 5d9aaa610bd5cc7633a679fd1d3144b12db4412f1739b697bbf53009b2654b9153a251890e4b2782a55a836c09e4bc00068287b1481d68d8b59568c07f035b25
-  data.tar.gz: 79a8db078530d7ccef8851f59c6f1d7c9aa1f61962bccf1c5ab736918ff482f7cadd7d09b5b8a21b7ac0e6697cb684c18c0b8513d04072dcd52f21c585b5b895
+  metadata.gz: f9bc85b65ff13a53db3bc3c21050287799c273be82778d2a9378f18bc83d8b80af3d5b3b7f43db921743c66e3bd5125b26ce14252586c13b40938222f072d165
+  data.tar.gz: 37a4f52a6b29bad99ddfc7618b5706e6ae80512633993daf179b4f79810db54925b5c324bd6911015e5ce5b60abf5717e362ef6139091d51084984cda395d1d2

data/lib/contentful_converter/nodes/base.rb

@@ -13,7 +13,7 @@ module ContentfulConverter
       end
 
       def add_content(node)
-        @content << node
+        @content << (node.needs_p_wrapping? ? wrap_in_p(node) : node)
       end
 
       def to_h(params = options)
@@ -25,9 +25,9 @@ module ContentfulConverter
 
       def needs_p_wrapping?
         if parent.nil? ||
-            parent&.class == Nodes::Header ||
-            parent&.class == Nodes::Paragraph ||
-            parent&.class == Nodes::Hyperlink
+           parent&.class == Nodes::Header ||
+           parent&.class == Nodes::Paragraph ||
+           parent&.class == Nodes::Hyperlink
 
           return false
         end
@@ -37,6 +37,14 @@ module ContentfulConverter
 
       private
 
+      attr_writer :content
+
+      def wrap_in_p(node)
+        p_node = Nodes::Paragraph.new(nil, node.parent)
+        p_node.content << node
+        p_node
+      end
+
       def value
         nokogiri_node.content
       end

data/lib/contentful_converter/nodes/hyperlink.rb

@@ -9,15 +9,15 @@ module ContentfulConverter
       private
 
       def type
-        return 'asset-hyperlink' if !(uri_scheme?) && uri_extension?
+        return 'asset-hyperlink' if !uri_scheme? && uri_extension?
         return 'entry-hyperlink' unless uri_scheme?
 
         'hyperlink'
       end
 
       def options
-        return hyperlink_entry_option("Asset") if !(uri_scheme?) && uri_extension?
-        return hyperlink_entry_option("Entry") unless uri_scheme?
+        return hyperlink_entry_option('Asset') if !uri_scheme? && uri_extension?
+        return hyperlink_entry_option('Entry') unless uri_scheme?
 
         hyperlink_option
       end
@@ -32,7 +32,7 @@ module ContentfulConverter
             target: {
               sys: {
                 id: parsed_link.to_s.split('.').first,
-                type: "Link",
+                type: 'Link',
                 linkType: type
               }
             }

data/lib/contentful_converter/nokogiri_builder.rb

@@ -18,7 +18,7 @@ module ContentfulConverter
       # nokogiri creates a tree that is accepted by contentful.
       def transform(html)
         doc = create_nokogiri_fragment(html)
-        find_nodes(doc, ['section', 'div']).each { |elem| elem.name = 'p' }
+        find_nodes(doc, %w[section div]).each { |elem| elem.name = 'p' }
         find_nodes(doc, 'img').each { |elem| elem.name = 'embed' }
         doc.to_html
       end

data/lib/contentful_converter/stack.rb

@@ -0,0 +1,21 @@
+# frozen_string_literal: true
+
+module ContentfulConverter
+  class Stack
+    def initialize
+      @stack = []
+    end
+
+    def add(value)
+      @stack << value
+    end
+
+    def pop
+      @stack.pop
+    end
+
+    def any?
+      @stack.any?
+    end
+  end
+end

data/lib/contentful_converter/tree_cloner.rb

@@ -1,53 +1,65 @@
 # frozen_string_literal: true
 
 require 'contentful_converter/node_builder'
+require 'contentful_converter/stack'
 
 module ContentfulConverter
   class TreeCloner
-    class << self
-      def nokogiri_to_rich_text(nokogiri_fragment)
-        if nokogiri_fragment.children.empty?
-          return NodeBuilder.build(nokogiri_fragment).to_h
-        end
-
-        traverse_and_clone(nokogiri_fragment).to_h
+    def self.nokogiri_to_rich_text(nokogiri_fragment)
+      if nokogiri_fragment.children.empty?
+        return NodeBuilder.build(nokogiri_fragment).to_h
       end
 
-      private
+      new(nokogiri_fragment, Stack.new, Stack.new).traverse_and_clone
+    end
 
-      def traverse_and_clone(nokogiri_fragment)
-        rich_root_node = NodeBuilder.build(nokogiri_fragment)
+    def initialize(nokogiri_fragment, noko_stack, rich_stack)
+      @nokogiri_fragment = nokogiri_fragment
+      @noko_stack = noko_stack
+      @rich_stack = rich_stack
+    end
 
-        noko_stack = [nokogiri_fragment]
-        rich_stack = [rich_root_node]
+    def traverse_and_clone
+      initialize_stacks
 
-        while noko_stack.any?
-          noko_node = noko_stack.pop
-          rich_node = rich_stack.pop
+      while noko_stack.any?
+        noko_node = noko_stack.pop
+        rich_node = rich_stack.pop
 
-          next unless noko_node.children.any?
+        next unless noko_node.children.any?
 
-          noko_node.children.each do |child_node|
-            rich_child_node = NodeBuilder.build(child_node, rich_node)
+        children_traversal(noko_node, rich_node)
+      end
 
-            noko_stack << child_node
-            rich_stack << rich_child_node
-            rich_node.add_content(wrap_in_paragraph(rich_child_node))
-          end
-        end
+      rich_root_node.to_h
+    end
 
-        rich_root_node
-      end
+    private
 
-      def wrap_in_paragraph(node)
-        node.needs_p_wrapping? ? p_wrapper(node) : node
-      end
+    attr_reader :noko_stack, :rich_stack, :nokogiri_fragment
 
-      def p_wrapper(node)
-        p_node = Nodes::Paragraph.new(nil, node.parent)
-        p_node.add_content(node)
-        p_node
+    def initialize_stacks
+      noko_stack.add(nokogiri_fragment)
+      rich_stack.add(rich_root_node)
+    end
+
+    def rich_root_node
+      @rich_root_node ||= NodeBuilder.build(nokogiri_fragment)
+    end
+
+    def children_traversal(noko_node, rich_node)
+      noko_node.children.each do |child_node|
+        rich_child_node = NodeBuilder.build(child_node, rich_node)
+
+        add_to_stacks(child_node, rich_child_node)
+
+        rich_node.add_content(rich_child_node)
       end
     end
+
+    def add_to_stacks(noko_node, rich_node)
+      noko_stack.add(noko_node)
+      rich_stack.add(rich_node)
+    end
   end
 end

data/lib/contentful_converter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ContentfulConverter
-  VERSION = '0.0.1.21'
+  VERSION = '0.0.1.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_converter
 version: !ruby/object:Gem::Version
-  version: 0.0.1.21
+  version: 0.0.1.22
 platform: ruby
 authors:
 - Alex Avlonitis
@@ -65,6 +65,7 @@ files:
 - lib/contentful_converter/nodes/underline.rb
 - lib/contentful_converter/nodes/unordered_list.rb
 - lib/contentful_converter/nokogiri_builder.rb
+- lib/contentful_converter/stack.rb
 - lib/contentful_converter/tree_cloner.rb
 - lib/contentful_converter/version.rb
 homepage: https://github.com/AlexAvlonitis/contentful_converter