asciidoctor-dita-map 0.9.12 → 0.9.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5c6a12e6aed6332bab0729841ef59f95889de1a2b29835b61e4262a41160a193
-  data.tar.gz: 595b111f04f4ce44b4d49ecd1e7f02facb44c2c9446501af403f48679335bf94
+  metadata.gz: e88ed0e53a52ea190b7e6c9a019f6beec53e56b4c2cbe697e8ccbdb30ec8a054
+  data.tar.gz: 6472d8d180c56526fbc53baef936e0f67c38b918a1bf01b7eec6eb272a0eba9a
 SHA512:
-  metadata.gz: 6c27e7c8d5350b9231cbfbe0ee68a133de45f5287b6a5a61772ff8ecbcd5c05a3cbc2d1d6851913900be0c2b04cb9b029d7b2a2671c0ee5e89dc0de24aa317c4
-  data.tar.gz: 38450ab30ec18a34a0019134b2e1585fc8d28390596ef9d922caadc7f2cb1c14a1ba5f3a9699a9cf62b186eaec64a7f82de30c6216d2990e9cef42c073cf8bf5
+  metadata.gz: 55e181b3063be81b310dfa4d3cf80eb65ee4ca257c660244f184fed9db58c69cc37b45b4fef38e3b18db29afbbd6d17687a1654397ab66962c38d717954665be
+  data.tar.gz: 2e8578bc05678448fa76ca9feaaa514d0c7bf54bcaa69659c61c31c799b1385e62e707c5a821bd03f1d49d884e586ba2a461510775eb7aef34cbecb2eaf9bc87

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/convert.rb

@@ -102,13 +102,16 @@ module AsciidoctorDitaMap
       end
 
       if @opts[:self] and file
-        file_info = map.chunk ? { :target => file, :chunk => 'to-content' } : { :target => file }
         xml_self  = xml_root.add_element('topicref')
+        file_info = { :target => file }
+        file_info[:chunk]    = 'to-content' if map.chunk
+        file_info[:navtitle] = map.navtitle
+
         compose_topicref_attributes(xml_self, file_info, map.title, map.type)
 
-        stack     = [{ :offset => 0, :element => xml_self }]
+        stack = [{ :offset => 0, :element => xml_self }]
       else
-        stack     = [{ :offset => 0, :element => xml_root }]
+        stack = [{ :offset => 0, :element => xml_root }]
       end
 
       map.includes.each do |file_info|

data/lib/dita-map/map.rb

@@ -27,12 +27,13 @@ require_relative 'topic'
 
 module AsciidoctorDitaMap
   class Map < Topic
-    attr_accessor :chunk, :id, :includes
+    attr_accessor :chunk, :id, :includes, :navtitle
 
     def initialize input, base_dir, attributes = []
       if input.empty?
         @id       = nil
         @title    = nil
+        @navtitle = nil
         @type     = nil
         @includes = []
         @chunk    = false
@@ -46,6 +47,7 @@ module AsciidoctorDitaMap
         @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'
       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.12'
+  VERSION     = '0.9.14'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: asciidoctor-dita-map
 version: !ruby/object:Gem::Version
-  version: 0.9.12
+  version: 0.9.14
 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: []