dimples 1.4.2 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c053a92ddd197a30525d00f21dfd46dea48d8f4
-  data.tar.gz: f862f7af50f5915afac0123bb245a1ecb38aca57
+  metadata.gz: 9ae8bc727e02d6f02d3e14da64cee9c8660f9aff
+  data.tar.gz: 5a9e818fd763eaa3260975c769b0f7aac1927b5a
 SHA512:
-  metadata.gz: 7fd6b61f03ae93808d2cc06618c766a4994bbb9716f6be348061fe9d36974493ddc8504bc1a7e444b369d2cbd695b3ae0e379f57dc2d6a29bb36bcb78f0b6cd5
-  data.tar.gz: 6aca9885f896bdd371e5a257d220060896a25c2f18b3d135c4d503ae35785c2e74588a9620f687ccbd456322dfd8bf4964efdd8e3aedb1255151f6c8e06a2f71
+  metadata.gz: 02c0a846329aaf6efa707bd94e93f0d81a897b025a989f9c47de958b0125ec174e338a5b422ed4414a9f3031f1ecd84c1158f5a6e9be684b3b5442ae2f42c80b
+  data.tar.gz: a8d6fe8b156c157aa31489a12b7da8c357bb341d392db3f6f4fbf69d3b19fceb421ce61d13c1a70907eb714d63f023e97d81c05c8fc385406870c83ece4461b6

data/lib/dimples/configuration.rb

@@ -28,8 +28,8 @@ module Dimples
         'destination_path' => File.join(current_path, 'site'),
 
         'paths' => {
-          'posts' => 'archives',
-          'post' => '%Y/%m/%d',
+          'archives' => 'archives',
+          'posts' => 'archives/%Y/%m/%d',
           'categories' => 'archives/categories'
         },
 

data/lib/dimples/post.rb

@@ -52,17 +52,8 @@ module Dimples
     end
 
     def output_file_path(parent_path)
-      parts = [parent_path]
-
-      if @site.config['paths']['post']
-        path = @date.strftime(@site.config['paths']['post'])
-        parts.concat(path.split('/')) if path
-      end
-
-      parts << @slug
-      parts << "#{@filename}.#{@extension}"
-
-      File.join(parts)
+      parent_path = @date.strftime(parent_path) if parent_path =~ /%/
+      File.join([parent_path, @slug, "#{@filename}.#{@extension}"])
     end
   end
 end

data/lib/dimples/site.rb

@@ -37,6 +37,7 @@ module Dimples
         @source_paths[path.to_sym] = File.join(@source_paths[:root], path)
       end
 
+      @output_paths[:archives] = File.join(@output_paths[:site], @config['paths']['archives'])
       @output_paths[:posts] = File.join(@output_paths[:site], @config['paths']['posts'])
       @output_paths[:categories] = File.join(@output_paths[:site], @config['paths']['categories'])
     end
@@ -129,7 +130,7 @@ module Dimples
       end
 
       if @config['generation']['paginated_posts']
-        paginate(posts: @posts, paths: [@output_paths[:posts]], layout: @config['layouts']['posts'])
+        paginate(posts: @posts, paths: [@output_paths[:archives]], layout: @config['layouts']['posts'])
       end
     end
 
@@ -154,7 +155,7 @@ module Dimples
           template = @config['layouts'][date_type] || @config['layouts']['archives'] || @config['layouts']['posts']
           archives[date_type.to_sym].each_pair do |date_title, posts|
 
-            paths = [@output_paths[:posts], posts[0].year]
+            paths = [@output_paths[:archives], posts[0].year]
             paths << posts[0].month if date_type =~ /month|day/
             paths << posts[0].day if date_type == 'day'
 

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.4.2"
+  VERSION = "1.5.0"
 end

metadata

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