madness 0.8.4 → 0.8.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fe93b51cce9d5f1e2b37597b86bbcab62273fd2ba588d013308b194bb607d20e
-  data.tar.gz: 4b5e8a9de2af92f7aef8fa86792c8f3156ae9aba4b5049507693c2467dcc439c
+  metadata.gz: 2ffaa41eacda31f502ff69d9c68189533cff31f293907089288b496e82038304
+  data.tar.gz: 44053382dd7dda362a34dd57e9663b7e9d46d510ca5cdecef4f1625468b8c376
 SHA512:
-  metadata.gz: 78e416333ece7eb2a236a07593c31f78cb93919f8842b5fede75baff6ae6e07d956ff0b1f30501c1be99416aab4ce036885d49800eeea5d38d5f811745d4c55d
-  data.tar.gz: d237b707b9a7d7a6d9334942a760811f51463a9aa04c007f54789bfa89be08cd04ac6bf7e6f946d86aa45302b50d3d6e4e7c5d4d83ffec88fb4a42c65cdb063c
+  metadata.gz: 33dc087ef4dec3a0f79019846bd4aadf6b6eab4dd81ed9049d4d619c89bed23235de14879a99296e264dbb14aa87102b841f7a9a1d2f600ab7828d82286a817c
+  data.tar.gz: 74c35835a66aa14e44e9885c759445c64b82b8801bc8663c1d088d3d7fa123044d66331068200c649a943545ee8377a75ac038329d6feae4be5f5d92a6f1f1f7

data/lib/madness/document.rb

@@ -8,36 +8,13 @@ module Madness
     include ServerHelper
     using StringRefinements
 
-    attr_reader :base, :path
+    attr_reader :base, :path, :type, :file, :dir, :title
 
     def initialize(path)
       @path = path
       @base = path.empty? ? docroot : "#{docroot}/#{path}"
       @base.chomp! '/'
-    end
-
-    # Return :readme, :file or :empty
-    def type
-      set_base_attributes unless @type
-      @type
-    end
-
-    # Return the path to the actual markdown file
-    def file
-      set_base_attributes unless @file
-      @file
-    end
-
-    # Return the path to the document directory
-    def dir
-      set_base_attributes unless @dir
-      @dir
-    end
-
-    # Return the path to the document directory
-    def title
-      set_base_attributes unless @title
-      @title
+      set_base_attributes
     end
 
     # Return the HTML for that document
@@ -92,23 +69,25 @@ module Madness
       @markdown ||= File.read file
     end
 
+    def doc
+      @doc ||= CommonMarker.render_doc markdown, :DEFAULT, [:table]
+    end
+
     # Convert markdown to HTML, with some additional processing:
     # 1. Add anchors to headers
     # 2. Syntax highilghting
     # 3. Prepend H1 if needed
     def markdown_to_html
-      doc = CommonMarker.render_doc markdown, :DEFAULT, [:table]
-
-      replace_toc_marker doc
-      add_anchor_ids doc
+      replace_toc_marker
+      prepend_h1 if config.auto_h1
+      add_anchor_ids
       html = doc.to_html :UNSAFE
       html = syntax_highlight(html) if config.highlighter
-      html = prepend_h1(html) if config.auto_h1
       html
     end
 
     # Add anchors with IDs before all headers
-    def add_anchor_ids(doc)
+    def add_anchor_ids
       doc.walk do |node|
         if node.type == :header
           anchor = CommonMarker::Node.new(:inline_html)
@@ -123,39 +102,38 @@ module Madness
     end
 
     # Replace <!-- TOC --> with a Table of Contents for the page
-    def replace_toc_marker(doc)
+    def replace_toc_marker
       toc_marker = doc.find do |node|
         node.type == :html and node.string_content.include? "<!-- TOC -->"
       end
 
       return unless toc_marker
 
+      toc_marker.insert_after document_toc
+      toc_marker.insert_after CommonMarker.render_doc("## Table of Contents").first_child
+    end
+
+    # Returns a UL object containing the document table of contents
+    def document_toc
       toc = []
       doc.walk do |node|
         next unless node.type == :header
         level = node.header_level
         next unless level.between? 2, 3
         text = node.first_child.string_content
-
-        if level == 2
-          toc << "- [#{text}](##{text.to_slug})"
-        else
-          toc << "  - [#{text}](##{text.to_slug})"
-        end    
+        spacer = "  " * (level - 1)
+        toc << "#{spacer}- [#{text}](##{text.to_slug})"
       end
 
       toc = toc.join "\n"
-      toc = CommonMarker.render_doc toc
-      toc_marker.insert_after toc.first_child
-      toc_marker.insert_after CommonMarker.render_doc("## Table of Contents").first_child
+      CommonMarker.render_doc(toc).first_child
     end
 
     # If the document does not start with an H1 tag, add it.
-    def prepend_h1(html)
-      unless html[0..3] == "<h1>"
-        html = "<h1>#{title}</h1>\n#{html}"
-      end
-      html
+    def prepend_h1
+      return if doc.first_child.type == :header and doc.first_child.header_level == 1
+      h1 = CommonMarker.render_doc("# #{title}").first_child
+      doc.first_child.insert_before h1
     end
 
     # Apply syntax highlighting with CodeRay. This will parse for any

data/lib/madness/version.rb

@@ -1,3 +1,3 @@
 module Madness
-  VERSION = "0.8.4"
+  VERSION = "0.8.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: madness
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.8.5
 platform: ruby
 authors:
 - Danny Ben Shitrit
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-08 00:00:00.000000000 Z
+date: 2020-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: coderay
@@ -128,14 +128,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.0'
+        version: '5.1'
 - !ruby/object:Gem::Dependency
   name: rack-ssl
   requirement: !ruby/object:Gem::Requirement