mato 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f46b573236cfe6df6101e6b1af416d30f49599f
-  data.tar.gz: a33bef4d43f2681f75745be18dca5159bd631426
+  metadata.gz: 6e4685b308739fc1de3c616e18bd6e0b212da845
+  data.tar.gz: daea3d57330a9533caf058cf71e174132cef07fb
 SHA512:
-  metadata.gz: 0de9be2d817df555c6158f3d7c97e9e829b6c00afa8b8245eefed902eff42b3bac6e5159dde4d33a9a18c2e217274bf7a621a65afe1f85027305302dcbd6d510
-  data.tar.gz: cef99b815e789e7c71acf04c7a75a1669e1a04799b86cbbb9f6ea5a4757e11695ab6cc7545bed5e9dcbc2e3b5205664d86637f13841beffb38c8cf27af2aa260
+  metadata.gz: 04443f969138bd2a9943df1dad30e7d001fc4630efd75f68be484beb9fef8990c2fca6081e751d538841985df3f8275c8bc9a3c625b03f2bd45cfbf43d26b58b
+  data.tar.gz: c48fc06e567b09614cc184e672d1a2850b9159bbb75f1b7eab6db3bd65bdf274c4257b84c0beece0d90405d2a7ac242de6f01e2aa16004b19c8c5da04236c207

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # The revision history of Mato
 
+## v1.0.2 - 2017/08/23
+
+https://github.com/bitjourney/mato/compare/v1.0.1...v1.0.2
+
+* fix #3's issue again [#4](https://github.com/bitjourney/mato/pull/4)
+
 ## v1.0.1 - 2017/08/22
 
 https://github.com/bitjourney/mato/compare/v1.0.0...v1.0.1

data/lib/mato/renderers/html_toc_renderer.rb

@@ -7,6 +7,7 @@ module Mato
     class HtmlTocRenderer
 
       H_SELECTOR = %w(h1 h2 h3 h4 h5 h6).join(',')
+      ANCHOR_SELECTOR = "a.#{AnchorBuilder::CSS_CLASS_NAME}"
 
       # @param [Nokogiri::HTML::DocumentFragment] doc
       def call(doc)
@@ -24,26 +25,27 @@ module Mato
               s << %{</li></ul>\n}
               stack.pop
             end
+          else
+            s << %{</li>\n}
           end
 
-          first_child = hx.child
-          if anchor?(first_child)
-            s << %{<li><a href="##{first_child['id']}">}
+          node = hx.dup
 
-            child = first_child.next_sibling
-            while child
-              s << child.to_html
-              child = child.next_sibling
-            end
+          anchor = node.css(ANCHOR_SELECTOR).first
 
-            s << %{</a>}
-          else
-            duped_hx = hx.dup
-            duped_hx.css('a').each do |a|
-              a.replace(a.children)
-            end
+          s << %{<li>}
+          if anchor
+            s << %{<a href="##{anchor['id']}">}
+            anchor.unlink
+          end
 
-            s << %{<li>#{duped_hx.children}}
+          node.css('a').each do |a|
+            a.replace(a.children)
+          end
+          s << node
+
+          if anchor
+            s << %{</a>}
           end
         end
 
@@ -61,11 +63,6 @@ module Mato
       def level(node)
         /\d+/.match(node.name)[0].to_i
       end
-
-      # @param [Nokogiri::XML::Node] node
-      def anchor?(node)
-        node.name == 'a' && node['class'] == AnchorBuilder::CSS_CLASS_NAME
-      end
     end
   end
 end

data/lib/mato/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mato
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - FUJI Goro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-08-22 00:00:00.000000000 Z
+date: 2017-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri