dimples 11.0.0 → 11.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c840b0dffbd13241c53322349b2d4d8cc27702fd24e23e634f8aa3c68ccb7ef
-  data.tar.gz: a84f8dd4b99af20ad44a60bc42e4155731ed34aadd245987552f105cbc744ad2
+  metadata.gz: e72ac558386b1bec960daa57fae865dd8b20cdb01fe5302f4e7f971377836419
+  data.tar.gz: bff05467b9c3a65109686cef1860df044df877984c69f03803ec68886510285f
 SHA512:
-  metadata.gz: 81dfeb441b90d5861bb75353317e71f9e528a6d6008f221f65af1b5ab98529d0046afc0fdf4bcb2cbb7507d94546784dea360366e427a0394664cbecf19c8f7b
-  data.tar.gz: f66eaa19302fe7c177160fb935fdab210d6e6c02afbeee936ae80880b1a225de94c3432433cee4773b3d4667d111903aaf552d6e7c0955b8f5662e22b1e28209
+  metadata.gz: b72eeca086c5507dd1e4ad0c38f25268b2f878c6be792fa7fdce0532cf03adf427b62456c1373902e12968a319495a7c0d8930a85f01634133f8c6b73fe3574f
+  data.tar.gz: 24d15dc6a09d7bdad7ffedd1ab24e4c76bdcdb76fde49c54f8c811df57f52c8554e12d13f41672af8b1e75d6ad006b10d8be5bed9bb0d9acc56fd58ea29c8191

data/lib/dimples/entry.rb

@@ -9,8 +9,7 @@ module Dimples
     FRONT_MATTER_PATTERN = /^(-{3}\n.*?\n?)^(-{3}*$\n?)/m
     DEFAULT_FILENAME = 'index.html'
 
-    attr_accessor :path, :contents, :rendered_contents
-    attr_reader :metadata
+    attr_reader :path, :contents, :metadata
 
     def initialize(source:)
       contents = case source

data/lib/dimples/pager.rb

@@ -5,22 +5,21 @@ module Dimples
   class Pager
     include Enumerable
 
-    DEFAULT_PER_PAGE = 5
+    DEFAULT_OPTIONS = { per_page: 5, page_prefix: 'page_' }.freeze
 
     attr_reader :current_page, :previous_page, :next_page, :page_count
 
-    def self.paginate(url:, posts:, per_page: DEFAULT_PER_PAGE, context: {}, &block)
-      new(url: url, posts: posts).paginate(context: context, &block)
+    def self.paginate(url:, posts:, options: {}, context: {}, &block)
+      new(url: url, posts: posts, options: options).paginate(context: context, &block)
     end
 
-    def initialize(url:, posts:, per_page: DEFAULT_PER_PAGE)
+    def initialize(url:, posts:, options: {})
       @url = url
       @url << '/' unless @url[-1] == '/'
 
       @posts = posts
-
-      @per_page = per_page
-      @page_count = (posts.length.to_f / @per_page.to_i).ceil
+      @options = DEFAULT_OPTIONS.merge(options)
+      @page_count = (posts.length.to_f / @options[:per_page].to_i).ceil
 
       step_to(1)
     end
@@ -42,7 +41,7 @@ module Dimples
     end
 
     def posts_at(page)
-      @posts.slice((page - 1) * @per_page, @per_page)
+      @posts.slice((page - 1) * @options[:per_page], @options[:per_page])
     end
 
     def previous_page?
@@ -58,7 +57,7 @@ module Dimples
     end
 
     def current_page_url
-      @current_page == 1 ? @url : "#{@url}page_#{@current_page}"
+      @current_page == 1 ? @url : "#{@url}#{@options[:page_prefix]}#{@current_page}"
     end
 
     def first_page_url
@@ -66,17 +65,17 @@ module Dimples
     end
 
     def last_page_url
-      @page_count == 1 ? @url : "#{@url}page_#{@page_count}"
+      @page_count == 1 ? @url : "#{@url}#{@options[:page_prefix]}#{@page_count}"
     end
 
     def previous_page_url
       return unless @previous_page
 
-      @previous_page == 1 ? @url : "#{@url}page_#{@previous_page}"
+      @previous_page == 1 ? @url : "#{@url}#{@options[:page_prefix]}#{@previous_page}"
     end
 
     def next_page_url
-      "#{@url}page_#{@next_page}" if @next_page
+      "#{@url}#{@options[:page_prefix]}#{@next_page}" if @next_page
     end
 
     def urls

data/lib/dimples/post.rb

@@ -18,7 +18,7 @@ module Dimples
     end
 
     def render(context: nil)
-      Dimples::Post.markdown.render(contents)
+      @rendered_contents ||= Dimples::Post.markdown.render(contents)
     end
 
     private

data/lib/dimples/site.rb

@@ -70,7 +70,7 @@ module Dimples
 
       url = @config.build_paths[:posts].gsub(@config.build_paths[:root], '').concat('/')
 
-      Pager.paginate(url: url, posts: posts) do |url, page_context|
+      Pager.paginate(url: url, posts: posts, options: @config.pagination) do |url, page_context|
         generate_entry(
           entry: templates[:posts],
           output_path: File.join(@config.build_paths[:root], url),
@@ -110,7 +110,8 @@ module Dimples
         Pager.paginate(
           url: "/categories/#{category}/",
           posts: posts,
-          context: context
+          context: context,
+          options: @config.pagination
         ) do |url, page_context|
           generate_entry(
             entry: templates[:posts],

data/lib/dimples/template.rb

@@ -10,14 +10,11 @@ module Dimples
     end
 
     def render(context:)
-      context.merge!(metadata)
-
-      context.each do |key, value|
+      context.merge(metadata).each do |key, value|
         instance_variable_set("@#{key}", value)
       end
 
-      erb = ERB.new(contents)
-      erb.result(binding)
+      ERB.new(contents).result(binding)
     end
   end
 end

data/lib/dimples/version.rb

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

metadata

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