builder_quill_content 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8ae5025ab31bcfa7a716431be579fb1ee7a279724c1d7ffab1a6a1775dd5b64
-  data.tar.gz: 214ebcbe24cfdc56e13ee64e78c6d30cf594acd63828cd05023c69569aa88c38
+  metadata.gz: a2ec3f0ee541302574c92d357c52171813cfbdf405962f65ca229ab09f7a5253
+  data.tar.gz: 5e44ce1c2dc121e074e2e6dbfd2147377bddbc6b2903db73bd1b07a81d143c3c
 SHA512:
-  metadata.gz: 143de3efae9414d5d22f4b6b26415a925311300224dd8d2385b353ca7f689d71df912bccbde6a76a7fd4a90b3dc4f296d09e0ea200cc410c099f231eaeeebb74
-  data.tar.gz: 53c35b3645a27631ad7dfac1c742851be2529e04f539b829041e7b3d0ebbfe4ed00a6586b3396a08792d14bf787d3b9c138013e84a9af2e6d170c054529444d3
+  metadata.gz: 7fc5ab54a2de0371ca472f7cc2fc1460bded3494f3a85a140fe8518f88faba21cbc426a621334366d7a67a1f8520f47afad3cfb36a2bb884fdd4ee8dea2c0609
+  data.tar.gz: df40c78f9bca9bf7fa5edd7cb08ba7f5234fbce315a71269579609544ad5b120b8e028d9da10b897530e88a330f29a22029ad933e3382e1ffbaa908eee4ad057

data/builder_quill_content.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Michael Tran"]
   spec.email         = ["mictran205@gmail.com"]
 
-  spec.summary       = "Convert quill content to html"
-  spec.homepage      = "https://github.com/michaelt0520/word_censored"
+  spec.summary       = "Convert quill content to html for wakuwaku"
+  spec.homepage      = "https://github.com/michaelt0520/builder_quill_content"
   spec.license       = "MIT"
   # spec.required_ruby_version = Gem::Requirement.new(">= 2.3.0")
 

data/lib/builder_quill_content.rb

@@ -1,128 +1,59 @@
-# frozen_string_literal: true
+require "builder_quill_content/version"
+require "json"
+require "convert_inline"
 
-class BuilderQuillContent
-  attr_accessor :content
+module BuilderQuillContent
+  class Error < StandardError; end
+  # Your code goes here...
 
-  VALID_INLINE_KEYS     = %w[italic bold header blockquote link list].freeze
-  VALID_MEDIA_KEYS      = %w[wk-image wk-youtube wk-tweet wk-instagram wk-divider waku-post wk-maps].freeze
-  START_VALID_HTML_TAGS = %w[<h2 <div <ul <hr <blockquote].freeze
-  END_VALID_HTML_TAGS   = %w[/h2> /div> /ul> hr> /blockquote>].freeze
+  EMBED_KEYS = %w[wk-image wk-youtube wk-tweet wk-instagram wk-divider waku-post wk-maps].freeze
 
-  def initialize(content)
-    @content = content
-  end
-
-  def to_html
-    save_tag_p = result = ''
+  def to_html(input)
+    content_json = JSON.parse(input)
+    line = content = ''
 
-    convert_inline.each_with_index do |text, i|
-      next if text.blank?
+    while content_json.length.positive?
+      node = content_json.shift
 
-      if text.include?("\n")
-        result += merge_array(text)
-      elsif in_valid_html_tag(text)
-        result += text
-      elsif !in_valid_html_tag(text)
-        if save_tag_p.blank?
-          result += "<p>#{text}"
-          save_tag_p = '<p>'
-        elsif save_tag_p == '<p>' && in_valid_html_tag(convert_inline[i + 1])
-          result += "#{text}</p>"
-          save_tag_p = ''
-        else
-          result += text
-        end
+      if node['insert'] == "\n"
+        content, line = end_of_line(content, line, node['attributes'])
+      elsif node['insert'].include?("\n")
+        content, line = break_line(content, line, node['insert'])
+      else
+        content, line = inline(content, line, node)
       end
     end
 
-    result
+    content.gsub('</ul><ul>', '')
   end
 
