jekyll-theme-amethyst 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2fac70f56f1769603d1d784c69d33c9fa40b9a200ef8eee0a8d126eb5c8178b1
-  data.tar.gz: a59c9b8182e67c571ac5ef59488eef8dec691bec4f802ee966876cd1a0d33770
+  metadata.gz: b821452b60270650a16031ce0c02143e94cc397e8c99dd661318398d59576497
+  data.tar.gz: f23da2ecb2b942d07cdb71a96e2de9c30f3d2ad3506b4bc3ef1fa2548e59a04d
 SHA512:
-  metadata.gz: fd6693f94f8f0c67f85dce79533fc0ac9b6fcc95d96e2cb3ec06afb60745e42c1b1f270c0fb27b6dd0361b6278383346a3e69f2f1a98cf2d94c81ed9bf0baeca
-  data.tar.gz: 31ac837f404e4c5d2592b9c0034038f02db666c7c9de294002a8aaf73ba89b1e11d13adfc1554c558e55a1c5d7837c055ea2e88a11ea79a4575c5cce87749bc1
+  metadata.gz: 7739a80aa0ad3174a480b5302b6d8510fc3c0d219dfcebb6cfe6d2ff958ee87e346972b97102c5bc1bf13cd89dea9ce6996fb65d84fa0c693a9e1ea64eb6f7d4
+  data.tar.gz: 5cb9d1535f2899914db53358d579b846b233c0853d6210ac76f52c3c2844b38bd0d6b14791700740c5af5e049d814ee20aadf906b342ff7a15fbf71f5f52460b

data/_includes/opengraph.html

@@ -53,7 +53,7 @@
 {% if page.layout == "post" and page.date and page.author %}
 <meta property="og:type" content="article">
 <meta property="article:published_time" content="{{ page.date | date_to_xmlschema }}">
-<meta name="author" content="{% include author-text.html author=page.author %}">
+<meta name="author" content="{{ site.data.authors[include.author] | default: include.author | escape }}">
 {% endif %}
 
 {% endcapture -%}

data/_layouts/post.html

@@ -11,8 +11,8 @@ layout: wrapper
 		<p class="post-meta byline">Posted on <a href="{{ page.url | relative_url }}" rel="bookmark"><time itemprop="pubdate" datetime="{{ page.date | date_to_xmlschema }}">{{ page.date | date: date_format }}</time></a>{% if page.author %} by <span class="vcard"><span class="fn n" rel="author">
         {%- assign author_page = site.pages | where: "layout", "posts-author" | where: "author", page.author | first -%}
         {%- if author_page -%}
-	        <a href="{{ author_page.url | relative_url }}">{{ author_page.title | escape }}</a>
-        {%- else -%}{{ page.author | escape }}
+	        <a href="{{ author_page.url | relative_url }}">{{ site.data.authors[page.author] | default: page.author | escape }}</a>
+        {%- else -%}{{ site.data.authors[page.author] | default: page.author | escape}}
 	    {%- endif -%}</span></span>{% endif %}</p>
 	</header>
 	{{ content }}

data/_layouts/posts-tag.html

@@ -12,7 +12,7 @@ amethyst:
 	{%- for post in posts -%}
 	<div class="post-row">
 		<h2><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a></h2>
-		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {% include author-text.html author=post.author %}{% endif %}</p>
+		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ site.data.authors[include.author] | default: include.author | escape }}{% endif %}</p>
 		<div class="post">
 			{{- post.excerpt -}}
 			{%- if post.excerpt != post.content %}

data/_layouts/posts-year.html

@@ -12,7 +12,7 @@ amethyst:
 	{%- for post in posts -%}
 	<div class="post-row">
 		<h2><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a></h2>
-		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {% include author-text.html author=post.author %}{% endif %}</p>
+		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ site.data.authors[include.author] | default: include.author | escape }}{% endif %}</p>
 		<div class="post">
 			{{- post.excerpt -}}
 			{%- if post.excerpt != post.content %}

data/_layouts/posts.html

@@ -13,7 +13,7 @@ amethyst:
 	{% for post in posts -%}
 	<div class="post-row">
 		<h2><a href="{{ post.url | relative_url }}">{{ post.title | escape }}</a></h2>
-		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {% include author-text.html author=post.author %}{% endif %}</p>
+		<p class="post-meta">Posted on <time datetime="{{ post.date | date_to_xmlschema }}">{{ post.date | date: date_format }}</time>{% if post.author %} by {{ site.data.authors[include.author] | default: include.author | escape }}{% endif %}</p>
 		<div class="post">
 			{{- post.excerpt -}}
 			{%- if post.excerpt != post.content %}

data/lib/jekyll-theme-amethyst.rb

@@ -37,3 +37,37 @@ module Jekyll
 end
 
 Liquid::Template.register_filter(Jekyll::AmethystFilters)
+
+module AmethystPlugin
+
+	class AuthorPageWithoutAFile < Jekyll::PageWithoutAFile
+		def template
+			# The template of the permalink, can be customized e.g. to "/blog/author/:author/"
+			# for sites with both API docs and a blog.
+			site.config["amethyst"]["author_permalink"] || "/author/:author"
+		end
+
+		def url_placeholders
+			super.merge({
+				"author" => data["author"]
+			})
+		end
+	end
+
+	class AuthorPageGenerator < Jekyll::Generator
+		safe true
+
+		def generate(site)
+			site.data["authors"].each do |slug, name|
+				site.pages << AuthorPageWithoutAFile.new(site, site.source, 'author', "#{slug}.html").tap do |page|
+					page.data.merge!(
+						"layout" => "posts-author",
+						"title" => name,
+						"author" => slug
+					)
+				end
+			end
+		end
+	end
+
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-theme-amethyst
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Timo Tijhof
@@ -108,7 +108,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE.txt
-- _includes/author-text.html
 - _includes/opengraph.html
 - _includes/search.html
 - _includes/sidebar.html

data/_includes/author-text.html

@@ -1,6 +0,0 @@
-{%- assign author_page = site.pages | where: "layout", "posts-author" | where: "author", include.author | first -%}
-{%- if author_page -%}
-  {{ author_page.title | escape }}
-{%- else -%}
-  {{ include.author | escape }}
-{%- endif -%}