diff --git a/github-markup.gemspec b/github-markup.gemspec index ebec6a19..69e10b45 100644 --- a/github-markup.gemspec +++ b/github-markup.gemspec @@ -16,7 +16,6 @@ Gem::Specification.new do |s| s.test_files = s.files.grep(%r{^(test|spec|features)/}) s.require_paths = %w[lib] - s.add_dependency "github-linguist", "~> 5.0", ">= 5.0.8" s.add_dependency "rinku" s.add_development_dependency 'rake', '~> 12' s.add_development_dependency 'activesupport', '~> 4.0' @@ -25,4 +24,5 @@ Gem::Specification.new do |s| s.add_development_dependency 'sanitize', '~> 2.1', '>= 2.1.0' s.add_development_dependency 'nokogiri', '1.6.8.1' s.add_development_dependency 'nokogiri-diff', '~> 0.2.0' + s.add_development_dependency "github-linguist", "~> 5.0", ">= 5.0.8" end diff --git a/lib/github/markup.rb b/lib/github/markup.rb index 712ef7c7..f7befbe0 100644 --- a/lib/github/markup.rb +++ b/lib/github/markup.rb @@ -1,3 +1,9 @@ +begin + require "linguist" +rescue LoadError + # Rely on extensions instead. +end + require "github/markup/command_implementation" require "github/markup/gem_implementation" @@ -54,8 +60,8 @@ def render_s(symbol, content) end end - def markup(symbol, gem_name, pattern, opts = {}, &block) - markup_impl(symbol, GemImplementation.new(pattern, gem_name, &block)) + def markup(symbol, gem_name, regexp, languages, opts = {}, &block) + markup_impl(symbol, GemImplementation.new(regexp, languages, gem_name, &block)) end def markup_impl(symbol, impl) @@ -65,12 +71,12 @@ def markup_impl(symbol, impl) markups[symbol] = impl end - def command(symbol, command, languages, name, &block) + def command(symbol, command, regexp, languages, name, &block) if File.exist?(file = File.dirname(__FILE__) + "/commands/#{command}") command = file end - markup_impl(symbol, CommandImplementation.new(languages, command, name, &block)) + markup_impl(symbol, CommandImplementation.new(regexp, languages, command, name, &block)) end def can_render?(filename, content) @@ -80,13 +86,15 @@ def can_render?(filename, content) def renderer(filename, content) language = language(filename, content) markup_impls.find { |impl| - impl.match?(language) + impl.match?(filename, language) } end def language(filename, content) - blob = Linguist::Blob.new(filename, content) - return Linguist.detect(blob, allow_empty: true) + if defined?(::Linguist) + blob = Linguist::Blob.new(filename, content) + return Linguist.detect(blob, allow_empty: true) + end end # Define markups diff --git a/lib/github/markup/command_implementation.rb b/lib/github/markup/command_implementation.rb index d0f2fc47..439ed293 100644 --- a/lib/github/markup/command_implementation.rb +++ b/lib/github/markup/command_implementation.rb @@ -15,8 +15,8 @@ class CommandError < RuntimeError class CommandImplementation < Implementation attr_reader :command, :block, :name - def initialize(languages, command, name, &block) - super languages + def initialize(regexp, languages, command, name, &block) + super(regexp, languages) @command = command.to_s @block = block @name = name diff --git a/lib/github/markup/gem_implementation.rb b/lib/github/markup/gem_implementation.rb index 08383f52..1391de97 100644 --- a/lib/github/markup/gem_implementation.rb +++ b/lib/github/markup/gem_implementation.rb @@ -5,8 +5,8 @@ module Markup class GemImplementation < Implementation attr_reader :gem_name, :renderer - def initialize(languages, gem_name, &renderer) - super languages + def initialize(regexp, languages, gem_name, &renderer) + super(regexp, languages) @gem_name = gem_name.to_s @renderer = renderer end diff --git a/lib/github/markup/implementation.rb b/lib/github/markup/implementation.rb index 46df1510..fb31165b 100644 --- a/lib/github/markup/implementation.rb +++ b/lib/github/markup/implementation.rb @@ -1,10 +1,15 @@ module GitHub module Markup class Implementation + attr_reader :regexp attr_reader :languages - def initialize(languages) - @languages = languages + def initialize(regexp, languages) + @regexp = regexp + + if defined?(::Linguist) + @languages = languages.map {|l| Linguist::Language[l]} + end end def load @@ -15,8 +20,18 @@ def render(content) raise NotImplementedError, "subclasses of GitHub::Markup::Implementation must define #render" end - def match?(language) - languages.include? language + def match?(filename, language) + if defined?(::Linguist) + languages.include? language + else + file_ext_regexp =~ filename + end + end + + private + + def file_ext_regexp + @file_ext_regexp ||= /\.(#{regexp})\z/ end end end diff --git a/lib/github/markup/markdown.rb b/lib/github/markup/markdown.rb index 0d8555c3..0894fa03 100644 --- a/lib/github/markup/markdown.rb +++ b/lib/github/markup/markdown.rb @@ -28,7 +28,9 @@ class Markdown < Implementation } def initialize - super([Linguist::Language["Markdown"], Linguist::Language["RMarkdown"], Linguist::Language["Literate CoffeeScript"]]) + super( + /md|rmd|mkdn?|mdwn|mdown|markdown|litcoffee/i, + ["Markdown", "RMarkdown", "Literate CoffeeScript"]) end def load diff --git a/lib/github/markup/rdoc.rb b/lib/github/markup/rdoc.rb index e96ddf07..1064f24b 100644 --- a/lib/github/markup/rdoc.rb +++ b/lib/github/markup/rdoc.rb @@ -6,7 +6,7 @@ module GitHub module Markup class RDoc < Implementation def initialize - super([Linguist::Language["RDoc"]]) + super(/rdoc/, ["RDoc"]) end def render(content) diff --git a/lib/github/markups.rb b/lib/github/markups.rb index 24ecaffa..538ee7d0 100644 --- a/lib/github/markups.rb +++ b/lib/github/markups.rb @@ -1,34 +1,33 @@ require "github/markup/markdown" require "github/markup/rdoc" require "shellwords" -require "linguist" markup_impl(::GitHub::Markups::MARKUP_MARKDOWN, ::GitHub::Markup::Markdown.new) -markup(::GitHub::Markups::MARKUP_TEXTILE, :redcloth, [Linguist::Language["Textile"]]) do |content| +markup(::GitHub::Markups::MARKUP_TEXTILE, :redcloth, /textile/, ["Textile"]) do |content| RedCloth.new(content).to_html end markup_impl(::GitHub::Markups::MARKUP_RDOC, GitHub::Markup::RDoc.new) -markup(::GitHub::Markups::MARKUP_ORG, 'org-ruby', [Linguist::Language["Org"]]) do |content| +markup(::GitHub::Markups::MARKUP_ORG, 'org-ruby', /org/, ["Org"]) do |content| Orgmode::Parser.new(content, { :allow_include_files => false, :skip_syntax_highlight => true }).to_html end -markup(::GitHub::Markups::MARKUP_CREOLE, :creole, [Linguist::Language["Creole"]]) do |content| +markup(::GitHub::Markups::MARKUP_CREOLE, :creole, /creole/, ["Creole"]) do |content| Creole.creolize(content) end -markup(::GitHub::Markups::MARKUP_MEDIAWIKI, :wikicloth, [Linguist::Language["MediaWiki"]]) do |content| +markup(::GitHub::Markups::MARKUP_MEDIAWIKI, :wikicloth, /mediawiki|wiki/, ["MediaWiki"]) do |content| wikicloth = WikiCloth::WikiCloth.new(:data => content) WikiCloth::WikiBuffer::HTMLElement::ESCAPED_TAGS << 'tt' unless WikiCloth::WikiBuffer::HTMLElement::ESCAPED_TAGS.include?('tt') wikicloth.to_html(:noedit => true) end -markup(::GitHub::Markups::MARKUP_ASCIIDOC, :asciidoctor, [Linguist::Language["AsciiDoc"]]) do |content| +markup(::GitHub::Markups::MARKUP_ASCIIDOC, :asciidoctor, /adoc|asc(iidoc)?/, ["AsciiDoc"]) do |content| Asciidoctor::Compliance.unique_id_start_index = 1 Asciidoctor.convert(content, :safe => :secure, :attributes => %w(showtitle=@ idprefix idseparator=- env=github env-github source-highlighter=html-pipeline)) end @@ -36,8 +35,9 @@ command( ::GitHub::Markups::MARKUP_RST, "python2 -S #{Shellwords.escape(File.dirname(__FILE__))}/commands/rest2html", - [Linguist::Language["reStructuredText"]], + /re?st(\.txt)?/, + ["reStructuredText"], "restructuredtext" ) -command(::GitHub::Markups::MARKUP_POD, :pod2html, [Linguist::Language["Pod"]], "pod") +command(::GitHub::Markups::MARKUP_POD, :pod2html, /pod/, ["Pod"], "pod") diff --git a/test/markup_test.rb b/test/markup_test.rb index 6c8365d4..ccd1818e 100644 --- a/test/markup_test.rb +++ b/test/markup_test.rb @@ -102,7 +102,7 @@ def test_rendering_by_symbol end def test_raises_error_if_command_exits_non_zero - GitHub::Markup.command(:doesntmatter, 'test/fixtures/fail.sh', [Linguist::Language['Java']], 'fail') + GitHub::Markup.command(:doesntmatter, 'test/fixtures/fail.sh', /fail/, ['Java'], 'fail') assert GitHub::Markup.can_render?('README.java', 'stop swallowing errors') begin GitHub::Markup.render('README.java', "stop swallowing errors")