contentful_converter 0.0.1.25 → 0.0.1.26

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db73e54f2c69e59e6e8226b0fe637923751c6e08e0b6969af6cb1be71ed428e3
-  data.tar.gz: 03d183bce70c3c68d0e1aeef56b39bf2b6066fc10888958c4eec38b1a8b0322b
+  metadata.gz: 60f068e6ba05414012bc0bacd531648585829e96d17afed00513fc1fdef31801
+  data.tar.gz: 91a6276c212b1684bd84d4361ed8bbcb198f4281bef5c642842465361ec0b4c2
 SHA512:
-  metadata.gz: c5bdd3783d1852e1df52c5d8c2ca1bd059b8e7482ca8bedaff6643b910a01c551c5b6a6ff318a590fbd58957b9cdb23f2ec1b342d00b1b1ecde7bcb52b46735d
-  data.tar.gz: 21f47df813122e6e3d8618ec713d2d8ef962260465606c0556685a9a8b999f6b974c2c778a77e0984cad25764bec409dbf74a2f9566635c9d244f7f9d88848c8
+  metadata.gz: e402d018e413aaaf2e4435a455513ef2b745048d05edbf61d729daf5d8af2f9f32d545c2b84cd18b76a919a6439f30014b70493648c74dd439f791ed32e0397a
+  data.tar.gz: d6384e721401bdb87abc7aecdb44166e7fb60eb60331518eeabeed11d3b0d444f87e70f22e12e6eb938886300217ad7c1d08d77a715078b7e971e4038f50e40b

data/README.md

@@ -110,7 +110,7 @@ end
   }
   ```
 
-* HTML hyperlinks without a scheme but with an extension e.g: (`<a href="/path/to_file.docx">file</a>`), will be converted into ASSET hyperlinks, with the href value as an ID, excluding the extension.
+* HTML hyperlinks without a scheme but with an extension e.g: (`<a href="file.docx">file</a>`), will be converted into ASSET hyperlinks, with the href value as an ID.
   ```ruby
   {
     nodeType: "paragraph",
@@ -121,7 +121,7 @@ end
         data: {
           target: {
             sys: {
-              id: "/path/to_file",
+              id: "file.docx",
               type: "Link",
               linkType: "Entry"
             }

data/lib/contentful_converter/configuration.rb

@@ -8,7 +8,6 @@ module ContentfulConverter
   def self.configure
     self.configuration ||= Configuration.new
     yield(configuration) if block_given?
-    self
   end
 
   class Configuration

data/lib/contentful_converter/nokogiri_builder.rb

@@ -6,39 +6,53 @@ require 'contentful_converter/configuration'
 module ContentfulConverter
   class NokogiriBuilder
     class << self
+      # By transforming the elements at this point,
+      # nokogiri creates a tree that is accepted by contentful.
       def build(html)
-        doc = create_nokogiri_fragment(transform(html))
-        normalize_lists(doc)
-        normalize_embeds(doc)
-        doc
+        html_node = nokogiri_fragment(html)
+        remove_forbidden_elements(html_node)
+        normalize_nodes(html_node)
+        html_node
       end
 
       private
 
-      # By transforming the elements at this point,
-      # nokogiri creates a tree that is accepted by contentful.
-      def transform(html)
-        doc = create_nokogiri_fragment(html)
-        remove_forbidden_elements(doc)
-        find_nodes(doc, %w[section div]).each { |elem| elem.name = 'p' }
-        find_nodes(doc, 'img').each { |elem| elem.name = 'embed' }
-        doc.to_html
-      end
-
-      def create_nokogiri_fragment(html)
+      def nokogiri_fragment(html)
         Nokogiri::HTML.fragment(html)
       end
 
-      def remove_forbidden_elements(doc)
-        forbidden_nodes = ContentfulConverter.configure.configuration.forbidden_nodes
-        remove_empty_links(doc)
+      def remove_forbidden_elements(html_node)
+        remove_empty_links(html_node)
+        return unless ContentfulConverter.configuration
+
+        forbidden_nodes = ContentfulConverter.configuration.forbidden_nodes
         return if forbidden_nodes.empty?
 
-        find_nodes(doc, forbidden_nodes).each(&:remove)
+        find_nodes(html_node, forbidden_nodes).each(&:remove)
+      end
+
+      def normalize_nodes(html_node)
+        normalize_blocks(html_node)
+        normalize_imgs(html_node)
+        normalize_lists(html_node)
+        normalize_embeds(html_node)
+      end
+
+      def normalize_blocks(html_node)
+        find_nodes(html_node, %w[section div]).each do |elem|
+          elem.swap(elem.children)
+        end
+      end
+
+      def normalize_imgs(html_node)
+        find_nodes(html_node, 'img').each { |elem| elem.name = 'embed' }
       end
 
       def normalize_lists(nokogiri_fragment)
-        find_nodes(nokogiri_fragment, 'li').each { |li| wrap_parents_in_ul(li) }
+        find_nodes(nokogiri_fragment, 'li').each do |li|
+          wrap_parents_in_ul(li)
+          wrap_children_in_single_p(li)
+        end
       end
 
       def normalize_embeds(nokogiri_fragment)
@@ -47,12 +61,8 @@ module ContentfulConverter
         end
       end
 
-      def remove_empty_links(doc)
-        find_nodes(doc, 'a').each { |n| n.remove unless n['href'] }
-      end
-
-      def find_nodes(doc, element)
-        doc.css(*element)
+      def remove_empty_links(html_node)
+        find_nodes(html_node, 'a').each { |n| n.remove unless n['href'] }
       end
 
       def wrap_parents_in_ul(node)
@@ -60,6 +70,38 @@ module ContentfulConverter
 
         node.wrap('<ul>')
       end
+
+      def wrap_children_in_single_p(node)
+        return if node.children.count == 1 && node.children.first.name == 'p'
+
+        find_nodes(node, 'p').each { |p_node| p_node.swap(p_node.children) }
+        node_children = append_space_to_text_nodes(node.children.remove, node)
+
+        node.add_child('<p>')
+        node.at_css('p').children = node_children
+        merge_text_nodes(node)
+      end
+
+      def append_space_to_text_nodes(children, node)
+        children.each do |child|
+          next if child.text.chomp.empty? || child.text.end_with?(' ')
+
+          child.content = create_text_node("#{child.text} ", node)
+        end
+        children
+      end
+
+      def find_nodes(html_node, element)
+        html_node.css(*element)
+      end
+
+      def create_text_node(text, html_node)
+        Nokogiri::XML::Text.new(text, html_node)
+      end
+
+      def merge_text_nodes(node)
+        Nokogiri::XML(node.to_xml)
+      end
     end
   end
 end

data/lib/contentful_converter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contentful_converter
 version: !ruby/object:Gem::Version
-  version: 0.0.1.25
+  version: 0.0.1.26
 platform: ruby
 authors:
 - Alex Avlonitis