dimples 10.1.4 → 10.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dc9b0a5d7daa298ddcb448b6c01a87cb523f93476073e3b5fc96ae990ae315e3
-  data.tar.gz: 35b8c6c8794af46c60d79594d63b79eff43323b488db487451d30a203b4610e3
+  metadata.gz: b82d0d0b1768cb2feeaa99bdcffdbe091e4a74464e1626ab945fa6261f44b066
+  data.tar.gz: 905531f3cd50da2854b43b413c69459c26c36faae05b18de53e434f9d4b8405f
 SHA512:
-  metadata.gz: 6130823fd14607307d064fe8a38b6e9ad9afc98c95390ecc32fea62597159f7ff308b74b4b0d09905e85c57b1b13a23c5822f931d8236da223b0f321d41b1a61
-  data.tar.gz: 2746165d1e77dbf494e33126cf64718a1d7ec6781e789996453ec03655a8c3915ecb1e30ead8475d5d8722dae9c47a35adcb36d8b6000eefa0ccd17d1394f21f
+  metadata.gz: 34b59758473587a23629d2459c95362f12484a43f9395c6f188eb6f90adf83b648b7cab6be8e47f4755992a60e6578bc2c2906db626f132bb5bb75d4388e1533
+  data.tar.gz: 7caf87e0d6fe6435b9b1459b2d3a111ee5952ca6bf98b5db4f0b90752aad262f417c6ef024e02dd7a8873384a2fa18e1eaa0722cc39579e550181f459e582a7c

data/bin/dimples

@@ -12,10 +12,8 @@ config = {}
 if File.exist?(config_path)
   config = begin
     YAML.safe_load_file(config_path, symbolize_names: true)
-  rescue YAML::Error
-    puts 'Failed to parse config - using defaults'
-  ensure
-    {}
+  rescue StandardError => e
+    puts "Failed to parse config #{e} - using defaults"
   end
 end
 

data/lib/dimples/config.rb

@@ -3,31 +3,31 @@
 module Dimples
   # Configuration settings for a site.
   class Config
+    SOURCE_PATHS = { pages: 'pages', posts: 'posts', layouts: 'layouts', static: 'static' }.freeze
+
+    attr_accessor :source_paths, :build_paths, :pagination
+
     def self.defaults
       {
-        sources: { root: '.', posts: './posts', pages: './pages', layouts: './layouts', static: './static' },
-        output: { root: './site', posts: './site/posts', categories: './site/categories' }
+        build: './site',
+        pathnames: { posts: 'posts', categories: 'categories' },
+        pagination: { page_prefix: 'page_', per_page: 5 }
       }
     end
 
     def initialize(options = {})
-      @options = Config.defaults
+      options = Config.defaults.merge(options)
 
-      options&.each do |key, value|
-        @options[key]&.merge!(value)
-      end
-
-      %i[sources output].each do |type|
-        @options[type].each { |key, value| @options[type][key] = File.expand_path(value) }
-      end
+      @source_paths = expand_paths(File.expand_path(Dir.pwd), SOURCE_PATHS.dup)
+      @build_paths = expand_paths(File.expand_path(options[:build]), options[:pathnames])
+      @pagination = options[:pagination]
     end
 
-    def dig(*args)
-      @options.dig(*args)
-    end
+    def expand_paths(root, paths)
+      root = File.expand_path(root)
 
-    def [](key)
-      @options[key]
+      paths.transform_values! { |value| File.expand_path(File.join(root, value)) }
+      paths.tap { |expanded_paths| expanded_paths[:root] = root }
     end
   end
 end

data/lib/dimples/pager.rb

@@ -3,8 +3,6 @@
 module Dimples
   # A class for paginating a collection of posts.
   class Pager
-    PER_PAGE = 5
-
     include Enumerable
 
     attr_reader :current_page, :previous_page, :next_page, :page_count
@@ -18,8 +16,8 @@ module Dimples
       @url = url
       @posts = posts
 
-      @per_page = @site.config.dig(:pagination, :per_page) || PER_PAGE
-      @page_prefix = @site.config.dig(:pagination, :page_prefix) || 'page_'
+      @per_page = @site.config.pagination[:per_page]
+      @page_prefix = @site.config.pagination[:page_prefix]
       @page_count = (posts.length.to_f / @per_page.to_i).ceil
 
       step_to(1)
