Merge pull request #1139 from github/kivikakk/pass-symlink

Pass through symlink info

Gemfile

@@ -10,5 +10,6 @@ gem "rdoc", "~>3.6"
 gem "org-ruby", "= 0.9.9"
 gem "creole", "~>0.3.6"
 gem "wikicloth", "=0.8.3"
+gem "twitter-text", "~> 1.14"
 gem "asciidoctor", "= 1.5.6.1"
 gem "rake"

github-markup.gemspec

@@ -23,5 +23,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"
+  s.add_development_dependency "github-linguist", "~> 6.0"
 end

lib/github/markup.rb

@@ -40,10 +40,11 @@ def preload!
       end
     end
 
-    def render(filename, content = nil)
+    def render(filename, content = nil, symlink = nil)
       content ||= File.read(filename)
+      symlink = (File.symlink?(filename) rescue false) if symlink.nil?
 
-      if impl = renderer(filename, content)
+      if impl = renderer(filename, content, symlink)
         impl.render(filename, content)
       else
         content
@@ -79,20 +80,20 @@ def command(symbol, command, regexp, languages, name, &block)
       markup_impl(symbol, CommandImplementation.new(regexp, languages, command, name, &block))
     end
 
-    def can_render?(filename, content)
-      !!renderer(filename, content)
+    def can_render?(filename, content, symlink = false)
+      !!renderer(filename, content, symlink)
     end
 
-    def renderer(filename, content)
-      language = language(filename, content)
+    def renderer(filename, content, symlink = false)
+      language = language(filename, content, symlink)
       markup_impls.find { |impl|
         impl.match?(filename, language)
       }
     end
 
-    def language(filename, content)
+    def language(filename, content, symlink = false)
       if defined?(::Linguist)
-        blob = Linguist::Blob.new(filename, content)
+        blob = Linguist::Blob.new(filename, content, symlink: symlink)
         return Linguist.detect(blob, allow_empty: true)
       end
     end

test/markup_test.rb

@@ -104,7 +104,7 @@ def test_raises_error_if_command_exits_non_zero
     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")
+      GitHub::Markup.render('README.java', "stop swallowing errors", false)
     rescue GitHub::Markup::CommandError => e
       assert_equal "failure message", e.message
     else