dimples 10.6.0 → 10.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46c0d12cf89d7318ad1c0e9717a3389bc3b4033676206caddc8f31081975797a
-  data.tar.gz: ed93b72589065aa25a013624ffec85a17a24629b15188bf3f0a83cbac4c52904
+  metadata.gz: 2dbafe84ea3b47edb09710e64408e2bd564463b3774812bf3738a4581778d14a
+  data.tar.gz: 8cd626b91b5487ff5ccd139e600e28154c3b9cf419d0c4f4fec03fbf26a9eec0
 SHA512:
-  metadata.gz: 8518ff8cc7c925122dbe8ca28c0775497068a15ed2bc8426cf5006591e988e52c26c35d2c7a31b2229cd3f95825e654b126133122dbeab65b7b056918f99788d
-  data.tar.gz: f1a58dc7294faec5b8e47547fccc07fea07225ba500cf509c55fcd84f0f4242757e27ebe2eb8d270de01218f53a14cc3d844ecb9181fccac631ba3d6089c93c4
+  metadata.gz: 2fa0abf7b05309cc28a094682391f884c9739dda4721ce45bf2a51988b36ecafafa454f236cccacc2731635970385a3e678136eadca78fd21c05f9cf6b23df44
+  data.tar.gz: '05093a25c038a0a2fe7b631de3c44135b313c83a82e3e59f8544b01caff9127bdb60ac8ff36f91f56185e9bfaaa640e25343d2811c0c0cef70b9ca3b9b091e53'

data/lib/dimples/config.rb

@@ -17,7 +17,7 @@ module Dimples
         source: Dir.pwd,
         build: './site',
         pathnames: { posts: 'posts', categories: 'categories' },
-        site: { name: nil, domain: nil },
+        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

@@ -61,7 +61,7 @@ module Dimples
 
     def render(context: {}, body: nil)
       context[:site] ||= @site.metadata
-      context[:page] ||= @metadata
+      context[:page] ||= @metadata.merge(context)
 
       @rendered_contents = template.render(Metadata.new(context)) { body }
 
@@ -79,10 +79,6 @@ 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)
     end

data/lib/dimples/metadata.rb

@@ -15,6 +15,10 @@ module Dimples
       @data.keys
     end
 
+    def merge(hash)
+      @data.merge(hash)
+    end
+
     def [](key)
       @data[key]
     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

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

@@ -58,7 +58,7 @@ module Dimples
     end
 
     def metadata
-      @metadata ||= Metadata.new(posts: posts, categories: categories)
+      @metadata ||= Metadata.new(@config.site.merge(posts: posts, categories: categories.merge))
     end
 
     private

data/lib/dimples/version.rb

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

metadata

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