-  def convert_inline
-    preprocess.each_with_object([]) do |node, arr|
-      arr << if node['insert'].is_a?(Hash)
-               convert_media(node)
-             else
-               convert_attribute(arr.last, node)
-             end
-    end
+  def end_of_line(content, line, attributes)
+    content += attributes.nil? ? "<p>#{line}</p>" : ConvertInline.new('insert' => line, 'attributes' => attributes).convert
+    [content, '']
   end
 
-  def convert_media(node)
-    key = node['insert'].keys.first
-
-    case key
-    when 'wk-image'
-      '<div data-id="wk-image" data-src="' + node['insert']['wk-image']['src'] + '" data-caption="' + node['insert']['wk-image']['caption'] + '" data-alt="' + node['attributes']['alt'] + '"></div>'
-    when 'wk-divider'
-      '<hr>'
-    else
-      '<div data-id="' + key + '" data-src="' + node['insert'][key] + '"></div>'
-    end
-  end
-
-  def convert_attribute(pre_node, node)
-    return node['insert'] if node['attributes'].nil?
-
-    text_array = node['insert'].split("\n")
-    text = text_array.last
-
-    node['attributes'].each_pair do |key, value|
-      case key
-      when 'bold'
-        text.replace("<strong>#{text}</strong>")
-      when 'italic'
-        text.replace("<em>#{text}</em>")
-      when 'header'
-        text.replace("<h#{value}>#{text}</h#{value}>")
-      when 'blockquote'
-        text.replace("<blockquote>#{text}</blockquote>")
-      when 'list'
-        if pre_node.end_with?('</ul>')
-          pre_node.gsub!('</ul>', "<li>#{text}</li></ul>")
-          text.replace('')
-        else
-          text.replace("<ul><li>#{text}</li></ul>")
-        end
-      when 'link'
-        text.replace('<a href="' + value + '" target="_blank">' + text + '</a>')
-      end
-    end
-
-    text_array.join("\n")
-  end
-
-  def preprocess
-    JSON.parse(@content).each_with_object([]) do |node, arr|
-      next if node['insert'].blank? && node['attributes'].nil?
-
-      if valid_inline_node?(node)
-        arr.last.merge!(node) { |key, _| key == 'insert' ? arr.last[key] + node[key] : arr.last[key].merge(node[key]) }
+  def break_line(content, line, insert)
+    insert.split(/(?<=\n)/).each do |text|
+      if text.end_with?("\n")
+        content += "<p>#{line}#{text.delete("\n")}</p>"
+        line = ''
       else
-        arr << node
+        line += text
       end
     end
+    [content, line]
   end
 
-  def merge_array(text)
-    text.split("\n").reject(&:blank?).map { |e| in_valid_html_tag(e) ? e : "<p>#{e}</p>" }.join
-  end
-
-  def valid_inline_node?(node)
-    return false if node['insert'].is_a?(Hash) || node['insert'].present?
-    return false if node['attributes'].nil?
-    return false unless node['attributes'].keys.find { |k| VALID_INLINE_KEYS.include?(k) }
+  def inline(content, line, node)
+    return [content + ConvertInline.new(node).convert, line] if embed_node?(node)
 
-    true
+    [content, line + ConvertInline.new(node).convert]
   end
 
-  def valid_media_node?(node)
-    return false unless node['insert'].keys.find { |k| VALID_MEDIA_KEYS.include?(k) }
+  def embed_node?(node)
+    return false if node['insert'].is_a?(String)
+    return false unless node['insert'].keys.find { |k| EMBED_KEYS.include?(k) }
 
     true
   end
-
-  def in_valid_html_tag(text)
-    text.start_with?(*START_VALID_HTML_TAGS) && text.end_with?(*END_VALID_HTML_TAGS)
-  end
 end

data/lib/builder_quill_content/version.rb

@@ -1,3 +1,3 @@
 module BuilderQuillContent
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builder_quill_content
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Michael Tran
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-02-28 00:00:00.000000000 Z
+date: 2020-03-03 00:00:00.000000000 Z
 dependencies: []
 description: 
 email:
@@ -28,7 +28,7 @@ files:
 - builder_quill_content.gemspec
 - lib/builder_quill_content.rb
 - lib/builder_quill_content/version.rb
-homepage: https://github.com/michaelt0520/word_censored
+homepage: https://github.com/michaelt0520/builder_quill_content
 licenses:
 - MIT
 metadata: {}
@@ -50,5 +50,5 @@ requirements: []
 rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
-summary: Convert quill content to html
+summary: Convert quill content to html for wakuwaku
 test_files: []