giblish 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db70ccddaf7473a9da59c81a9a592635a027faa4ffbec31a7d30a976c9fa7c6
-  data.tar.gz: a2c1034a4ef601d1f37ec1402d07de6258d1273a8524e4b6347418f0fb42cd2e
+  metadata.gz: 963e7aeee8afe72afe253d10a5ef3f9fb8538af3668838d18ac6539d388f64a1
+  data.tar.gz: 32916267003809333978cb261e459795b14d36e29e4d2f199ab21b9a02ba791a
 SHA512:
-  metadata.gz: 05d9414c48c69d13eec80cbedc5d5a6049d711e53af054a7d26af9192e7845ec114667459ab090af3c0fab610f1c3f6b50629b15a51024fc5f15b01dc546d87d
-  data.tar.gz: da0330a4f1fe0fd9b009fa2689dda4b2f6f9e95e76acd9ba6755055d252e8b1b62d0ed974cbb7ca5ddbf0dd408781d9915dff68f843c9b8cec472115d7287d1d
+  metadata.gz: d0c13cd9f84c9bba7a241eb156b843145026b9e199c13255a518e487fc62c1968417c7482445457750c1c825b4b671ee80076459442f24d561a1eb670f46843c
+  data.tar.gz: '084d83eb182a093f5b1dff2bbfd0074b6d3d9f4657b7661c7395dd4fdf1e7755d88d3342f3d1a40fc529e798543390d9e7ffefcc702a51cbbe5ecb00c7e6106c'

data/data/testdocs/wellformed/docidtest/docid_1.adoc

@@ -15,6 +15,7 @@ Other valid docid references::
   * <<:docid:WF-013>> No title and no hash
   * <<:docid:WF-022,docid_2 adoc>> Another document within the tree.
   * <<:docid:WF-022#Purpose, Purpose in WF-022>> Reference a section in another document
+  * <<:docid:WF-022>> Two references on the same line <<:docid:WF-013>>.
 
 Invalid docid references::
 

data/lib/giblish/buildindex.rb

@@ -71,7 +71,7 @@ module Giblish
       docid_info_str = if ! @manage_docid
                          ""
                        else
-                         "The 'largest' document id found when resolving :docid: tags is *#{largest}*."
+                         "The 'largest' document id found when resolving :docid: tags in all documents is *#{largest}*."
                        end
 
       docid_warn_str = if duplicates.length.zero?
@@ -123,6 +123,9 @@ module Giblish
         root.add_path(d.rel_path.to_s, d)
       end
 
+      # sort the tree
+      root.sort_children
+
       # generate each tree entry string
       root.traverse_top_down do |level, node|
         tree_string << tree_entry_string(level, node)

data/lib/giblish/docid.rb

@@ -86,7 +86,7 @@ module Giblish
 
       # Convert all docid refs to valid relative refs
       reader.lines.each do |line|
-        line.gsub!(/<<\s*:docid:\s*(.*)>>/) do |_m|
+        line.gsub!(/<<\s*:docid:\s*(.*?)>>/) do |_m|
           # parse the ref
           target_id, section, display_str =
             parse_doc_id_ref Regexp.last_match(1)

data/lib/giblish/version.rb

@@ -1,3 +1,3 @@
 module Giblish
-  VERSION = "0.3.0".freeze
+  VERSION = "0.3.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: giblish
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Anders Rillbert
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-09 00:00:00.000000000 Z
+date: 2019-02-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler