yatoc 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c2bb843d88e06a813cf01c3a47842d006a92b336f62d0c54b978cc852176d8a9
-  data.tar.gz: ab4b2bebe5992d53ca6006c1a7e5d48393130c7be1c5cae7d05b838cf1082a2e
+  metadata.gz: 12802d5b494cdbe07c289ecf38cf66cce80d78aa8baa19820db8d6442c24c03c
+  data.tar.gz: 4bffd78ece9d1c9f7654f34ce347fa24683ee2d6cbeebd8962b2fb25a0e384b0
 SHA512:
-  metadata.gz: 97966191c212ecf6a7487f35f8fdeef8d6c61e89ab0a437c10a099c8f748af29881979ebac7fc2ff0ed912f992fa5b0155693ad560eee53c2deaad780fc05a18
-  data.tar.gz: 319f11e91e8c7c551978dd1450e86f0a8d14c18b50035259b1864a129cbaad490ccf5d7f391ee58208b7741dc54fb220396d8e23ee9fe49e537091635d9830ec
+  metadata.gz: 9d6e8b68cae40b38e7ce6e0adb4efb9741f39b9b57e21fb1d40d3827ce8f27ad6e9bcc9776d417e431179dfa82f1f69d118c6b41ed4beb999d227b6a6dcffddd
+  data.tar.gz: 7db1142efef3b831edf2e334391aeeba192b680d4455d1f11e03d2c90adfea7e013803f5c3aa218b3578a92c1c72e3bbd5288d4b2ffef737866928e7b53dca0f

data/lib/yatoc.rb

@@ -4,8 +4,6 @@
 
 # description: Yet Another Table Of Contents HTML generator
 
-
-require 'c32'
 require 'line-tree'
 
 
@@ -18,65 +16,52 @@ class Yatoc
     
     @debug = debug
 
-    @to_html = html.scan(/<h\d+/).length > 3 ? gen_toc(html) : html
+    @to_html = html.scan(/<h\d+/).length > min_sections ? gen_toc(html) : html
 
   end
 
+  private  
+
   def gen_toc(html)
 
     a = scan_headings html
-    puts a.inspect.debug if @debug
+    puts ('a: ' + a.inspect).debug if @debug
     
     a2 = make_tree(a)
     puts a2.inspect.debug if @debug
+    raw_html = LineTree.new(a2).to_html(numbered: true)            
     
-    a3 = LineTree.new(a2).to_a
-    puts a3.inspect.debug if @debug
-    
-    toc = "<ul>%s</ul>" % make_headings(a3)
+    puts ('raw_html: ' + raw_html.inspect).debug if @debug
+    toc = make_linkable(raw_html)
     @to_toc = toc
     
     pos = html =~ /<h2/
     html.insert(pos, "<div id='toc' class='toc'>\n%s\n</div>\n\n" % toc)
 
-  end
-
-  private
-
-  def make_headings(a, indent=-1, count=nil)
-
-    items = a.map.with_index do |x, i|    
-      
-      if x.is_a? Array then
+  end  
 
-        id, head, tail = if count then 
-         
-          [
-            count.to_s + '.' + i.to_s, 
-            i == 1 ? "<ul>\n" : '', 
-            i == a.length - 1 ? "</li>\n</ul></li>" : \
-                i == a.length - 1 ? '</ul></li>' : ''
-          ]
+  def make_linkable(html)
 
-        else
-          [i+1, '', '']
-        end
+    doc = Rexle.new(html)
+    doc.root.each_recursive do |node|
 
-        head + make_headings(x, indent+1, id) + tail
+      if node.name == 'li' then
         
-      else
+        link = node.text ? '#' + node.text.strip.downcase.gsub(' ', '-') : ''
+        anchor = Rexle::Element.new('a', attributes: {href: link})
+        anchor.add Rexle::Element.new('span', value: node\
+                                      .attributes[:id][1..-1].gsub('-','.'))
+        
+        anchor.children << ' ' + node.text if node.text
 
-        #"%s%s %s" % ['  ' * indent, count, x]
-        r = "%s<li><a href='#%s'><span>%s</span> %s</a>" % \
-          ['  ' * indent, x.downcase.gsub(' ','-'), count, x]
-        i == 1 ? "<ul>" + r : r
+        node.add anchor
+        node.text = ''
+        node.attributes.delete :id
 
       end
-
     end
-
-    items.join("\n")
-
+    
+    doc.xml declaration: false
   end
 
 
@@ -88,13 +73,12 @@ class Yatoc
     end
     
     a.map.with_index do |x, i|
-
       
       puts ('x: ' + x.inspect).debug if @debug
       
       if x.is_a? Array then
 
-        puts 'before make_true()'.info if @debug
+        puts 'before make_tree()'.info if @debug
         
         make_tree(x, indent+1)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: yatoc
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   7RVV+J+oYjvww0tYfGq6N2tECM5thrQYj3cKLzAEEPYBjoWcPA5bqRXBTNta+k+K
   tc7DELyeAZoKgZBO2wAc4FQ6
   -----END CERTIFICATE-----
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2018-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: line-tree
@@ -46,7 +46,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
+        version: 0.7.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -56,27 +56,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.0
-- !ruby/object:Gem::Dependency
-  name: c32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.7.1
 description: 
 email: james@jamesrobertson.eu
 executables: []

metadata.gz.sig

@@ -1,2 +1,4 @@
-�!���C��W�$&U\����b�}�������x��h���h|�1��t��wjdz-3��nྗb����=�E�8��!^e�P�|���\,!�	���B��m&��</>'��;-��P�Z�0�gٕ��4�XN/�:�
-��2�H�7(Hv�E��^B�?�Bt��U%Ҿ?��bL�wV`�0�����Ԉ���I!���y�I,S*Ւ6���q�;����3N��R_N
;��e���<�U�k��c�Ji�[�R�Ԍ��a~�
�ɭ���9Yd��0���UXmu9���l/�k��/����Í��F��̦�M�V�ɦMG�r��,DN���)(1M�&�j�����W�x�����!���Mwp�ʔ ꆆP�^˵�~���
+g~4w����������x�s����a5n#x!(���Nc߄�bI��<���8b
+�o�p^
+jr�WtE��L���U����F�e������ԅ���:oK$R���C%J��{>c/�U�9��6Yr�7o��Qi1ֿjҔ��D�Dy5���6%	����3�|md��`c1��4i��
��\ʝ�$y��/���} <�'u��0�`��؈�I��r�3U(�$�<5p[hq�g����@*�܌a����kp���j
+Y�g5�y����ȇ&����Y"�O�����'N<�W�����e���C'E-3}��