dimples 10.1.1 → 10.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1851462f5263625c3180103f3be8e6484246bdd21609a401ab779f26d489cfc7
-  data.tar.gz: 5b2312987fd9ceb6c78f8be7152445bf25161fd4e16f6bf9a1e055b9b21d5502
+  metadata.gz: b4cb30bd078959510f0f81a130d22689cf34eba48ea90361806c9b046214e447
+  data.tar.gz: d24ddeeabc388b164fb82151ea13b9ae50cb7ecf1888d700bcccec9a56ec8ea1
 SHA512:
-  metadata.gz: 92451497846e5d3724a09d98ea88e9eec50f96b282061cf96fcb17be39bc180bad42d2e9994077545bd70b3f4ba68a8d11fee2d29cd66f2b812c82a8673c1811
-  data.tar.gz: a23cc742b62eed3ace4b40bb38002c392c5be58525177f4d159e3f983ad15ccbda1331e5cf9080841f1295b604cb09d361b215c647bd09040deb7c23f017eb47
+  metadata.gz: f41a59f95690d77f5cb5836e558b15c39696bacd214966b43ca66d7c45f57f8fafe4267e320b17420c414a432dabb992d39fddf7403d0fe5ad185ab9a72a8b24
+  data.tar.gz: 06b9420670c7863edf252586cd589a3f37a9f6b2649ea858a5839436e3b324bad692505dd8678fef0d5f40833a92bf0db2e60b973322149036cc996681ee30d6

data/lib/dimples/sources/base.rb

@@ -16,6 +16,7 @@ module Dimples
         @contents = File.read(@path)
 
         parse_metadata(@contents)
+        assign_metadata
       end
 
       def parse_metadata(contents)
@@ -24,18 +25,22 @@ module Dimples
 
         @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 = {})
-        output = render(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)
+
         FileUtils.mkdir_p(output_dir) unless File.directory?(output_dir)
         File.write(output_path, output)
       end
@@ -54,8 +59,8 @@ module Dimples
         @site.config[:output][:root]
       end
 
-      def url
-        @metadata[:url] || output_directory.gsub(@site.config[:output][:root], '')
+      def url_for(path)
+        path.gsub(@site.config[:output][:root], '').concat('/')
       end
 
       def template

data/lib/dimples/sources/page.rb

@@ -12,7 +12,7 @@ module Dimples
       end
 
       def url
-        @metadata[:url] || super.tap do |url|
+        super.tap do |url|
           url.concat(filename) unless filename == 'index.html'
         end
       end

data/lib/dimples/sources/post.rb

@@ -8,7 +8,11 @@ module Dimples
         @output_directory ||= File.dirname(@path).gsub(
           @site.config[:sources][:posts],
           @site.config[:output][:posts]
-        ).concat("/#{@metadata[:slug]}/")
+        ).concat("/#{slug}/")
+      end
+
+      def slug
+        File.basename(@path)
       end
 
       def template

data/lib/dimples/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimples
 version: !ruby/object:Gem::Version
-  version: 10.1.1
+  version: 10.1.3
 platform: ruby
 authors:
 - Daniel Bogan
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-04 00:00:00.000000000 Z
+date: 2024-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erb
@@ -76,7 +76,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -92,7 +92,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.4.10
-signing_key: 
+signing_key:
 specification_version: 4
 summary: A basic static site generator
 test_files: []