pandocomatic 0.2.0.2 → 0.2.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 653f8e6c1f7f11317cb4c866f56e93eb724b5f66
-  data.tar.gz: 25b56957a923d4a9a5d5d5f70a566fbbc106d0d4
+  metadata.gz: 3d2709f2c2749f23899e6f950673b58fe1982dd0
+  data.tar.gz: e0a943a880a4403d6a1435867e0cf2e46e6595bd
 SHA512:
-  metadata.gz: 4988f18e8e4f5a836e56582e0bafd23faaac1ecf7bed8a7821ca94053f4099d742e55e9cbb9a8d47a3479049932b287618ee4b5a293c38a385ea0ce2ce1047ff
-  data.tar.gz: 21fa2d133ade10f877ab730fda87f1c813d11e05e374e582a5588a18dccf51bd95d90864ff22b6aafddb3f0d7b9fa97772c74cb5158c7e3a293bebe59fdc20d4
+  metadata.gz: 20b21cf6c12f8e770b25eb8e8a124910c8d0fbfe530b9d1294982984b6e88f40fc6526fe4779fa4dbd0c6c9650b297c3480eb628f69e78749f794eda2b390213
+  data.tar.gz: ac6eede225266eb2f60da753b26bbec7fb4a70b56df9cbda1e0169171381bf7f2d32d92501b39cb5c4e53dca02eefe748fb7561c58b9e01047939492728804ce

data/lib/pandocomatic/command/convert_file_command.rb

@@ -66,12 +66,15 @@ module Pandocomatic
             @config = config
             @src = src
             @dst = dst
-
+            
             if template_name.nil? or template_name.empty?
                 @template_name = @config.determine_template @src
             else
                 @template_name = template_name
             end
+            
+            @metadata = PandocMetadata.load_file @src
+            @dst = @config.set_extension @dst, @template_name, @metadata
 
             @errors.push IOError.new(:file_does_not_exist, nil, @src) unless File.exist? @src
             @errors.push IOError.new(:file_is_not_a_file, nil, @src) unless File.file? @src
@@ -93,8 +96,7 @@ module Pandocomatic
         private
 
         def convert_file
-            metadata = PandocMetadata.load_file @src
-            pandoc_options = metadata.pandoc_options || {}
+            pandoc_options = @metadata.pandoc_options || {}
             template = {}
 
             # Determine the actual options and settings to use when converting this
@@ -106,7 +108,7 @@ module Pandocomatic
                 pandoc_options = Configuration.extend_value(pandoc_options, template['pandoc'])
             end
                
-            template = Configuration.extend_value(metadata.pandocomatic, template) if metadata.has_pandocomatic?
+            template = Configuration.extend_value(@metadata.pandocomatic, template) if @metadata.has_pandocomatic?            
 
             # Run setup scripts
             setup template
@@ -127,8 +129,8 @@ module Pandocomatic
             output = postprocess input, template
 
             # Write out the results of the conversion process to file.
-            if @dst.to_s.empty? and metadata.pandoc_options.has_key? 'output'
-                @dst = metadata.pandoc_options['output']
+            if @dst.to_s.empty? and @metadata.pandoc_options.has_key? 'output'
+                @dst = @metadata.pandoc_options['output']
             end
 
             begin

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, 0, 2]
+        VERSION = [0, 2, 0, 3]
 
         # 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.0.2
+  version: 0.2.0.3
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-20 00:00:00.000000000 Z
+date: 2017-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
@@ -154,7 +154,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - pandoc, a universal document converer <http://pandoc.org>
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Automating the use of pandoc