dimples 6.1.0 → 6.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92e195459728e28b5120a92a4282b2dbf7fe169f
-  data.tar.gz: ff63f1c065662ccc3dd8b64ca66e5a28fa78d398
+  metadata.gz: 6afbd71e5416934a021d53ad883b21c5b3e7d919
+  data.tar.gz: 342eb97cfe1817bfb00e910582710b49c99a25fc
 SHA512:
-  metadata.gz: e2bbd4a0f7e1165e4d2e3d2e8411d3ebe14a105cac745bc363d7638babecb673a3b6bc79c073a1c41c3ce99f9405302163f1fc30e1797fb9a6545d19570e3b63
-  data.tar.gz: e63c7504d58398086e15a4f42c3df8b281e59e50964aa28dd8467215b14a1c7a43e135acc79d1535988de4063e73cae5af012d2a1a0212cbfc7c7af434b3007c
+  metadata.gz: fa79976d760b83d9cb8f6125b38ffd6fd71adee6e9cbdfaae730407933e38743a19da11f5e8783af938901313f3f8ce99226f27661520af6b6357751ca5e4ead
+  data.tar.gz: 2e3df64946baed2bdf1a8837f25ee0f709c00a0f0f3b9d8e972964d4957a34c7e60570a2d591fddd2ebc211980edc175cb7d63ac1d62ec6cc955a3e85e29ac16

data/lib/dimples.rb

@@ -8,12 +8,16 @@ require 'yaml'
 
 require 'dimples/frontable'
 
+require 'dimples/archive'
 require 'dimples/category'
 require 'dimples/configuration'
 require 'dimples/errors'
-require 'dimples/page'
 require 'dimples/pager'
-require 'dimples/post'
 require 'dimples/renderer'
-require 'dimples/site'
+
+require 'dimples/page'
+require 'dimples/feed'
+require 'dimples/post'
 require 'dimples/template'
+
+require 'dimples/site'

data/lib/dimples/archive.rb

@@ -0,0 +1,64 @@
+# frozen_string_literal: true
+
+module Dimples
+  # A collection of posts, organised by date.
+  class Archive
+    def initialize
+      @years = {}
+    end
+
+    def add_post(post)
+      year(post.year)[:posts] << post
+      month(post.year, post.month)[:posts] << post
+      day(post.year, post.month, post.day)[:posts] << post
+    end
+
+    def years
+      @years.keys
+    end
+
+    def months(year)
+      year(year)[:months].keys
+    end
+
+    def days(year, month)
+      month(year, month)[:days].keys
+    end
+
+    def posts_for_date(year, month = nil, day = nil)
+      if day
+        day_posts(year, month, day)
+      elsif month
+        month_posts(year, month)
+      else
+        year_posts(year)
+      end
+    end
+
+    def year_posts(year)
+      year(year)[:posts]
+    end
+
+    def month_posts(year, month)
+      month(year, month)[:posts]
+    end
+
+    def day_posts(year, month, day)
+      day(year, month, day)[:posts]
+    end
+
+    private
+
+    def year(year)
+      @years[year.to_s] ||= { months: {}, posts: [] }
+    end
+
+    def month(year, month)
+      year(year)[:months][month.to_s] ||= { days: {}, posts: [] }
+    end
+
+    def day(year, month, day)
+      month(year, month)[:days][day.to_s] ||= { posts: [] }
+    end
+  end
+end

data/lib/dimples/feed.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module Dimples
+  # A single feed.
+  class Feed < Page
+    def initialize(site, format)
+      super(site)
+
+      self.filename = 'feed'
+      self.extension = format
+      self.layout = "feeds.#{format}"
+    end
+  end
+end

data/lib/dimples/pager.rb

@@ -13,6 +13,31 @@ module Dimples
     attr_reader :page_count
     attr_reader :item_count
 
+    def self.paginate(site, posts, path, layout, context = {})
+      pager = Pager.new(
+        path.sub(site.paths[:destination], '') + '/',
+        posts,
+        site.config.pagination
+      )
+
+      pager.each do |index|
+        page = Page.new(site)
+        page.layout = layout
+
+        page_prefix = site.config.pagination.page_prefix
+        page_path = if index == 1
+                      path
+                    else
+                      File.join(path, "#{page_prefix}#{index}")
+                    end
+
+        page.write(
+          page_path,
+          context.merge(pagination: pager.to_context)
+        )
+      end
+    end
+
     def initialize(url, posts, options = {})
       @url = url
       @posts = posts

