daimon_markdown 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7dc6824cc4df9719aba51eed6b8fe849b3885d07
-  data.tar.gz: 8f4b326bf02fefc3d026c11f5a92a5b21c93c3f1
+  metadata.gz: 1b919648b289fa4707eb5d83c1543de90eb49add
+  data.tar.gz: 15f05ea47e81dfd6ec438426dc7290cabae176e4
 SHA512:
-  metadata.gz: dfe1d12e0cac4f1c3ac054acb020665e7508d439475a4f81d37f9cb8ccffac3a6dc24186b7a6f9873b657effd55021ab314bac89381733e4ed501b87cf10aa5a
-  data.tar.gz: 082116ac11b8cf37ded52adaee2c5f9532c7d3625f32cfc7971f48c2767823df826c63e0fd0f026e634c8fc8ef859fc81491ab74820112433bad61d4cd1ec805
+  metadata.gz: cd11bfa96af73ce7d7de20d6678aaa2548fac1bdd72e94a36fa5ad2ba8792421a79af41030784cdc0bfca35f464c0955683c19df6bfce3fcbc8c59246e669352
+  data.tar.gz: 250dcf44e7b67d2d3fa57bffa124d85b6fc0eb4ed6e8db485fb1f4ff759da28cac87cc050f25ebdeb44aea55610981b9a55865d2c76b0de16a8987482e332e81

data/README.md

@@ -22,12 +22,16 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+For example, in your Rails application:
 
 ```ruby
-processor = DaimonMarkdown::Processor.new
-result = processor.call(input)
-puts result[:output].to_s
+module MarkdownHelper
+  def render_markdown(markdown_text, context = {})
+    processor = DaimonMarkdown::Processor.new(context)
+    result = processor.call(markdown_text)
+    puts result[:output].to_s.html_safe
+  end
+end
 ```
 
 ## How to write plugin

data/lib/daimon_markdown/filter/plugin.rb

@@ -19,6 +19,20 @@ module DaimonMarkdown
               node.replace(message)
             rescue DaimonMarkdown::Plugin::UnknownPluginError => ex
               node.replace(ex.message)
+            rescue DaimonMarkdown::Plugin::Error => ex
+              message = <<~MESSAGE
+              <pre>Error occured in #{plugin_class}
+              #{node} (#{ex.class}: #{ex.message})
+              #{ex.backtrace.join("\n")}</pre>
+              MESSAGE
+              node.parent.replace(message)
+            rescue => ex
+              message = <<~MESSAGE
+              <pre>Unexpected error occured in #{plugin_class}
+              #{node} (#{ex.class}: #{ex.message})
+              #{ex.backtrace.join("\n")}</pre>
+              MESSAGE
+              node.parent.replace(message)
             end
           end
           unless result[:plugins].empty?

data/lib/daimon_markdown/plugin.rb

@@ -6,6 +6,9 @@ module DaimonMarkdown
     class UnknownPluginError < StandardError
     end
 
+    class Error < StandardError
+    end
+
     class << self
       def lookup(name)
         PLUGIN_REGISTRY.fetch(name)

data/lib/daimon_markdown/plugin/toc.rb

@@ -5,55 +5,134 @@ module DaimonMarkdown
 
       def call(limit = nil)
         toc_html = ""
-        items = []
+        toc_class = context[:toc_class] || "section-nav"
 
-        headers = Hash.new(0)
+        ul_list = Hash.new {|h, k| h[k] = UnorderedList.new }
+        ul_list[1] = UnorderedList.new(html_class: toc_class)
         previous_level = 1
         doc.css("h1, h2, h3, h4, h5, h6").each do |header_node|
-          level = header_node.name.tr("h", "").to_i
-          next if limit && limit < level
-          text = header_node.text
-          id = text.downcase
-          id.gsub!(/ /, "-")
-          id.gsub!(/\s/, "")
-
-          if headers[id] > 0
-            unique_id = "#{id}-#{headers[id]}"
-          else
-            unique_id = id
-          end
-          headers[id] += 1
-          header_content = header_node.children.first
-          # TODO: Arrange indent level
-          if header_content
-            diff = level - previous_level
-            case
-            when diff > 0
-              items.concat(["<ul>"] * diff)
-            when diff < 0
-              items.concat(["</ul>"] * diff.abs)
+          header = Header.new(header_node)
+          next if limit && limit < header.level
+          next unless header.content?
+          header.unique_id = generate_unique_id(header.text)
+          if header.level - previous_level > 0
+            (previous_level + 1).upto(header.level) do |level|
+              ul_list[level - 1] << ul_list[level]
             end
-            items << list_item(link_to(unique_id, text))
-            header_node["id"] = unique_id
           end
-          previous_level = level
+          ul_list[header.level] << ListItem.new(header: header)
+          previous_level = header.level
         end
-        toc_class = context[:toc_class] || "section-nav"
-        toc_header = context[:toc_header] || ""
-        unless items.empty?
-          toc_html = %Q(#{toc_header}<ul class="#{toc_class}">\n#{items.join("\n")}\n</ul>)
+
+        unless ul_list[1].items.empty?
+          toc_header = context[:toc_header] || ""
+          toc_html = "#{toc_header}#{ul_list[1].to_html}"
         end
         node.parent.replace(toc_html)
       end
 
       private
 
-      def link_to(href, text)
-        %Q(<a href="##{href}">#{text}</a>)
+      def generate_unique_id(text)
+        @headers ||= Hash.new(0)
+        id = text.downcase
+        id.tr!(" ", "-")
+        id.gsub!(/\s/, "")
+
+        unique_id =
+          if @headers[id] > 0
+            "#{id}-#{@headers[id]}"
+          else
+            id
+          end
+        @headers[id] += 1
+        unique_id
+      end
+
+      class Header
+        attr_reader :level, :text, :unique_id
+
+        def initialize(node)
+          @node = node
+          @level = node.name.tr("h", "").to_i
+          @text = node.text
+          @unique_id = ""
+        end
+
+        def unique_id=(id)
+          @node["id"] = id
+          @unique_id = id
+        end
+
+        def content?
+          @node.children.first
+        end
+
+        def link
+          %Q(<a href="##{unique_id}">#{text}</a>)
+        end
+
+        def to_s
+          @node.to_s
+        end
       end
 
-      def list_item(content)
-        %Q(<li>#{content}</li>)
+      class EmptyHeader
+        def link
+          ""
+        end
+      end
+
+      class UnorderedList
+        attr_reader :items, :level
+
+        def initialize(html_class: nil, level: 1)
+          @html_class = html_class
+          @level = level
+          @items = []
+        end
+
+        def <<(item)
+          case
+          when item.is_a?(UnorderedList) && @items.last.is_a?(ListItem)
+            @items.last << item
+          when item.is_a?(UnorderedList) && @items.last.nil?
+            li = ListItem.new
+            li << item
+            @items << li
+          else
+            @items << item
+          end
+        end
+
+        def to_html
+          if @html_class
+            %Q(<ul class="#{@html_class}">\n#{@items.map(&:to_html).join("\n")}\n</ul>)
+          else
+            %Q(<ul>\n#{@items.map(&:to_html).join("\n")}\n</ul>)
+          end
+        end
+      end
+
+      class ListItem
+        attr_reader :items
+
+        def initialize(header: EmptyHeader.new)
+          @header = header
+          @items = []
+        end
+
+        def <<(item)
+          @items << item
+        end
+
+        def to_html
+          if @items.empty?
+            %Q(<li>#{@header.link}</li>)
+          else
+            %Q(<li>#{@header.link}\n#{@items.map(&:to_html).join("\n")}\n</li>)
+          end
+        end
       end
     end
   end

data/lib/daimon_markdown/version.rb

@@ -1,3 +1,3 @@
 module DaimonMarkdown
-  VERSION = "0.6.0"
+  VERSION = "0.7.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: daimon_markdown
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - daimon developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-18 00:00:00.000000000 Z
+date: 2017-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: html-pipeline
@@ -185,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.4
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Markdown renderer for Daimon