asciidoctor-external-callout 1.1.2 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 284ba079c9ce91935490ced1b9041717c3d733f1eb03cb428b75b3b85b5718e4
-  data.tar.gz: aca07340cfd7cf61f7afc90825c137e20934cb3905ab83a2be91e41ff589b2e1
+  metadata.gz: 92129f0b6fe96367004f4aa8e3f44b8bdf1182e56b07f296bb1d341a9568c7a1
+  data.tar.gz: c342a82f9630d128c38d1b87a802aa8a59791dc4666576cea6ced8ccea99aaae
 SHA512:
-  metadata.gz: 6f6dd07c7042d9432d3e6f3de53fa67dc52248aa9a3cdc38f937c831edd66327081293c148601161eaf0a644cd7f7995ed0a9b1aeaa5df266f79d53e0565ff60
-  data.tar.gz: 854510529f76e96891b1ac7e482b984a0df273dbd97f8d84c37d85c940f86d6d5fd187aa79ff7e4c314913a10ab0b4439558dd31c9bbafcd76e2d5c6da8afa32
+  metadata.gz: 6c292169bea665e64331fbd2a9e473860d26845c953c8fa64666b10a262c205cd978dc786ec31584df864c04fa59c0301ad2d00e8db218dff033ecd9320baad1
+  data.tar.gz: 2d571d81ea89b61250050c64ecdf6f7b94b18ca60ce9653c294d1c95fdd8fe824807791d0e98e82fa9026571569dba93daaa5a26ce439be96517ea02e6ef1888

data/.gitignore

@@ -9,6 +9,7 @@
 /.idea
 **/sample.html
 **/sample_global_search.html
+**/callout-list-block-sample.html
 **/sample.pdf
 *.gem
 /Gemfile.lock

data/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 Record of bug fixes, enhancements, and changes.
 
+## [1.1.3] – 2022-07-07-16
+
+### Fixed
+
+- The global and case-insensitive flags (ig) are now parsing correctly: using ii or gg will cause prevent the callout block from being processed. Thanks to Hakim Cassimally for finding the bug.
+- Escaped slash characters were not being processed in the search.  Thanks to Hakim Cassimally for finding the bug.
+
 ## [1.1.2] – 2022-07-07
 
 ### Fixed

data/README.md

@@ -53,22 +53,21 @@ Rather than tagging the code, you add a location token at the end of a list item
 
 Two types of location token are supported:
 
-@_number_
+**@_number_**
 : This format takes a numeric value indicating the line in the source block where the callout should appear. The callouts will appear at the end of the line. Multiple callouts on the same line will have a single space between them.
 
-
-@/_text_/
+**@/_text_/**
 : The text between the two slashes will be used in a regex search. A callout will be placed at the end of the first matching line.
 If you have a large listing then it may be preferable to use the text search rather than counting all the lines. It may also be preferable to use a smaller listing, as a long listing might mean that your description is a bit too general. +
 Using the text search method means that the location of the callout will move with the line; handy if you're referencing a source file that might get the occasional tweak outside your control.
 
-@/_text_/g
+**@/_text_/g**
 : Works the same as the standard text search; the `g` flag means that callouts willl be added to _all_ the lines that match the search string, instead of just the first one.
 
-@/_text_/i
+**@/_text_/i**
 : This is a case-insensitive search.
 
-@/_text_/gi
+**@/_text_/gi**
 : And of course, you can combine the two, though I'm not sure why you'd want to.
 
 ## Installation

data/lib/asciidoctor-external-callout.rb

@@ -18,8 +18,11 @@ Asciidoctor::Extensions::register do
   CALLOUT_SOURCE_BLOCK_ROLE ||= 'external-callout-block'
   CALLOUT_ORDERED_LIST_ROLE ||= 'external-callout-list'
 
-  LOCATION_TOKEN_RX ||= /@(\d+)|(@\/[^\/]+?\/(?:i|g|gi|ig){0,2})/
-  LOCATION_TOKEN_ARRAY_RX ||= /^(@\d+|@\/[^\/]+?\/(i|g|gi|ig){0,2})((\s+@\d+)|(\s+@\/[^\/]+?\/(i|g|gi|ig){0,2}))*$/
+  LOCATION_TOKEN_RX ||= /@(\d+)|(@\/(?:\\\/|[^\/])+?\/[ig]{0,2})/
+  LOCATION_TOKEN_ARRAY_RX ||= /^(@\d+|@\/(?:\\\/|[^\/]|)+?\/[ig]{0,2})((\s+@\d+)|(\s+@\/(?:\\\/|[^\/]|)+?\/[ig]{0,2}))*$/
+
+  SEARCH_STRING_RX ||= /\/((?:\\\/|[^\/])+?)\//
+  SEARCH_OPTIONS_RX ||= /\/(?:\\\/|[^\/])+?\/([ig]{0,2})/
 
   tree_processor do
 
@@ -157,12 +160,11 @@ Asciidoctor::Extensions::register do
           else
 
             # Must be a string matcher then
+            search_options = get_search_options location
 
-            # Is this a global search?
-            global_search = !!location.match(/\/([^\/]+?)\/.*g.*/)
-            case_insensitive = !!location.match(/\/([^\/]+?)\/.*i.*/)
-            search_string = location[/\/([^\/]+?)\//, 1]
-            found_line_numbers = find_matching_lines(search_string, global_search, case_insensitive, owner_block)
+            search_string = location[SEARCH_STRING_RX, 1]
+            found_line_numbers = find_matching_lines(search_string, search_options[:global_search],
+                                                     search_options[:case_insensitive], owner_block)
 
             if !found_line_numbers.empty?
 
@@ -214,6 +216,27 @@ Asciidoctor::Extensions::register do
 
     end
 
+    def get_search_options(location)
+
+      options = { :case_insensitive => false,
+                  :global_search => false }
+
+      matches = location.match(SEARCH_OPTIONS_RX)
+
+      return options unless matches
+
+      # This is just for completeness, but make sure that
+      # none of the options are mentioned twice in the list
+
+      raise "Invalid search options: #{matches[1]}" if matches[1].match /^(.).*\1$/
+
+      options[:case_insensitive] = true if matches[1].include? 'i'
+      options[:global_search] = true if matches[1].include? 'g'
+
+      return options
+
+    end
+
     class String
       def is_numeric?
         self.match(/^\d+$/)

data/lib/version.rb

@@ -3,7 +3,7 @@
 module Asciidoctor
   module External
     module Callout
-      VERSION = "1.1.2"
+      VERSION = "1.1.4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-external-callout
 version: !ruby/object:Gem::Version
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors:
 - Ray Offiah
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-07-08 00:00:00.000000000 Z
+date: 2022-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: asciidoctor