Skip to content

Commit 9fe0536

Browse files
author
Yuki Izumi
committed
Pass filename to all renderers
1 parent 4998caa commit 9fe0536

7 files changed

Lines changed: 13 additions & 13 deletions

File tree

lib/github/markup.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def render(filename, content = nil)
4444
content ||= File.read(filename)
4545

4646
if impl = renderer(filename, content)
47-
impl.render(content)
47+
impl.render(filename, content)
4848
else
4949
content
5050
end
@@ -54,7 +54,7 @@ def render_s(symbol, content)
5454
if content.nil?
5555
raise ArgumentError, 'Can not render a nil.'
5656
elsif markups.has_key?(symbol)
57-
markups[symbol].render(content)
57+
markups[symbol].render(nil, content)
5858
else
5959
content
6060
end

lib/github/markup/command_implementation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def initialize(regexp, languages, command, name, &block)
2222
@name = name
2323
end
2424

25-
def render(content)
25+
def render(filename, content)
2626
rendered = execute(command, content)
2727
rendered = rendered.to_s.empty? ? content : rendered
2828
call_block(rendered, content)

lib/github/markup/gem_implementation.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ def load
1717
@loaded = true
1818
end
1919

20-
def render(content)
20+
def render(filename, content)
2121
load
22-
renderer.call(content)
22+
renderer.call(filename, content)
2323
end
2424

2525
def name

lib/github/markup/implementation.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def load
1616
# no-op by default
1717
end
1818

19-
def render(content)
19+
def render(filename, content)
2020
raise NotImplementedError, "subclasses of GitHub::Markup::Implementation must define #render"
2121
end
2222

lib/github/markup/markdown.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ def load
4444
raise LoadError, "no suitable markdown gem found"
4545
end
4646

47-
def render(content)
47+
def render(filename, content)
4848
load
4949
@renderer.call(content)
5050
end

lib/github/markup/rdoc.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ def initialize
99
super(/rdoc/, ["RDoc"])
1010
end
1111

12-
def render(content)
12+
def render(filename, content)
1313
if ::RDoc::VERSION.to_i >= 4
1414
h = ::RDoc::Markup::ToHtml.new(::RDoc::Options.new)
1515
else

lib/github/markups.rb

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,30 @@
44

55
markup_impl(::GitHub::Markups::MARKUP_MARKDOWN, ::GitHub::Markup::Markdown.new)
66

7-
markup(::GitHub::Markups::MARKUP_TEXTILE, :redcloth, /textile/, ["Textile"]) do |content|
7+
markup(::GitHub::Markups::MARKUP_TEXTILE, :redcloth, /textile/, ["Textile"]) do |filename, content|
88
RedCloth.new(content).to_html
99
end
1010

1111
markup_impl(::GitHub::Markups::MARKUP_RDOC, GitHub::Markup::RDoc.new)
1212

13-
markup(::GitHub::Markups::MARKUP_ORG, 'org-ruby', /org/, ["Org"]) do |content|
13+
markup(::GitHub::Markups::MARKUP_ORG, 'org-ruby', /org/, ["Org"]) do |filename, content|
1414
Orgmode::Parser.new(content, {
1515
:allow_include_files => false,
1616
:skip_syntax_highlight => true
1717
}).to_html
1818
end
1919

20-
markup(::GitHub::Markups::MARKUP_CREOLE, :creole, /creole/, ["Creole"]) do |content|
20+
markup(::GitHub::Markups::MARKUP_CREOLE, :creole, /creole/, ["Creole"]) do |filename, content|
2121
Creole.creolize(content)
2222
end
2323

24-
markup(::GitHub::Markups::MARKUP_MEDIAWIKI, :wikicloth, /mediawiki|wiki/, ["MediaWiki"]) do |content|
24+
markup(::GitHub::Markups::MARKUP_MEDIAWIKI, :wikicloth, /mediawiki|wiki/, ["MediaWiki"]) do |filename, content|
2525
wikicloth = WikiCloth::WikiCloth.new(:data => content)
2626
WikiCloth::WikiBuffer::HTMLElement::ESCAPED_TAGS << 'tt' unless WikiCloth::WikiBuffer::HTMLElement::ESCAPED_TAGS.include?('tt')
2727
wikicloth.to_html(:noedit => true)
2828
end
2929

30-
markup(::GitHub::Markups::MARKUP_ASCIIDOC, :asciidoctor, /adoc|asc(iidoc)?/, ["AsciiDoc"]) do |content|
30+
markup(::GitHub::Markups::MARKUP_ASCIIDOC, :asciidoctor, /adoc|asc(iidoc)?/, ["AsciiDoc"]) do |filename, content|
3131
Asciidoctor::Compliance.unique_id_start_index = 1
3232
Asciidoctor.convert(content, :safe => :secure, :attributes => %w(showtitle=@ idprefix idseparator=- outfilesuffix=.adoc env=github env-github source-highlighter=html-pipeline))
3333
end

0 commit comments

Comments
 (0)