dimples 7.0.2 → 7.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d3ea00fe31ee988acc15a95454594f0d63287ded91d987f0518dd4c3d92e63c4
-  data.tar.gz: d81b643d433efe3d6fdbd77c6150a936c53cc5f18c034c029aa03fb3b2ad3487
+  metadata.gz: ec92ee367aa0923a32bd9638a7fc72c074ac4e6447bee213de65279747ff9344
+  data.tar.gz: 7ec38efb0f64cc6c7681a836062663da96542bff95d5f7283f4fd1dd69e05069
 SHA512:
-  metadata.gz: 0f735e7a99b299949a0575f035153fe037fb9d05c987d2cec6d199814c55fdc076f5f20f6d6079d0ffb27a747c8c27b98207b706e3382a0fb24aab99a826a0da
-  data.tar.gz: '085264bed45ab98e9c932ba36e15136c06cf8d68fcde793761219fb662fb3f56f66e71bf1ae8d4dda45a99ac09a872c90f61091a2c55a7cb1273a842457a2c21'
+  metadata.gz: 6fcd12629c5d6e61507207f244880a96672ddb19f5dd1156c257ce0c44956ce438b29edc8b870ede84ff1c84f15a33ccf2c954e3edaf85065de4eba454613e24
+  data.tar.gz: c1871eeb7a84bc5d61973d15bd4c1e98e7c2c4bc52234aa22d671efbf2769d0f5a1b437df237d8c3debf2b9733cf40ed578ef892e566cb4622b8272b9001ae71

data/bin/dimples

@@ -8,7 +8,7 @@ require 'dimples'
 path = if ARGV[0]
          File.expand_path(ARGV[0])
        else
-         File.join(Dir.pwd(), 'site')
+         File.join(Dir.pwd, 'site')
        end
 
 Dimples::Site.generate(path)

data/lib/dimples/document.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 require_relative 'frontmatter'
 
 module Dimples
   class Document
     attr_accessor :metadata, :contents, :path, :rendered_contents
 
-    def initialize(path = nil)
+    def initialize(path = nil, metadata = {})
       @path = path
 
       if @path
@@ -13,6 +15,8 @@ module Dimples
         @metadata = {}
         @contents = ''
       end
+
+      @metadata.merge!(metadata)
     end
 
     def filename
@@ -44,22 +48,22 @@ module Dimples
 
     def renderer
       @renderer ||= begin
-                      callback = proc { contents }
-
-                      if @path
-                        Tilt.new(@path, {}, &callback)
-                      else
-                        Tilt::StringTemplate.new(&callback)
-                      end
-                    end
-    end
+        callback = proc { contents }
 
-    def method_missing(method_name, *args, &block)
-      if @metadata.key?(method_name)
-        @metadata[method_name]
-      else
-        nil
+        if @path
+          Tilt.new(@path, {}, &callback)
+        else
+          Tilt::StringTemplate.new(&callback)
+        end
       end
     end
+
+    def method_missing(method_name, *_args)
+      @metadata[method_name] if @metadata.key?(method_name)
+    end
+
+    def respond_to_missing?(method_name, include_private)
+      @metadata.key?(method_name) || super
+    end
   end
 end

data/lib/dimples/frontmatter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'yaml'
 
 module Dimples
@@ -7,8 +9,8 @@ module Dimples
     def self.parse(contents)
       metadata = {}
 
-      if matches = contents.match(PATTERN)
-        metadata = YAML.load(matches[1], symbolize_names: true)
+      if (matches = contents.match(PATTERN))
+        metadata = YAML.safe_load(matches[1], symbolize_names: true, permitted_classes: [Date])
         contents = matches.post_match.strip
       end
 

data/lib/dimples/page.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'document'
 
 module Dimples

data/lib/dimples/pager.rb

@@ -6,16 +6,13 @@ module Dimples
 
     include Enumerable
 
-    attr_reader :current_page
-    attr_reader :previous_page
-    attr_reader :next_page
-    attr_reader :page_count
+    attr_reader :current_page, :previous_page, :next_page, :page_count
 
-    def initialize(url, posts)
+    def initialize(url, posts, options = {})
       @url = url
       @posts = posts
