pandocomatic 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f407c39ec47d26ed9e8bdbb5452983aba4778824
-  data.tar.gz: beea9f4b103e36896a83be1cf57be5d279d09cf3
+  metadata.gz: a4eb96b887676605773e3929aebac5709f2a70ff
+  data.tar.gz: 2815789aeb3065e128606f3dedb338277251134f
 SHA512:
-  metadata.gz: b5b33aa1bbf4a007c30b9a270dbd78341d80f3830d5f18f8f4d00beb39f565ab99051f705d480d817aee2209fa7aaa2b47b797c6942ee7dc0918554ce4b96eab
-  data.tar.gz: f2a4c7b1b5869eafb6ed777b49070fefb1a970329da7f7b9ba26af56584cc90c87b82e9f43ad5201a2ba21f5825d511edb58446a82a14bc085ea1d726b2d45dc
+  metadata.gz: 439b66fabcd4f8c9af43c112f16495aa251a71a592ba22b8691fbdfb40ced84dd1abdb859a927be56ad2fd829aede581a4f811749bdb58bcc9e0839a41ce9623
+  data.tar.gz: 982c94db04f6e51e0bce760e3028aa8256bd9315d3b7ffab6bfe0609810479a215f7cc5ccb27df428fd0daffb4dd19d0cac76587741b0fcf6dda5a7fef99f78b

data/lib/pandocomatic/command/convert_file_command.rb

@@ -57,7 +57,6 @@ module Pandocomatic
 
     def convert_file
       metadata = PandocMetadata.load_file @src
-
       pandoc_options = metadata.pandoc_options || {}
       template = {}
 

data/lib/pandocomatic/pandoc_metadata.rb

@@ -26,18 +26,6 @@ module Pandocomatic
   require_relative './error/io_error.rb'
 
   class PandocMetadata < Hash
-  
-    # Paru converters:
-    # Note. When converting metadata back to the pandoc markdown format, you have
-    # to use the option 'standalone', otherwise the metadata is skipped
-    PANDOC_2_JSON = Paru::Pandoc.new {from 'markdown'; to 'json'}
-    JSON_2_PANDOC = Paru::Pandoc.new {from 'json'; to 'markdown'; standalone}
-
-    # When converting a pandoc document to JSON, or vice versa, the JSON object
-    # has the following three properties:
-    VERSION = 'pandoc-api-version'
-    META = 'meta'
-    BLOCKS = 'blocks'
 
     def self.extract_metadata input_document
       begin
@@ -48,31 +36,17 @@ module Pandocomatic
     end
 
     def self.pandoc2yaml(input)
-      yaml = ""
-      begin
-        json = JSON.parse(PANDOC_2_JSON << input)
-
-        version, metadata = json.values_at(VERSION, META)
-
-        if not metadata.empty? then
-          metadata_document = {
-            VERSION => version, 
-            META => metadata, 
-            BLOCKS => []
-          }
-
-          yaml = JSON_2_PANDOC << JSON.generate(metadata_document)
-        end
-      rescue Paru::Error => e
-        raise PandocError.new(:error_running_pandoc, e, input_document)
-      end
-
-      yaml
+      input
+        .scan(/^---\n(.+?)^(?:---|\.\.\.)\n/m)
+        .flatten
+        .map{|yaml| yaml.strip}
+        .join("\n")
     end
 
     # Collect the metadata embedded in the src file
     def self.load_file src
       yaml_metadata = extract_metadata src
+
       if yaml_metadata.empty? then
         return PandocMetadata.new
       else
@@ -85,14 +59,13 @@ module Pandocomatic
       merge! hash
     end
 
-    def has_template?
-      self['pandocomatic'] and self['pandocomatic']['use-template'] and 
-          not self['pandocomatic']['use-template'].empty?
+    def has_template?()
+      has_pandocomatic? and pandocomatic.has_key? 'use-template' and not pandocomatic['use-template'].empty?
     end
 
-    def template_name
+    def template_name()
       if has_template? then
-        self['pandocomatic']['use-template']
+        pandocomatic['use-template']
       else
         ''
       end
@@ -101,18 +74,27 @@ module Pandocomatic
     # TODO: allow a pandoc block outside a pandocomatic block to make
     # pandocomatic work like paru's do-pandoc.rb.
 
-    def has_pandoc_options?
-      self['pandocomatic'] and self['pandocomatic']['pandoc']
+    def has_pandoc_options?()
+      has_pandocomatic? and pandocomatic.has_key? 'pandoc'
     end
 
-    def pandoc_options
+    def pandoc_options()
       if has_pandoc_options? then
-        self['pandocomatic']['pandoc']
+        pandocomatic['pandoc']
       else
         {}
       end
     end
 
+    def has_pandocomatic?()
+      has_key? 'pandocomatic' or has_key? 'pandocomatic_'
+    end
+
+    def pandocomatic()
+      return self['pandocomatic'] if has_key? 'pandocomatic'
+      return self['pandocomatic_'] if has_key? 'pandocomatic_'
+    end
+
   end
 
 end

data/lib/pandocomatic/pandocomatic.rb

@@ -40,7 +40,7 @@ module Pandocomatic
   require_relative './command/convert_file_command.rb'
 
   class Pandocomatic
-    VERSION = [0, 1, 0]
+    VERSION = [0, 1, 2]
     CONFIG_FILE = 'pandocomatic.yaml'
 
     def self.run(args)

metadata

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