asciidoctor-dita-topic 1.4.4 → 1.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 717dd58c267369873a2fe78ec88ee18e1c8ff50c308a292374cb63cca102b14d
-  data.tar.gz: 3d6721ed5f09341567e887b90090e98fa6598050902f6ea52b606b08a1563459
+  metadata.gz: 7690eaba37e895e876771c847da1ed9bdbed1a6c697c843a4ab6c2b68e76e7b6
+  data.tar.gz: c4661d29f5dd07245e438e9f44446bfee3030b885d4b38d4d39964ef5031872e
 SHA512:
-  metadata.gz: 4f33bcd097400cc12f089794f09b4cbef47b7177f50fe1d6e076415b90abfb70d6ba39c9b4c93fdea33ac722913497ed8dc4f3c79f20646adce45c6b7b4e0a6b
-  data.tar.gz: ab89f66595f1724d584cbac39c07940920254b0264b275d8d026745e0824d60565bdc69f2a34aed03a047ce5f5a72af968faba956d8bc3a32b4dcd939f8199cf
+  metadata.gz: 05ae4c5ca74d8b200ef763026171a1d82cc63c8fbd1a3492d6f5c53e5c5ecf525a72422b974c52093812ab76497167234042a44cb753b8dec7814678a6b6dde8
+  data.tar.gz: 238cb4a1a4f9f037f13ac8686ff9766d0100621044df8d0990374cc59c77743edb3fa888b07d23147a20678d660659e36c452348956027634a15eef86c15f7e4

data/lib/dita-topic/cli.rb

@@ -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
 
@@ -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,21 +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 file, input, output
-      if file == $stdin
-        base_dir = Pathname.new(Dir.pwd).expand_path
-      else
-        base_dir = Pathname.new(file).dirname.expand_path
-      end
-
-      Asciidoctor.convert input, backend: 'dita-topic', standalone: @opts[:standalone], safe: :unsafe, attributes: @attr, to_file: output, base_dir: base_dir
+    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
@@ -218,20 +206,28 @@ 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)
+          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]
 
         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 file, 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.4'
+  VERSION     = '1.4.6'
 end

metadata

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