bridgetown-core 0.21.2 → 0.21.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d33d466ab78dad035cfbd9d255dcd53a42c307cefebb5a12ae215393ec096ee3
-  data.tar.gz: 7c46ed1c37f82ffd63b3ee6753029fc74a17d67c625e638ac5b088fb3d2b929a
+  metadata.gz: 93f29ed24b8de3b277f80f77581605e3e0ed4aa8a40f87bb5b3e3cbc68fa8dfa
+  data.tar.gz: 9da3d6b3c608d7b067fdd9a65f6c05f1f40479c752d5c4fc5c523bcb9074e41b
 SHA512:
-  metadata.gz: 6a61dfef1bd907e8ff64fccfb43b57f081e45c92c0824b342d13f4137f02bd30d21772c8c9e8e1083d396738ef9df22eba103bbeeb2f7858192bac662cd2b18a
-  data.tar.gz: 19c1ff73c5f47403c6d741935cf0aa6bb52cc8f78b41114521c36f2594d7f79ee49f6919ca07d8cd3ea188edd1eba0a5605e94c102c66ba95b1549755ddbc082
+  metadata.gz: 63578f5534657f1ce647edd2f8d63ab7603d95d2ab3e2090a67baee046aa851f25eebca7d140525e39d5291f7101a286e0667eddedfe3dbbfe25a9f5a965f6ec
+  data.tar.gz: a0d39c95cd660de86debb328c6aecd8e884ef2154caedd5e8d61b5de7c9268e3df4feb4c7f2ebc0706ec5d7eef40ce40b46be38190ce68a7679d42abd4dffd68

data/lib/bridgetown-core/frontmatter_defaults.rb

@@ -1,13 +1,13 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  # This class handles custom defaults for YAML frontmatter settings.
-  # These are set in bridgetown.config.yml and apply both to internal use (e.g. layout)
-  # and the data available to liquid.
-  #
+  # This class handles custom defaults for YAML frontmatter variables.
   # It is exposed via the frontmatter_defaults method on the site class.
+  # TODO: needs simplification/refactoring.
   class FrontmatterDefaults
-    # Initializes a new instance.
+    # @return [Bridgetown::Site]
+    attr_reader :site
+
     def initialize(site)
       @site = site
     end
@@ -45,7 +45,7 @@ module Bridgetown
       set
     end
 
-    # Finds a default value for a given setting, filtered by path and type
+    # TODO: deprecated. See `all` method instead
     #
     # path - the path (relative to the source) of the page or
     # post the default is used in
@@ -96,8 +96,8 @@ module Bridgetown
     private
 
     def merge_data_cascade_for_path(path, merged_data)
-      absolute_path = @site.in_source_dir(path)
-      @site.defaults_reader.path_defaults
+      absolute_path = site.in_source_dir(path)
+      site.defaults_reader.path_defaults
         .select { |k, _v| absolute_path.include? k }
         .sort_by { |k, _v| k.length }
         .each do |defaults|
@@ -130,7 +130,7 @@ module Bridgetown
     end
 
     def glob_scope(sanitized_path, rel_scope_path)
-      site_source    = Pathname.new(@site.source)
+      site_source    = Pathname.new(site.source)
       abs_scope_path = site_source.join(rel_scope_path).to_s
 
       glob_cache(abs_scope_path).each do |scope_path|
@@ -152,7 +152,7 @@ module Bridgetown
     end
 
     def strip_collections_dir(path)
-      collections_dir  = @site.config["collections_dir"]
+      collections_dir  = site.config["collections_dir"]
       slashed_coll_dir = collections_dir.empty? ? "/" : "#{collections_dir}/"
       return path if collections_dir.empty? || !path.to_s.start_with?(slashed_coll_dir)
 
@@ -226,7 +226,7 @@ module Bridgetown
     #
     # Returns an array of hashes
     def valid_sets
-      sets = @site.config["defaults"]
+      sets = site.config["defaults"]
       return [] unless sets.is_a?(Array)
 
       sets.map do |set|

data/lib/bridgetown-core/resource/base.rb

@@ -30,9 +30,9 @@ module Bridgetown
       def initialize(model:)
         @model = model
         @site = model.site
-        self.data = HashWithDotAccess::Hash.new
+        @data = front_matter_defaults
 
-        trigger_hooks(:post_init)
+        trigger_hooks :post_init
       end
 
       # Collection associated with this resource
@@ -75,20 +75,21 @@ module Bridgetown
         @relations ||= Bridgetown::Resource::Relations.new(self)
       end
 
+      # Loads in any default front matter associated with the resource.
+      #
+      # @return [HashWithDotAccess::Hash]
+      def front_matter_defaults
+        site.frontmatter_defaults.all(
+          relative_path.to_s,
+          collection.label.to_sym
+        ).with_dot_access
+      end
+
+      # Merges new data into the existing data hash.
+      #
       # @param new_data [HashWithDotAccess::Hash]
       def data=(new_data)
-        unless new_data.is_a?(HashWithDotAccess::Hash)
-          raise "#{self.class} data should be of type HashWithDotAccess::Hash"
-        end
-
-        @data = new_data
-        @data.default_proc = proc do |_, key|
-          site.frontmatter_defaults.find(
-            relative_path.to_s,
-            collection.label.to_sym,
-            key.to_s
-          )
-        end
+        @data = @data.merge(new_data)
       end
 
       # @return [Bridgetown::Resource::Base]
@@ -107,7 +108,7 @@ module Bridgetown
 
         @destination = Destination.new(self) if requires_destination?
 
-        trigger_hooks(:post_read)
+        trigger_hooks :post_read
 
         self
       end
@@ -188,7 +189,7 @@ module Bridgetown
       def summary
         return summary_extension_output if respond_to?(:summary_extension_output)
 
-        content.to_s.strip.lines.first.to_s.strip
+        content.to_s.strip.lines.first.to_s.strip.html_safe
       end
 
       # @return [Hash<String, Hash<String => Bridgetown::Resource::TaxonomyType,

data/lib/bridgetown-core/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module Bridgetown
-  VERSION = "0.21.2"
+  VERSION = "0.21.3"
   CODE_NAME = "Broughton Beach"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bridgetown-core
 version: !ruby/object:Gem::Version
-  version: 0.21.2
+  version: 0.21.3
 platform: ruby
 authors:
 - Bridgetown Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel