Helpers.rootname should only consider final path segment when dropping file extension (PR #3235)

- if final segment does not contain a dot, return original filename
- optimize assignments in PreprocessorReader#push_include
- add additional tests

1 files changed, 12 insertions, 0 deletions

diff --git a/test/reader_test.rb b/test/reader_test.rb
index c124f292..78adb2cf 100644
--- a/test/reader_test.rb
+++ b/test/reader_test.rb
@@ -564,6 +564,7 @@ class ReaderTest < Minitest::Test
         reader.push_include append_lines, '/tmp/lines.adoc'
         assert_equal '/tmp/lines.adoc', reader.file
         assert_equal 'lines.adoc', reader.path
+        assert doc.catalog[:includes]['lines']
       end
 
       test 'PreprocessorReader#push_include method should accept file as a URI and compute dir and path' do
@@ -594,6 +595,17 @@ class ReaderTest < Minitest::Test
         assert_equal 0, reader.include_stack.size
         assert_equal 'a', reader.read_line.rstrip
       end
+
+      test 'PreprocessorReader#push_include method should ignore dot in directory name when computing include path' do
+        lines = %w(a b c)
+        doc = Asciidoctor::Document.new lines
+        reader = doc.reader
+        append_lines = %w(one two three)
+        reader.push_include append_lines, nil, 'include.d/data'
+        assert_nil reader.file
+        assert_equal 'include.d/data', reader.path
+        assert doc.catalog[:includes]['include.d/data']
+      end
     end
 
     context 'Include Directive' do