Merge pull request #1386 from tsigo/github_markup

Use GitHub::Markup to parse markup files

Merge pull request #1386 from tsigo/github_markup
Use GitHub::Markup to parse markup files
Dmitriy Zaporozhets
2 parents ebd2a5d0 1814ee0c
Showing 7 changed files with 34 additions and 9 deletions Show diff stats
Gemfile
Gemfile.lock
app/controllers/refs_controller.rb
app/helpers/tree_helper.rb
app/views/refs/_tree.html.haml
app/views/refs/_tree_file.html.haml
spec/helpers/tree_helper_spec.rb
@@ -44,7 +44,8 @@ gem &quot;ffaker&quot;
 gem "seed-fu"
  
 # Markdown to HTML
-gem "redcarpet", "~> 2.1.1"
+gem "redcarpet",     "~> 2.1.1"
+gem "github-markup", "~> 0.7.4"
  
 # Servers
 gem "thin"
@@ -178,6 +178,7 @@ GEM
     gherkin (2.11.0)
       json (>= 1.4.6)
     git (1.2.5)
+    github-markup (0.7.4)
     gitlab_meta (2.9)
     grape (0.2.1)
       hashie (~> 1.2)
@@ -396,6 +397,7 @@ DEPENDENCIES
   ffaker
   foreman
   git
+  github-markup (~> 0.7.4)
   gitlab_meta (= 2.9)
   gitolite!
   grack!
+require 'github/markup'
+
 class RefsController < ApplicationController
   include Gitlab::Encode
   before_filter :project
@@ -24,4 +24,14 @@ module TreeHelper
       content.name
     end
   end
+
+  # Public: Determines if a given filename is compatible with GitHub::Markup.
+  #
+  # filename - Filename string to check
+  #
+  # Returns boolean
+  def markup?(filename)
+    filename.end_with?(*%w(.mdown .md .markdown .textile .rdoc .org .creole
+                          .mediawiki .rst .asciidoc .pod))
+  end
 end
@@ -43,11 +43,7 @@
           %i.icon-file
           = content.name
         .file_content.wiki
-          - if content.name =~ /\.(md|markdown)$/i
-            = preserve do
-              = markdown(content.data)
-          - else
-            = simple_format(content.data)
+          = raw GitHub::Markup.render(content.name, content.data)
  
 :javascript
   $(function(){
@@ -9,10 +9,9 @@
       = link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
       = link_to "blame", blame_file_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small"
   - if file.text?
-    - if name =~ /\.(md|markdown)$/i
+    - if markup?(name)
       .file_content.wiki
-        = preserve do
-          = markdown(file.data)
+        = raw GitHub::Markup.render(name, file.data)
     - else
       .file_content.code
         - unless file.empty?
@@ -0,0 +1,15 @@
+require 'spec_helper'
+
+describe TreeHelper do
+  describe '#markup?' do
+    %w(mdown md markdown textile rdoc org creole mediawiki rst asciidoc pod).each do |type|
+      it "returns true for #{type} files" do
+        markup?("README.#{type}").should be_true
+      end
+    end
+
+    it "returns false when given a non-markup filename" do
+      markup?('README.rb').should_not be_true
+    end
+  end
+end
...	...	@@ -44,7 +44,8 @@ gem "ffaker"
44	44	gem "seed-fu"
45	45
46	46	# Markdown to HTML
47		-gem "redcarpet", "~> 2.1.1"
	47	+gem "redcarpet", "~> 2.1.1"
	48	+gem "github-markup", "~> 0.7.4"
48	49
49	50	# Servers
50	51	gem "thin"
...	...
...	...	@@ -178,6 +178,7 @@ GEM
178	178	gherkin (2.11.0)
179	179	json (>= 1.4.6)
180	180	git (1.2.5)
	181	+ github-markup (0.7.4)
181	182	gitlab_meta (2.9)
182	183	grape (0.2.1)
183	184	hashie (~> 1.2)
...	...	@@ -396,6 +397,7 @@ DEPENDENCIES
396	397	ffaker
397	398	foreman
398	399	git
	400	+ github-markup (~> 0.7.4)
399	401	gitlab_meta (= 2.9)
400	402	gitolite!
401	403	grack!
...	...
	1	+require 'github/markup'
	2	+
1	3	class RefsController < ApplicationController
2	4	include Gitlab::Encode
3	5	before_filter :project
...	...
...	...	@@ -24,4 +24,14 @@ module TreeHelper
24	24	content.name
25	25	end
26	26	end
	27	+
	28	+ # Public: Determines if a given filename is compatible with GitHub::Markup.
	29	+ #
	30	+ # filename - Filename string to check
	31	+ #
	32	+ # Returns boolean
	33	+ def markup?(filename)
	34	+ filename.end_with?(*%w(.mdown .md .markdown .textile .rdoc .org .creole
	35	+ .mediawiki .rst .asciidoc .pod))
	36	+ end
27	37	end
...	...
...	...	@@ -43,11 +43,7 @@
43	43	%i.icon-file
44	44	= content.name
45	45	.file_content.wiki
46		- - if content.name =~ /\.(md\|markdown)$/i
47		- = preserve do
48		- = markdown(content.data)
49		- - else
50		- = simple_format(content.data)
	46	+ = raw GitHub::Markup.render(content.name, content.data)
51	47
52	48	:javascript
53	49	$(function(){
...	...
...	...	@@ -9,10 +9,9 @@
9	9	= link_to "history", project_commits_path(@project, path: params[:path], ref: @ref), class: "btn very_small"
10	10	= link_to "blame", blame_file_project_ref_path(@project, @ref, path: params[:path]), class: "btn very_small"
11	11	- if file.text?
12		- - if name =~ /\.(md\|markdown)$/i
	12	+ - if markup?(name)
13	13	.file_content.wiki
14		- = preserve do
15		- = markdown(file.data)
	14	+ = raw GitHub::Markup.render(name, file.data)
16	15	- else
17	16	.file_content.code
18	17	- unless file.empty?
...	...
...	...	@@ -0,0 +1,15 @@
	1	+require 'spec_helper'
	2	+
	3	+describe TreeHelper do
	4	+ describe '#markup?' do
	5	+ %w(mdown md markdown textile rdoc org creole mediawiki rst asciidoc pod).each do \|type\|
	6	+ it "returns true for #{type} files" do
	7	+ markup?("README.#{type}").should be_true
	8	+ end
	9	+ end
	10	+
	11	+ it "returns false when given a non-markup filename" do
	12	+ markup?('README.rb').should_not be_true
	13	+ end
	14	+ end
	15	+end
...	...