Refactor util/data.rb further

middleman-core/lib/middleman-core/util/data.rb

@@ -1,21 +1,10 @@
-# Core Pathname library used for traversal
+require 'yaml'
+require 'json'
 require 'pathname'
-
-# DbC
+require 'middleman-core/util'
 require 'middleman-core/contracts'
 
-# Shared util methods
-require 'middleman-core/util'
-
-# Parsing YAML data
-require 'yaml'
-
-# Parsing JSON data
-require 'json'
-
-module Middleman
-  module Util
-    module Data
+module Middleman::Util::Data
   include Contracts
 
   module_function
@@ -48,8 +37,6 @@ module Middleman
       (?<additional_content>.*)
     /mx =~ content
 
-        return [{}, content] unless frontmatter
-
     case [start, stop]
     when %w[--- ---], %w[--- ...]
       [parse_yaml(frontmatter, full_path), additional_content]
@@ -65,7 +52,7 @@ module Middleman
   # @return [Array<Hash, String>]
   Contract String, Pathname, Bool => Hash
   def parse_yaml(content, full_path)
-        map_value(YAML.load(content))
+    symbolize_recursive(YAML.load(content))
   rescue StandardError, Psych::SyntaxError => error
     warn "YAML Exception parsing #{full_path}: #{error.message}"
     {}
@@ -76,28 +63,20 @@ module Middleman
   # @return [Array<Hash, String>]
   Contract String, Pathname => Hash
   def parse_json(content, full_path)
-        map_value(JSON.parse(content))
+    symbolize_recursive(JSON.parse(content))
   rescue StandardError => error
     warn "JSON Exception parsing #{full_path}: #{error.message}"
     {}
   end
 
-      def symbolize_recursive(hash)
-        {}.tap do |h|
-          hash.each { |key, value| h[key.to_sym] = map_value(value) }
-        end
-      end
-
-      def map_value(thing)
-        case thing
+  def symbolize_recursive(value)
+    case value
     when Hash
-          symbolize_recursive(thing)
+      value.map { |k, v| [k.to_sym, symbolize_recursive(v)] }.to_h
     when Array
-          thing.map { |v| map_value(v) }
+      value.map { |v| symbolize_recursive(v) }
     else
-          thing
-        end
-      end
+      value
     end
   end
 end