asciidoctor-dita-topic 1.4.5 → 1.4.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8f6ab85df9ce5321111233e1d6010ffbaff45ef483429b52f1c4f1e21b24a599
-  data.tar.gz: 3032b2f55d0e62d5259ab80172c0ae6e22c64d0dad22d6af3e93de9b16432429
+  metadata.gz: aa49c2e77c20ed32770fa37f0a286ca5a5aa808c5fef1e11c70bce3ac5fc3f74
+  data.tar.gz: 698164a21ee241367c0ebc3d029759e546618514ac91d93e7076abe0eea58ca7
 SHA512:
-  metadata.gz: 3a0b76fb1014db44d1b4480ba9b3769104651ef209e74b3557e8c4834719ae44982604d7423729c3a57fdd226e275fe07bca439239cf8eb574c6b7d0f7b8a0be
-  data.tar.gz: c0b2aeb4ffc8bd7c21ff1cb26ea9112eb48b651e7137c696a2a2dda4789077f9e98ce754d04c2ede6523a0380d89527f1846a27549951442252e0e38b5e23bd4
+  metadata.gz: 6ddefc4aec275a5ce85990ca28bdcffe0d2a8033834112c5eea7c225f0420af2de96f952661799a17b3c2134739001ccf7f6323b7f8953a191f4dc9dcfb18ada
+  data.tar.gz: 1088e887c924235e473b9f23aa04e4e3a41e3f8f307857342f7f852b2de5791e2917d7b69c74ff8f487e1c82098d62cbe993f1b8fd9c9f72f127e7284dd14fe1

data/lib/dita-topic/cli.rb

@@ -33,9 +33,9 @@ module AsciidoctorDitaTopic
       @attr = ['experimental']
       @opts = {
         :output => false,
-        :includes => true,
         :standalone => true,
-        :map => false
+        :map => false,
+        :no_includes => 0
       }
       @prep = []
       @name = name
@@ -61,7 +61,7 @@ module AsciidoctorDitaTopic
 
         opt.separator ''
 
-        opt.on('-m', '--dita-map', 'generate a DITA map instead of a topic') do
+        opt.on('-m', '--dita-map', 'generate a DITA map instead of a topic; this functionality is experimental and not yet fully tested') do
           @opts[:map] = true
         end
 
@@ -72,8 +72,8 @@ module AsciidoctorDitaTopic
           @prep.append file
         end
 
-        opt.on('-I', '--no-includes', 'disable processing of include directives') do
-          @opts[:includes] = false
+        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
         end
 
         opt.separator ''
@@ -125,12 +125,10 @@ module AsciidoctorDitaTopic
       return args
     end
 
-    def convert_map file, input, output
+    def convert_map file, input, base_dir
       if file == $stdin
-        base_dir = Pathname.new(Dir.pwd).expand_path
         offset   = 0
       else
-        base_dir = Pathname.new(file).dirname.expand_path
         file     = Pathname.new(file).sub_ext('.dita').basename
         offset   = 1
       end
@@ -191,15 +189,11 @@ module AsciidoctorDitaTopic
         result << %(</map>)
       end
 
-      if output == $stdout
-        $stdout.write result.join("\n")
-      else
-        File.write output, result.join("\n")
-      end
+      return result.join("\n")
     end
 
-    def convert_topic input, output
-      Asciidoctor.convert input, backend: 'dita-topic', standalone: @opts[:standalone], safe: :unsafe, attributes: @attr, to_file: output
+    def convert_topic input, base_dir
+      return Asciidoctor.convert input, backend: 'dita-topic', standalone: @opts[:standalone], safe: :unsafe, attributes: @attr, base_dir: base_dir
     end
 
     def run
@@ -212,20 +206,30 @@ module AsciidoctorDitaTopic
 
       @args.each do |file|
         if file == $stdin
-          input  = $stdin.read
-          output = @opts[:output] ? @opts[:output] : $stdout
+          base_dir = Pathname.new(Dir.pwd).expand_path
+          input    = $stdin.read
+          output   = @opts[:output] ? @opts[:output] : $stdout
         else
-          suffix = @opts[:map] ? '.ditamap' : '.dita'
-          input  = File.read(file)
-          output = @opts[:output] ? @opts[:output] : Pathname.new(file).sub_ext(suffix).to_s
+          suffix   = @opts[:map] ? '.ditamap' : '.dita'
+          base_dir = Pathname.new(file).dirname.expand_path
+          input    = File.read(file)
+          output   = @opts[:output] ? @opts[:output] : Pathname.new(file).sub_ext(suffix).to_s
         end
 
-        input.gsub!(Asciidoctor::IncludeDirectiveRx, '//\&') unless @opts[:includes]
+        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
 
         if @opts[:map]
-          convert_map file, prepended + input, output
+          result = convert_map file, prepended + input, base_dir
+        else
+          result = convert_topic prepended + input, base_dir
+        end
+
+        if output == $stdout
+          $stdout.write result
         else
-          convert_topic prepended + input, output
+          File.write output, result
         end
       end
     end

data/lib/dita-topic/version.rb

@@ -24,5 +24,5 @@
 # frozen_string_literal: true
 
 module AsciidoctorDitaTopic
-  VERSION     = '1.4.5'
+  VERSION     = '1.4.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.4.5
+  version: 1.4.7
 platform: ruby
 authors:
 - Jaromir Hradilek