pandocomatic 0.2.4.1 → 0.2.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2ba2dda8b4f64ba3c2d84133f820873123f0ebbbc508bd781f0e52263abc9d4
-  data.tar.gz: 0b21f1cdaf4c24e80599817f3a63343e268425dfdcac4736e0e1c9fdbaeb8242
+  metadata.gz: 5805486820ab39b17105f8734d5a8bb06cd4974b504a433bfb2a8fd7257f1292
+  data.tar.gz: fac1b7cdaf0b6bde56c14b27cf69a8314a9cb8d61570ee0b9bae8fa24bc119a5
 SHA512:
-  metadata.gz: 701ffe09cc816d0682c84c2cfaeeec04351e8c4ca8f1fade978df7a4b8b1daf204c1fc59eba9701bbfd551f2374477ae094b14a8bed7d4b503d7968f04eb6830
-  data.tar.gz: 98a1ba392021ae2170793736dcc350a26550db5ac989e332862b2b617e6195165308179b987787c76552110be400f0ef5272b0e2e1bb54e1f01e8c09f0b2051a
+  metadata.gz: c6af721ff587c11366cdec4bf08dea7d022d9e82b902f6ca4690864ebacdc463e8eed745158f8e1d716a98d755943cd8c0300b17d17b1145bc4940361648a4f0
+  data.tar.gz: 400a4e734a7bb904dac926a6fee4a35ca1f0622ff37cb202f7b9b61e33b94e8704aae94e601975228eeab2a7f06c1e0f81cc44e24b429a3a5026c8a55b29b5fd

data/lib/pandocomatic/configuration.rb

@@ -245,22 +245,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"]
@@ -304,21 +295,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
 
@@ -685,6 +669,5 @@ module Pandocomatic
                 path.start_with? "/"
             end
         end
-
     end
 end

data/lib/pandocomatic/pandoc_metadata.rb

@@ -159,7 +159,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

@@ -50,7 +50,7 @@ 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, 4, 1]
+        VERSION = [0, 2, 4, 2]
 
         # Pandocomatic's default configuration file
         CONFIG_FILE = 'pandocomatic.yaml'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.4.1
+  version: 0.2.4.2
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-04 00:00:00.000000000 Z
+date: 2019-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru