pandocomatic 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 270f53bbe40f85d3e270da8512c8c43b24b4f433
-  data.tar.gz: 9d637b18ad586b9513a8eae8d5e6ed9f0d08df0b
+  metadata.gz: 6dd24956dd80cddb7d00b97c85b67f273aaac352
+  data.tar.gz: a7e58aca8742f9dd3257f7402bf7b91f641b240f
 SHA512:
-  metadata.gz: c6ce8bb13042c452f0087ab30435c1ea72e76f509f31b475fdbd1f50f041829ff49e5b2d68efee5b731e41de397dd5694287fc3216369f9fa5503df877a5e1db
-  data.tar.gz: a1c5c4f72999edf47d31a4afbb02285d8aab3f8b6199f0bb42a46037e81e9c6c5533e30ae671e08b78c3aa7c1abf2fc87215690aab51c1d136e270782792a48f
+  metadata.gz: 8a9a03171aba28b925e30434ead0a1aae0664a1d78bf322e6e828cc7434c4597947703a04894ce242781fcb5ac9195c252e529eb6fcd4221ab610a6f4464f88b
+  data.tar.gz: 31f06d733453f38c5d02da008fb1da0a632f4b8255f586c9dca839601dbaa3c8770a92f98a1471a8350ca5f9c0bdd6d5ae438bbbcc5060d61de6bcf32c566a3a

data/lib/pandocomatic/default_configuration.yaml

@@ -1,6 +1,6 @@
 settings:
     recursive: true
-    follow-symlinks: true
+    follow-symlinks: false
     skip: ['.*', 'pandocomatic.yaml']
 templates:
     markdown-to-html:

data/lib/pandocomatic/file_converter.rb

@@ -9,6 +9,7 @@ module Pandocomatic
 
     def convert src, dst, current_config
       @config = current_config
+      @src = src
       metadata = PandocMetadata.load_file src
 
       if metadata.has_template? then
@@ -83,7 +84,8 @@ module Pandocomatic
         processors = config[type]
         output = input
         processors.each do |processor|
-          output = Processor.run(@config.update_path(type, processor), output)
+          script = @config.update_path(processor, File.dirname(@src))
+          output = Processor.run(script, output)
         end
         output
       else

data/lib/pandocomatic/pandoc_metadata.rb

@@ -4,8 +4,6 @@ module Pandocomatic
   require 'yaml'
   require 'paru/pandoc'
 
-  require_relative 'configuration.rb'
-
   class PandocMetadata < Hash
 
     def initialize hash = {}
@@ -16,24 +14,32 @@ module Pandocomatic
     # Collect the metadata embedded in the src file
     def self.load_file src
       begin
-        json_reader = Paru::Pandoc.new {from 'markdown'; to 'json'}
-        json_document = JSON.parse json_reader << File.read(src)
-        if json_document.first["unMeta"].empty? then
-          return PandocMetadata.new 
+        yaml_metadata = pandoc2yaml File.read(src)
+        if yaml_metadata.empty? then
+            return PandocMetadata.new
         else
-          json_metadata = [json_document.first, []]
-          json_writer = Paru::Pandoc.new {from 'json'; to 'markdown'; standalone}
-          yaml_metadata = json_writer << JSON.generate(json_metadata)
-          return PandocMetadata.new YAML.load yaml_metadata
+            return PandocMetadata.new YAML.load(yaml_metadata)
         end
       rescue Exception => e
         raise "Error while reading metadata from #{src}; Are you sure it is a pandoc markdown file?\n#{e.message}"
       end
     end
 
+    def self.pandoc2yaml document
+        json_reader = Paru::Pandoc.new {from 'markdown'; to 'json'}
+        json_document = JSON.parse json_reader << document
+        yaml_metadata = ''
+        metadata = json_document.first
+        if metadata.has_key? "unMeta" and not metadata["unMeta"].empty? then
+            json_metadata = [metadata, []]
+            json_writer = Paru::Pandoc.new {from 'json'; to 'markdown'; standalone}
+            yaml_metadata = json_writer << JSON.generate(json_metadata)
+        end
+        yaml_metadata
+    end
+
     def has_template?
-      has_key? 'pandocomatic' and 
-          self['pandocomatic'].has_key? 'use-template' and 
+      self['pandocomatic'] and self['pandocomatic']['use-template'] and 
           not self['pandocomatic']['use-template'].empty?
     end
 
@@ -46,7 +52,7 @@ module Pandocomatic
     end
 
     def has_pandoc_options?
-      has_key? 'pandocomatic' and self['pandocomatic'].has_key? 'pandoc'
+      self['pandocomatic'] and self['pandocomatic']['pandoc']
     end
 
     def pandoc_options
@@ -57,9 +63,6 @@ module Pandocomatic
       end
     end
 
-    def to_configuration parent_config = Configuration.new
-    end
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-21 00:00:00.000000000 Z
+date: 2015-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru