dimples 10.6.0 → 10.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c0d12cf89d7318ad1c0e9717a3389bc3b4033676206caddc8f31081975797a
-  data.tar.gz: ed93b72589065aa25a013624ffec85a17a24629b15188bf3f0a83cbac4c52904
+  metadata.gz: 4b5c714d45ca9e2ea1acc71d9cd7f4ce61baf15da289780e3bcca06195f7688d
+  data.tar.gz: 347fce125c6cae601b18d6becd20715203f1ebe98ffb265300eb1a5bfc0fc371
 SHA512:
-  metadata.gz: 8518ff8cc7c925122dbe8ca28c0775497068a15ed2bc8426cf5006591e988e52c26c35d2c7a31b2229cd3f95825e654b126133122dbeab65b7b056918f99788d
-  data.tar.gz: f1a58dc7294faec5b8e47547fccc07fea07225ba500cf509c55fcd84f0f4242757e27ebe2eb8d270de01218f53a14cc3d844ecb9181fccac631ba3d6089c93c4
+  metadata.gz: f9086e486dc0a12e6ec28a526382f806dc338c45852ffb3226e571d135c2d1520662c8d49127076646edc416fef4a0cd68009410a8709631436fe53e5d31f654
+  data.tar.gz: 7481579f5ad52500f7085e1ce28a8f158066baf38fbe292c0cf903cbf2ca2f94dae23fb5e9336cdfc643e931c98a7bc554d4d2c598a62d6444dfd95c141e4ec3

data/lib/dimples/config.rb

@@ -17,7 +17,6 @@ module Dimples
         source: Dir.pwd,
         build: './site',
         pathnames: { posts: 'posts', categories: 'categories' },
-        site: { name: nil, domain: nil },
         pagination: { page_prefix: 'page_', per_page: 5 },
         generation: { main_feed: true, category_feeds: false }
       }

data/lib/dimples/entry.rb

@@ -42,7 +42,7 @@ module Dimples
     end
 
     def generate(output_path: nil, context: {})
-      output_path = File.join(output_directory, @metadata[:filename]) if output_path.nil?
+      output_path = File.join(output_directory, filename) if output_path.nil?
       write(output_path: output_path, body: render(context: context))
     end
 
@@ -55,20 +55,26 @@ module Dimples
 
     def url
       @url ||= output_directory.gsub(@site.config.build_paths[:root], '').tap do |url|
-        url.concat(@metadata[:filename]) unless @metadata[:filename] == 'index.html'
+        url.concat(filename) unless filename == 'index.html'
       end
     end
 
     def render(context: {}, body: nil)
-      context[:site] ||= @site.metadata
-      context[:page] ||= @metadata
+      context[:site] ||= @site
+      context[:page] ||= self
 
-      @rendered_contents = template.render(Metadata.new(context)) { body }
+      @rendered_contents = template.render(
+        Object.new.tap do |render_context|
+          context.each do |key, value|
+            render_context.instance_variable_set("@#{key}", value)
+          end
+        end
+      ) { body }
 
-      layout = @site.layouts[@metadata.layout.to_sym] if @metadata.layout
-      return @rendered_contents if layout.nil?
+      template = @site.layouts[layout.to_sym] unless layout.nil?
+      return @rendered_contents if template.nil?
 
-      layout.render(context: context, body: @rendered_contents)
+      template.render(context: context, body: @rendered_contents)
     end
 
     def output_directory
@@ -79,16 +85,14 @@ module Dimples
       @template ||= Tilt::ERBTemplate.new { @contents }
     end
 
-    def to_h
-      @metadata.to_h.merge({ contents: contents })
-    end
-
     def method_missing(method_name, *_args)
-      @metadata.send(method_name)
+      method_sym = method_name.to_sym
+
+      @metadata.send(method_sym)
     end
 
-    def respond_to_missing?(_method_name, _include_private = false)
-      true
+    def respond_to_missing?(method_name, _include_private = false)
+      @metadata.respond_to?(method_name.to_sym) || super
     end
 
     private

data/lib/dimples/metadata.rb

@@ -1,53 +1,21 @@
+# frozen_string_literal: true
+
 module Dimples
+  # A tiny wrapper around metadata for rendering
   class Metadata
-    include Enumerable
-
     def initialize(source)
       source.each do |key, value|
         self.class.send(:attr_reader, key)
-        instance_variable_set("@#{key}", build(value))
+        instance_variable_set("@#{key}", value.is_a?(Hash) ? Metadata.new(value) : value)
       end
-
-      @data = source
-    end
-
-    def keys
-      @data.keys
-    end
-
-    def [](key)
-      @data[key]
-    end
-
-    def each(&block)
-      @data.each(&block)
-    end
-
-    def each_key(&block)
-      @data.keys.each(&block)
     end
 
-    def method_missing(method_name, *_args)
-      return @data[method_name] if @data.key?(method_name)
-
+    def method_missing(_method_name, *_args)
       nil
     end
 
-    def respond_to_missing?(method_name, include_private = false)
-      @data.key?(method_name) || super
-    end
-
-    private
-
-    def build(item)
-      case item
-      when Array
-        item.map { |i| build(i) }
-      when Hash
-        item.empty? ? item : Metadata.new(item)
-      else
-        item
-      end
+    def respond_to_missing?(_method_name, _include_private = false)
+      true
     end
   end
 end

data/lib/dimples/pager.rb

@@ -27,13 +27,11 @@ module Dimples
       (1..@page_count).each do |index|
         step_to(index)
 
-        output_directory = File.join(@site.config.build_paths[:root], current_page_url)
-
-        context.merge!(metadata, url: current_page_url)
+        output_directory = File.join(@site.config.build_paths[:root], current_page_path)
 
         @site.layouts[:posts]&.generate(
           output_path: File.join(output_directory, 'index.html'),
-          context: context
+          context: metadata.merge(context, url: current_page_url)
         )
 
         yield(output_directory, context) if block_given?
@@ -60,6 +58,10 @@ module Dimples
       @current_page + 1 <= @page_count
     end
 
+    def current_page_path
+      @current_page == 1 ? @url : File.join(@url, "page_#{@current_page}")
+    end
+
     def current_page_url
       @current_page == 1 ? @url : "#{@url}#{@page_prefix}#{@current_page}"
     end
@@ -95,14 +97,14 @@ module Dimples
     def metadata
       {
         posts: posts_at(current_page),
-        pagination: {
+        pagination: Metadata.new(
           current_page: @current_page,
           page_count: @page_count,
           post_count: @posts.count,
           previous_page: @previous_page,
           next_page: @next_page,
           urls: urls
-        }
+        )
       }
     end
   end

data/lib/dimples/post.rb

@@ -22,13 +22,6 @@ module Dimples
       @template ||= Tilt::RedcarpetTemplate.new { @contents }
     end
 
-    def to_h
-      super.reject { |k, _| %i[filename layout].include?(k) }.tap do |output|
-        output[:date] = output[:date].iso8601 unless output[:date].nil?
-        output[:url] ||= url
-      end
-    end
-
     private
 
     def default_metadata

data/lib/dimples/site.rb

@@ -31,7 +31,7 @@ module Dimples
     def posts
       @posts ||= Dir.glob(File.join(@config.source_paths[:posts], '**', '*.markdown')).map do |path|
         Dimples::Post.new(site: self, path: path)
-      end.sort_by! { |post| post.metadata[:date] }.reverse!
+      end.sort_by! { |post| post.date }.reverse!
     end
 
     def pages
@@ -49,7 +49,7 @@ module Dimples
     def categories
       @categories ||= {}.tap do |categories|
         posts.each do |post|
-          post.metadata[:categories].each do |category|
+          post.categories.each do |category|
             categories[category] ||= []
             categories[category].append(post)
           end
@@ -57,10 +57,6 @@ module Dimples
       end
     end
 
-    def metadata
-      @metadata ||= Metadata.new(posts: posts, categories: categories)
-    end
-
     private
 
     def generate_posts

data/lib/dimples/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 10.6.0
+  version: 10.7.0
 platform: ruby
 authors:
 - Daniel Bogan