Skip to content

Commit

Permalink
Add support for canonical URLs
Browse files Browse the repository at this point in the history
Fixes #844
  • Loading branch information
Fryguy committed Jul 10, 2020
1 parent 1fa0d40 commit 3947df7
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 3 deletions.
1 change: 1 addition & 0 deletions lib/miq/ref_page.rb
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ def initialize(site, base, dir, name)
data['branch'] = @branch || data['doc_branch']
data['legacy'] = @legacy
data['branch_paths'] = RefVersions.instance.paths_for(@source)
data['canonical_url'] = RefVersions.instance.canonical_path_for(@source)
end

# Only render with liquid if markdown file
Expand Down
7 changes: 6 additions & 1 deletion lib/miq/ref_versions.rb
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,12 @@ def paths_for(path)

def canonical_path_for(path)
recent_path = self[path].first
path_version(recent_path) == "latest" ? recent_path : nil

# TODO: This case should not happen, but some docs do not conform to versioned docs (e.g. /api/)
# Remove this when all docs conform.
recent_path ||= path.to_s.sub(%r{/docs/reference/(?:\w+)/}, "/docs/reference/latest/")

recent_path
end

private
Expand Down
4 changes: 2 additions & 2 deletions site/_includes/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<title>{{ site.title | escape }}{% if page.title %} - {{ page.title | escape }}{% endif %}</title>
<meta name="description" content="{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | truncate: 160 }}{% else %}{{ site.description }}{% endif %}">
<meta property="og:image" content="http://manageiq.org/assets/images/logo/manageiq-logo-blue.png" />

{% css main %}
<link rel="canonical" href="{{ page.url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="canonical" href="{{ page.canonical_url | replace:'index.html','' | prepend: site.baseurl | prepend: site.url }}">
<link rel="alternate" type="application/rss+xml" title="{{ site.title }}" href="{{ "/feed.xml" | prepend: site.baseurl | prepend: site.url }}">

<link href="/assets/images/favicon.ico" rel="shortcut icon">
Expand Down
20 changes: 20 additions & 0 deletions site/_plugins/canonical_url.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Jekyll::Page#url is memoized on first call, but this causes issues with the
# paginator. As such, we get the URL and then remove the memoization.
def extract_page_url(page)
had_url = true if page.instance_variable_defined?(:@url)
page.url.tap do
page.instance_variable_set(:@url, nil) unless had_url
end
end

Jekyll::Hooks.register :pages, :post_init do |page|
page.data['canonical_url'] ||= extract_page_url(page)
end

Jekyll::Hooks.register :posts, :post_init do |post|
post.data['canonical_url'] ||= extract_page_url(post)
end

Jekyll::Hooks.register :documents, :post_init do |doc|
doc.data['canonical_url'] ||= extract_page_url(doc)
end
13 changes: 13 additions & 0 deletions test/lib/miq/ref_versions_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,17 @@ def test_paths_for_with_ref_doc
assert_equal "latest", paths.keys.first
assert_equal "euwe", paths.keys.last
end

def test_canonical_path_for_with_ref_doc
path = Miq::RefVersions.instance.canonical_path_for("/docs/reference/latest/installing_on_google_compute_engine/index.html")
assert_equal "/docs/reference/latest/installing_on_google_compute_engine/index.html", path

path = Miq::RefVersions.instance.canonical_path_for("/docs/reference/jansa/installing_on_google_compute_engine/index.html")
assert_equal "/docs/reference/latest/installing_on_google_compute_engine/index.html", path
end

def test_canonical_path_for_with_legacy_ref_doc
path = Miq::RefVersions.instance.canonical_path_for("/docs/reference/ivanchuk/doc-Installing_on_Google_Compute_Engine/miq/index.html")
assert_equal "/docs/reference/latest/installing_on_google_compute_engine/index.html", path
end
end

0 comments on commit 3947df7

Please sign in to comment.