dimples 6.2.1 → 6.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96343858172cce426b369da61bb47accbf3a614f
-  data.tar.gz: 66216803513d5bc1ec30ab66c60d3cf4851d1dcd
+  metadata.gz: 21a60d2b84e1719f4e61d24bf855fbcf51ebb21a
+  data.tar.gz: fdc5daaa67484d85c6fa745f8a4df44184543fb2
 SHA512:
-  metadata.gz: 64a53d14330f3299f9818b10bc2687cb0c6f9eabb8f0a98c9418a11ea6128048ecf4cd751ac98c9c51b57706a3507b05eabc81ed06a71797d1c54dea1673ff07
-  data.tar.gz: '08305d4b7201679a64cf18cdc50d21bd7e858f63453e86ab76f60910f3936c2597d3cc28e9daab6572a1119961d277d6a0f00a0a436463e7b31f3d7c6cc7d068'
+  metadata.gz: 485c8d88d322a27221e219de92ba0144d76bc7358c2f1026261efc22672451770d8fbb3b72143f15a20b795452714b12c2a3ed374fb2b7f0db23051ac4998bd3
+  data.tar.gz: 5333091633ef50a30261559a3ee0c53bfc199c37e7793f9d581c38c8145a85c78b6a9c1cf8d2b4b1a0309c2ecba5f5e4f5ce7c5f133dcd49722d687394281a15

data/bin/dimples

@@ -24,7 +24,8 @@ Usage:
 dimples <#{valid_commands.join('|')}> [options]
 
 Options:
-BANNER
+  BANNER
+
   opt :config, 'Config file path', type: :string
   opt :source, 'Source directory', type: :string
   opt :destination, 'Destination directory', type: :string

data/lib/dimples.rb

@@ -2,6 +2,7 @@
 
 $LOAD_PATH.unshift(__dir__)
 
+require 'fileutils'
 require 'hashie'
 require 'tilt'
 require 'yaml'

data/lib/dimples/pager.rb

@@ -86,6 +86,7 @@ module Dimples
 
     def previous_page_url
       return unless @previous_page
+
       @previous_page != 1 ? "#{@url}#{@page_prefix}#{@previous_page}" : @url
     end
 

data/lib/dimples/post.rb

@@ -3,7 +3,7 @@
 module Dimples
   # A single dated post on a site.
   class Post < Page
-    POST_FILENAME = /(\d{4})-(\d{2})-(\d{2})-(.+)/
+    POST_FILENAME = /(\d{4})-(\d{2})-(\d{2})-(.+)/.freeze
 
     def initialize(site, path)
       super

data/lib/dimples/site.rb

@@ -125,13 +125,22 @@ module Dimples
 
     def copy_static_assets
       return unless Dir.exist?(@paths[:static])
+
       FileUtils.cp_r(File.join(@paths[:static], '.'), @paths[:destination])
     rescue StandardError => e
       raise GenerationError, "Failed to copy site assets (#{e.message})"
     end
 
     def publish_posts
-      @posts.each { |post| publish_post(post) }
+      @posts.each do |post|
+        path = File.join(
+          @paths[:destination],
+          post.date.strftime(@config.paths.posts),
+          post.slug
+        )
+
+        post.write(path)
+      end
 
       if @config.generation.main_feed
         publish_feeds(@posts, @paths[:destination])
@@ -147,31 +156,19 @@ module Dimples
       )
     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 { |page| publish_page(page) }
-    end
-
-    def publish_page(page)
-      path = if page.path
-               File.dirname(page.path).sub(
-                 @paths[:pages],
+      @pages.each do |page|
+        path = if page.path
+                 File.dirname(page.path).sub(
+                   @paths[:pages],
+                   @paths[:destination]
+                 )
+               else
                  @paths[:destination]
-               )
-             else
-               @paths[:destination]
-             end
+               end
 
-      page.write(path)
+        page.write(path)
+      end
     end
 
     def publish_archives
@@ -217,41 +214,35 @@ module Dimples
     end
 
     def publish_categories
-      @categories.each_value { |category| publish_category(category) }
-    end
-
-    def publish_category(category)
-      path = File.join(
-        @paths[:destination],
-        @config.paths.categories,
-        category.slug
-      )
-
-      category_posts = category.posts.reverse
-      context = { page: { title: category.name, category: category } }
-
-      Dimples::Pager.paginate(
-        self,
-        category_posts,
-        path,
-        @config.layouts.category,
-        context
-      )
-
-      publish_feeds(category_posts, path, context)
+      @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 } }
+
+        Dimples::Pager.paginate(
+          self,
+          category_posts,
+          path,
+          @config.layouts.category,
+          context
+        )
+
+        publish_feeds(category_posts, path, context)
+      end
     end
 
     def publish_feeds(posts, path, context = {})
       @config.feed_formats.each do |format|
-        publish_feed(format, posts, path, context)
-      end
-    end
+        feed = Feed.new(self, format)
 
-    def publish_feed(format, posts, path, context = {})
-      feed = Feed.new(self, format)
-
-      feed.feed_posts = posts.slice(0, @config.pagination.per_page)
-      feed.write(path, context)
+        feed.feed_posts = posts.slice(0, @config.pagination.per_page)
+        feed.write(path, context)
+      end
     end
   end
 end

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 6.2.1
+  version: 6.2.2
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-26 00:00:00.000000000 Z
+date: 2018-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie