asciidoctor-dita-topic 1.4.7 → 1.4.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aa49c2e77c20ed32770fa37f0a286ca5a5aa808c5fef1e11c70bce3ac5fc3f74
-  data.tar.gz: 698164a21ee241367c0ebc3d029759e546618514ac91d93e7076abe0eea58ca7
+  metadata.gz: fa920fa9fdc9383aca4b8411314622cb154dd6ada686b0b12f997e6e184b2a65
+  data.tar.gz: 56888969b54b717a5f716684e210688b04bd7a4b31e7023437faf5860992eaa5
 SHA512:
-  metadata.gz: 6ddefc4aec275a5ce85990ca28bdcffe0d2a8033834112c5eea7c225f0420af2de96f952661799a17b3c2134739001ccf7f6323b7f8953a191f4dc9dcfb18ada
-  data.tar.gz: 1088e887c924235e473b9f23aa04e4e3a41e3f8f307857342f7f852b2de5791e2917d7b69c74ff8f487e1c82098d62cbe993f1b8fd9c9f72f127e7284dd14fe1
+  metadata.gz: ac7bb7c93a66b5b0b2ffd1cb202fc09e42c1944f3e98f60a79c6a06c7d8b271b9e549fa1f4362e7d78295d171ed8e54f9668d2daa5f85d23740ebcfb00667b1c
+  data.tar.gz: 0f1722b7ea6b5adb0cdfa8a9816ccb85a98bb9f924b936acc08ad725b1f9b5e9133bd266bfa00321ae576d10f50a23627d3b2d05345ca2a5d6ad7a8943965b7f

data/lib/dita-topic/cli.rb

@@ -1,4 +1,4 @@
-# Copyright (C) 2025 Jaromir Hradilek
+# Copyright (C) 2025, 2026 Jaromir Hradilek
 
 # MIT License
 #
@@ -34,7 +34,6 @@ module AsciidoctorDitaTopic
       @opts = {
         :output => false,
         :standalone => true,
-        :map => false,
         :no_includes => 0
       }
       @prep = []
@@ -61,10 +60,6 @@ module AsciidoctorDitaTopic
 
         opt.separator ''
 
-        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
-
         opt.on('-p', '--prepend-file FILE', 'prepend a file to all input files; can be supplied multiple times') do |file|
           raise OptionParser::InvalidArgument, "not a file: #{file}" unless File.exist? file and File.file? file
           raise OptionParser::InvalidArgument, "file not readable: #{file}" unless File.readable? file
@@ -125,73 +120,6 @@ module AsciidoctorDitaTopic
       return args
     end
 
-    def convert_map file, input, base_dir
-      if file == $stdin
-        offset   = 0
-      else
-        file     = Pathname.new(file).sub_ext('.dita').basename
-        offset   = 1
-      end
-
-      doc        = Asciidoctor.load input, backend: 'dita-topic', safe: :unsafe, attributes: @attr, base_dir: base_dir, sourcemap: true
-      sections   = doc.find_by context: :section
-
-      return unless sections
-
-      title      = (sections.first.level == 0 and sections.first.title) ? sections.first.title : false
-
-      if @opts[:standalone]
-        result   = ["<?xml version='1.0' encoding='utf-8' ?>"]
-        result  << %(<!DOCTYPE map PUBLIC "-//OASIS//DTD DITA Map//EN" "map.dtd">)
-        result  << %(<map>)
-        result  << %(  <title>#{title}</title>) if title
-      else
-        result   = []
-      end
-
-      last_level = 0
-      last_file  = ''
-
-      sections.each_index do |i|
-        section  = sections[i]
-        level    = section.level
-        title    = section.title.gsub(/"|<[^>]*>|[<>]/, '')
-        filename = section.file ? Pathname.new(section.file).sub_ext('.dita').relative_path_from(base_dir) : Pathname.new(file)
-        current  = last_level
-
-        next if filename == last_file
-
-        while current > level
-          current -= 1
-          result << '  ' * (current + offset) + %(</topicref>)
-        end
-
-        if level - last_level > 1
-          warn "WARNING: #{filename.basename}: line #{section.lineno}: section title out of sequence: expected level #{last_level + 1}, got level #{level}"
-          level = last_level + 1
-        end
-
-        indent  = '  ' * (level + offset)
-        parent  = (sections[i + 1] and sections[i + 1].level > level) ? true : false
-        result << indent + %(<topicref href="#{filename}" navtitle="#{title}"#{parent ? '>' : ' />'}) unless filename == $stdin
-
-        last_level = level
-        last_file  = filename
-      end
-
-      while last_level > 0
-        last_level -= 1
-        break if last_level == 0 and file == $stdin
-        result << '  ' * (last_level + offset) + %(</topicref>)
-      end
-
-      if @opts[:standalone]
-        result << %(</map>)
-      end
-
-      return result.join("\n")
-    end
-
     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
@@ -210,21 +138,18 @@ module AsciidoctorDitaTopic
           input    = $stdin.read
           output   = @opts[:output] ? @opts[:output] : $stdout
         else
-          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
+          output   = @opts[:output] ? @opts[:output] : Pathname.new(file).sub_ext('.dita').to_s
         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
 
-        if @opts[:map]
-          result = convert_map file, prepended + input, base_dir
-        else
-          result = convert_topic prepended + input, base_dir
-        end
+        result = convert_topic prepended + input, base_dir
+
+        result.gsub!(/<ph (?:(?:platform|product|audience|otherprops)="[^"]+" ?)+><\/ph> */, '')
 
         if output == $stdout
           $stdout.write result

data/lib/dita-topic/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-topic
 version: !ruby/object:Gem::Version
-  version: 1.4.7
+  version: 1.4.8
 platform: ruby
 authors:
 - Jaromir Hradilek
@@ -18,7 +18,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.26
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,49 +28,81 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 2.0.26
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.3.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 12.3.0
+        version: '13.3'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 13.3.1
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.0
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.22.0
+        version: '6.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 6.0.2
+- !ruby/object:Gem::Dependency
+  name: minitest-mock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.27'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.27'
 - !ruby/object:Gem::Dependency
   name: rexml
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.2.6
+        version: '3.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.4.4
 description: An extension for AsciiDoctor that converts a single AsciiDoc file to
   a DITA topic.
 email: jhradilek@gmail.com