booklab-sml 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f40ffbae208235a1dfafa968aa9816198027175749c37b846133c4c90d1e0579
-  data.tar.gz: e47ff7a87045859d6d78ad591651e1e0c92f2ca3d9f745c1c71cd47971910962
+  metadata.gz: d7221135ee40e21ca054073ec862e70f9f298b858a47254cabc978fd5b1b2ea1
+  data.tar.gz: b0aa1e7faaba0780cd2ac13a02d4247f5ed76a980ed4a5874f7084afe95336aa
 SHA512:
-  metadata.gz: 2826b2f592c86982df5694b1fb8deaf788d0639facc2bd67a956b7028f1621d73dcc1c686df6b54676afbfa27029c53b0f220a7a224e0e898060e289d9723381
-  data.tar.gz: 50fe6bdd5bbfbb946b3c543f2359f34c82b43f68b9b091c3517b25a50cf54cbab75018087e38dbc0e53c08f37c3d888a74f9ce40e698aac9ce8f1a382170e670
+  metadata.gz: 8e924228f106d6885dce973fdb0a9abf97f1171ebeefd829529424a161627ffafefacbb56d448c5bd441d2605c9bf53aa429ea94e8a369d40b2abc8824feef92
+  data.tar.gz: f673b5dcffe277844ccd491b93c26919e6ffdc7076610ef138bfa2335eb7ff74deb44ca2eb4f9b3a07a8d4f5c59a5221f4d87c57fc4fa800fc3ced60e55df067

data/lib/booklab/sml/renderer.rb

@@ -8,6 +8,9 @@ module BookLab::SML
 
     attr_accessor :sml, :config
 
+    # For table, list for temp mark in block
+    attr_accessor :in_block
+
     def initialize(sml, options)
       @sml = sml
       @config = Config.new
@@ -34,7 +37,7 @@ module BookLab::SML
         prev_node = idx > 0 ? children[idx - 1] : nil
         next_node = idx < children.length ? children[idx + 1] : nil
 
-        node_to_html(child)
+        node_to_html(child, { prev: prev_node, next: next_node })
       end.join("")
     end
   end

data/lib/booklab/sml/rules/base.rb

@@ -8,6 +8,8 @@ module BookLab::SML::Rules
   class Base
     include BookLab::SML::Utils
 
+    INDENT_PX = 8
+
     class << self
       include EscapeUtils
     end
@@ -24,6 +26,18 @@ module BookLab::SML::Rules
     end
 
     protected
+      def self.style_for_attrs(attrs, style = {})
+        attrs ||= {}
+        if attrs[:align]
+          style["text-align"] = attrs[:align]
+        end
+        if attrs[:indent]
+          style["text-indent"] = "#{4 * INDENT_PX}px"
+        end
+        props = styleize(style)
+        return "" if props.strip.blank?
+        %( style="#{props}")
+      end
 
       def self.styleize(style)
         style.map { |k, v| "#{k}: #{v};" }.join(" ")

data/lib/booklab/sml/rules/heading.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "digest/md5"
+
 module BookLab::SML::Rules
   class Heading < Base
     def self.match?(node)
@@ -10,7 +12,16 @@ module BookLab::SML::Rules
       renderer = opts[:renderer]
       title = renderer.children_to_html(node)
       heading_tag = tag_name(node)
