builder_quill_content 0.1.5 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e3d82247613af647f6d7fbe2248fa838962d1978526a83e2d47332cae9ac8a6b
-  data.tar.gz: 9ab2101a36a93705def90f856b05f0424b614dbfa4d81c1636842ffb0e12dba0
+  metadata.gz: 2526f9efaf6443135a7b094de1946b440873fa78c32090b89bfbfed95318eaf9
+  data.tar.gz: 7df88bad7d6f0e5199985f028d659ce0ac20ad5cf0f590d299ee19831e296fb5
 SHA512:
-  metadata.gz: 0aa1105edf460b4531f1ab5fca822dff297763fd60b0fd0aff982858cf3e5d14fc6153da93bd709ffc33183e548ffb5a5064e19b8e0420ab98f9a69525f2e7ea
-  data.tar.gz: 5fc8f884cb6b2abff9b11d392c1d50d3b73ffd9c842d17eba42d071ac23a6d58c50b8e3a0614a646d6120d850604a7ee75b1ce5bfcbe5d0bec7dcaedd3a20823
+  metadata.gz: adc3f8c32b9a324978866582820f5321dec0fbf76339a23fdccec80ff8d2749f98329fae730d653ea6c5084f85a0ec4e2a599fb83a7ca8753072760bf6adc539
+  data.tar.gz: bbc989cf463c3cd74861f3d536c8d308bb8352872d261ac8921924360768fcdd834ba8637d0f8b44bec1623216c005bf4d0adf8aa7ccfa164ed09bc7800c276a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    builder_quill_content (0.1.5)
+    builder_quill_content (1.1.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -7,7 +7,7 @@ Welcome to your new gem! In this directory, you'll find the files you need to be
 Add this line to your application's Gemfile:
 
 ```ruby
-gem 'builder_quill_content'
+gem 'builder_quill_content', '~> 1.2.0'
 ```
 
 And then execute:
@@ -21,13 +21,21 @@ Or install it yourself as:
 ## Usage
 
 ```ruby
-include BuilderQuillContent
+BuilderQuillContent.new(quill_content, { title: 'for blank caption' }).to_html
 ```
 
-then
+## ChangeLog
 
-```ruby
-to_html(quill_content)
+### Version 1.2 - 11/12/2020
+
+```
+Modify value of image alt to image's caption or post's title
+```
+
+### Version 1.1 - 03/12/2020
+
+```
+Fix bug add to content if the input have only 1 node and not include "\n"
 ```
 
 ## Development
@@ -38,7 +46,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/michaelt0520/builder_quill_content. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/michaelt0520/builder_quill_content/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/1PACVietnam/wakuwaku-builder_quill_content. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/1PACVietnam/wakuwaku-builder_quill_content/blob/master/CODE_OF_CONDUCT.md).
 
 
 ## License
@@ -47,4 +55,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the BuilderQuillContent project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/michaelt0520/builder_quill_content/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the BuilderQuillContent project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/1PACVietnam/wakuwaku-builder_quill_content/blob/master/CODE_OF_CONDUCT.md).

data/builder_quill_content.gemspec

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

data/lib/builder_quill_content.rb

@@ -1,61 +1,65 @@
-require "builder_quill_content/version"
-require "json"
-require "convert_inline"
+require 'builder_quill_content/version'
+require 'json'
+require 'convert_inline'
 
-module BuilderQuillContent
+class BuilderQuillContent
   class Error < StandardError; end
   # Your code goes here...
 
+  attr_accessor :input, :args
+
   EMBED_KEYS = %w[wk-image wk-youtube wk-tweet wk-instagram wk-divider waku-post wk-maps].freeze
 
-  def to_html(input)
-    content_json = JSON.parse(input)
-    line = content = ''
+  def initialize(input, args = {})
+    @input = input
+    @args  = args
+    @line  = @content = ''
+  end
+
+  def to_html
+    content_json = JSON.parse(@input)
 
     while content_json.length.positive?
       node = content_json.shift
 
       if node['insert'] == "\n"
-        content, line = end_of_line(content, line, node['attributes'])
+        end_of_line(node['attributes'])
       elsif node['insert'].include?("\n")
-        content, line = break_line(content, line, node['insert'])
+        break_line(node['insert'])
       else
-        content, line = inline(content, line, node)
+        inline(node)
       end
     end
 
-    content.gsub('</ul><ul>', '')
+    @content += @line unless @line.strip.empty?
+    @content.gsub('</ul><ul>', '')
   rescue JSON::ParserError
     'No content'
   end
 
-  def end_of_line(content, line, attributes)
-    content += attributes.nil? ? "<p>#{line}</p>" : ConvertInline.new('insert' => line, 'attributes' => attributes).convert
-    [content, '']
+  def end_of_line(attributes)
+    @content += attributes.nil? ? "<p>#{@line}</p>" : ConvertInline.new({ 'insert' => @line, 'attributes' => attributes }, args).convert
+    @line = ''
   end
 
-  def break_line(content, line, insert)
+  def break_line(insert)
     insert.split(/(?<=\n)/).each do |text|
       if text.end_with?("\n")
-        content += "<p>#{line}#{text.delete("\n")}</p>"
-        line = ''
+        @content += "<p>#{@line}#{text.delete("\n")}</p>"
+        @line = ''
       else
-        line += text
+        @line += text
       end
     end
-    [content, line]
   end
 
-  def inline(content, line, node)
-    return [content + ConvertInline.new(node).convert, line] if embed_node?(node)
-
-    [content, line + ConvertInline.new(node).convert]
+  def inline(node)
+    embed_node?(node) ? @content += ConvertInline.new(node, args).convert : @line += ConvertInline.new(node, args).convert
   end
 
   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
+    node['insert'].keys.find { |k| EMBED_KEYS.include?(k) }
   end
 end

data/lib/builder_quill_content/version.rb

@@ -1,3 +1,3 @@
-module BuilderQuillContent
-  VERSION = "0.1.5"
+class BuilderQuillContent
+  VERSION = '1.2.0'
 end

data/lib/convert_inline.rb

@@ -2,26 +2,27 @@ class ConvertInline
   class Error < StandardError; end
   # Your code goes here...
 
-  attr_accessor :node, :insert, :attributes
+  attr_accessor :node, :insert, :attributes, :args
 
-  def initialize(node)
+  def initialize(node, args = {})
     @node       = node
     @insert     = @node['insert']
     @attributes = @node['attributes']
+    @args       = args
   end
 
   def convert
     return @insert if @insert.is_a?(String) && @attributes.nil?
 
-    content = ''
-
     if @insert.is_a?(String)
-      @attributes.keys.each { |attr| content += send(attr) }
+      @attributes.each_key { |attr| @insert = send(attr) }
     else
-      content = @insert.keys.first == 'wk-image' ? image : embed(@insert.keys.first)
+      @insert = @insert.keys.first == 'wk-image' ? image : embed(@insert.keys.first)
     end
 
-    content
+    @insert
+  rescue NoMethodError
+    @insert
   end
 
   private
@@ -43,7 +44,7 @@ class ConvertInline
   end
 
   def link
-    '<a href="' + @attributes['link'] + '" target="_blank">' + @insert + '</a>'
+    '<a href="' << @attributes['link'] << '" target="_blank">' << @insert << '</a>'
   end
 
   def list
@@ -53,17 +54,19 @@ class ConvertInline
   def embed(key)
     return '<hr>' if key == 'wk-divider'
 
-    '<div data-id="' + key + '" data-src="' + @insert[key] + '"></div>'
+    '<div data-id="' << key << '" data-src="' << @insert[key] << '"></div>'
   end
 
   def image
-    img_src = @insert['wk-image']['src']
-    img_cap = @insert['wk-image']['caption']
-    img_alt = @attributes['alt']
-
-    '<figure class="post-content-image-container">
-      <img class="post-content-image lazy blur" data-src="' + img_src + '" alt="' + img_alt + '">
-      <figcaption class="post-image-caption u-text-center">' + img_cap + '</figcaption>
-    </figure>'
+    img_src = @insert['wk-image']['src'] || @attributes['src'] || @insert['wk-image']
+    img_cap = @insert['wk-image']['caption'].strip.empty? ? '' : @insert['wk-image']['caption']
+    img_alt = @insert['wk-image']['caption'].strip.empty? ? args[:title] : @insert['wk-image']['caption']
+    return '' if img_src.nil?
+
+    data = '<figure class="post-content-image-container">'
+    data << '<img class="post-content-image lazy blur" data-src="' << img_src << '" alt="' << img_alt << '">'
+    data << '<figcaption class="post-image-caption u-text-center">' << img_cap << '</figcaption>'
+    data << '</figure>'
+    data
   end
 end

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: builder_quill_content
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 1.2.0
 platform: ruby
 authors:
 - Michael Tran
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-03-04 00:00:00.000000000 Z
+date: 2020-11-13 00:00:00.000000000 Z
 dependencies: []
-description: 
+description:
 email:
 - mictran205@gmail.com
 executables: []
@@ -30,11 +30,11 @@ files:
 - lib/builder_quill_content.rb
 - lib/builder_quill_content/version.rb
 - lib/convert_inline.rb
-homepage: https://github.com/michaelt0520/builder_quill_content
+homepage: https://github.com/1PACVietnam/wakuwaku-builder_quill_content
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -49,8 +49,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: Convert quill content to html for wakuwaku
 test_files: []