bluedoc-sml 0.8.1 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c30834de730fc0b91f692e1f10ce1ae164db8a3581403ed15246f7dfab868631
-  data.tar.gz: a947c59b093ddcbe7c145e4bd4f43284ce9c321beeffaa3e02ea5f65edaa4e1d
+  metadata.gz: 1aed464d55d58e5bc7f34bb4a86d7f0b5d8ca23c5323cdb49992a3536c41bb9b
+  data.tar.gz: 5e50a22dc3b84817d036347ca595129e364cce421aa76f5e3daf6b9bba8f821a
 SHA512:
-  metadata.gz: 504efae7d193c057b299818f1149088fa7099e9fe92cf81dff99a83c273e07b95aafa206cec82c467007f0b3509808f3894605fe4b607971f2a038a856c7e182
-  data.tar.gz: 1c31691b13a0c91dad1d43c7b2ac81ac016930798b92c39f5de88da07c22cfa8cbaf6bcf531ace6bb7fc18e4d42e84f91dd2ff17af1126b52b5678142111dabc
+  metadata.gz: 3c73f6b68eca4cc63435fe6d319d53352c23510e2dfc1842cf510481c32360b35d2aa022805e2963e473319e8be847f9bf09b4d7b4e1393ce0f2399d23d11348
+  data.tar.gz: 802b687d07deff3fe3406e29fbb8e9c11e7eb4e6dbcf1c1713cc83e3e74b35cfb8fe35945ca193dbc79f521bb34cdedc044b08414d9ca345387b2c443029c57b

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

@@ -32,6 +32,16 @@ module BlueDoc::SML::Rules
     end
 
     protected
+      def self.name_by_attrs(attrs)
+        attrs ||= {}
+
+        if !attrs[:nid]
+          return ""
+        end
+
+        return %( nid="#{attrs[:nid]}")
+      end
+
       def self.style_for_attrs(attrs, style = {})
         attrs ||= {}
         if attrs[:align]
@@ -66,7 +76,7 @@ module BlueDoc::SML::Rules
         style.map { |k, v| "#{k}: #{v};" }.join(" ")
       end
 
-      def self.html_attrs(attrs)
+      def self.html_attrs(attrs, style_attr = nil)
         attrs[:width] = nil if attrs[:width].to_i == 0
         attrs[:height] = nil if attrs[:height].to_i == 0
 

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

@@ -12,7 +12,9 @@ module BlueDoc::SML::Rules
 
       children = renderer.children_to_html(node)
 
