Skip to content

Add Hex package configuration and display "Find on Hex" footer links #1385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 12, 2021
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
4 changes: 4 additions & 0 deletions assets/less/content/footer.less
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,10 @@
.linkUnderlines(@mediumGray)
}

.footer-hex-package {
margin-right: 4px;
}

a {
color: @mediumGray;
.linkUnderlines(@mediumGray)
Expand Down
2 changes: 2 additions & 0 deletions lib/ex_doc/cli.ex
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ defmodule ExDoc.CLI do
switches: [
language: :string,
paths: :keep,
package: :string,
proglang: :string,
source_ref: :string,
version: :boolean
Expand Down Expand Up @@ -156,6 +157,7 @@ defmodule ExDoc.CLI do
-l, --logo Path to the image logo of the project (only PNG or JPEG accepted)
The image size will be 64x64 and copied to the assets directory
-m, --main The entry-point page in docs, default: "api-reference"
--package Hex package name
--source-ref Branch/commit/tag used for source link inference, default: "master"
-r, --source-root Path to the source code root, used for generating links, default: "."
-u, --source-url URL to the source code
Expand Down
6 changes: 4 additions & 2 deletions lib/ex_doc/config.ex
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ defmodule ExDoc.Config do
title: nil,
version: nil,
authors: nil,
skip_undefined_reference_warnings_on: []
skip_undefined_reference_warnings_on: [],
package: nil

@type t :: %__MODULE__{
apps: [atom()],
Expand Down Expand Up @@ -78,6 +79,7 @@ defmodule ExDoc.Config do
title: nil | String.t(),
version: nil | String.t(),
authors: nil | [String.t()],
skip_undefined_reference_warnings_on: [String.t()]
skip_undefined_reference_warnings_on: [String.t()],
package: :atom | nil
}
end
8 changes: 4 additions & 4 deletions lib/ex_doc/formatter/html.ex
Original file line number Diff line number Diff line change
Expand Up @@ -205,8 +205,8 @@ defmodule ExDoc.Formatter.HTML do
defp generate_extras(nodes_map, extras, config) do
extras
|> with_prev_next()
|> Enum.map(fn {%{id: id, title: title, content: content}, prev, next} ->
filename = "#{id}.html"
|> Enum.map(fn {node, prev, next} ->
filename = "#{node.id}.html"
output = "#{config.output}/#{filename}"
config = set_canonical_url(config, filename)

Expand All @@ -215,7 +215,7 @@ defmodule ExDoc.Formatter.HTML do
next: next && %{path: "#{next.id}.html", title: next.title}
}

html = Templates.extra_template(config, title, nodes_map, content, refs)
html = Templates.extra_template(config, node, nodes_map, refs)

if File.regular?(output) do
IO.puts(:stderr, "warning: file #{Path.relative_to_cwd(output)} already exists")
Expand Down Expand Up @@ -338,7 +338,7 @@ defmodule ExDoc.Formatter.HTML do
group = GroupMatcher.match_extra(groups, input)
title = title || extract_title(html_content) || filename_to_title(input)

%{id: id, title: title, group: group, content: html_content}
%{id: id, title: title, group: group, content: html_content, source_path: input}
end

defp extension_name(input) do
Expand Down
4 changes: 2 additions & 2 deletions lib/ex_doc/formatter/html/templates.ex
Original file line number Diff line number Diff line change
Expand Up @@ -267,13 +267,13 @@ defmodule ExDoc.Formatter.HTML.Templates do

templates = [
detail_template: [:node, :_module],
footer_template: [:config],
footer_template: [:config, :node],
head_template: [:config, :page],
module_template: [:config, :module, :summary, :nodes_map],
not_found_template: [:config, :nodes_map],
api_reference_entry_template: [:module_node],
api_reference_template: [:config, :nodes_map],
extra_template: [:config, :title, :nodes_map, :content, :refs],
extra_template: [:config, :node, :nodes_map, :refs],
search_template: [:config, :nodes_map],
sidebar_template: [:config, :nodes_map],
summary_template: [:name, :nodes],
Expand Down
6 changes: 3 additions & 3 deletions lib/ex_doc/formatter/html/templates/extra_template.eex
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<%= head_template(config, %{title: title, type: :extra}) %>
<%= head_template(config, %{title: node.title, type: :extra}) %>
<%= sidebar_template(config, nodes_map) %>

<%= link_headings(content) %>
<%= link_headings(node.content) %>
<%= bottom_actions_template(refs) %>
<%= footer_template(config) %>
<%= footer_template(config, node) %>
12 changes: 12 additions & 0 deletions lib/ex_doc/formatter/html/templates/footer_template.eex
Original file line number Diff line number Diff line change
@@ -1,4 +1,16 @@
<footer class="footer">
<%= if config.package do %>

<p>
Find it on Hex:
<a href="https://hex.pm/packages/<%= config.package %>/<%= config.version %>" class="line footer-hex-package">Package</a>
<a href="https://preview.hex.pm/preview/<%= config.package %>/<%= config.version %>" class="line">Preview</a>

<%= source_path = node && Map.get(node, :source_path); if source_path do %>
<a href="https://preview.hex.pm/preview/<%= config.package %>/<%= config.version %>/show/<%= source_path %>">(current file)</a>
<% end %>
</p>
<% end %>
<p>
<span class="line">
Built using
Expand Down
2 changes: 1 addition & 1 deletion lib/ex_doc/formatter/html/templates/module_template.eex
Original file line number Diff line number Diff line change
Expand Up @@ -50,4 +50,4 @@
</div>
</section>
<% end %>
<%= footer_template(config) %>
<%= footer_template(config, module) %>
2 changes: 1 addition & 1 deletion lib/ex_doc/formatter/html/templates/not_found_template.eex
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ may want to try searching this site using the sidebar
<% end %>
to find what you were looking for.</p>

<%= footer_template(config) %>
<%= footer_template(config, nil) %>
2 changes: 1 addition & 1 deletion lib/ex_doc/formatter/html/templates/search_template.eex
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<div class="loading"><div></div><div></div><div></div><div></div></div>
</div>
<script src="<%= asset_rev config.output, "dist/search_items*.js" %>"></script>
<%= footer_template(config) %>
<%= footer_template(config, nil) %>
9 changes: 9 additions & 0 deletions lib/mix/tasks/docs.ex
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,7 @@ defmodule Mix.Tasks.Docs do
|> normalize_apps(config)
|> normalize_main()
|> normalize_deps()
|> put_package(config)

Mix.shell().info("Generating docs...")

Expand Down Expand Up @@ -453,4 +454,12 @@ defmodule Mix.Tasks.Docs do
{key, "https://hexdocs.pm/#{key}/#{vsn}/"}
end
end

defp put_package(options, config) do
if package = config[:package] do
Keyword.put(options, :package, package[:name] || config[:app])
else
options
end
end
end