docco 0.1.1 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cc8e122cfc342c995aafcd7f252fd4bf40c40e93954b8d53893cb4b1bc542b97
-  data.tar.gz: 7559ebddafbb6294e31650ce213a3526a32ed18bd065def3b396b713898255f9
+  metadata.gz: 2b1c6900d2f698b784960def013b7695b41e8c4e03fe7564e38170e10dc4a5d6
+  data.tar.gz: d1023be9573eff8363bafb83041a153f70abe24ee5554ba265ffb91e6db1bbad
 SHA512:
-  metadata.gz: c01036732ff4b2b6db81ae86d1794c4200590fb222d6bdaa3a72a59681032ac8a402a0afb27ce25a27cd44b5cd96adaec5b389d6ba1c3071d85789eed53e6c79
-  data.tar.gz: eb4237fe63017abaccb95faf6f2edc003ee07a8cf7fa31693af18372e9d293316a7ffdb01e046ede9db1348176eebb793daeb4d5b60001445c676ca35eea8d62
+  metadata.gz: a53396c5bf038b7b5a98ba6113b0f460c615d3f97101bfed05b93ff68bc90911942e52b57b50d9e85569a1da9f0c4071ec80c37184aafb23bbd0a5b7b5c986ac
+  data.tar.gz: 9abc9c091fc9cd92800e9ebca77aae21a8bd32eadcf810f76fa5db2b1246b4afe4bfa9fb0db1078e52211a4fe96f5c55b55ffbf2ca3f08bb39922cb00b2215ab

data/lib/docco/parser/content_node.rb

@@ -3,17 +3,14 @@
 module Docco
   class Parser
     class ContentNode
-      def initialize(converter, node)
-        @converter = converter
+      def initialize(node, html)
         @node = node
+        @html = html
       end
 
       def inspect = %(<#{self.class}:#{@node.type} [#{@node.children}]>)
       def section? = false
-
-      def to_html
-        @to_html ||= @converter.convert(@node, 0)
-      end
+      def to_html = @html
     end
   end
 end

data/lib/docco/parser/root.rb

@@ -5,8 +5,7 @@ module Docco
     class Root
       attr_reader :nodes, :level
 
-      def initialize(converter)
-        @converter = converter
+      def initialize
         @nodes = []
         @level = 0
       end
@@ -18,8 +17,8 @@ module Docco
         @nodes << section
       end
 
-      def add_content(node)
-        @nodes << ContentNode.new(@converter, node)
+      def add_content(node, html)
+        @nodes << ContentNode.new(node, html)
       end
 
       def to_html

data/lib/docco/parser/section.rb

@@ -7,9 +7,9 @@ module Docco
 
       attr_reader :id, :options, :nodes
 
-      def initialize(converter:, node:)
-        @converter = converter
+      def initialize(node:, html:)
         @node = node
+        @title_html = html
         @id = node.attr['id']
         @options = node.options
         @nodes = []
@@ -24,20 +24,18 @@ module Docco
         @nodes << section
       end
 
-      def add_content(node)
-        @nodes << ContentNode.new(@converter, node)
+      def add_content(node, html)
+        @nodes << ContentNode.new(node, html)
       end
 
-      def title_html
-        @to_html ||= @converter.convert(@node, 0)
-      end
+      def title_html = @title_html
 
       def title
-        @title ||= title_html.match(HEADING_EXP)[2]
+        @title ||= @title_html.match(HEADING_EXP)[2]
       end
 
       def to_html
-        @nodes.reduce(title_html) do |str, node|
+        @nodes.reduce(+title_html) do |str, node|
           str << "\n" << node.to_html
         end
       end

data/lib/docco/parser.rb

@@ -4,6 +4,31 @@ require 'kramdown'
 
 module Docco
   class Parser
+    # Subclasses Kramdown's HTML converter so we can capture each top-level
+    # child's rendered HTML during a single top-down walk. Overriding only
+    # convert_root lets Kramdown drive the recursion normally (so @stack,
+    # @footnotes, @used_ids, etc. behave as designed); we just replace the
+    # root-level concatenation step with a per-child capture into a hash
+    # keyed by Kramdown element identity.
+    class Renderer < Kramdown::Converter::Html
+      attr_reader :per_element_html
+
+      def initialize(root, options)
+        super
+        @per_element_html = {}
+      end
+
+      def convert_root(el, indent)
+        @stack.push(el)
+        indent += @indent
+        el.children.each do |child|
+          @per_element_html[child] = send(@dispatcher[child.type], child, indent)
+        end
+        @stack.pop
+        ''
+      end
+    end
+
     def initialize(text, input: 'GFM')
       @text = text
       @input = input
@@ -14,26 +39,26 @@ module Docco
     end
 
     private
-    # cc = Kramdown::Converter::Html.send(:new, doc.root, doc.options)
-    # cc.convert doc.children[0], 1 # <= 1 is indent and it's needed
+
     def build
       doc = Kramdown::Document.new(@text, input: @input, auto_ids: true)
-      converter = Kramdown::Converter::Html.send(:new, doc.root, doc.options)
-      root = Root.new(converter)
+      renderer = Renderer.send(:new, doc.root, doc.options)
+      renderer.convert(doc.root)
+
+      root = Root.new
       last_section = root
       levels = Hash.new { |h, k| h[k] = [] }
-      levels[last_section.level] << last_section # root
+      levels[root.level] << root
 
       doc.root.children.each do |child|
+        html = renderer.per_element_html.fetch(child)
         if child.type == :header
-          section = Section.new(converter:, node: child)
+          section = Section.new(node: child, html: html)
           levels[section.level] << section
-          if (parent = levels[section.level - 1].last)
-            parent << section
-          end
+          levels[section.level - 1].last&.<<(section)
           last_section = section
-        else # not a section. Content belonging to last section, or directly to root
-          last_section.add_content child
+        else
+          last_section.add_content(child, html)
         end
       end
 

data/lib/docco/themes/default.css

@@ -379,6 +379,46 @@ li {
     font-weight: bold;
 }
 
+/* Tables */
+table {
+    width: 100%;
+    margin: 1.5rem 0;
+    border-collapse: collapse;
+    background-color: var(--content-bg);
+    border: 1px solid var(--border-color);
+    border-radius: 6px;
+    box-shadow: var(--shadow);
+    overflow: hidden;
+    font-size: 0.95em;
+}
+
+thead {
+    background-color: var(--bg-color);
+}
+
+th {
+    text-align: left;
+    font-weight: 600;
+    color: var(--text-color);
+    padding: 0.75rem 1rem;
+    border-bottom: 1px solid var(--border-color);
+}
+
+td {
+    padding: 0.75rem 1rem;
+    border-bottom: 1px solid var(--border-color);
+    vertical-align: top;
+    line-height: 1.6;
+}
+
+tbody tr:last-child td {
+    border-bottom: none;
+}
+
+tbody tr:hover {
+    background-color: var(--bg-color);
+}
+
 /* Code Blocks */
 code {
     font-family: 'SF Mono', Monaco, 'Cascadia Code', 'Roboto Mono', Consolas, 'Courier New', monospace;

data/lib/docco/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Docco
-  VERSION = "0.1.1"
+  VERSION = "0.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docco
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors:
 - Ismael Celis