dimples 10.0.0 → 10.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18bfc09d96924fc5ed5ed12f9d939ad035feaa2ede3f67b0045bd524da5d0d66
-  data.tar.gz: 224f9dbecde7c7a57fc11d5843898fd2f3b553acc7448cd7639f73fb8c8d7fad
+  metadata.gz: 1851462f5263625c3180103f3be8e6484246bdd21609a401ab779f26d489cfc7
+  data.tar.gz: 5b2312987fd9ceb6c78f8be7152445bf25161fd4e16f6bf9a1e055b9b21d5502
 SHA512:
-  metadata.gz: 6eb46d1192a47f326865c567372c1dc1a5d12f8c93a932d99c7d5c1f2269abbe5cef6a2511eab752938cabf276c92e21f4cf010fac6c206d71674cafd62213b9
-  data.tar.gz: 4d360af4ddf70adeea836fa311f63bdc14cc5184ecd042b30a7b88670523a1611db707bd42ea66e76494d4b46466c7cc693ee40391c6d9b7a97b74f94db5eae5
+  metadata.gz: 92451497846e5d3724a09d98ea88e9eec50f96b282061cf96fcb17be39bc180bad42d2e9994077545bd70b3f4ba68a8d11fee2d29cd66f2b812c82a8673c1811
+  data.tar.gz: a23cc742b62eed3ace4b40bb38002c392c5be58525177f4d159e3f983ad15ccbda1331e5cf9080841f1295b604cb09d361b215c647bd09040deb7c23f017eb47

data/lib/dimples/metadata.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+module Dimples
+  # A class representing metadata passed into a template for rendering.
+  class Metadata
+    attr_reader :keys
+
+    def initialize(source)
+      source.each do |key, value|
+        self.class.send(:attr_reader, key)
+        instance_variable_set("@#{key}", build(value))
+      end
+
+      @keys = source.keys
+    end
+
+    def build(item)
+      case item
+      when Array
+        item.map { |i| build(i) }
+      when Hash
+        item.empty? ? item : Metadata.new(item)
+      else
+        item
+      end
+    end
+
+    def method_missing(_method_name, *_args)
+      nil
+    end
+
+    def respond_to_missing?(_method_name, _include_private)
+      true
+    end
+  end
+end

data/lib/dimples/pager.rb

@@ -29,7 +29,7 @@ module Dimples
       (1..@page_count).each do |index|
         step_to(index)
 
-        @site.layouts['posts'].write(
+        @site.layouts['posts']&.write(
           File.join(@site.config[:output][:root], current_page_url, 'index.html'),
           metadata.merge(pagination: self.metadata, url: current_page_url)
         )

data/lib/dimples/site.rb

@@ -3,6 +3,7 @@
 require 'fileutils'
 require 'tilt'
 require 'date'
+require 'yaml'
 
 module Dimples
   # A class representing a single generated website.
@@ -57,7 +58,7 @@ module Dimples
     end
 
     def metadata
-      @metadata ||= { posts: posts, categories: categories }
+      @metadata ||= Metadata.new(posts: posts, categories: categories)
     end
 
     private

data/lib/dimples/sources/base.rb

@@ -15,17 +15,22 @@ module Dimples
         @metadata = default_metadata
         @contents = File.read(@path)
 
-        matches = @contents.match(FRONT_MATTER_PATTERN)
+        parse_metadata(@contents)
+      end
+
+      def parse_metadata(contents)
+        matches = contents.match(FRONT_MATTER_PATTERN)
         return unless matches
 
         @metadata.merge!(YAML.safe_load(matches[1], symbolize_names: true, permitted_classes: [Date]))
         @contents = matches.post_match.strip
+
+        @metadata.each_key do |key|
+          self.class.send(:define_method, key.to_sym) { @metadata[key] }
+        end
       end
 
       def write(output_path = nil, metadata = {})
-        metadata[:site] ||= @site
-        metadata[context_key] ||= self
-
         output = render(metadata)
 
         output_path = File.join(output_directory, filename) if output_path.nil?
@@ -35,24 +40,14 @@ module Dimples
         File.write(output_path, output)
       end
 
-      def render(metadata = {}, body = nil)
-        output = template.render(context(metadata)) { body }
-        return output unless @metadata[:layout] && @site.layouts[@metadata[:layout]]
+      def render(render_metadata = {}, body = nil)
+        render_metadata[:site] ||= @site.metadata
+        render_metadata[:page] ||= metadata
 
-        @site.layouts[@metadata[:layout]].render(metadata, output)
-      end
+        output = template.render(Metadata.new(render_metadata)) { body }
+        return output unless @metadata[:layout] && @site.layouts[@metadata[:layout]]
 
-      def context(metadata)
-        Object.new.tap do |context|
-          metadata.each { |key, variable| context.instance_variable_set("@#{key}", variable) }
-        end
-      end
-
-      def default_metadata
-        {
-          layout: nil,
-          filename: 'index.html'
-        }
+        @site.layouts[@metadata[:layout]].render(render_metadata, output)
       end
 
       def output_directory
@@ -69,16 +64,11 @@ module Dimples
 
       private
 
-      def context_key
-        :page
-      end
-
-      def method_missing(method_name, *_args)
-        @metadata[method_name] if @metadata.key?(method_name)
-      end
-
-      def respond_to_missing?(method_name, include_private)
-        @metadata.key?(method_name) || super
+      def default_metadata
+        {
+          layout: nil,
+          filename: 'index.html'
+        }
       end
     end
   end

data/lib/dimples/sources/post.rb

@@ -17,10 +17,6 @@ module Dimples
 
       private
 
-      def context_key
-        :post
-      end
-
       def default_metadata
         super.tap do |defaults|
           defaults[:layout] = 'post'

data/lib/dimples/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Dimples
-  VERSION = '10.0.0'
+  VERSION = '10.1.1'
 end

data/lib/dimples.rb

@@ -3,6 +3,7 @@
 $LOAD_PATH.unshift(__dir__)
 
 require 'dimples/config'
+require 'dimples/metadata'
 require 'dimples/pager'
 require 'dimples/site'
 

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 10.0.0
+  version: 10.1.1
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-03 00:00:00.000000000 Z
+date: 2024-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: erubi
+  name: erb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: redcarpet
   requirement: !ruby/object:Gem::Requirement
@@ -63,6 +63,7 @@ files:
 - bin/dimples
 - lib/dimples.rb
 - lib/dimples/config.rb
+- lib/dimples/metadata.rb
 - lib/dimples/pager.rb
 - lib/dimples/site.rb
 - lib/dimples/sources/base.rb