-      @per_page = PER_PAGE
-      @page_prefix = 'page_'
+      @per_page = options.fetch(:per_page, PER_PAGE)
+      @page_prefix = options.fetch(:page_prefix, 'page_')
       @page_count = (posts.length.to_f / @per_page.to_i).ceil
 
       step_to(1)

data/lib/dimples/post.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'document'
 
 require 'date'

data/lib/dimples/site.rb

@@ -4,6 +4,7 @@ require_relative 'pager'
 
 require 'fileutils'
 require 'tilt'
+require 'date'
 
 module Dimples
   class Site
@@ -21,9 +22,7 @@ module Dimples
 
       @config = read_config
 
-      %w[pages posts static templates].each do |type|
-        @paths[type.to_sym] = File.join(@paths[:source], type)
-      end
+      %w[pages posts static templates].each { |type| @paths[type.to_sym] = File.join(@paths[:source], type) }
 
       scan_posts
       scan_pages
@@ -51,7 +50,8 @@ module Dimples
       config_path = File.join(@paths[:source], '.config')
 
       return {} unless File.exist?(config_path)
-      YAML.load(File.read(config_path), symbolize_names: true)
+
+      YAML.safe_load(File.read(config_path), symbolize_names: true)
     end
 
     def read_files(path)
@@ -59,11 +59,8 @@ module Dimples
     end
 
     def scan_posts
-      @posts = read_files(@paths[:posts]).map do |path|
-        Dimples::Post.new(path)
-      end
-
-      @posts.sort_by! { |post| post.date }.reverse!
+      @posts = read_files(@paths[:posts]).map { |path| Dimples::Post.new(path) }
+      @posts.sort_by!(&:date).reverse!
 
       @categories = {}
 
@@ -98,11 +95,10 @@ module Dimples
     end
 
     def generate_paginated_posts(posts, path, context = {})
-      pager = Dimples::Pager.new(path.sub(@paths[:destination], '') + '/', posts)
+      pager = Dimples::Pager.new("#{path.sub(@paths[:destination], '')}/", posts)
 
       pager.each do |index|
-        page = Dimples::Page.new()
-        page.metadata[:layout] = 'posts'
+        page = Dimples::Page.new(nil, layout: 'posts')
 
         page_path = if index == 1
                       path
@@ -110,8 +106,7 @@ module Dimples
                       File.join(path, "page_#{index}")
                     end
 
-        context.merge!(pagination: pager.to_context)
-        write_file(File.join(page_path, page.filename), render(page, context))
+        write_file(File.join(page_path, page.filename), render(page, context.merge!(pagination: pager.to_context)))
       end
     end
 
@@ -131,10 +126,7 @@ module Dimples
     def generate_pages
       @pages.each do |page|
         path = if page.path
-                 File.dirname(page.path).sub(
-                   @paths[:pages],
-                   @paths[:destination]
-                 )
+                 File.dirname(page.path).sub(@paths[:pages], @paths[:destination])
                else
                  @paths[:destination]
                end
@@ -153,14 +145,13 @@ module Dimples
     end
 
     def generate_feed(posts, path)
-      page = Dimples::Page.new()
-      page.metadata[:layout] = 'feed'
-
+      page = Dimples::Page.new(nil, layout: 'feed')
       write_file(File.join(path, 'feed.atom'), render(page, posts: posts))
     end
 
     def copy_assets
       return unless Dir.exist?(@paths[:static])
+
       FileUtils.cp_r(File.join(@paths[:static], '.'), @paths[:destination])
     end
 
@@ -169,9 +160,7 @@ module Dimples
 
       output = object.render(context, content)
 
-      if object.layout && @templates[object.layout]
-        output = render(@templates[object.layout], context, output)
-      end
+      output = render(@templates[object.layout], context, output) if object.layout && @templates[object.layout]
 
       output
     end

data/lib/dimples/template.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative 'document'
 
 module Dimples

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 7.0.2
+  version: 7.0.4
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-20 00:00:00.000000000 Z
+date: 2023-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubi
@@ -25,33 +25,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: tilt
+  name: redcarpet
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.5'
 - !ruby/object:Gem::Dependency
-  name: redcarpet
+  name: tilt
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.5'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,7 +108,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement