pandocomatic 0.2.5.0 → 0.2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c06eec24affb54e4be5ef0001947cdcd926cf6633d178d22214ef1c069d6ef4f
-  data.tar.gz: 213c8c84c92573b2a0120243a64a0071b6b38382aefc7084a4bb744e2376d68a
+  metadata.gz: d6a91e1ee77a00b1064990b56b389a42ac5d81941d77165c983b100ec1642d13
+  data.tar.gz: 56233af1ce48cc32a24aba970d08972760bd9b21c4fe31151bac14ceccae6c8e
 SHA512:
-  metadata.gz: 90e7117da32ff9bb5af3c5e9d2c15cd0147af94b96a477faf4ab694022082ec1adcdd3dd29796c929c9ad6cf672d2582a36f44a8c852c34e4fb19dc6063a8d59
-  data.tar.gz: 906b949a52464bc6df6433c8c7bd8c69b49141e3657c2bc263e26eb1af9c317648d2815365df3450c9af30cb632c2f7708f3c20018c80bdeab9c2099342f3608
+  metadata.gz: 3df9df16cc6950d3f58396b722fbcaa78a2d29fbb0ca9a9cebb9dd9d2c4cc1047c0f4a1bcfd8306b48559d6df6bfce327ff319116f0a6fc5ec5451af95578eda
+  data.tar.gz: bda77fdbe40a60ac3e4d9f681009b745f83769382de0d6d313a685a7545533ae1953b054a7cfdd29e404aab1fe1f22d416e3abae367d7acc9822af67d9ba794b

data/lib/pandocomatic/pandoc_metadata.rb

@@ -191,21 +191,32 @@ module Pandocomatic
 
             pandocomatic_blocks = 0
 
-            metadata_blocks = metadata_blocks.each do |metadata|
-                metadata.delete_if do |key|
-                    if key == "pandocomatic_" or key == "pandocomatic"
-                        pandocomatic_blocks += 1
-                        
-                        1 < pandocomatic_blocks 
-                    else 
-                        false
-                    end
+            metadata_blocks = metadata_blocks
+                .select {|m| not m.nil? and not m.empty?}
+                .each do |metadata|
+                    metadata.delete_if do |key|
+                        if key == "pandocomatic_" or key == "pandocomatic"
+                            pandocomatic_blocks += 1
+                            
+                            1 < pandocomatic_blocks 
+                        else 
+                            false
+                        end
                 end
             end
 
-            yaml_string = metadata_blocks
-                    .map {|metadata| YAML.dump(metadata)}
-                    .join("\n")
+            # According to the pandoc manual: "A document may contain multiple
+            # metadata blocks. The metadata fields will be combined through a
+            # left-biased union: if two metadata blocks attempt to set the
+            # same field, the value from the first block will be taken."
+            #
+            # Here we do the same
+            full_metadata = Hash.new
+            metadata_blocks
+                .reverse
+                .each {|block| full_metadata.merge!(block)}
+
+            yaml_string = YAML.dump(full_metadata) + "..."
 
             return [yaml_string, pandocomatic_blocks]
         end

data/lib/pandocomatic/pandocomatic.rb

@@ -47,7 +47,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, 5, 0]
+        VERSION = [0, 2, 5, 1]
 
         # Run pandocomatic given options
         #

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.5.0
+  version: 0.2.5.1
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-06 00:00:00.000000000 Z
+date: 2019-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
@@ -78,9 +78,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.18
-description: Pandocomatic is a tool to automate using pandoc (<http://pandoc.org>).
-  With pandocomatic you can express common patterns of using pandoc for generating
-  your documents. Applied to a directory, pandocomatic can act as a static site generator.
+description: Pandocomatic is a tool to automate using pandoc. With pandocomatic you
+  can express common patterns of using pandoc for generating your documents. Applied
+  to a directory, pandocomatic can act as a static site generator.
 email: Huub@heerdebeer.org
 executables:
 - pandocomatic
@@ -154,10 +154,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements:
-- pandoc, a universal document converer <http://pandoc.org>
+- pandoc, a universal document converter
 rubyforge_project: 
 rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
-summary: Automating the use of pandoc
+summary: Automate the use of pandoc
 test_files: []