From 87c00b27561f4f5b47d827acafc100717a98b613 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sat, 20 Aug 2016 17:42:05 +0200 Subject: [PATCH 1/4] Get static filename --- lib/jekyll/static_file.rb | 3 ++- test/test_static_file.rb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 0f8544ee..580a3856 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -1,6 +1,6 @@ module Jekyll class StaticFile - attr_reader :relative_path, :extname + attr_reader :relative_path, :extname, :name class << self # The cache of last modification times [path] -> mtime. @@ -97,6 +97,7 @@ module Jekyll def to_liquid { + "filename" => File.basename(name, extname), "extname" => extname, "modified_time" => modified_time, "path" => File.join("", relative_path) diff --git a/test/test_static_file.rb b/test/test_static_file.rb index 285ec879..1685bb9d 100644 --- a/test/test_static_file.rb +++ b/test/test_static_file.rb @@ -134,6 +134,7 @@ class TestStaticFile < JekyllUnitTest should "be able to convert to liquid" do expected = { + "filename" => "static_file", "extname" => ".txt", "modified_time" => @static_file.modified_time, "path" => "/static_file.txt" From 326332a5d544056ed0197481a638a16dffedf133 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sun, 21 Aug 2016 21:32:26 +0200 Subject: [PATCH 2/4] Rename filename to name --- lib/jekyll/static_file.rb | 2 +- test/test_static_file.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 580a3856..1158c044 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -97,7 +97,7 @@ module Jekyll def to_liquid { - "filename" => File.basename(name, extname), + "name" => File.basename(name, extname), "extname" => extname, "modified_time" => modified_time, "path" => File.join("", relative_path) diff --git a/test/test_static_file.rb b/test/test_static_file.rb index 1685bb9d..a53dc952 100644 --- a/test/test_static_file.rb +++ b/test/test_static_file.rb @@ -134,7 +134,7 @@ class TestStaticFile < JekyllUnitTest should "be able to convert to liquid" do expected = { - "filename" => "static_file", + "name" => "static_file", "extname" => ".txt", "modified_time" => @static_file.modified_time, "path" => "/static_file.txt" From 349569592eb1a1d6ee68f798b62de5d610e658b2 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sat, 27 Aug 2016 10:06:29 +0200 Subject: [PATCH 3/4] [docs] add examples for static files liquid metadata --- site/_docs/static_files.md | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/site/_docs/static_files.md b/site/_docs/static_files.md index 00afbaec..df12acf1 100644 --- a/site/_docs/static_files.md +++ b/site/_docs/static_files.md @@ -26,7 +26,7 @@ following metadata:

file.path

- The relative path to the file. + The relative path to the file, e.g /assets/img/image.jpg

@@ -34,7 +34,15 @@ following metadata:

file.modified_time

- The `Time` the file was last modified. + The `Time` the file was last modified, e.g 2016-04-01 16:35:26 +0200 + +

+ + +

file.name

+

+ + The string name of the file without the extension, e.g. image for image.jpg

From a9da814f17a8df4c040ecfd13cc07b42a4ddd506 Mon Sep 17 00:00:00 2001 From: Frank Taillandier Date: Sat, 27 Aug 2016 11:22:24 +0200 Subject: [PATCH 4/4] add basename and name variables for static files --- lib/jekyll/static_file.rb | 3 ++- site/_docs/static_files.md | 10 +++++++++- test/test_static_file.rb | 3 ++- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/lib/jekyll/static_file.rb b/lib/jekyll/static_file.rb index 1158c044..f26263e3 100644 --- a/lib/jekyll/static_file.rb +++ b/lib/jekyll/static_file.rb @@ -97,7 +97,8 @@ module Jekyll def to_liquid { - "name" => File.basename(name, extname), + "basename" => File.basename(name, extname), + "name" => name, "extname" => extname, "modified_time" => modified_time, "path" => File.join("", relative_path) diff --git a/site/_docs/static_files.md b/site/_docs/static_files.md index df12acf1..19d45089 100644 --- a/site/_docs/static_files.md +++ b/site/_docs/static_files.md @@ -42,7 +42,15 @@ following metadata:

file.name

- The string name of the file without the extension, e.g. image for image.jpg + The string name of the file e.g. image.jpg for image.jpg + +

+ + +

file.basename

+

+ + The string basename of the file e.g. image for image.jpg

diff --git a/test/test_static_file.rb b/test/test_static_file.rb index a53dc952..ebb51c23 100644 --- a/test/test_static_file.rb +++ b/test/test_static_file.rb @@ -134,7 +134,8 @@ class TestStaticFile < JekyllUnitTest should "be able to convert to liquid" do expected = { - "name" => "static_file", + "basename" => "static_file", + "name" => "static_file.txt", "extname" => ".txt", "modified_time" => @static_file.modified_time, "path" => "/static_file.txt"