asciidoctor-lists 0.0.2 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4aecad588e7a8765383ef267e3347944a62014ea9c5f27eaa83ae9dfe0d358f0
-  data.tar.gz: d1c0206463124ef3a4a9acdf4d6065788bf9a06eb8d7d4581553b4153144df3e
+  metadata.gz: 938bd9392b0c912ac112ced82ebef41f9bbf0772215f7d1a5f5bc1b5fdfa0a9a
+  data.tar.gz: 45b6506f0adfc38b3ae52077e26a1ee4f8d8bc3bcded0c8a99e1b98ac5696a77
 SHA512:
-  metadata.gz: 16ea04882cb03b8ccc67c50c77025d4e7e7c359d85488dd4d0ccb2f94b1b6dceb68f5ea631a0466e2ae5a81c806894635a7802ad3e547ac08436a98f5d60d89f
-  data.tar.gz: 749d08796de0d73deb968623c25d0447a33454bdb19dcdb3969c37ceff2c1357f0bf59fca01f2795b8860812a05fe134fec041427cebb2ea95bad70747f4d80a
+  metadata.gz: 82b2c2dd1b85bd0d4b163110033c801f023795a2b42133639f5449541916fba75b66ab06ddef1c1e13de40c3b122d471fe7a1d2a9fe9c0b7fa893036fb965d87
+  data.tar.gz: cd5ed1b976130783ba8ff6badc212eadc123d6a0906ea4575020e55fdebee56189a78015838d2ce001bbe63041997843aeb0bcff0b53027fe278e738b10704cf

data/README.adoc

@@ -1,10 +1,12 @@
-= asciidoctor-lists (WIP)
-:toc: macro
-:toclevels: 1
+= asciidoctor-lists
 
+image:https://github.com/Alwinator/asciidoctor-lists/actions/workflows/test.yml/badge.svg[Test, link=https://github.com/Alwinator/asciidoctor-lists/actions/workflows/test.yml]
+image:https://github.com/Alwinator/asciidoctor-lists/actions/workflows/publish_gem.yml/badge.svg[Build, link=https://github.com/Alwinator/asciidoctor-lists/actions/workflows/publish_gem.yml]
 image:https://img.shields.io/gem/v/asciidoctor-lists.svg[Latest Release, link=https://rubygems.org/gems/asciidoctor-lists]
 
-Adds a list of figures, list of tables (WIP) or list of anything you want!
+An https://asciidoctor.org/[asciidoctor] extension that adds a list of figures, a list of tables, or a list of anything you want!
+
+*Pull Request are always welcome! :)*
 
 == Install
 [source,asciidoc]
@@ -16,26 +18,33 @@ gem install asciidoctor-lists
 === Code
 [source,asciidoc]
 ----
-== Test the List of Figures Macro
+...
+
+.And this is the second one
+|===
+|Column 1, Header Row |Column 2, Header Row
+
+|Cell in column 1, row 1
+|Cell in column 2, row 1
+
+|Cell in column 1, row 2
+|Cell in column 2, row 2
+|===
 
-.The wonderful linux logo
-image::https://upload.wikimedia.org/wikipedia/commons/3/35/Tux.svg[Linux Logo,100,100]
 
 .Another wikipedia SVG image
 image::https://upload.wikimedia.org/wikipedia/commons/thumb/4/4f/SVG_Logo.svg/400px-SVG_Logo.svg.png[SVG,100,100]
 
 === List of figures
+element_list::[element=image]
 
-tof::[]
+=== List of tables
+element_list::[element=table]
 
 ----
 
 === Rendered
-image::https://user-images.githubusercontent.com/39517491/139903592-84e9e6cd-c1a8-45ec-acb7-52f37e366ddc.png[Sample,width=400]
-
-== What is planned next?
-* Link between image/table/element and list
-* Make generic (Also allow list of tables, or list of x)
+image::img/sample.png[Sample,width=400]
 
 == Docker
 [source,bash]
@@ -43,14 +52,21 @@ image::https://user-images.githubusercontent.com/39517491/139903592-84e9e6cd-c1a
 # Build container
 docker build -t asciidoctor-lists .
 # Run Docker
-docker run -it --rm -v $(pwd):/work asciidoctor-lists:latest
+docker run -it --rm -v $(pwd):/work asciidoctor-lists
 # Build sample
-asciidoctor-pdf -r asciidoctor-lists samples/list-of-figures.adoc
+asciidoctor-pdf -r asciidoctor-lists samples/list-sample.adoc
 ----
 
 == Dev setup
+=== Run
+[source,bash]
+----
+asciidoctor -r ./lib/asciidoctor-lists.rb samples/list-sample.adoc
+----
+
+=== Install Gem
 [source,bash]
 ----
 gem build asciidoctor-lists.gemspec
-gem install asciidoctor-lists-0.0.2.gem
+gem install asciidoctor-lists-x.x.x.gem
 ----

