Skip to content

Commit

Permalink
Merge pull request #353 from tightenco/kd-modified-date-meta
Browse files Browse the repository at this point in the history 
Add getModifiedTime() to page metadata
  • Loading branch information
@damiani
damiani committed Jun 19, 2019
2 parents d7c77b3 + 5e37331 commit 7fa2f29
Show file tree
Hide file tree
Showing 46 changed files with 268 additions and 46 deletions.
3 changes: 2 additions & 1 deletion src/Loaders/CollectionDataLoader.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,8 +115,9 @@ private function getMetaData($file, $collection, $data)
$collectionName = $collection->name;
$collection = $collectionName;
$source = $file->getPath();
$modifiedTime = $file->getLastModifiedTime();

return compact('filename', 'baseUrl', 'extension', 'collection', 'collectionName', 'source');
return compact('filename', 'baseUrl', 'extension', 'collection', 'collectionName', 'source', 'modifiedTime');
}

private function buildUrls($paths)
Expand Down
3 changes: 2 additions & 1 deletion src/SiteBuilder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,9 @@ private function getMetaData($file, $baseUrl)
$extension = $file->getFullExtension();
$path = rightTrimPath($this->outputPathResolver->link($file->getRelativePath(), $filename, $file->getExtraBladeExtension() ?: 'html'));
$url = rightTrimPath($baseUrl) . '/' . trimPath($path);
$modifiedTime = $file->getLastModifiedTime();

return compact('filename', 'baseUrl', 'path', 'extension', 'url');
return compact('filename', 'baseUrl', 'path', 'extension', 'url', 'modifiedTime');
}

private function getOutputDirectory($file)
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/2/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/2</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/3/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/3</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/4/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/4</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/404-permalink-test.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/404</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/a-regular-page/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/a-regular-page</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/categories/faq/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/categories/faq</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/categories/news/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/categories/news</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/collection-tests/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/collection-tests</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/collection-tests/mdown-extension-test/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/collection-tests/mdown-extension-test</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/collection-tests/simple-one/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/collection-tests/simple-one</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/collection-tests/simple-three/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/collection-tests/simple-three</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/collection-tests/simple-two/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/collection-tests/simple-two</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/escape-test-blade/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/escape-test-blade</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/escape-test-hybrid/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/escape-test-hybrid</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">March 08 2019, 01:28:42</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/escape-test-markdown/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/escape-test-markdown</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/index_test_blade/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/index_test_blade</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down
7 changes: 6 additions & 1 deletion tests/snapshots/index_test_two/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">BASE URL:</p>
<p class="text-xs text-dark-soft text-uppercase">Base URL:</p>
<p class="p-xs-l-2 text-sm">http://jigsaw.test</p>
</div>

Expand All @@ -84,6 +84,11 @@ <h4 class="text-sm wt-light text-uppercase text-brand">Page meta</h4>
<p class="p-xs-l-2 text-sm">http://jigsaw.test/index_test_two</p>
</div>

<div class="p-xs-y-4 border-b">
<p class="text-xs text-dark-soft text-uppercase">Modified Time:</p>
<p class="p-xs-l-2 text-sm">February 26 2019, 19:11:16</p>
</div>

<div class="p-xs-t-4">
<p class="text-xs text-dark-soft text-uppercase">Global Variable:</p>
<p class="p-xs-l-2 text-sm">some global variable</p>
Expand Down

0 comments on commit 7fa2f29

Please sign in to comment.