-      %(<#{heading_tag}>#{title}</#{heading_tag}>)
+
+      title_length = title.length
+      min_length = title_length * 0.3
+      words_length = /[a-z0-9]/i.match(title)&.length || 0
+      header_id = title.gsub(/[^a-z0-9]+/i, "-").downcase.gsub(/^\-|\-$/, "")
+      if title_length - header_id.length > min_length
+        header_id = Digest::MD5.hexdigest(title.strip)[0..8]
+      end
+
+      %(<#{heading_tag} id="#{header_id}"><a href="##{header_id}" class="heading-anchor">#</a>#{title}</#{heading_tag}>)
     end
   end
 end

data/lib/booklab/sml/rules/link.rb

@@ -12,7 +12,7 @@ module BookLab::SML::Rules
       name = renderer.children_to_html(node)
       return name if attrs[:href].blank?
 
-      %(<a href="#{attrs[:href]}" title="#{attrs[:title]}">#{name}</a>)
+      %(<a href="#{attrs[:href]}" title="#{attrs[:title]}" target="_blank">#{name}</a>)
     end
   end
 end

data/lib/booklab/sml/rules/list.rb

@@ -23,36 +23,62 @@ module BookLab::SML::Rules
       nid       = attrs[:nid]
       list_type = attrs[:type] || "bulleted"
       level     = attrs[:level] || 1
-      num       = attrs[:num] || 1
-      pstyle    = attrs[:pstyle] || "paragraph"
+      num       = (attrs[:num] || 0) + 1
 
-      wrap_tag = attrs[:type] == "bulleted" ? "ul" : "ol"
-      item_tag = "li"
+      style_attrs = style_for_attrs(attrs, {
+        "padding-left": "#{indent_left * INDENT_PX}px"
+      })
 
-      case pstyle
-      when "paragraph" then item_tag = "p"
-      when "heading1" then item_tag = "h1"
-      when "heading2" then item_tag = "h2"
-      else item_tag = "p"
-      end
+      wrap_tag = list_type == "bulleted" ? "ul" : "ol"
 
-      style = {
-        "text-align": text_align,
-        "text-indent": text_indent ? "#{4 * INDENT_PX}px" : "0px",
-        "padding-left": "#{indent_left * INDENT_PX}px"
-      }.map { |k, v| "#{k}: #{v};" }.join(" ")
+
+      # <ul>
+      #   <li>Bold text</li>
+      #   <li>Important text
+      #     <ul>
+      #       <li>Emphasized text</li>
+      #       <li>
+      #         Small text
+      #         <ul>
+      #           <li>Subscript text</li>
+      #         </ul>
+      #       </li>
+      #     </ul>
+      #   </li>
+      # </ul>
+
+      # get prev attrs
+      prev_name = tag_name(opts[:prev])
+      next_name = tag_name(opts[:next])
+      prev_level = attributes(opts[:prev])[:level]
+      next_level = attributes(opts[:next])[:level]
 
       outs = []
-      if opts[:prev] && tag_name(opts[:prev]) != "list"
-        outs << %(<#{wrap_tag} style="#{style}">)
+
+
+      if prev_name != "list" || prev_level != level
+        outs << %(<#{wrap_tag} data-level="#{level}">)
       end
 
-      outs << %(<li>#{children}</li>)
+      li_item = "<li>#{children}"
 
-      if opts[:next] && tag_name(opts[:next]) != "list"
-        outs << "</#{wrap_tag}>"
+      if next_name == "list"
+        if next_level < level
+          (level - next_level + 1).times do
+            li_item += "</li></#{wrap_tag}>"
+          end
+        elsif next_level == level
+          li_item += "</li>"
+        else
+          li_item += "\n"
+        end
+      else
+        li_item += "</li></#{wrap_tag}>"
       end
-      outs.join("")
+
+      outs << li_item
+
+      outs.join("\n")
     end
   end
 end

data/lib/booklab/sml/rules/paragraph.rb

@@ -9,7 +9,11 @@ module BookLab::SML::Rules
     def self.to_html(node, opts = {})
       renderer = opts[:renderer]
       children = renderer.children_to_html(node)
-      %(<p>#{children}</p>)
+      attrs = attributes(node)
+
+      style_attrs = style_for_attrs(attrs)
+
+      %(<p#{style_attrs}>#{children}</p>)
     end
   end
 end

data/lib/booklab/sml/rules/span_with_mark.rb

@@ -5,11 +5,10 @@ module BookLab::SML::Rules
     MARKS = {
       cd: ["<code>", "</code>"],
       b: ["<strong>", "</strong>"],
-      i: ["<em>", "</em>"],
+      i: ["<i>", "</i>"],
       s: ["<del>", "</del>"],
       u: ["<u>", "</u>"],
-      mt: ["$", "$"],
-      m: ["==", "=="],
+      m: ["<mark>", "</mark>"],
       sup: ["<sup>", "</sup>"],
       sub: ["<sub>", "</sub>"],
     }

data/lib/booklab/sml/rules/td.rb

@@ -12,15 +12,7 @@ module BookLab::SML::Rules
       children = renderer.children_to_html(node)
 
       style = {}
-      if attrs[:align]
-        style["text-align"] = attrs[:align]
-      end
-
-      style_attrs = ""
-      if style.any?
-        style_attrs = %( style="#{styleize(style)}")
-      end
-
+      style_attrs = style_for_attrs(attrs, style)
       %(<td#{style_attrs}>#{children}</td>)
     end
   end

data/lib/booklab/sml/utils.rb

@@ -10,12 +10,14 @@ module BookLab::SML
       end
 
       def tag_name(node)
+        return nil if node.blank?
         node[0] || ""
       end
 
       def attributes(node, add_if_mission:  false)
+        return {} if node.blank?
         return node[1].deep_symbolize_keys if has_attributes?(node)
-        return nil unless add_if_mission
+        return {} unless add_if_mission
 
         name = node.shift || ""
         attrs = {}

data/lib/booklab/sml/version.rb

@@ -2,6 +2,6 @@
 
 module BookLab
   module SML
-    VERSION = "0.2.0"
+    VERSION = "0.2.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: booklab-sml
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-09 00:00:00.000000000 Z
+date: 2019-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport