dimples 10.6.1 → 10.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbafe84ea3b47edb09710e64408e2bd564463b3774812bf3738a4581778d14a
-  data.tar.gz: 8cd626b91b5487ff5ccd139e600e28154c3b9cf419d0c4f4fec03fbf26a9eec0
+  metadata.gz: 4b5c714d45ca9e2ea1acc71d9cd7f4ce61baf15da289780e3bcca06195f7688d
+  data.tar.gz: 347fce125c6cae601b18d6becd20715203f1ebe98ffb265300eb1a5bfc0fc371
 SHA512:
-  metadata.gz: 2fa0abf7b05309cc28a094682391f884c9739dda4721ce45bf2a51988b36ecafafa454f236cccacc2731635970385a3e678136eadca78fd21c05f9cf6b23df44
-  data.tar.gz: '05093a25c038a0a2fe7b631de3c44135b313c83a82e3e59f8544b01caff9127bdb60ac8ff36f91f56185e9bfaaa640e25343d2811c0c0cef70b9ca3b9b091e53'
+  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, summary: 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.merge(context)
+      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
@@ -80,11 +86,13 @@ module Dimples
     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,57 +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 merge(hash)
-      @data.merge(hash)
-    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

@@ -97,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/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(@config.site.merge(posts: posts, categories: categories.merge))
-    end
-
     private
 
     def generate_posts

data/lib/dimples/version.rb

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

metadata

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