bluedoc-sml 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b42faf5f6a63c5ba48bc3df7157f106ed348b0b1bb9ec5be85fccdb4ce7c8ed1
-  data.tar.gz: b09c64f34316a98d5f4b5df131eadc49dfe055342d877905890d81a221a5097a
+  metadata.gz: 675ba78976901654e5dfc6edbd8e3a6432af52f1566bff7a9dfe1fcbd9f138ad
+  data.tar.gz: 5d4d87f0db8127706450f765fd10a1f09ed632347e7be952bdd753a08f9cbd08
 SHA512:
-  metadata.gz: 5820c42b3eb931a26f24aa52d415623ae369f0fcaf59d8c3f333b0c3fd58118c28a95a746582996cf1812ae22c9fc8a5f6f4c86fe9178280d972c5b04fcd6d5b
-  data.tar.gz: f3925f4ab3884600dabdfaa1eca12230f2cad388e6b5074e3d368b6a447eb6a37367e1d52c7e5ef0948c7922f3995a48e4443d23e57ffb90fde4a0aed4e9659e
+  metadata.gz: 810a4ec0f30c541eb7e7d66016004cd699ed62af72fc1a182bc489c061db48c05d28b69b45a60d6894080e24e0545f9908ee991357f8af20abb2bc0e914ed4cc
+  data.tar.gz: 4e883a3d9fda0a022fd6f1047e8c222cc4a37a9b9be7dc33207a7b0a297ed4cc63eb392dbc841a1e043538b78f492ad6bb861d6b51702438d44686162bc5087a

data/lib/bluedoc/sml/renderer.rb

@@ -6,7 +6,7 @@ module BlueDoc::SML
   class Renderer
     include BlueDoc::SML::Utils
 
-    attr_accessor :sml, :value, :config
+    attr_accessor :sml, :value, :config, :list
 
     # For table, list for temp mark in block
     attr_accessor :in_block
@@ -17,6 +17,7 @@ module BlueDoc::SML
       @config.plantuml_service_host = options[:plantuml_service_host]
       @config.mathjax_service_host = options[:mathjax_service_host]
       @value = YAML.load(sml)
+      @list = {}
     end
 
     def to_html
@@ -42,6 +43,27 @@ module BlueDoc::SML
         prev_node = idx > 0 ? children[idx - 1] : nil
         next_node = idx < children.length ? children[idx + 1] : nil
 
+        list = self.list
+        is_list = self.class.tag_name(child) == "list"
+
+        if is_list
+          child_attrs = self.class.attributes(child)
+          nid = child_attrs[:nid]
+
+          if list[nid]
+            list[nid] << child
+          else
+            list[nid] = [child]
+          end
+        end
+
+        if (!is_list && self.class.tag_name(prev_node) == "list") ||
+          (is_list && self.class.tag_name(prev_node) == "list" && self.class.attributes(child)[:nid] != self.class.attributes(prev_node)[:nid])
+          nid = self.class.attributes(prev_node)[:nid]
+          list.delete(nid)
+        end
+
+
         node_to_html(child, prev: prev_node, next: next_node)
       end.join("")
     end

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

@@ -9,6 +9,92 @@ module BlueDoc::SML::Rules
     INDENT_PX = 8
 
     def self.to_html(node, opts = {})
+      renderer = opts[:renderer]
+      attrs = attributes(node)
+
+      nid = attrs[:nid]
+      list = renderer.list
+      current = list[nid]
+      html = []
+
+      return "" if !current
+      return "" if opts[:next] && nid == attributes(opts[:next])[:nid]
+
+      current.length.times do |i|
+        current_node = current[i]
+        prev_node = current[i - 1]
+        next_node = current[i + 1]
+
+        current_attrs = attributes(current_node)
+        prev_attrs = attributes(prev_node)
+        next_attrs = attributes(next_node)
+
+        current_tag = list_tag_by_type(current_attrs[:type])
+        current_level = current_attrs[:level]
+
+        prev_tag = nil
+        prev_level = nil
+        next_tag = nil
+        next_level = nil
+
+        if prev_node
+          prev_tag = list_tag_by_type(prev_attrs[:type])
+          prev_level = prev_attrs[:level]
+        end
+
+        if next_node
+          next_tag = list_tag_by_type(next_attrs[:type])
+          next_level = next_attrs[:level]
+        end
+
+        if (
+          i == 0 ||
+          prev_level < current_level ||
+          (
+            prev_level == current_level &&
+            current_tag != prev_tag
+          )
+        )
+
+          html << %(<#{current_tag} data-level="#{current_level}">)
+        end
+
+        children = renderer.children_to_html(current_node)
+        li = %(<li>#{children})
+
+        if i < current.length - 1
+          if next_level < current_level
+            (current_level - next_level).times do |j|
+              prev_item = current[i - j]
+              prev_item_attrs = attributes(prev_item)
+              prev_item_tag = list_tag_by_type(prev_item_attrs[:type])
+              li += %(</li></#{prev_item_tag}>)
+            end
+
+            li += %(</li>)
+          elsif next_level == current_level
+            if next_tag == current_tag
+              li += %(</li>)
+            else
+              li += %(</li></#{current_tag}>)
+            end
+          end
+        else
+          current_level.times do |j|
+            prev_item = current[i - j]
+            prev_item_attrs = attributes(prev_item)
+            prev_item_tag = list_tag_by_type(prev_item_attrs[:type])
+            li += %(</li></#{prev_item_tag}>)
+          end
+        end
+
+        html << li
+      end
+
+      html.join("\n")
+    end
+
+    def self.to_html1(node, opts = {})
       renderer = opts[:renderer]
       attrs    = attributes(node)
       children = renderer.children_to_html(node)

data/lib/bluedoc/sml/utils.rb

@@ -14,6 +14,16 @@ module BlueDoc::SML
         node[0] || ""
       end
 
+      def list_tag_by_type(type)
+        if type == "bulleted"
+          return "ul"
+        elsif type == "ordered"
+          return "ol"
+        else
+          return nil
+        end
+      end
+
       def attributes(node, add_if_mission:  false)
         return {} if node.blank?
         return node[1].deep_symbolize_keys if has_attributes?(node)

data/lib/bluedoc/sml/version.rb

@@ -2,6 +2,6 @@
 
 module BlueDoc
   module SML
-    VERSION = "0.6.1"
+    VERSION = "0.6.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bluedoc-sml
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-21 00:00:00.000000000 Z
+date: 2019-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport