pandocomatic 0.2.5.0.betad → 0.2.5.0.betae

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c46b6b2c7d745668a59b28bb2f38823ece50c90f24bd53e31c586489e429cb88
-  data.tar.gz: 336889e4f77b7511034f62cb21ab42c01095818e79ebd3d758f30aecc8e10278
+  metadata.gz: 8fc5078287ef035d1bd1734f28d6248f095ca6ec2ccf8c7bf6a4d702d3f7919b
+  data.tar.gz: e06523b3dd232c7688c30903082fdadc5133f413e651aeddb86c983690fd9700
 SHA512:
-  metadata.gz: f1f6304e2838a32387b88fd4a18f855e1ee90159262635b9f2cd2b3f568523868dcb157499dcd6fb886f77769ca5a687f68427f24ffb233cb8e6f914e0de9e00
-  data.tar.gz: 5f13e1a64e6b012726d55053df8bf0eb9a7bca879201f3c71d164ae526f6ad7db721b0032616471223e7910d88b202cc44791361ec1812e1fc06ae459e16bcc1
+  metadata.gz: 33669dd83b7de3921af91a19468dbbb4d5a640c9dd69886fb1d4fd673a523a2a53b5b8844f5aaea10e793b93fb54327a9dd6e9a8c5070557f522904d911e26eb
+  data.tar.gz: 530bb6418f57a25d780e83e338f0fd37484eb30c0e765aa79fa634368eba58061724d2858a670dc07c09ad993e180fa2584d719a027c3a6b397d5be0e9faa190

data/lib/pandocomatic/multiple_files_input.rb

@@ -81,7 +81,7 @@ module Pandocomatic
         def create_temp_file()
             # Concatenate all input files into one (temporary) input file
             # created in the same directory as the first input file
-            @tmp_file = Tempfile.new(@input_files.first, File.dirname(self.absolute_path))
+            @tmp_file = Tempfile.new("pandocomatic_tmp_", File.dirname(self.absolute_path))
 
             contents = @input_files.map{|file| 
                 @errors.push IOError.new(:file_does_not_exist, nil, file) unless File.exist? file
@@ -90,8 +90,10 @@ module Pandocomatic
                 File.read File.absolute_path(file)
             }.join("\n\n")
 
-            if not PandocMetadata.unique_pandocomatic_property? contents
-                warn "\nWarning: Encountered the pandocomatic metadata property more than once. Only the last occurrence of the pandocomatic metadata property is being used. Most likely you only want to use a pandocomatic metadata property in the first input file.\n\n"
+            metadata = PandocMetadata.load contents
+
+            if not metadata.unique?
+                warn "\nWarning: Encountered the pandocomatic metadata property in more than one YAML metadata block. Only the pandocomatic property from the first YAML metadata block is being used; the other pandocomatic properties have been discarded.\n\n"
             end
 
             @tmp_file.write contents

data/lib/pandocomatic/pandoc_metadata.rb

@@ -32,48 +32,12 @@ module Pandocomatic
     # templates and input files.
     class PandocMetadata < Hash
 
-        # Extract the metadata from an input file
-        #
-        # @param input_document [String] a path to an input file
-        # @return [String] the input document's metadata in the YAML format.
-        def self.extract_metadata(input_document)
-            begin
-                pandoc2yaml File.read(input_document)
-            rescue StandardError => e
-                raise IOError.new(:error_opening_file, e, input_document)
-            end
-        end
-
-        # Remove all metadata from an input string
-        #
-        # @param input [String] the input to remove all metadata from
-        # @return [String] the input with all metadata blocks removed
-        def self.remove_metadata(input)
-            input.gsub(METADATA_BLOCK, "\n");
-        end
-
         # Extract the YAML metadata from an input string
         #
         # @param input [String] the input string
         # @return [String] the YAML data embedded in the input string
         def self.pandoc2yaml(input)
-            mined_metadata = input.scan(METADATA_BLOCK)
-            
-            mined_metadata
-                .flatten
-                .map{|yaml| yaml.strip}
-                .join("\n")
-        end
-
-        # Does the pandocomatic metadata property occur at most once?
-        #
-        # @return [Boolean] False if the pandocomatic metadata property does
-        # occur multiple times.
-        def self.unique_pandocomatic_property?(input)
-            1 >= input
-                .scan(METADATA_BLOCK)
-                .map {|match| YAML.load "---#{match.join()}..."}
-                .count {|yaml| yaml.key? "pandocomatic_" or yaml.key? "pandocomatic"}
+            extract_metadata(input).first
         end
 
         # Collect the metadata embedded in the src file and create a new
@@ -83,13 +47,22 @@ module Pandocomatic
         # @return [PandocMetadata] the metadata in the source file, or an empty
         #   one if no such metadata is contained in the source file.
         def self.load_file(src)
-            input = File.read src
-            yaml_metadata = pandoc2yaml input
+            load(File.read src)
+        end
+        
+        # Collect the metadata embedded in the src file and create a new
+        # PandocMetadata instance
+        #
+        # @param input [String] the string to load the metadata from
+        # @return [PandocMetadata] the metadata in the source file, or an empty
+        #   one if no such metadata is contained in the source file.
+        def self.load(input)
+            yaml, pandocomatic_blocks = extract_metadata(input)
 
-            if yaml_metadata.empty? then
+            if yaml.empty? then
                 PandocMetadata.new
             else
-                PandocMetadata.new YAML.load(yaml_metadata), unique_pandocomatic_property?(input)
+                PandocMetadata.new YAML.load(yaml), 1 >= pandocomatic_blocks
             end
         end
 
@@ -196,6 +169,47 @@ module Pandocomatic
             has_pandocomatic? and pandocomatic.has_key? 'pandoc' and not pandocomatic['pandoc'].nil?
         end
 
+        private 
+
+        # Extract the metadata from an input file
+        #
+        # @param input [String] the string to extract metadata from
+        # @return [Array] The return value is an array with the following two
+        # values:
+        #  
+        # 1. The extracted metadata as a YAML string
+        # 2. The number of times the pandocomatic properties did occur in the
+        #    input.
+        #
+        # If more than one pandocomatic property is contained in the input,
+        # all but the first are discarded and are not present in the
+        # extracted metadata YAML string.
+        def self.extract_metadata(input)
+            metadata_blocks = input
+                .scan(METADATA_BLOCK)
+                .map {|match| YAML.load "---#{match.join()}..."}
+
+            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
+                end
+            end
+
+            yaml_string = metadata_blocks
+                    .map {|metadata| YAML.dump(metadata)}
+                    .join("\n")
+
+            return [yaml_string, pandocomatic_blocks]
+        end
+
     end
 
 end

metadata

@@ -1,53 +1,53 @@
 --- !ruby/object:Gem::Specification
 name: pandocomatic
 version: !ruby/object:Gem::Version
-  version: 0.2.5.0.betad
+  version: 0.2.5.0.betae
 platform: ruby
 authors:
 - Huub de Beer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-27 00:00:00.000000000 Z
+date: 2019-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paru
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.3.2.0
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.2
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.3.2.0
 - !ruby/object:Gem::Dependency
   name: optimist
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 3.0.0
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
@@ -156,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - pandoc, a universal document converer <http://pandoc.org>
 rubyforge_project: 
-rubygems_version: 3.0.0.beta1
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Automating the use of pandoc