diff options
author | Jakub Jirutka <jakub@jirutka.cz> | 2015-05-13 02:40:11 +0300 |
---|---|---|
committer | Jakub Jirutka <jakub@jirutka.cz> | 2015-05-18 23:51:56 +0300 |
commit | daa0925016a63dcde448643cbf1310aca359cf37 (patch) | |
tree | 6b8546fd4cdb2306dc40dec5e444b93d49b1d9de | |
parent | b61a44fe1aa17a3e647e71115d1b4a6a39d8c2d2 (diff) |
Rename MarkdownHelper to MarkupHelper
-rw-r--r-- | app/helpers/application_helper.rb | 6 | ||||
-rw-r--r-- | app/helpers/blob_helper.rb | 2 | ||||
-rw-r--r-- | app/models/tree.rb | 6 | ||||
-rw-r--r-- | lib/gitlab/markup_helper.rb (renamed from lib/gitlab/markdown_helper.rb) | 2 | ||||
-rw-r--r-- | spec/lib/gitlab/markup_helper_spec.rb (renamed from spec/lib/gitlab/gitlab_markdown_helper_spec.rb) | 14 |
5 files changed, 15 insertions, 15 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index bc07c09cd4a..5bcc0026016 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -233,15 +233,15 @@ module ApplicationHelper end def markup?(filename) - Gitlab::MarkdownHelper.markup?(filename) + Gitlab::MarkupHelper.markup?(filename) end def gitlab_markdown?(filename) - Gitlab::MarkdownHelper.gitlab_markdown?(filename) + Gitlab::MarkupHelper.gitlab_markdown?(filename) end def asciidoc?(filename) - Gitlab::MarkdownHelper.asciidoc?(filename) + Gitlab::MarkupHelper.asciidoc?(filename) end # Overrides ActionView::Helpers::UrlHelper#link_to to add `rel="nofollow"` to diff --git a/app/helpers/blob_helper.rb b/app/helpers/blob_helper.rb index 4ea838ca447..885ac5f85b8 100644 --- a/app/helpers/blob_helper.rb +++ b/app/helpers/blob_helper.rb @@ -55,7 +55,7 @@ module BlobHelper end def editing_preview_title(filename) - if Gitlab::MarkdownHelper.previewable?(filename) + if Gitlab::MarkupHelper.previewable?(filename) 'Preview' else 'Preview changes' diff --git a/app/models/tree.rb b/app/models/tree.rb index f279e896cda..93b3246a668 100644 --- a/app/models/tree.rb +++ b/app/models/tree.rb @@ -1,11 +1,11 @@ class Tree - include Gitlab::MarkdownHelper + include Gitlab::MarkupHelper attr_accessor :repository, :sha, :path, :entries def initialize(repository, sha, path = '/') path = '/' if path.blank? - + @repository = repository @sha = sha @path = path @@ -20,7 +20,7 @@ class Tree available_readmes = blobs.select(&:readme?) if available_readmes.count == 0 - return @readme = nil + return @readme = nil end # Take the first previewable readme, or the first available readme, if we diff --git a/lib/gitlab/markdown_helper.rb b/lib/gitlab/markup_helper.rb index 70384b1db2c..fb037266d23 100644 --- a/lib/gitlab/markdown_helper.rb +++ b/lib/gitlab/markup_helper.rb @@ -1,5 +1,5 @@ module Gitlab - module MarkdownHelper + module MarkupHelper module_function # Public: Determines if a given filename is compatible with GitHub::Markup. diff --git a/spec/lib/gitlab/gitlab_markdown_helper_spec.rb b/spec/lib/gitlab/markup_helper_spec.rb index beaafd56352..448beecf01f 100644 --- a/spec/lib/gitlab/gitlab_markdown_helper_spec.rb +++ b/spec/lib/gitlab/markup_helper_spec.rb @@ -1,40 +1,40 @@ require 'spec_helper' -describe Gitlab::MarkdownHelper do +describe Gitlab::MarkupHelper do describe '#markup?' do %w(textile rdoc org creole wiki mediawiki rst adoc ad asciidoc).each do |type| it "returns true for #{type} files" do - expect(Gitlab::MarkdownHelper.markup?("README.#{type}")).to be_truthy + expect(Gitlab::MarkupHelper.markup?("README.#{type}")).to be_truthy end end it 'returns false when given a non-markup filename' do - expect(Gitlab::MarkdownHelper.markup?('README.rb')).not_to be_truthy + expect(Gitlab::MarkupHelper.markup?('README.rb')).not_to be_truthy end end describe '#gitlab_markdown?' do %w(mdown md markdown).each do |type| it "returns true for #{type} files" do - expect(Gitlab::MarkdownHelper.gitlab_markdown?("README.#{type}")).to be_truthy + expect(Gitlab::MarkupHelper.gitlab_markdown?("README.#{type}")).to be_truthy end end it 'returns false when given a non-markdown filename' do - expect(Gitlab::MarkdownHelper.gitlab_markdown?('README.rb')).not_to be_truthy + expect(Gitlab::MarkupHelper.gitlab_markdown?('README.rb')).not_to be_truthy end end describe '#asciidoc?' do %w(adoc ad asciidoc ADOC).each do |type| it "returns true for #{type} files" do - expect(Gitlab::MarkdownHelper.asciidoc?("README.#{type}")).to be_truthy + expect(Gitlab::MarkupHelper.asciidoc?("README.#{type}")).to be_truthy end end it 'returns false when given a non-asciidoc filename' do - expect(Gitlab::MarkdownHelper.asciidoc?('README.rb')).not_to be_truthy + expect(Gitlab::MarkupHelper.asciidoc?('README.rb')).not_to be_truthy end end end |