pandocomatic 0.2.5.0.beta → 0.2.5.0.betaa

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55328031107054bb5f4c803fd3991da2709faf82fed6910c018f63547bbbda33
-  data.tar.gz: 5ee5ae08ebfd6bc3c23e5421f680924e2247034582a54b9af0e6e320f547333d
+  metadata.gz: 33cabeb7b49bddf1b107c44ebf448f07c1f8f33503d620c8d68eac2d23b216dd
+  data.tar.gz: 39f12455e1105aca31e552ec8d3fac810a4aa60a5041c11c84fb5088dde94dde
 SHA512:
-  metadata.gz: a42e71a975cce7d4bae39f81d8fc2211c3598787283e146e66b72ed3ab106b539ce847077346b49ff04f268717495e4eb203f2e0f38c20126e0c06c7048e4c62
-  data.tar.gz: 8b84109ff30f598fa8974d93cd6244ee32a572abb4571f2590c72e589ca01aa4e7ebfc4a23aa5ba4933e388b0c81c23b04e49895c642d59328aa71640975e51b
+  metadata.gz: 677152a5dde3f7359a75b44a4c678673a45d64bc917770d9bccbe9d43d70ff8fd25cb18b1a567b2fb095d52c969ef264c91eb4c49a9cf188c342da01d9dd51d2
+  data.tar.gz: fccd7849c1cd7de73d3310b13785228bc91df4e89372c0f0bdc8aed52ed1355133032280d61f322217e76472cc39269d5555e5d1e8cb3a3ce16dbae7799f448b

data/lib/pandocomatic/configuration.rb

@@ -385,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"]
@@ -444,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
 
@@ -884,6 +868,5 @@ module Pandocomatic
 
             path
         end
-
     end
 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

@@ -48,7 +48,7 @@ module Pandocomatic
 
         # Pandocomatic's current version
         VERSION = [0, 2, 5, 0, "beta"]
-        
+
         # Run pandocomatic given options
         #
         # @param args [String[]] list of options to configure pandocomatic

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.5.0.beta
+  version: 0.2.5.0.betaa
 platform: ruby
 authors:
 - Huub de Beer