data/lib/dimples/site.rb

@@ -9,7 +9,7 @@ module Dimples
     attr_reader :paths
     attr_reader :posts
     attr_reader :pages
-    attr_reader :archives
+    attr_reader :archive
     attr_reader :templates
     attr_reader :latest_post
 
@@ -57,7 +57,7 @@ module Dimples
     private
 
     def prepare
-      @archives = { year: {} }
+      @archive = Dimples::Archive.new
 
       @categories = {}
       @templates = {}
@@ -69,11 +69,14 @@ module Dimples
       @latest_post = nil
     end
 
+    def read_files(path)
+      Dir.glob(File.join(path, '**', '*.*')).sort
+    end
+
     def read_templates
       @templates = {}
-      template_glob = File.join(@paths[:templates], '**', '*.*')
 
-      Dir.glob(template_glob).each do |path|
+      read_files(@paths[:templates]).each do |path|
         basename = File.basename(path, File.extname(path))
         dir_name = File.dirname(path)
 
@@ -86,11 +89,9 @@ module Dimples
     end
 
     def read_posts
-      post_glob = File.join(@paths[:posts], '**', '*.*')
-
-      @posts = Dir.glob(post_glob).sort.map do |path|
+      @posts = read_files(@paths[:posts]).map do |path|
         Post.new(self, path).tap do |post|
-          add_archive_post(post)
+          @archive.add_post(post)
           categorise_post(post)
         end
       end.reverse
@@ -99,14 +100,7 @@ module Dimples
     end
 
     def read_pages
-      page_glob = File.join(@paths[:pages], '**', '*.*')
-      @pages = Dir.glob(page_glob).sort.map { |path| Page.new(self, path) }
-    end
-
-    def add_archive_post(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
+      @pages = read_files(@paths[:pages]).map { |path| Page.new(self, path) }
     end
 
     def categorise_post(post)
@@ -137,15 +131,7 @@ module Dimples
     end
 
     def publish_posts
-      @posts.each do |post|
-        path = File.join(
-          @paths[:destination],
-          post.date.strftime(@config.paths.posts),
-          post.slug
-        )
-
-        post.write(path)
-      end
+      @posts.each { |post| publish_post(post) }
 
       if @config.generation.main_feed
         publish_feeds(@posts, @paths[:destination])
@@ -153,45 +139,58 @@ module Dimples
 
       return unless @config.generation.paginated_posts
 
-      paginate_posts(
+      Dimples::Pager.paginate(
+        self,
         @posts,
         File.join(@paths[:destination], @config.paths.paginated_posts),
         @config.layouts.paginated_post
       )
     end
 
+    def publish_post(post)
+      path = File.join(
+        @paths[:destination],
+        post.date.strftime(@config.paths.posts),
+        post.slug
+      )
+
+      post.write(path)
+    end
+
     def publish_pages
-      @pages.each do |page|
-        path = if page.path
-                 File.dirname(page.path).sub(
-                   @paths[:pages],
-                   @paths[:destination]
-                 )
-               else
+      @pages.each { |page| publish_page(page) }
+    end
+
+    def publish_page(page)
+      path = if page.path
+               File.dirname(page.path).sub(
+                 @paths[:pages],
                  @paths[:destination]
-               end
+               )
+             else
+               @paths[:destination]
+             end
 
-        page.write(path)
-      end
+      page.write(path)
     end
 
     def publish_archives
-      @archives[:year].each do |year, year_archive|
-        publish_date_archive(year)
+      @archive.years.each do |year|
+        publish_archive(year)
         next unless @config.generation.month_archives
 
-        year_archive[:month].each do |month, month_archive|
-          publish_date_archive(year, month)
+        @archive.months(year).each do |month|
+          publish_archive(year, month)
           next unless @config.generation.day_archives
 
-          month_archive[:day].each_key do |day|
-            publish_date_archive(year, month, day)
+          @archive.days(year, month).each do |day|
+            publish_archive(year, month, day)
           end
         end
       end
     end
 
-    def publish_date_archive(year, month = nil, day = nil)
+    def publish_archive(year, month = nil, day = nil)
       date_type = if day
                     'day'
                   elsif month
@@ -200,106 +199,59 @@ module Dimples
                     'year'
                   end
 
+      posts = @archive.posts_for_date(year, month, day)
+
       date_parts = [year, month, day].compact
       path = File.join(@paths[:destination], @config.paths.archives, date_parts)
+      layout = @config.layouts.date_archive
 
-      posts = archive(year, month, day)[:posts]
-
-      paginate_posts(
-        posts.reverse,
-        path,
-        @config.layouts.date_archive,
+      data = {
         page: {
           title: posts[0].date.strftime(@config.date_formats[date_type]),
           archive_date: posts[0].date,
           archive_type: date_type
         }
-      )
+      }
+
+      Dimples::Pager.paginate(self, posts.reverse, path, layout, data)
     end
 
     def publish_categories
-      @categories.each_value do |category|
-        path = File.join(
-          @paths[:destination],
-          @config.paths.categories,
-          category.slug
-        )
-
-        category_posts = category.posts.reverse
-        context = { page: { title: category.name, category: category } }
-
-        paginate_posts(
-          category_posts,
-          path,
-          @config.layouts.category,
-          context
-        )
-
-        publish_feeds(category_posts, path, context)
-      end
+      @categories.each_value { |category| publish_category(category) }
     end
 
-    def paginate_posts(posts, path, layout, context = {})
-      pager = Pager.new(
-        path.sub(@paths[:destination], '') + '/',
-        posts,
-        @config.pagination
+    def publish_category(category)
+      path = File.join(
+        @paths[:destination],
+        @config.paths.categories,
+        category.slug
       )
 
-      pager.each do |index|
-        page = Page.new(self)
-        page.layout = layout
-
-        page_prefix = @config.pagination.page_prefix
-        page_path = if index == 1
-                      path
-                    else
-                      File.join(path, "#{page_prefix}#{index}")
-                    end
-
-        page.write(
-          page_path,
-          context.merge(pagination: pager.to_context)
-        )
-      end
-    end
-
-    def publish_feeds(posts, path, context = {})
-      @config.feed_formats.each do |feed_format|
-        feed_layout = "feeds.#{feed_format}"
-        next unless @templates.key?(feed_layout)
-
-        page = Page.new(self)
+      category_posts = category.posts.reverse
+      context = { page: { title: category.name, category: category } }
 
-        page.layout = feed_layout
-        page.feed_posts = posts.slice(0, @config.pagination.per_page)
-        page.filename = 'feed'
-        page.extension = feed_format
+      Dimples::Pager.paginate(
+        self,
+        category_posts,
+        path,
+        @config.layouts.category,
+        context
+      )
 
-        page.write(path, context)
-      end
+      publish_feeds(category_posts, path, context)
     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)
+    def publish_feeds(posts, path, context = {})
+      @config.feed_formats.each do |format|
+        publish_feed(format, posts, path, context)
       end
     end
 
-    def archive_year(year)
-      @archives[:year][year.to_s] ||= { month: {}, posts: [] }
-    end
-
-    def archive_month(year, month)
-      archive_year(year)[:month][month.to_s] ||= { day: {}, posts: [] }
-    end
+    def publish_feed(format, posts, path, context = {})
+      feed = Feed.new(self, format)
 
-    def archive_day(year, month, day)
-      archive_month(year, month)[:day][day.to_s] ||= { posts: [] }
+      feed.feed_posts = posts.slice(0, @config.pagination.per_page)
+      feed.write(path, context)
     end
   end
 end

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 6.1.0
+  version: 6.2.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-10 00:00:00.000000000 Z
+date: 2018-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
@@ -178,9 +178,11 @@ extra_rdoc_files: []
 files:
 - bin/dimples
 - lib/dimples.rb
+- lib/dimples/archive.rb
 - lib/dimples/category.rb
 - lib/dimples/configuration.rb
 - lib/dimples/errors.rb
+- lib/dimples/feed.rb
 - lib/dimples/frontable.rb
 - lib/dimples/page.rb
 - lib/dimples/pager.rb