pandocomatic 0.2.5.0.betaa → 0.2.5.0.betac

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33cabeb7b49bddf1b107c44ebf448f07c1f8f33503d620c8d68eac2d23b216dd
-  data.tar.gz: 39f12455e1105aca31e552ec8d3fac810a4aa60a5041c11c84fb5088dde94dde
+  metadata.gz: 83da5ac4d9f87c0b60d2ec6275604fbc8c840448a0d4b2e8bcd3d814f43851a1
+  data.tar.gz: 6c2aa725f3476c529b743a337b26e19c3135440e6972a5d8121c100cd8c95202
 SHA512:
-  metadata.gz: 677152a5dde3f7359a75b44a4c678673a45d64bc917770d9bccbe9d43d70ff8fd25cb18b1a567b2fb095d52c969ef264c91eb4c49a9cf188c342da01d9dd51d2
-  data.tar.gz: fccd7849c1cd7de73d3310b13785228bc91df4e89372c0f0bdc8aed52ed1355133032280d61f322217e76472cc39269d5555e5d1e8cb3a3ce16dbae7799f448b
+  metadata.gz: 142b4f1a64096eb3ae1b7311d2639020d6af74af98c0cc28acf90fe6018dcdb9b7685408114452ba4b50f54acbc8629afb1a40ebf64a886e0f7bdaf4a388b8aa
+  data.tar.gz: 1aa6c6e996c8c667f738ce40b09d5dafc2251536a1b2481502dca6627262fe2c84ca16597c0f62afcefec86b513e44bfaae2ec35926765b64f01d9f0061a6701

data/lib/pandocomatic/configuration.rb

@@ -61,6 +61,8 @@ module Pandocomatic
     # A Configuration object models a pandocomatic configuration.
     class Configuration
 
+        attr_reader :input
+
         # Pandocomatic's default configuration file
         CONFIG_FILE = 'pandocomatic.yaml'
 
@@ -265,7 +267,7 @@ module Pandocomatic
         # Get the input file name
         #
         # @return [String]
-        def input()
+        def input_file()
             if @input.nil? then
                 nil
             else
@@ -458,6 +460,15 @@ module Pandocomatic
             extension
         end
 
+        def is_markdown_file?(filename)
+            if filename.nil? then
+                false
+            else
+                ext = File.extname(filename).delete_prefix(".");
+                "markdown" == DEFAULT_EXTENSION.key(ext)
+            end
+        end
+
         # Is there a template with template_name in this Configuration?
         #
         # @param template_name [String] a template's name

data/lib/pandocomatic/multiple_files_input.rb

@@ -61,7 +61,19 @@ module Pandocomatic
         #
         # @return String
         def to_s()
-            @input_files.join(" + ")
+            input_string = @input_files.first
+            previous_dir = File.dirname @input_files.first
+            @input_files.slice(1..-1).each do |f|
+                current_dir = File.dirname f
+                if current_dir == previous_dir
+                    input_string += " + #{File.basename f}"
+                else
+                    previous_dir = current_dir
+                    input_string += " + #{f}"
+                end
+            end
+
+            input_string
         end
 
         private 
@@ -82,13 +94,21 @@ module Pandocomatic
                                   if not template.nil? and not template.dig("pandoc", "from").nil? then
                                       template["pandoc"]["from"]
                                   else
-                                      "unknown"
+                                      if @config.is_markdown_file? @input_files.first then
+                                          "markdown"
+                                      else
+                                          "unknown"
+                                      end
                                   end
                               end
 
             @input_files.each_with_index do |filename, index|
                 input = File.read File.absolute_path(filename)
-                input = if 0 == index or not strip_metadata then input else PandocMetadata.remove_metadata(input) end
+                input = if 0 == index or not strip_metadata or not @config.is_markdown_file? filename then 
+                            input 
+                        else 
+                            PandocMetadata.remove_metadata(input) 
+                        end
                 @tmp_file.write input
             end
 

data/lib/pandocomatic/pandocomatic.rb

@@ -72,9 +72,9 @@ module Pandocomatic
                     # Pandocomatic has two modes: converting a directory tree or
                     # converting a single file. The mode is selected by the input.
                     if configuration.directory?
-                        command = ConvertDirCommand.new(configuration, configuration.input, configuration.output)
+                        command = ConvertDirCommand.new(configuration, configuration.input_file, configuration.output)
                     else
-                        command = ConvertFileMultipleCommand.new(configuration, configuration.input, configuration.output)
+                        command = ConvertFileMultipleCommand.new(configuration, configuration.input_file, configuration.output)
                         command.make_quiet unless command.subcommands.size > 1
                     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.5.0.betaa
+  version: 0.2.5.0.betac
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-15 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
@@ -147,7 +147,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.4.4
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"