dimples 10.2.0 → 10.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b82d0d0b1768cb2feeaa99bdcffdbe091e4a74464e1626ab945fa6261f44b066
-  data.tar.gz: 905531f3cd50da2854b43b413c69459c26c36faae05b18de53e434f9d4b8405f
+  metadata.gz: 9b26a3e1592398021aab828178c2dbb71bb521f99db69503b196195806745721
+  data.tar.gz: aae282b44ca14b4a244ef9f1827c7f186f654b7ebd83ed8818b4af3388eb8910
 SHA512:
-  metadata.gz: 34b59758473587a23629d2459c95362f12484a43f9395c6f188eb6f90adf83b648b7cab6be8e47f4755992a60e6578bc2c2906db626f132bb5bb75d4388e1533
-  data.tar.gz: 7caf87e0d6fe6435b9b1459b2d3a111ee5952ca6bf98b5db4f0b90752aad262f417c6ef024e02dd7a8873384a2fa18e1eaa0722cc39579e550181f459e582a7c
+  metadata.gz: e6c9b35b7da2435a8361a006e668b18249b56c34747ca1f0bd0774ed0c6d652211e04a1a9edae0a5e776c018cdd1767a2261bc276cc67d1819d070c25a6aa8c4
+  data.tar.gz: dc34dc37e9d0961a2445aea5132647cc88ab0da6886274a45c1a830e5d32f247e20c3c16f0a726582ae87b826a00df6da8804eb051088dd4a0a5799e415618cd

data/bin/dimples

@@ -18,7 +18,7 @@ if File.exist?(config_path)
 end
 
 begin
-  Dimples::Site.generate(config)
+  Dimples::Site.generate(config:)
 rescue StandardError => e
   puts "Error generating site: #{e}"
 end

data/lib/dimples/config.rb

@@ -10,6 +10,7 @@ module Dimples
     def self.defaults
       {
         build: './site',
+        source: Dir.pwd,
         pathnames: { posts: 'posts', categories: 'categories' },
         pagination: { page_prefix: 'page_', per_page: 5 }
       }
@@ -18,7 +19,7 @@ module Dimples
     def initialize(options = {})
       options = Config.defaults.merge(options)
 
-      @source_paths = expand_paths(File.expand_path(Dir.pwd), SOURCE_PATHS.dup)
+      @source_paths = expand_paths(File.expand_path(options[:source]), SOURCE_PATHS.dup)
       @build_paths = expand_paths(File.expand_path(options[:build]), options[:pathnames])
       @pagination = options[:pagination]
     end

data/lib/dimples/pager.rb

@@ -7,11 +7,11 @@ module Dimples
 
     attr_reader :current_page, :previous_page, :next_page, :page_count
 
-    def self.paginate(site, url, posts, metadata = {})
-      new(site, url, posts).paginate(metadata)
+    def self.paginate(site:, url:, posts:, metadata: {})
+      new(site:, url:, posts:).paginate(metadata)
     end
 
-    def initialize(site, url, posts)
+    def initialize(site:, url:, posts:)
       @site = site
       @url = url
       @posts = posts
@@ -28,8 +28,8 @@ module Dimples
         step_to(index)
 
         @site.layouts['posts']&.write(
-          File.join(@site.config.build_paths[:root], current_page_url, 'index.html'),
-          metadata.merge(pagination: self.metadata, url: current_page_url)
+          output_path: File.join(@site.config.build_paths[:root], current_page_url, 'index.html'),
+          metadata: metadata.merge(pagination: self.metadata, url: current_page_url)
         )
       end
     end

data/lib/dimples/site.rb

@@ -10,11 +10,11 @@ module Dimples
   class Site
     attr_accessor :config
 
-    def self.generate(config = {})
-      new(config).generate
+    def self.generate(config: {})
+      new(config:).generate
     end
 
-    def initialize(config = {})
+    def initialize(config: {})
       @config = Config.new(config)
     end
 
@@ -30,19 +30,19 @@ module Dimples
 
     def posts
       @posts ||= Dir.glob(File.join(@config.source_paths[:posts], '**', '*.markdown')).map do |path|
-        Dimples::Sources::Post.new(self, path)
+        Dimples::Sources::Post.new(site: self, path:)
       end.sort_by!(&:date).reverse!
     end
 
     def pages
       @pages ||= Dir.glob(File.join(@config.source_paths[:pages], '**', '*.erb')).map do |path|
-        Dimples::Sources::Page.new(self, path)
+        Dimples::Sources::Page.new(site: self, path:)
       end
     end
 
     def layouts
       @layouts ||= Dir.glob(File.join(@config.source_paths[:layouts], '**', '*.erb')).to_h do |path|
-        [File.basename(path, '.erb'), Dimples::Sources::Layout.new(self, path)]
+        [File.basename(path, '.erb'), Dimples::Sources::Layout.new(site: self, path:)]
       end
     end
 
@@ -64,29 +64,50 @@ module Dimples
     private
 
     def generate_posts
-      posts.each(&:write)
-      Pager.paginate(self, @config.build_paths[:posts].gsub(@config.build_paths[:root], '').concat('/'), posts)
-      generate_feed(@config.build_paths[:root], posts)
+      posts.each { |post| generate_post(post) }
+
+      Pager.paginate(
+        site: self,
+        url: @config.build_paths[:posts].gsub(@config.build_paths[:root], '').concat('/'),
+        posts:
+      )
+
+      generate_feed(output_path: @config.build_paths[:root], posts:)
+    end
+
+    def generate_post(post)
+      post.write
+    end
+
+    def generate_pages
+      pages.each { |page| generate_page(page) }
+    end
+
+    def generate_page(page)
+      page.write
     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.build_paths[:root], 'categories', category), posts)
-      end
-    end
 
-    def generate_pages
-      pages.each(&:write)
+        Pager.paginate(
+          site: self,
+          url: "/categories/#{category}/",
+          posts:,
+          metadata:
+        )
+
+        generate_feed(output_path: File.join(@config.build_paths[:root], 'categories', category), posts:)
+      end
     end
 
-    def generate_feed(output_path, posts)
+    def generate_feed(output_path:, posts:)
       return if layouts['feed'].nil?
 
       layouts['feed'].write(
-        File.join(output_path, 'feed.atom'),
-        posts: posts.slice(0, 10)
+        output_path: File.join(output_path, 'feed.atom'),
+        metadata: { posts: posts.slice(0, 10) }
       )
     end
 

data/lib/dimples/sources/base.rb

@@ -6,53 +6,50 @@ module Dimples
     class Base
       FRONT_MATTER_PATTERN = /^(-{3}\n.*?\n?)^(-{3}*$\n?)/m
 
-      attr_accessor :path, :metadata, :contents
+      attr_accessor :path, :metadata, :contents, :rendered_contents
 
-      def initialize(site, path)
+      def initialize(site:, path:)
         @site = site
         @path = File.expand_path(path)
-
-        @metadata = default_metadata
         @contents = File.read(@path)
 
         parse_metadata(@contents)
-        assign_metadata
       end
 
       def parse_metadata(contents)
+        @metadata = default_metadata
+
         matches = contents.match(FRONT_MATTER_PATTERN)
         return unless matches
 
         @metadata.merge!(YAML.safe_load(matches[1], symbolize_names: true, permitted_classes: [Date]))
         @contents = matches.post_match.strip
-      end
 
-      def assign_metadata
         @metadata.each_key do |key|
           self.class.send(:define_method, key.to_sym) { @metadata[key] }
         end
       end
 
-      def write(output_path = nil, metadata = {})
+      def write(output_path: nil, metadata: {})
         output_path = File.join(output_directory, filename) if output_path.nil?
         output_dir = File.dirname(output_path)
 
         @metadata[:url] = url_for(output_dir)
 
-        output = render(metadata)
+        output = render(context: metadata)
 
         FileUtils.mkdir_p(output_dir) unless File.directory?(output_dir)
         File.write(output_path, output)
       end
 
-      def render(render_metadata = {}, body = nil)
-        render_metadata[:site] ||= @site.metadata
-        render_metadata[:page] ||= metadata
+      def render(context: {}, body: nil)
+        context[:site] ||= @site.metadata
+        context[:page] ||= metadata
 
-        output = template.render(Metadata.new(render_metadata)) { body }
-        return output unless @metadata[:layout] && @site.layouts[@metadata[:layout]]
+        @rendered_contents = template.render(Metadata.new(context)) { body }
+        return @rendered_contents unless @metadata[:layout] && @site.layouts[@metadata[:layout]]
 
-        @site.layouts[@metadata[:layout]].render(render_metadata, output)
+        @site.layouts[@metadata[:layout]].render(context:, body: @rendered_contents)
       end
 
       def output_directory

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 10.2.0
+  version: 10.3.1
 platform: ruby
 authors:
 - Daniel Bogan
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-03 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -76,7 +75,6 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -91,8 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubygems_version: 3.6.7
 specification_version: 4
 summary: A basic static site generator
 test_files: []