pandocomatic 0.2.5.0.alpha → 0.2.5.0.betaa

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e0830abb917ca87c8d072ee5a4f88fee1f2f2d8da6359f14e74f9160614b23f9
-  data.tar.gz: 68f2dbf9325b3ccaeeeae4c2c99b3de4486ff00a2e6c1951a6b14f3f4260232a
+  metadata.gz: 33cabeb7b49bddf1b107c44ebf448f07c1f8f33503d620c8d68eac2d23b216dd
+  data.tar.gz: 39f12455e1105aca31e552ec8d3fac810a4aa60a5041c11c84fb5088dde94dde
 SHA512:
-  metadata.gz: e8c034acc735d84f56c95765a070a129bb522bfe2b6536d407dc067c86f954fad64c7679cb561551689f837d1c54186a9e6c69e7f9fa192eaf548dc948395a0b
-  data.tar.gz: a625b92f99fdccfc5786cb8e2e234b572f4157f4efc894bdc6ed2be39eaad54cb4d33895014e410abfc37e3e983fa9bb6b9de805fa693fa5e1bab54a1f0cebf0
+  metadata.gz: 677152a5dde3f7359a75b44a4c678673a45d64bc917770d9bccbe9d43d70ff8fd25cb18b1a567b2fb095d52c969ef264c91eb4c49a9cf188c342da01d9dd51d2
+  data.tar.gz: fccd7849c1cd7de73d3310b13785228bc91df4e89372c0f0bdc8aed52ed1355133032280d61f322217e76472cc39269d5555e5d1e8cb3a3ce16dbae7799f448b

data/lib/pandocomatic/cli.rb

@@ -22,7 +22,6 @@ module Pandocomatic
   require_relative './error/cli_error.rb'
   require_relative './configuration.rb'
 
-
   ##
   # Command line options parser for pandocomatic using optimist.
   #

data/lib/pandocomatic/configuration.rb

@@ -75,7 +75,7 @@ module Pandocomatic
             @input = if input.nil? or input.empty? then
                          nil
                      elsif 1 < input.size then
-                         MultipleFilesInput.new(input)
+                         MultipleFilesInput.new(input, self)
                      else
                          Input.new(input)
                      end
@@ -347,7 +347,6 @@ module Pandocomatic
             @settings.has_key? 'match-files' and 'first' == @settings['match-files']
         end
 
-
         # Set the extension of the destination file given this Confguration,
         # template, and metadata
         #
@@ -386,22 +385,13 @@ module Pandocomatic
                 end
             end
 
-            destination = nil
-            rename_script = nil
-
-            # Output option in pandoc property has precedence
-            if metadata.has_pandocomatic?
-                pandocomatic = metadata.pandocomatic
-                if pandocomatic.has_key? "pandoc"
-                    pandoc = pandocomatic["pandoc"]
-                    destination = determine_output_in_pandoc.call pandoc
-                    rename_script = pandoc["rename"]
-                end
-            end
+            # Output options in pandoc property have precedence
+            destination = determine_output_in_pandoc.call metadata.pandoc_options
+            rename_script = metadata.pandoc_options["rename"]
 
             # Output option in template's pandoc property is next
             if destination.nil? and not template_name.nil? and not template_name.empty? then
-                if @templates[template_name].has_key? "pandoc"
+                if @templates[template_name].has_key? "pandoc" and not @templates[template_name]["pandoc"].nil?
                     pandoc = @templates[template_name]["pandoc"]
                     destination = determine_output_in_pandoc.call pandoc
                     rename_script ||= pandoc["rename"]
@@ -445,21 +435,14 @@ module Pandocomatic
             end
 
             if template_name.nil? or template_name.empty? then
-                if metadata.has_pandocomatic? 
-                    pandocomatic = metadata.pandocomatic
-                    if pandocomatic.has_key? "pandoc"
-                        pandoc = pandocomatic["pandoc"]
-                        
-                        ext = use_extension.call pandoc
-                        if not ext.nil?
-                            extension = ext
-                        elsif pandoc.has_key? "to"
-                            extension = strip_extensions.call(pandoc["to"])
-                        end
-                    end
-                end 
+                ext = use_extension.call metadata.pandoc_options
+                if not ext.nil?
+                    extension = ext
+                elsif metadata.pandoc_options.has_key? "to"
+                    extension = strip_extensions.call(metadata.pandoc_options["to"])
+                end
             else
-                if @templates[template_name].has_key? "pandoc"
+                if @templates[template_name].has_key? "pandoc" and not @templates[template_name]["pandoc"].nil?
                     pandoc = @templates[template_name]["pandoc"]
                     ext = use_extension.call pandoc
 
@@ -885,6 +868,5 @@ module Pandocomatic
 
             path
         end
-
     end
 end

data/lib/pandocomatic/multiple_files_input.rb

@@ -28,8 +28,9 @@ module Pandocomatic
         # is created as well containing the content of all the files in input.
         #
         # @param input [String[]] a list with input files
-        def initialize(input)
+        def initialize(input, config)
             super(input)
+            @config = config
             create_temp_file
         end
 
@@ -69,10 +70,25 @@ module Pandocomatic
             # Concatenate all input files into one (temporary) input file
             # created in the same directory as the first input file
             @tmp_file = Tempfile.new(@input_files.first, File.dirname(self.absolute_path))
-            
+
+            # Read first file and its metadata
+            metadata = PandocMetadata.load_file @input_files.first
+
+            strip_metadata = 
+                "markdown" == if metadata.pandoc_options.has_key? "from" then
+                                  metadata.pandoc_options["from"]
+                              else
+                                  template = @config.determine_template @input_files.first
+                                  if not template.nil? and not template.dig("pandoc", "from").nil? then
+                                      template["pandoc"]["from"]
+                                  else
+                                      "unknown"
+                                  end
+                              end
+
             @input_files.each_with_index do |filename, index|
                 input = File.read File.absolute_path(filename)
-                input = if 0 === index then input else PandocMetadata.remove_metadata(input) end
+                input = if 0 == index or not strip_metadata then input else PandocMetadata.remove_metadata(input) end
                 @tmp_file.write input
             end
 

data/lib/pandocomatic/pandoc_metadata.rb

@@ -170,7 +170,7 @@ module Pandocomatic
         # @return [Boolean] True if there is a pandoc options property in this
         #   PandocMetadata object. False otherwise.
         def has_pandoc_options?()
-            has_pandocomatic? and pandocomatic.has_key? 'pandoc'
+            has_pandocomatic? and pandocomatic.has_key? 'pandoc' and not pandocomatic['pandoc'].nil?
         end
 
     end

data/lib/pandocomatic/pandocomatic.rb

@@ -47,8 +47,8 @@ module Pandocomatic
         ERROR_STATUS = 1266 # This is the sum of the ascii values of the characters in 'pandocomatic'
 
         # Pandocomatic's current version
-        VERSION = [0, 2, 5, 0, "α"]
-        
+        VERSION = [0, 2, 5, 0, "beta"]
+
         # Run pandocomatic given options
         #
         # @param args [String[]] list of options to configure pandocomatic

data/lib/pandocomatic/printer/finish_printer.rb

@@ -40,7 +40,7 @@ module Pandocomatic
 
     # Calculate the duration of the whole conversion process
     #
-    # @erturn [Number]
+    # @return [Number]
     def duration()
       seconds = @end_time - @start_time
       if seconds > MINUTE

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.5.0.alpha
+  version: 0.2.5.0.betaa
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-09 00:00:00.000000000 Z
+date: 2019-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
@@ -56,28 +56,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.18
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.9.18
 description: Pandocomatic is a tool to automate using pandoc (<http://pandoc.org>).
   With pandocomatic you can express common patterns of using pandoc for generating
   your documents. Applied to a directory, pandocomatic can act as a static site generator.