-      %(<blockquote>#{children}</blockquote>)
+      nid_attr = name_by_attrs(attrs)
+
+      %(<blockquote#{nid_attr}>#{children}</blockquote>)
     end
   end
 end

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

@@ -19,7 +19,9 @@ module BlueDoc::SML::Rules
       language = attrs[:language]
       code = attrs[:code] || ""
 
-      block_code(code, language)
+       nid_attr = name_by_attrs(attrs)
+       html = block_code(code, language)
+       html.sub(%(class="highlight"), %(class="highlight"#{nid_attr}))
     end
   end
 end

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

@@ -20,8 +20,9 @@ module BlueDoc::SML::Rules
 
       file_type = (::File.extname(attrs[:name]) || "none").sub(".", "")
 
+      nid_attr = name_by_attrs(attrs)
       out = <<~HTML
-      <a class="attachment-file" title="#{attrs[:name]}" target="_blank" href="#{attrs[:src]}">
+      <a class="attachment-file" title="#{attrs[:name]}" target="_blank" href="#{attrs[:src]}"#{nid_attr}>
         <span class="icon-box"><i class="fas fa-file fa-#{file_type}-file"></i></span>
         <span class="filename">#{escape_html(attrs[:name])}</span>
         <span class="filesize">#{escape_html(humanize_size)}</span>

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

@@ -21,10 +21,13 @@ module BlueDoc::SML::Rules
         header_id = Digest::MD5.hexdigest(title.strip)[0..8]
       end
 
+      attrs = attributes(node)
+      nid_attr = name_by_attrs(attrs)
+
       if title.blank?
-        %(<#{heading_tag}>#{title}</#{heading_tag}>)
+        %(<#{heading_tag}#{nid_attr}>#{title}</#{heading_tag}>)
       else
-        %(<#{heading_tag} id="#{header_id}"><a href="##{header_id}" class="heading-anchor">#</a>#{title}</#{heading_tag}>)
+        %(<#{heading_tag} id="#{header_id}"#{nid_attr}><a href="##{header_id}" class="heading-anchor">#</a>#{title}</#{heading_tag}>)
       end
     end
   end

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

@@ -19,6 +19,7 @@ module BlueDoc::SML::Rules
 
       return "" if !current
       return "" if opts[:next] && nid == attributes(opts[:next])[:nid]
+      nid_attr = name_by_attrs(attrs)
 
       current.length.times do |i|
         current_node = current[i]
@@ -56,8 +57,10 @@ module BlueDoc::SML::Rules
             current_tag != prev_tag
           )
         )
+          tag_attr = %( data-level="#{current_level}")
+          tag_attr += nid_attr if current_level == 1
 
-          html << %(<#{current_tag} data-level="#{current_level}">)
+          html << %(<#{current_tag}#{tag_attr}>)
         end
 
         children = renderer.children_to_html(current_node)
@@ -94,80 +97,5 @@ module BlueDoc::SML::Rules
 
       html.join("\n")
     end
-
-    def self.to_html1(node, opts = {})
-      renderer = opts[:renderer]
-      attrs    = attributes(node)
-      children = renderer.children_to_html(node)
-
-      # Normal paragraph data
-      text_align  = attrs[:align] || "left"
-      indent      = attrs[:indent]
-      text_indent = indent && indent[:firstline]
-      indent_left = indent ? indent[:left] : 0
-
-      # List style
-      nid       = attrs[:nid]
-      list_type = attrs[:type] || "bulleted"
-      level     = attrs[:level] || 1
-      num       = (attrs[:num] || 0) + 1
-
-      style_attrs = style_for_attrs(attrs,
-        "padding-left": "#{indent_left * INDENT_PX}px"
-      )
-
-      wrap_tag = list_type == "bulleted" ? "ul" : "ol"
-
-
-      # <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 prev_name != "list" || prev_level != level
-        outs << %(<#{wrap_tag} data-level="#{level}">)
-      end
-
-      li_item = "<li>#{children}"
-
-      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
-        (level - 1 + 1).times do
-          li_item += "</li></#{wrap_tag}>"
-        end
-      end
-
-      outs << li_item
-
-      outs.join("\n")
-    end
   end
 end

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

@@ -12,8 +12,8 @@ module BlueDoc::SML::Rules
       attrs = attributes(node)
 
       style_attrs = style_for_attrs(attrs)
-
-      %(<p#{style_attrs}>#{children}</p>)
+      nid_attr = name_by_attrs(attrs)
+      %(<p#{style_attrs}#{nid_attr}>#{children}</p>)
     end
   end
 end

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

@@ -14,7 +14,8 @@ module BlueDoc::SML::Rules
       return "" if code.blank?
 
       svg_code = BlueDoc::Plantuml.encode(code)
-      %(<img src="#{renderer.config.plantuml_service_host}/svg/#{svg_code}" class="plantuml-image" />)
+      nid_attr = name_by_attrs(attrs)
+      %(<div#{nid_attr}><img src="#{renderer.config.plantuml_service_host}/svg/#{svg_code}" class="plantuml-image" /></div>)
     end
   end
 end

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

@@ -9,8 +9,10 @@ module BlueDoc::SML::Rules
     def self.to_html(node, opts = {})
       renderer = opts[:renderer]
       children = renderer.children_to_html(node)
+      attrs = attributes(node)
+      nid_attr = name_by_attrs(attrs)
 
-      %(<table>#{children}</table>)
+      %(<table#{nid_attr}>#{children}</table>)
     end
   end
 end

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

@@ -20,8 +20,10 @@ module BlueDoc::SML::Rules
         width: width
       )
 
+      nid_attr = name_by_attrs(attrs)
+
       out = <<~HTML
-      <video controls preload="no"#{video_attrs}>
+      <video controls preload="no"#{video_attrs}#{nid_attr}>
         <source src="#{attrs[:src]}" type="#{attrs[:type]}">
       </video>
       HTML

data/lib/bluedoc/sml/version.rb

@@ -2,6 +2,6 @@
 
 module BlueDoc
   module SML
-    VERSION = "0.8.1"
+    VERSION = "0.9.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bluedoc-sml
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.9.0
 platform: ruby
 authors:
 - Jason Lee
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-17 00:00:00.000000000 Z
+date: 2019-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport