Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions lib/rdoc/generator/markup.rb
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,18 @@ def cvs_url(url, full_path)
end
end

##
# The preferred URL for this object.

def canonical_url
options = @store.options
if path
File.join(options.canonical_root, path.to_s)
else
options.canonical_root
end
end

end

class RDoc::CodeObject
Expand Down
5 changes: 5 additions & 0 deletions lib/rdoc/generator/template/darkfish/_head.rhtml
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,11 @@
<%- end -%>
<%- end -%>

<%- if canonical_url = @options.canonical_root -%>
<% canonical_url = current.canonical_url if defined?(current) %>
<link rel="canonical" href="<%= canonical_url %>">
<%- end -%>

<script type="text/javascript">
var rdoc_rel_prefix = "<%= h asset_rel_prefix %>/";
var index_rel_prefix = "<%= h rel_prefix %>/";
Expand Down
7 changes: 7 additions & 0 deletions lib/rdoc/options.rb
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,11 @@ class RDoc::Options

attr_accessor :file_path_prefix

##
# The preferred root URL for the documentation

attr_accessor :canonical_root

def initialize(loaded_options = nil) # :nodoc:
init_ivars
override loaded_options if loaded_options
Expand Down Expand Up @@ -429,6 +434,7 @@ def init_ivars # :nodoc:
@apply_default_exclude = true
@class_module_path_prefix = nil
@file_path_prefix = nil
@canonical_root = nil
end

def init_with(map) # :nodoc:
Expand Down Expand Up @@ -492,6 +498,7 @@ def override(map) # :nodoc:
@webcvs = map['webcvs'] if map.has_key?('webcvs')
@autolink_excluded_words = map['autolink_excluded_words'] if map.has_key?('autolink_excluded_words')
@apply_default_exclude = map['apply_default_exclude'] if map.has_key?('apply_default_exclude')
@canonical_root = map['canonical_root'] if map.has_key?('canonical_root')

@warn_missing_rdoc_ref = map['warn_missing_rdoc_ref'] if map.has_key?('warn_missing_rdoc_ref')

Expand Down
33 changes: 33 additions & 0 deletions test/rdoc/rdoc_generator_darkfish_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -514,6 +514,39 @@ def test_meta_tags_for_empty_document
)
end

def test_canonical_url_for_index
@store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
@g.generate

content = File.binread("index.html")

assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/">')
end

def test_canonical_url_for_classes
top_level = @store.add_file("file.rb")
top_level.add_class(@klass.class, @klass.name)
inner = @klass.add_class(RDoc::NormalClass, "Inner")

@store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
@g.generate

content = File.binread("Klass/Inner.html")

assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/Klass/Inner.html">')
end

def test_canonical_url_for_rdoc_files
top_level = @store.add_file("CONTRIBUTING.rdoc", parser: RDoc::Parser::Simple)

@store.options.canonical_root = @options.canonical_root = "https://docs.ruby-lang.org/en/master/"
@g.generate

content = File.binread("CONTRIBUTING_rdoc.html")

assert_include(content, '<link rel="canonical" href="https://docs.ruby-lang.org/en/master/CONTRIBUTING_rdoc.html">')
end

##
# Asserts that +filename+ has a link count greater than 1 if hard links to
# @tmpdir are supported.
Expand Down
1 change: 1 addition & 0 deletions test/rdoc/rdoc_options_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ def test_to_yaml
'autolink_excluded_words' => [],
'class_module_path_prefix' => nil,
'file_path_prefix' => nil,
'canonical_root' => nil,
}

assert_equal expected, coder
Expand Down
Loading