asciidoctor 2.0.21 → 2.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb33ff3290649511b70addaa88b8b1ef9429641bc0cf04113b8fe8613ac6ad63
-  data.tar.gz: 6c26157b4e3a366c43b2ef6a2fffcad558b3a3363fc3985ca7a1b2412292d192
+  metadata.gz: 5c8bf90148c22e9396333d1062352368ea297bd1a63d03c0166e0dde81677989
+  data.tar.gz: a9c48ed8d9827acb0b9919b1f6909c1752cd62115b3e6e7e9b552d8a6d7930c6
 SHA512:
-  metadata.gz: 72aca517f60e682e3038e8f790669de5e00f86f6b3d20be023b090bff7e837f866e2211e67657ba5139ca9758f9b260ffff70edf597b060d371e2e1ffc09e1e7
-  data.tar.gz: efcc562d749e9fafc3462598490a9b03a0f556919a55c1fb0c5f04635006ac006800dd6607388bacef5d837aeb7f3d2951ed11069675dae5555b84ce8945bcf3
+  metadata.gz: 84f45230cbd9b25b810ef9a369b2c2e769833517fda4197f55f52129b86c6c30b9c4f06d20df20e6abd552a3b12679c123641de35c8d29e6dd3d0d3b511b8185
+  data.tar.gz: 0cf0028a60356d0966ff1637e130b285b73d769f7bcf426a31397f9eab8bbe91118d78fa27c303684f0e624dd062980ec5602c931e65272382d079b086ea076f

data/CHANGELOG.adoc

@@ -16,6 +16,21 @@ For an even more detailed look at what has changed, refer to the {url-repo}/comm
 This project utilizes semantic versioning.
 
 // tag::compact[]
+== 2.0.22 (2024-03-08) - @mojavelinux
+
+Improvements::
+
+  * Set `cloaked-context` attribute on source block when context is not `:listing` (#4556)
+
+Compliance::
+
+  * Remove use of base64 library to prevent warning in Ruby >= 3.3 (#4561)
+
+=== Details
+
+{url-repo}/releases/tag/v2.0.22[git tag] | {url-repo}/compare/v2.0.21\...v2.0.22[full diff]
+// end::compact[]
+
 == 2.0.21 (2024-02-20) - @mojavelinux
 
 Compliance::
@@ -46,7 +61,6 @@ Bug Fixes::
 === Details
 
 {url-repo}/releases/tag/v2.0.21[git tag] | {url-repo}/compare/v2.0.20\...v2.0.21[full diff]
-// end::compact[]
 
 == 2.0.20 (2023-05-18) - @mojavelinux
 

data/README-de.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.21, 2024-02-20
+v2.0.22, 2024-03-08
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.21
+:release-version: 2.0.22
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-fr.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.21, 2024-02-20
+v2.0.22, 2024-03-08
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.21
+:release-version: 2.0.22
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-jp.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.21, 2024-02-20
+v2.0.22, 2024-03-08
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.21
+:release-version: 2.0.22
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README-zh_CN.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.21, 2024-02-20
+v2.0.22, 2024-03-08
 // settings:
 :page-layout: base
 :idprefix:
@@ -17,7 +17,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.21
+:release-version: 2.0.22
 // URIs:
 :uri-org: https://github.com/asciidoctor
 :uri-repo: {uri-org}/asciidoctor

data/README.adoc

@@ -1,6 +1,6 @@
 = Asciidoctor
 Dan Allen <https://github.com/mojavelinux[@mojavelinux]>; Sarah White <https://github.com/graphitefriction[@graphitefriction]>
-v2.0.21, 2024-02-20
+v2.0.22, 2024-03-08
 // settings:
 :idprefix:
 :idseparator: -
@@ -16,7 +16,7 @@ ifdef::env-github[]
 :warning-caption: :warning:
 endif::[]
 // Variables:
-:release-version: 2.0.21
+:release-version: 2.0.22
 // URLs:
 :url-org: https://github.com/asciidoctor
 :url-repo: {url-org}/asciidoctor

data/asciidoctor.gemspec

@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
   # erubi is needed for testing alternate eRuby impls
   s.add_development_dependency 'erubi', '~> 1.10.0'
   s.add_development_dependency 'haml', '~> 6.1.0'
-  s.add_development_dependency 'minitest', '~> 5.14.0'
+  s.add_development_dependency 'minitest', '~> 5.22.0'
   s.add_development_dependency 'nokogiri', '~> 1.13.0'
   s.add_development_dependency 'rake', '~> 12.3.0'
   s.add_development_dependency 'slim', '~> 4.1.0'

data/lib/asciidoctor/abstract_node.rb

@@ -354,8 +354,8 @@ class AbstractNode
   #
   # First, and foremost, the target image path is cleaned if the document safe mode level
   # is set to at least SafeMode::SAFE (a condition which is true by default) to prevent access
-  # to ancestor paths in the filesystem. The image data is then read and converted to
-  # Base64. Finally, a data URI is built which can be used in an image tag.
+  # to ancestor paths in the filesystem. The image data is then read and converted to base64.
+  # Finally, a data URI is built which can be used in an image tag.
   #
   # target_image - A String path to the target image
   # asset_dir_key - The String attribute key used to lookup the directory where
@@ -376,8 +376,8 @@ class AbstractNode
     end
 
     if ::File.readable? image_path
-      # NOTE base64 is autoloaded by reference to ::Base64
-      %(data:#{mimetype};base64,#{::Base64.strict_encode64 ::File.binread image_path})
+      # NOTE pack 'm0' is equivalent to Base64.strict_encode64
+      %(data:#{mimetype};base64,#{[(::File.binread image_path)].pack 'm0'})
     else
       logger.warn %(image to embed not found or not readable: #{image_path})
       %(data:#{mimetype};base64,)
@@ -410,8 +410,8 @@ class AbstractNode
 
     begin
       mimetype, bindata = ::OpenURI.open_uri(image_uri, URI_READ_MODE) {|f| [f.content_type, f.read] }
-      # NOTE base64 is autoloaded by reference to ::Base64
-      %(data:#{mimetype};base64,#{::Base64.strict_encode64 bindata})
+      # NOTE pack 'm0' is equivalent to Base64.strict_encode64
+      %(data:#{mimetype};base64,#{[bindata].pack 'm0'})
     rescue
       logger.warn %(could not retrieve image data from URI: #{image_uri})
       image_uri

data/lib/asciidoctor/parser.rb

@@ -561,6 +561,7 @@ class Parser
       # process lines verbatim
       if style && Compliance.strict_verbatim_paragraphs && (VERBATIM_STYLES.include? style)
         block_context = style.to_sym
+        cloaked_context = :paragraph
         reader.unshift_line this_line
         # advance to block parsing =>
         break
@@ -818,16 +819,17 @@ class Parser
     unless block
       case block_context
       when :listing, :source
-        if block_context == :source || (!attributes[1] && (language = attributes[2] || doc_attrs['source-language']))
-          if language
+        if block_context == :source || (language = attributes[1] ? nil : attributes[2] || doc_attrs['source-language'])
+          if language # :listing
             attributes['style'] = 'source'
             attributes['language'] = language
             AttributeList.rekey attributes, [nil, nil, 'linenums']
-          else
+          else # :source
             AttributeList.rekey attributes, [nil, 'language', 'linenums']
             if doc_attrs.key? 'source-language'
               attributes['language'] = doc_attrs['source-language']
             end unless attributes.key? 'language'
+            attributes['cloaked-context'] = cloaked_context unless cloaked_context == :listing
           end
           if attributes['linenums-option'] || doc_attrs['source-linenums-option']
             attributes['linenums'] = ''
@@ -856,6 +858,7 @@ class Parser
         else
           attributes['language'] = language
         end
+        attributes['cloaked-context'] = cloaked_context
         if attributes['linenums-option'] || doc_attrs['source-linenums-option']
           attributes['linenums'] = ''
         end unless attributes.key? 'linenums'

data/lib/asciidoctor/rx.rb

@@ -103,6 +103,7 @@ module Asciidoctor
   #   }
   #   // end::try-catch[]
   # NOTE m flag is required for Asciidoctor.js
+  # NOTE the regex checks for \r to account of include files that use Windows newlines
   TagDirectiveRx = /\b(?:tag|(e)nd)::(\S+?)\[\](?=$|[ \r])/m
 
   ## Attribute entries and references

data/lib/asciidoctor/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Asciidoctor
-  VERSION = '2.0.21'
+  VERSION = '2.0.22'
 end

data/lib/asciidoctor.rb

@@ -6,7 +6,6 @@ if RUBY_ENGINE == 'opal'
   # this require is satisfied by the Asciidoctor.js build; it augments the Ruby environment for Asciidoctor.js
   require 'asciidoctor/js'
 else
-  autoload :Base64, 'base64'
   require 'cgi/util'
   autoload :OpenURI, 'open-uri'
   autoload :Pathname, 'pathname'
@@ -209,13 +208,13 @@ module Asciidoctor
   BOM_BYTES_UTF_16BE = [0xfe, 0xff]
 
   # The mode to use when opening a file for reading
-  FILE_READ_MODE = RUBY_ENGINE_OPAL ? 'r' : 'rb:utf-8:utf-8'
+  FILE_READ_MODE = RUBY_ENGINE_OPAL ? 'r' : 'rb:UTF-8:UTF-8'
 
   # The mode to use when opening a URI for reading
   URI_READ_MODE = FILE_READ_MODE
 
   # The mode to use when opening a file for writing
-  FILE_WRITE_MODE = RUBY_ENGINE_OPAL ? 'w' : 'wb:utf-8'
+  FILE_WRITE_MODE = RUBY_ENGINE_OPAL ? 'w' : 'wb:UTF-8'
 
   # The default document type
   # Can influence markup generated by the converters

data/man/asciidoctor.1

@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: asciidoctor
 .\"    Author: Dan Allen, Sarah White
-.\" Generator: Asciidoctor 2.0.20
+.\" Generator: Asciidoctor 2.0.21
 .\"      Date: 2018-03-20
 .\"    Manual: Asciidoctor Manual
-.\"    Source: Asciidoctor 2.0.21
+.\"    Source: Asciidoctor 2.0.22
 .\"  Language: English
 .\"
-.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.21" "Asciidoctor Manual"
+.TH "ASCIIDOCTOR" "1" "2018-03-20" "Asciidoctor 2.0.22" "Asciidoctor Manual"
 .ie \n(.g .ds Aq \(aq
 .el       .ds Aq '
 .ss \n[.ss] 0

data/man/asciidoctor.adoc

@@ -1,7 +1,7 @@
 = asciidoctor(1)
 Dan Allen; Sarah White
 :doctype: manpage
-:release-version: 2.0.21
+:release-version: 2.0.22
 :man manual: Asciidoctor Manual
 :man source: Asciidoctor {release-version}
 ifdef::backend-manpage[:!author:]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor
 version: !ruby/object:Gem::Version
-  version: 2.0.21
+  version: 2.0.22
 platform: ruby
 authors:
 - Dan Allen
@@ -77,14 +77,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.22.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.14.0
+        version: 5.22.0
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement