asciidoctor-dita-topic 1.5.3 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1fdb04438dfebfea62e9b3acc42cb7fb49163f16ec12d32600f1278bd4d1d2d
-  data.tar.gz: d74b1ba6b6a927fd6135e480c05a24f81edb1e0be342a48ac11c3c70434fe2c6
+  metadata.gz: 37d3fe1b7ae8cb11eeb5e3d574ad573b4da91de2cb7a65cca8a9457a897f98f9
+  data.tar.gz: 1954c5d7413949d52e6fa29674c00f1dbcd66d7c55ae43affc4dd25758cf359f
 SHA512:
-  metadata.gz: 85412cefbd22bac8cfe57783bf01c8e75699ecef6b1309a9789679d64e7028a4e9b0431aad443f01b8746c49467e59702ac6f77cdb52a1338b6cdc8e7b412c56
-  data.tar.gz: 3f4fc350a02a7bfe2b75cd626b3e1942061bc9b59cd77793826ce3c882e3164b107be723da60ba076c9b4c4c38d4c83253fc9754bae09f67fd97b539fd057466
+  metadata.gz: '092f0143295e2082f968ffa396ff5caba173571c03af731f219def9ffbe9f4bc6ea70e6f36ca734c9283e7ad1678401db9160ecc6933d17d0c39571317e8d25b'
+  data.tar.gz: 3ed083fe157dda18113807966e5f16b1bfd2f17754d60108574783a82f8d03034055315d95d2a3e4ab35697d8aab53616daca697cb4615f7e0b6d9da2a159e83

data/README.adoc

@@ -29,7 +29,7 @@ $ *dita-convert -g _source_file.dita_ -o _output_file.dita_*
 +
 [literal,subs="+quotes"]
 ....
-$ *dita-cleanup -iI -D ../images -X . _output_file.dita_*
+$ *dita-cleanup -i -D ../images -X . _output_file.dita_*
 ....
 
 [#install]
@@ -272,7 +272,7 @@ Unlike AsciiDoc, DITA provides a number of semantic elements for software compon
 
 | option
 | `<option>`
-| An command-line option.
+| A command-line option.
 
 | variable
 | `<varname>`

data/lib/dita-topic/cli.rb

@@ -36,7 +36,7 @@ module AsciidoctorDitaTopic
         :output => false,
         :standalone => true,
         :modules => true,
-        :no_includes => 0
+        :no_includes => false
       }
       @prep = []
       @name = name
@@ -69,11 +69,11 @@ module AsciidoctorDitaTopic
           @prep.append file
         end
 
-        opt.on('-I', '--no-includes', 'disable processing of include directives; specify this option twice to also apply on prepended files') do
-          @opts[:no_includes] += 1
+        opt.on('-I', '--no-includes', 'disable processing of include directives') do
+          @opts[:no_includes] = true
         end
 
-        opt.on('-A', '--no-modules', 'disable processing of include directives with assemblies and modules') do
+        opt.on('-A', '--no-modules', 'disable processing of include directives with assemblies, modules, and attributes') do
           @opts[:modules] = false
         end
 
@@ -163,8 +163,8 @@ module AsciidoctorDitaTopic
         end
 
         prepended.gsub!(/^:_(?:mod-docs-content|content|module)-type:[ \t]+\S/, '//\&')
-        prepended.gsub!(Asciidoctor::IncludeDirectiveRx, '//\&') if @opts[:no_includes] > 1
-        input.gsub!(Asciidoctor::IncludeDirectiveRx, '//\&') if @opts[:no_includes] > 0
+        prepended.gsub!(Asciidoctor::IncludeDirectiveRx, '')
+        input.gsub!(Asciidoctor::IncludeDirectiveRx, '') if @opts[:no_includes]
 
         result = convert_topic prepended + input, base_dir
 

data/lib/dita-topic/filter.rb

@@ -31,7 +31,13 @@ class FilterIncludeDirectives < Asciidoctor::Extensions::IncludeProcessor
   end
 
   def process doc, reader, target, attributes
-    file_path   = Pathname.new(doc.base_dir) + target
+    base_dir = Pathname.new(doc.base_dir)
+
+    if reader.cursor.file
+      file_path = base_dir + Pathname.new(reader.cursor.file).dirname + target
+    else
+      file_path = base_dir + target
+    end
 
     begin
       logger = Asciidoctor::LoggerManager.logger
@@ -55,6 +61,6 @@ class FilterIncludeDirectives < Asciidoctor::Extensions::IncludeProcessor
     type = attributes['_content-type'] ? attributes['_content-type'].downcase : nil unless type
     type = attributes['_module-type'] ? attributes['_module-type'].downcase : nil unless type
 
-    ['attributes', 'snippet'].include? type
+    ['snippet'].include? type
   end
 end

data/lib/dita-topic/version.rb

@@ -24,6 +24,6 @@
 # frozen_string_literal: true
 
 module AsciidoctorDitaTopic
-  VERSION     = '1.5.3'
+  VERSION     = '1.5.5'
   NAME        = 'dita-topic'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.5
 platform: ruby
 authors:
 - Jaromir Hradilek
@@ -140,7 +140,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.21
 specification_version: 4
 summary: A custom AsciiDoc converter that generates individual DITA topics
 test_files: []