asciidoctor-dita-map 0.9.13 → 0.9.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 98bea8d9cbc76880ed050644d87dba51910d7e7ac722fdf04449d4b53743e7fd
-  data.tar.gz: e96e393535d5212e2f786b77baa6a182eb81874bc64e11d3e9c8d63ac823fdfe
+  metadata.gz: e10278e445c7ebb802fd7b59b0f2d59833ef3cf15daac9f5401a21ffa5004cf5
+  data.tar.gz: db2bfadc8deb15cddac4f2edc10c2e84edaae52532eb85539046376f310f6736
 SHA512:
-  metadata.gz: 217aa01cb9a704bc51e7bef39f6e36b263d9f0a7e7d7678f084feabebb2e2c8db84af43b1e0d97009fe4c9944da9d939fc9b35f6aa49a4a3c777b0bbb6f63cb7
-  data.tar.gz: 9646161ae41f05054b8ff31474128464299d5c948150927a5b550223593302bf8163571dc8323c46e51424de37c61fa5010be54f3ef97437a94b2e51038523b2
+  metadata.gz: 8e6b6ab31781f9cba233fbc62194a738e3db56746c8dcb134d4ce4288119ead15cf13af4f985812688caa7195dcbd76204290e0c03a39b880c0ccb4f22626267
+  data.tar.gz: 7274e2d7e1f79bbefae1500e1530ad7ed167e6a814d58ed6aa977914ebb12ebd455668bd72cabb7fb07bb807dfc778ad474ebb5e457e6b15d644cd1b15625bae

data/bin/dita-type

@@ -73,11 +73,6 @@ class Cli
       topic = AsciidoctorDitaMap::Topic.new File.read(@file)
     end
 
-    if not topic.type
-      puts 'undef'
-      abort
-    end
-
     puts topic.type
   end
 end

data/lib/dita-map/cli.rb

@@ -72,22 +72,26 @@ module AsciidoctorDitaMap
           @converter.opts[:assembly] = false
         end
 
-        opt.on('-I', '--no-id', 'do not generate the map id attribute') do
-          @converter.opts[:id] = false
+        opt.on('-C', '--no-chunk', 'do not generate the chunk attribute') do
+          @converter.opts[:chunk] = false
         end
 
-        opt.on('-M', '--no-maptitle', 'do not generate the map title') do
-          @converter.opts[:title] = false
+        opt.on('-H', '--no-topichead', 'do not generate the topichead element') do
+          @converter.opts[:topichead] = false
         end
 
-        opt.on('-C', '--no-chunk', 'do not generate the chunk attribute') do
-          @converter.opts[:chunk] = false
+        opt.on('-I', '--no-id', 'do not generate the map id attribute') do
+          @converter.opts[:id] = false
         end
 
         opt.on('-L', '--no-locktitle', 'do not generate the locktitle attribute') do
           @converter.opts[:locktitle] = false
         end
 
+        opt.on('-M', '--no-maptitle', 'do not generate the map title') do
+          @converter.opts[:title] = false
+        end
+
         opt.on('-N', '--no-navtitle', 'do not generate the navtitle attribute') do
           @converter.opts[:navtitle] = false
         end

data/lib/dita-map/convert.rb

@@ -39,6 +39,7 @@ module AsciidoctorDitaMap
         :navtitle => true,
         :title => true,
         :toc => true,
+        :topichead => true,
         :type => true,
         :self => false,
         :verbose => false,
@@ -101,6 +102,10 @@ module AsciidoctorDitaMap
         xml_title.add REXML::Text.new(map.title, false, nil, true)
       end
 
+      if map.topichead and @opts[:topichead]
+        xml_root = xml_root.add_element('topichead', { 'navtitle' => map.topichead })
+      end
+
       if @opts[:self] and file
         xml_self  = xml_root.add_element('topicref')
         file_info = { :target => file }

data/lib/dita-map/map.rb

@@ -27,16 +27,17 @@ require_relative 'topic'
 
 module AsciidoctorDitaMap
   class Map < Topic
-    attr_accessor :chunk, :id, :includes, :navtitle
+    attr_accessor :chunk, :id, :includes, :navtitle, :topichead
 
     def initialize input, base_dir, attributes = []
       if input.empty?
-        @id       = nil
-        @title    = nil
-        @navtitle = nil
-        @type     = nil
-        @includes = []
-        @chunk    = false
+        @id        = nil
+        @title     = nil
+        @navtitle  = nil
+        @type      = nil
+        @topichead = nil
+        @includes  = []
+        @chunk     = false
       else
         Asciidoctor::Extensions.register do
           include_processor CatalogIncludeDirectives
@@ -44,12 +45,13 @@ module AsciidoctorDitaMap
 
         doc = Asciidoctor.load input, safe: :safe, logger: false, catalog_assets: true, attributes: attributes, base_dir: base_dir
 
-        @includes = doc.catalog[:include_files] ? doc.catalog[:include_files] : []
-        @id       = doc.id ? doc.id.gsub(/["']/, '') : nil
-        @title    = doc.title ? doc.title.gsub(/<[^>]*>/, '') : nil
-        @navtitle = (doc.attributes.key? 'navtitle') ? doc.attributes['navtitle'] : nil
-        @type     = get_content_type doc.attributes
-        @chunk    = doc.attributes.key? 'chunk-to-content'
+        @includes  = doc.catalog[:include_files] ? doc.catalog[:include_files] : []
+        @id        = doc.id ? doc.id.gsub(/["']/, '') : nil
+        @title     = doc.title ? doc.title.gsub(/<[^>]*>/, '') : nil
+        @navtitle  = (doc.attributes.key? 'navtitle') ? doc.attributes['navtitle'] : nil
+        @type      = get_content_type doc.attributes
+        @topichead = (doc.attributes.key? 'topichead') ? doc.attributes['topichead'] : nil
+        @chunk     = doc.attributes.key? 'chunk-to-content'
       end
     end
   end

data/lib/dita-map/topic.rb

@@ -30,7 +30,7 @@ module AsciidoctorDitaMap
     def initialize input, attributes = []
       if input.empty?
         @title = nil
-        @type  = nil
+        @type  = 'undef'
       else
         doc = Asciidoctor.load input, safe: :secure, logger: false, attributes: attributes
 
@@ -46,12 +46,14 @@ module AsciidoctorDitaMap
       type = attributes['_content-type'] ? attributes['_content-type'].downcase : nil unless type
       type = attributes['_module-type'] ? attributes['_module-type'].downcase : nil unless type
 
-      if type
-        type.sub!(/^procedure$/, 'task')
+      if not type
+        return 'undef'
       end
 
+      type.sub!(/^procedure$/, 'task')
+
       unless ['assembly', 'concept', 'reference', 'task', 'map', 'attributes', 'snippet', 'ignore'].include? type
-        return nil
+        return 'invalid'
       end
 
       return type

data/lib/dita-map/version.rb

@@ -25,5 +25,5 @@
 
 module AsciidoctorDitaMap
   NAME        = 'dita-map'
-  VERSION     = '0.9.13'
+  VERSION     = '0.9.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-map
 version: !ruby/object:Gem::Version
-  version: 0.9.13
+  version: 0.9.15
 platform: ruby
 authors:
 - Jaromir Hradilek
@@ -144,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.18
+rubygems_version: 4.0.19
 specification_version: 4
 summary: Convert an AsciiDoc file to a DITA map
 test_files: []