dimples 1.6.3 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d8efe1feb572148827ab83694edcf8b5429be15
-  data.tar.gz: 638b4c45430282d35779d2dfee179926d9c0f0ae
+  metadata.gz: 2195d33c5db58576e330e294263c8e0372b5751b
+  data.tar.gz: 8395118f614c8e2e72a31f43cb57717ca8d79c8d
 SHA512:
-  metadata.gz: 3e3be8bbeee3358c972b1b07cfa135fc4ea21861220ed3d6aadd05a881f1cdbcadba0a3e1b77a18dbbc7ec10b476951232aacbbade33736277f8dc0a00c832d4
-  data.tar.gz: 4a8860e444bea38ce540797a1a734c87e2b06fa98e3920cff21c4dd75c6f4d84633b1b258ed6b29a3abe64e77e6ab0c3a0c201041f258df3bb95679aab4a9afa
+  metadata.gz: f4b5a24e2576217a18ab9cb26c060fdf9775e6b73f6302a008df047b9d4b6ed1960b6221cada8cbcdd5f76d5e6a8e0e1aece6b410981614e2c3c63680d20d938
+  data.tar.gz: dc5359f9081e0628ee56902834bd38f9717112c72d41622a9f0d7b9961795624beb728a9ea80595f3c61d4d91866e0b1781b21f88b025d0249744039e55a4fb9

data/lib/dimples/configuration.rb

@@ -37,6 +37,9 @@ module Dimples
           'posts' => 'posts',
           'post' => 'post',
           'category' => 'category',
+          'year_archives' => 'year_archives',
+          'month_archives' => 'month_archives',
+          'day_archives' => 'day_archives'
         },
 
         'rendering' => {

data/lib/dimples/site.rb

@@ -33,13 +33,13 @@ module Dimples
       @source_paths[:root] = File.expand_path(@config['source_path'])
       @output_paths[:site] = File.expand_path(@config['destination_path'])
 
-      %w{pages posts public templates}.each do |path|
+      %w[pages posts public templates].each do |path|
         @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'])
+      %w[archives posts categories].each do |path|
+        @output_paths[path.to_sym] = File.join(@output_paths[:site], @config['paths'][path])
+      end
     end
 
     def generate(options = {})
@@ -100,13 +100,9 @@ module Dimples
           (@categories[slug] ||= []) << post
         end
 
-        %w[year month day].each do |date_type|
-          if @config['generation']["#{date_type}_archives"]
-
-            date_key = post.date.strftime(@config['date_formats'][date_type])
-            (@archives[date_type.to_sym][date_key] ||= []) << post
-          end
-        end
+        (@archives[:year][post.year] ||= []) << post
+        (@archives[:month]["#{post.year}/#{post.month}"] ||= []) << post
+        (@archives[:day]["#{post.year}/#{post.month}/#{post.day}"] ||= []) << post
 
         @posts << post
       end
@@ -165,15 +161,23 @@ module Dimples
       %w[year month day].each do |date_type|
 
         if @config['generation']["#{date_type}_archives"]
+          template = @config['layouts']["#{date_type}_archives"]
 
-          template = @config['layouts'][date_type] || @config['layouts']['archives'] || @config['layouts']['posts']
-          archives[date_type.to_sym].each_pair do |date_title, posts|
-
+          @archives[date_type.to_sym].each_value do |posts|
+            title = posts[0].date.strftime(@config['date_formats'][date_type])
             paths = [@output_paths[:archives], posts[0].year]
-            paths << posts[0].month if date_type =~ /month|day/
-            paths << posts[0].day if date_type == 'day'
-
-            paginate(posts: posts, title: date_title, paths: paths, layout: template)
+            dates = {year: posts[0].year}
+
+            case date_type
+              when 'month'
+                paths << posts[0].month
+                dates[:month] = posts[0].month
+              when 'day'
+                paths.concat([posts[0].month, posts[0].day])
+                dates[:day] = posts[0].month
+            end
+
+            paginate(posts: posts, title: title, paths: paths, layout: template, context: dates)
           end
         end
       end

data/lib/dimples/version.rb

@@ -1,3 +1,3 @@
 module Dimples
-  VERSION = "1.6.3"
+  VERSION = "1.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: '1.7'
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-10 00:00:00.000000000 Z
+date: 2016-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
@@ -132,7 +132,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A basic static site generator