dimples 13.1.1 → 14.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a3a083ef71c4142029367c026394e4d499f4e8760ff3bf54712d3ee319322b8
-  data.tar.gz: c8f2e5ee9b6fbfd7e35a4d496798ebd02cb2773d6f532d12138bf1db21b800fb
+  metadata.gz: 0cd730bee9db2d40308b4d6d5154ce35244821b905902e7bd395452aaf726ec5
+  data.tar.gz: e04f9a1b4a538f9aab53ef2d4db00a9309f9cd6f8ac24372c23d908e21970a52
 SHA512:
-  metadata.gz: ebfa89f7de5099291e8416980b7e2fd9f129f2f1c436e1ac1815cd8688bd3eaecc1f7bd8283de1dd7a9b1759c66878337cd9aa8249521d7bb4d2ad18aa457581
-  data.tar.gz: ec7e6e716c5c533e9013d6008deffb11741244963a2cf79869c85a5e2a3fa2e6e75e74ee66d8633fe9cb96b0b5f2e4685329f8f04c9c3ffd88a07d3a9464276d
+  metadata.gz: 850ea7a7863edd50da38a88c485d3d09e3456581cabf3636a2751def1e5d099e8dc98ef4a49227018231754a59c9823cbaed39e59f04647137fe6c48316bdb12
+  data.tar.gz: 23d23a7c7b6ce4807f8b604043789fde1758782a7e2a5972d73a64b23a4a44e7cefa11bd9d3497d30d4e996b76d227dddf660204e014635308f19d8ce492bc15

data/lib/dimples/pager.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module Dimples
-  # A class for paginating a collection of posts.
+  # A class for paginating a collection of items.
   class Pager
     include Enumerable
 
@@ -9,17 +9,17 @@ module Dimples
 
     attr_reader :current_page, :previous_page, :next_page, :page_count
 
-    def self.paginate(url:, posts:, options: {}, payload: {}, &block)
-      new(url: url, posts: posts, options: options).paginate(payload: payload, &block)
+    def self.paginate(url:, items:, options: {}, payload: {}, &block)
+      new(url: url, items: items, options: options).paginate(payload: payload, &block)
     end
 
-    def initialize(url:, posts:, options: {})
+    def initialize(url:, items:, options: {})
       @url = url
       @url << '/' unless @url[-1] == '/'
 
-      @posts = posts
+      @items = items
       @options = DEFAULT_OPTIONS.merge(options)
-      @page_count = (posts.length.to_f / @options[:per_page].to_i).ceil
+      @page_count = (items.length.to_f / @options[:per_page].to_i).ceil
 
       step_to(1)
     end
@@ -40,8 +40,8 @@ module Dimples
       @current_page
     end
 
-    def posts_at(page)
-      @posts.slice((page - 1) * @options[:per_page], @options[:per_page])
+    def items_at(page)
+      @items.slice((page - 1) * @options[:per_page], @options[:per_page])
     end
 
     def previous_page?
@@ -90,11 +90,11 @@ module Dimples
 
     def metadata
       {
-        posts: posts_at(current_page),
         pagination: Context.from_hash(
+          items: items_at(current_page),
           current_page: @current_page,
           page_count: @page_count,
-          post_count: @posts.count,
+          item_count: @items.count,
           previous_page: @previous_page,
           next_page: @next_page,
           urls: urls

data/lib/dimples/site.rb

@@ -50,7 +50,7 @@ module Dimples
     end
 
     def data
-      @data ||= scan_path(path: @config.source_paths[:data], extension: 'json') do |path|
+      @data ||= scan_path(path: @config.source_paths[:data], extension: '.json') do |path|
         Context.from_hash(JSON.parse(File.read(path)))
       end
     end
@@ -81,11 +81,11 @@ module Dimples
         Dir.children(path).each do |child|
           child_path = File.join(path, child)
 
-          key = File.basename(child_path, ".#{extension}").to_sym
+          key = File.basename(child_path, extension).to_sym
           data[key] = if File.directory?(child_path)
                         scan_path(path: child_path, extension:, &block)
                       else
-                        yield child_path if block_given?
+                        yield child_path if block_given? && File.extname(child_path) == extension
                       end
         end
       end
@@ -96,7 +96,7 @@ module Dimples
 
       url = @config.build_paths[:posts].gsub(@config.build_paths[:root], '').concat('/')
 
-      Pager.paginate(url: url, posts: posts, options: @config.pagination) do |url, payload|
+      Pager.paginate(url: url, items: posts, options: @config.pagination) do |url, payload|
         templates[:posts].generate(
           output_path: File.join(@config.build_paths[:root], url),
           payload: payload
@@ -134,7 +134,7 @@ module Dimples
       categories.each do |category, posts|
         Pager.paginate(
           url: "/categories/#{category}/",
-          posts: posts,
+          items: posts,
           payload: { title: category.capitalize, category: category },
           options: @config.pagination
         ) do |url, payload|

data/lib/dimples/template.rb

@@ -23,6 +23,8 @@ module Dimples
       end
 
       ERB.new(contents).result(binding)
+    rescue => e
+      raise "Failed to render template at #{path}: #{e}"
     end
   end
 end

data/lib/dimples/version.rb

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

metadata

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