dimples 5.5.0 → 5.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 347bd6a8efb9b677218b6f8ed69e3888fbf3ac2b
-  data.tar.gz: 1b7886a6af98d37c50d3538b3f180c04a7b05a91
+  metadata.gz: 523ca9490b506eb7f2c4da685e85809ec650f4a1
+  data.tar.gz: 5b40db0b29c2e846c1ed45f1a7bf9d0685244543
 SHA512:
-  metadata.gz: e880ddc6967301841abf9ff274e7082f9b7320f020bb0c87e48f4aad3795eaff97ecda8b33e96647486fac8696aa6ea6bb2531341c3525a37043959fbc2e4565
-  data.tar.gz: b744697a3b9566a3f2e029be3bb239182640df0e21834a6b5d5cc5d96a4026ebc4a5724ef2a29c499c9a149d3ed0941218e4c132d0955e365abac5f0ac811b10
+  metadata.gz: 644e0fcdfe86e59cb76175297ffc29fbc7655f94ae112c27338d84b971634cfff0ec6816a69d14a5e766fa7b33df954492700f1ce419b152469e1c1e82e8f620
+  data.tar.gz: 71625d1493f0b6731e56160e3b06ff6f65bb598aa1baf2e40db8b60b19888fe2d7974596e57e9264ca460dd5a60edbe175d37cd5dfae989540b356bce1d43f43

data/lib/dimples/site.rb

@@ -9,6 +9,7 @@ module Dimples
     attr_reader :paths
     attr_reader :posts
     attr_reader :pages
+    attr_reader :archives
     attr_reader :templates
     attr_reader :latest_post
 
@@ -54,7 +55,7 @@ module Dimples
 
       publish_posts
       publish_pages
-      publish_archives
+      publish_archives if @config.generation.year_archives
       publish_categories if @config.generation.categories
 
       trigger_event(:after_publishing)
@@ -67,7 +68,7 @@ module Dimples
     private
 
     def prepare
-      @archives = { year: {}, month: {}, day: {} }
+      @archives = { year: {} }
 
       @categories = {}
       @templates = {}
@@ -114,9 +115,9 @@ module Dimples
     end
 
     def add_archive_post(post)
-      archive_year(post.year) << post
-      archive_month(post.year, post.month) << post
-      archive_day(post.year, post.month, post.day) << post
+      archive_year(post.year)[:posts] << post
+      archive_month(post.year, post.month)[:posts] << post
+      archive_day(post.year, post.month, post.day)[:posts] << post
     end
 
     def categorise_post(post)
@@ -160,13 +161,13 @@ module Dimples
 
       publish_feeds(@posts, @paths[:output]) if @config.generation.main_feed
 
-      if @config.generation.paginated_posts
-        paginate_posts(
-          @posts,
-          File.join(@paths[:output], @config.paths.paginated_posts),
-          @config.layouts.paginated_post
-        )
-      end
+      return unless @config.generation.paginated_posts
+
+      paginate_posts(
+        @posts,
+        File.join(@paths[:output], @config.paths.paginated_posts),
+        @config.layouts.paginated_post
+      )
     end
 
     def publish_pages
@@ -189,30 +190,47 @@ module Dimples
     end
 
     def publish_archives
-      %w[year month day].each do |date_type|
-        next unless @config.generation["#{date_type}_archives"]
-        publish_date_archive(date_type.to_sym)
-      end
-    end
+      @archives[:year].each do |year, year_archive|
+        publish_date_archive(year)
+        next unless @config.generation.month_archives
 
-    def publish_date_archive(date_type)
-      @archives[date_type].each do |date, posts|
-        date_parts = date.split('-')
-        path = File.join(@paths[:output], @config.paths.archives, date_parts)
+        year_archive[:month].each do |month, month_archive|
+          publish_date_archive(year, month)
+          next unless @config.generation.day_archives
 
-        paginate_posts(
-          posts.reverse,
-          path,
-          @config.layouts.date_archive,
-          page: {
-            title: posts[0].date.strftime(@config.date_formats[date_type]),
-            archive_date: posts[0].date,
-            archive_type: date_type
-          }
-        )
+          month_archive[:day].each do |day, _|
+            publish_date_archive(year, month, day)
+          end
+        end
       end
     end
 
+    def publish_date_archive(year, month = nil, day = nil)
+      date_type = if day
+                    'day'
+                  elsif month
+                    'month'
+                  else
+                    'year'
+                  end
+
+      date_parts = [year, month, day].compact
+      path = File.join(@paths[:output], @config.paths.archives, date_parts)
+
+      posts = archive(year, month, day)[:posts]
+
+      paginate_posts(
+        posts.reverse,
+        path,
+        @config.layouts.date_archive,
+        page: {
+          title: posts[0].date.strftime(@config.date_formats[date_type]),
+          archive_date: posts[0].date,
+          archive_type: date_type
+        }
+      )
+    end
+
     def publish_categories
       @categories.each_value do |category|
         path = File.join(
@@ -276,16 +294,34 @@ module Dimples
       end
     end
 
+    def archive(year, month = nil, day = nil)
+      if day
+        archive_day(year, month, day)
+      elsif month
+        archive_month(year, month)
+      else
+        archive_year(year)
+      end
+    end
+
     def archive_year(year)
-      @archives[:year][year] ||= []
+      @archives[:year][year.to_s] ||= {
+        month: {},
+        posts: []
+      }
     end
 
     def archive_month(year, month)
-      @archives[:month]["#{year}-#{month}"] ||= []
+      archive_year(year)[:month][month.to_s] ||= {
+        day: {},
+        posts: []
+      }
     end
 
     def archive_day(year, month, day)
-      @archives[:day]["#{year}-#{month}-#{day}"] ||= []
+      archive_month(year, month)[:day][day.to_s] ||= {
+        posts: []
+      }
     end
 
     def plugins

data/lib/dimples/version.rb

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

metadata

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