mato 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ee78e990dd114340fd03e141890722535ee37f2
-  data.tar.gz: 7299447379be2ae7eb2479c964b03a7fa0f5a31a
+  metadata.gz: 3a166a9c9243a0e7f307e74cb2eb21cbe2a1a532
+  data.tar.gz: 74cd0d607ffdf636bfc9b0c686479824ba42c40e
 SHA512:
-  metadata.gz: 57a7bc331b7391e9c620cfa3aff84f8ddf6a603792a9f0f19edc60656c75892dff3bf3fe543cfbab0269051fd5a1daf77e48767a22da4997d4025724c504f159
-  data.tar.gz: 8c731d35a3eb7322c26004826f34183e5348198b68479571a850445522fdbc1af54ee65863cf63bc63ed662c31bb86b1198f1e2f7ccccb5ed22b1542198c4d19
+  metadata.gz: 26cb998d81df1ecfa6ebe49ce6ffc80faf2b8b6b6c91a387749ffde995fecc81d17596d5c3e867e3de368de58f8faae1d9887cc53d53315aa1ceeba3e723a4e3
+  data.tar.gz: 007af8513f6e3568bbb1f749bc4c7b40dba3bfb8c7c614ff6c4b0e3ff6266d46727685e4999f28ba4d497b4b78647a5cde04abd911c83984ffb663177bd7f4ea

data/.rubocop.yml

@@ -15,9 +15,6 @@ Lint/AmbiguousBlockAssociation:
 Lint/ScriptPermission:
   Enabled: false
 
-Lint/RescueWithoutErrorClass:
-  Enabled: false
-
 Layout/MultilineMethodCallIndentation:
   Enabled: false
 
@@ -51,6 +48,9 @@ Metrics/ModuleLength:
 Metrics/ParameterLists:
   Enabled: false
 
+Style/RescueStandardError:
+  Enabled: false
+
 Style/BlockDelimiters:
   Enabled: false
 

data/.travis.yml

@@ -3,6 +3,12 @@ language: ruby
 rvm:
   - 2.3
   - 2.4
+  - ruby-head
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
 cache: bundler
 before_install: gem install bundler
 notifications:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # The revision history of Mato
 
+## v2.0.1 - 2017/12/14
+
+https://github.com/bitjourney/mato/compare/v2.0.0...v2.0.1
+
+* fix ToC renderer to make consistent HTML from inconsistent headings [#12](https://github.com/bitjourney/mato/pull/12)
+
 ## v2.0.0 - 2017/11/27
 
 https://github.com/bitjourney/mato/compare/v1.3.1...v2.0.0

data/lib/mato/renderers/html_toc_renderer.rb

@@ -10,6 +10,7 @@ module Mato
       ANCHOR_SELECTOR = "a.#{AnchorBuilder::CSS_CLASS_NAME}"
 
       # @param [Nokogiri::HTML::DocumentFragment] doc
+      # @return [String]
       def call(doc)
         s = +''
 
@@ -17,13 +18,22 @@ module Mato
 
         doc.css(H_SELECTOR).each do |hx|
           h_level = level(hx)
+
           if h_level > stack.last
             stack.push(h_level)
             s << %{<ul>\n}
           elsif h_level < stack.last
-            while stack.last > h_level
-              s << %{</li></ul>\n}
-              stack.pop
+            while h_level < stack.last
+              # keep the user-level stack top element (i.e. [0, #]) here
+              if stack.size <= 2
+                s << %{</li>\n}
+                stack.pop
+                stack.push(h_level)
+                break
+              else
+                s << %{</li></ul>\n}
+                stack.pop
+              end
             end
           else
             s << %{</li>\n}
@@ -49,6 +59,7 @@ module Mato
           end
         end
 
+        # roll up all the stack elements
         while stack.last != 0
           stack.pop
           s << %{</li></ul>\n}
@@ -60,6 +71,7 @@ module Mato
       private
 
       # @param [Nokogiri::XML::Node] node
+      # @return [Integer] 1 to 6
       def level(node)
         /\d+/.match(node.name)[0].to_i
       end

data/lib/mato/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Mato
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mato
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - FUJI Goro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-11-27 00:00:00.000000000 Z
+date: 2017-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: commonmarker