data/lib/asciidoctor-lists/extensions.rb

@@ -1,74 +1,67 @@
 require 'asciidoctor'
 require 'asciidoctor/extensions'
+require 'securerandom'
 
 module AsciidoctorLists
   module Asciidoctor
-  # An macro that adds a list of all figures
-  # It only uses images that have a caption!
-  #
-  # Usage
-  """
-  == Test the List of Figures Macro
 
-  .The wonderful linux logo
-  image::https://upload.wikimedia.org/wikipedia/commons/3/35/Tux.svg[Linux Logo,100,100]
-
-  .Another wikipedia SVG image
-  image::https://upload.wikimedia.org/wikipedia/commons/thumb/4/4f/SVG_Logo.svg/400px-SVG_Logo.svg.png[SVG,100,100]
-
-  === List of figures
-
-  tof::[]
-  """
-  ListOfFiguresMacroPlaceholder = %(9d9711cf-0e95-4230-9973-78559fe928db)
+    MacroPlaceholder = Hash.new
 
   # Replaces tof::[] with ListOfFiguresMacroPlaceholder
-  class ListOfFiguresMacro < ::Extensions::BlockMacroProcessor
+  class ListOfFiguresMacro < ::Asciidoctor::Extensions::BlockMacroProcessor
     use_dsl
-    named :tof
+    named :element_list
+    name_positional_attributes 'element'
 
-    def process(parent, target, attrs)
-      create_paragraph parent, ListOfFiguresMacroPlaceholder, {}
+    def process(parent, _target, attrs)
+      uuid = SecureRandom.uuid
+      MacroPlaceholder[uuid] = {element: attrs['element']}
+      create_paragraph parent, uuid, {}
     end
   end
   # Searches for the figures and replaced ListOfFiguresMacroPlaceholder with the list of figures
   # Inspired by https://github.com/asciidoctor/asciidoctor-bibtex/blob/master/lib/asciidoctor-bibtex/extensions.rb#L162
   class ListOfFiguresTreeprocessor < ::Asciidoctor::Extensions::Treeprocessor
-     def process document
+     def process(document)
+       tof_blocks = document.find_by do |b|
+         # for fast search (since most searches shall fail)
+         (b.content_model == :simple) && (b.lines.size == 1) \
+            && (MacroPlaceholder.keys.include?(b.lines[0]))
+       end
+       tof_blocks.each do |block|
          references_asciidoc = []
-         document.find_by(context: :image).each do |image|
+         element_name = ":" + MacroPlaceholder[block.lines[0]][:element]
+         document.find_by(context: eval(element_name)).each do |element|
 
-         if image.caption
-             references_asciidoc << %(#{image.caption}#{image.title} +)
-          end
-        end
-        tof_blocks = document.find_by do |b|
-          # for fast search (since most searches shall fail)
-          (b.content_model == :simple) && (b.lines.size == 1) \
-            && (b.lines[0] == ListOfFiguresMacroPlaceholder)
-        end
-        tof_blocks.each do |block|
-          block_index = block.parent.blocks.index do |b|
-            b == block
-          end
-          reference_blocks = parse_asciidoc block.parent, references_asciidoc
-          reference_blocks.reverse.each do |b|
-            block.parent.blocks.insert block_index, b
-          end
-          block.parent.blocks.delete_at block_index + reference_blocks.size
-        end
-      end
+           if element.caption
+             unless element.id
+               element.id = SecureRandom.uuid
+             end
+             references_asciidoc << %(xref:#{element.id}[#{element.caption}]#{element.title} +)
+           end
+         end
+
+         block_index = block.parent.blocks.index do |b|
+           b == block
+         end
+         reference_blocks = parse_asciidoc block.parent, references_asciidoc
+         reference_blocks.reverse.each do |b|
+           block.parent.blocks.insert block_index, b
+         end
+         block.parent.blocks.delete_at block_index + reference_blocks.size
+       end
+     end
       # This is an adapted version of Asciidoctor::Extension::parse_content,
       # where resultant blocks are returned as a list instead of attached to
       # the parent.
       def parse_asciidoc(parent, content, attributes = {})
-      result = []
-      reader = ::Asciidoctor::Reader.new content
-      while reader.has_more_lines?
-        block = ::Asciidoctor::Parser.next_block reader, parent, attributes
-        result << block if block
-      end
-      result
+        result = []
+        reader = ::Asciidoctor::Reader.new content
+        while reader.has_more_lines?
+          block = ::Asciidoctor::Parser.next_block reader, parent, attributes
+          result << block if block
+        end
+        result
       end
     end
   end

data/lib/asciidoctor-lists/version.rb

@@ -1,3 +1,3 @@
 module AsciidoctorLists
-  VERSION = '0.0.2'
+  VERSION = '1.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-lists
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.2
 platform: ruby
 authors:
 - Alwin Schuster
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2021-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor