From ceabda743a14f2cbd8edfd704743765c8f58a743 Mon Sep 17 00:00:00 2001
From: Robert Schilling <rschilling@student.tugraz.at>
Date: Mon, 28 Jul 2014 11:47:27 +0200
Subject: [PATCH] Improve markup gems
---
Gemfile | 14 +++++++++-----
Gemfile.lock | 18 +++++++++++++++---
app/helpers/tree_helper.rb | 4 ++--
spec/helpers/tree_helper_spec.rb | 3 ++-
4 files changed, 28 insertions(+), 11 deletions(-)
diff --git a/Gemfile b/Gemfile
index 86f8edbdad4..e61d9b2ff7d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -79,16 +79,20 @@ gem "six"
gem "seed-fu"
# Markdown to HTML
-gem "redcarpet", "~> 2.2.2"
gem "github-markup"
-gem "org-ruby" # For rendering .org files
+
+# Required markup gems by github-markdown
+gem 'redcarpet', '~> 2.2.2'
+gem 'RedCloth'
+gem 'rdoc', '~>3.6'
+gem 'org-ruby', '= 0.9.1'
+gem 'creole', '~>0.3.6'
+gem 'wikicloth', '=0.8.1'
+gem 'asciidoctor', '= 0.1.4'
# Diffs
gem 'diffy', '~> 3.0.3'
-# Asciidoc to HTML
-gem "asciidoctor"
-
# Application server
group :unicorn do
gem "unicorn", '~> 4.6.3'
diff --git a/Gemfile.lock b/Gemfile.lock
index fe85e9ec9ea..385a5fac69b 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,6 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
+ RedCloth (4.2.9)
ace-rails-ap (2.0.1)
actionmailer (4.1.1)
actionpack (= 4.1.1)
@@ -86,6 +87,7 @@ GEM
thor
crack (0.4.1)
safe_yaml (~> 0.9.0)
+ creole (0.3.8)
d3_rails (3.1.10)
railties (>= 3.1.0)
daemons (1.1.9)
@@ -121,6 +123,7 @@ GEM
eventmachine (1.0.3)
excon (0.32.1)
execjs (2.0.2)
+ expression_parser (0.9.0)
factory_girl (4.3.0)
activesupport (>= 3.0.0)
factory_girl_rails (4.3.0)
@@ -320,7 +323,7 @@ GEM
omniauth-twitter (1.0.1)
multi_json (~> 1.3)
omniauth-oauth (~> 1.0)
- org-ruby (0.9.6)
+ org-ruby (0.9.1)
rubypants (>= 0.2.0)
orm_adapter (0.5.0)
pg (0.15.1)
@@ -413,6 +416,7 @@ GEM
require_all (1.3.2)
rest-client (1.6.7)
mime-types (>= 1.16)
+ rinku (1.7.3)
rouge (1.3.3)
rspec (2.14.1)
rspec-core (~> 2.14.0)
@@ -563,6 +567,10 @@ GEM
addressable (>= 2.2.7)
crack (>= 0.3.2)
websocket-driver (0.3.3)
+ wikicloth (0.8.1)
+ builder
+ expression_parser
+ rinku
xpath (2.0.0)
nokogiri (~> 1.3)
@@ -570,10 +578,11 @@ PLATFORMS
ruby
DEPENDENCIES
+ RedCloth
ace-rails-ap
acts-as-taggable-on
annotate (~> 2.6.0.beta2)
- asciidoctor
+ asciidoctor (= 0.1.4)
awesome_print
better_errors
binding_of_caller
@@ -583,6 +592,7 @@ DEPENDENCIES
coffee-rails
colored
coveralls
+ creole (~> 0.3.6)
d3_rails (~> 3.1.4)
database_cleaner
default_value_for (~> 3.0.0)
@@ -632,7 +642,7 @@ DEPENDENCIES
omniauth-github
omniauth-google-oauth2
omniauth-twitter
- org-ruby
+ org-ruby (= 0.9.1)
pg
poltergeist (~> 1.5.1)
pry
@@ -646,6 +656,7 @@ DEPENDENCIES
raphael-rails (~> 2.1.2)
rb-fsevent
rb-inotify
+ rdoc (~> 3.6)
redcarpet (~> 2.2.2)
redis-rails
request_store
@@ -682,3 +693,4 @@ DEPENDENCIES
unicorn-worker-killer
version_sorter
webmock
+ wikicloth (= 0.8.1)
diff --git a/app/helpers/tree_helper.rb b/app/helpers/tree_helper.rb
index 2d82b6a0b47..bde2a60faa9 100644
--- a/app/helpers/tree_helper.rb
+++ b/app/helpers/tree_helper.rb
@@ -44,8 +44,8 @@ module TreeHelper
#
# Returns boolean
def markup?(filename)
- filename.downcase.end_with?(*%w(.textile .rdoc .org .creole
- .mediawiki .rst .adoc .asciidoc .pod))
+ filename.downcase.end_with?(*%w(.textile .rdoc .org .creole .wiki .mediawiki
+ .rst .adoc .asciidoc .asc))
end
def gitlab_markdown?(filename)
diff --git a/spec/helpers/tree_helper_spec.rb b/spec/helpers/tree_helper_spec.rb
index d450b687caf..872dc2ebf31 100644
--- a/spec/helpers/tree_helper_spec.rb
+++ b/spec/helpers/tree_helper_spec.rb
@@ -2,7 +2,8 @@ require 'spec_helper'
describe TreeHelper do
describe '#markup?' do
- %w(textile rdoc org creole mediawiki rst asciidoc pod).each do |type|
+ %w(textile rdoc org creole wiki mediawiki
+ rst adoc asciidoc asc).each do |type|
it "returns true for #{type} files" do
markup?("README.#{type}").should be_true
end
--
GitLab