@@ -30,7 +28,7 @@ module Dimples
         step_to(index)
 
         @site.layouts['posts']&.write(
-          File.join(@site.config[:output][:root], current_page_url, 'index.html'),
+          File.join(@site.config.build_paths[:root], current_page_url, 'index.html'),
           metadata.merge(pagination: self.metadata, url: current_page_url)
         )
       end

data/lib/dimples/site.rb

@@ -29,19 +29,19 @@ module Dimples
     end
 
     def posts
-      @posts ||= Dir.glob(File.join(@config[:sources][:posts], '**', '*.markdown')).map do |path|
+      @posts ||= Dir.glob(File.join(@config.source_paths[:posts], '**', '*.markdown')).map do |path|
         Dimples::Sources::Post.new(self, path)
       end.sort_by!(&:date).reverse!
     end
 
     def pages
-      @pages ||= Dir.glob(File.join(@config[:sources][:pages], '**', '*.erb')).map do |path|
+      @pages ||= Dir.glob(File.join(@config.source_paths[:pages], '**', '*.erb')).map do |path|
         Dimples::Sources::Page.new(self, path)
       end
     end
 
     def layouts
-      @layouts ||= Dir.glob(File.join(@config[:sources][:layouts], '**', '*.erb')).to_h do |path|
+      @layouts ||= Dir.glob(File.join(@config.source_paths[:layouts], '**', '*.erb')).to_h do |path|
         [File.basename(path, '.erb'), Dimples::Sources::Layout.new(self, path)]
       end
     end
@@ -65,15 +65,15 @@ module Dimples
 
     def generate_posts
       posts.each(&:write)
-      Pager.paginate(self, @config[:output][:posts].gsub(@config[:output][:root], '').concat('/'), posts)
-      generate_feed(@config[:output][:root], posts)
+      Pager.paginate(self, @config.build_paths[:posts].gsub(@config.build_paths[:root], '').concat('/'), posts)
+      generate_feed(@config.build_paths[:root], posts)
     end
 
     def generate_categories
       categories.each do |category, posts|
         metadata = { title: category.capitalize, category: category }
         Pager.paginate(self, "/categories/#{category}/", posts, metadata)
-        generate_feed(File.join(@config[:output][:root], 'categories', category), posts)
+        generate_feed(File.join(@config.build_paths[:root], 'categories', category), posts)
       end
     end
 
@@ -91,15 +91,17 @@ module Dimples
     end
 
     def prepare_output_directory
-      raise "The site directory (#{@config[:output][:root]}) already exists." if Dir.exist?(@config[:output][:root])
+      if Dir.exist?(@config.build_paths[:root])
+        raise "The site directory (#{@config.build_paths[:root]}) already exists."
+      end
 
-      Dir.mkdir(@config[:output][:root])
+      Dir.mkdir(@config.build_paths[:root])
     end
 
     def copy_assets
-      return unless Dir.exist?(@config[:sources][:static])
+      return unless Dir.exist?(@config.source_paths[:static])
 
-      FileUtils.cp_r(File.join(@config[:sources][:static], '.'), @config[:output][:root])
+      FileUtils.cp_r(File.join(@config.source_paths[:static], '.'), @config.build_paths[:root])
     end
   end
 end

data/lib/dimples/sources/base.rb

@@ -56,11 +56,11 @@ module Dimples
       end
 
       def output_directory
-        @site.config[:output][:root]
+        @site.config.build_paths[:root]
       end
 
       def url_for(path)
-        path.gsub(@site.config[:output][:root], '').concat('/')
+        path.gsub(@site.config.build_paths[:root], '').concat('/')
       end
 
       def template

data/lib/dimples/sources/page.rb

@@ -6,8 +6,8 @@ module Dimples
     class Page < Base
       def output_directory
         @output_directory ||= File.dirname(@path).gsub(
-          @site.config[:sources][:pages],
-          @site.config[:output][:root]
+          @site.config.source_paths[:pages],
+          @site.config.build_paths[:root]
         ).concat('/')
       end
 

data/lib/dimples/sources/post.rb

@@ -6,8 +6,8 @@ module Dimples
     class Post < Base
       def output_directory
         @output_directory ||= File.dirname(@path).gsub(
-          @site.config[:sources][:posts],
-          @site.config[:output][:posts]
+          @site.config.source_paths[:posts],
+          @site.config.build_paths[:posts]
         ).concat("/#{slug}/")
       end
 

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 10.1.4
+  version: 10.2.0
 platform: ruby
 authors:
 - Daniel Bogan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-11-30 00:00:00.000000000 Z
+date: 2024-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb