Merge pull request #1384 from tsigo/emoji

Emoji!

Merge pull request #1384 from tsigo/emoji
Emoji!
Dmitriy Zaporozhets
2 parents 7c0a1068 2faa4bba
Showing 852 changed files with 121 additions and 48 deletions Show diff stats
app/assets/images/emoji/+1.png
app/assets/images/emoji/-1.png
app/assets/images/emoji/100.png
app/assets/images/emoji/109.png
app/assets/images/emoji/1234.png
app/assets/images/emoji/8ball.png
app/assets/images/emoji/a.png
app/assets/images/emoji/ab.png
app/assets/images/emoji/abc.png
app/assets/images/emoji/abcd.png
app/assets/images/emoji/accept.png
app/assets/images/emoji/aerial_tramway.png
app/assets/images/emoji/airplane.png
app/assets/images/emoji/alarm_clock.png
app/assets/images/emoji/alien.png
app/assets/images/emoji/ambulance.png
app/assets/images/emoji/anchor.png
app/assets/images/emoji/angel.png
app/assets/images/emoji/anger.png
app/assets/images/emoji/angry.png
 module GitlabMarkdownHelper
-  # Replaces references (i.e. @abc, #123, !456, ...) in the text with links to
-  # the appropriate items in GitLab.
-  #
-  # text          - the source text
-  # html_options  - extra options for the reference links as given to link_to
-  #
-  # note: reference links will only be generated if @project is set
-  #
-  # see Gitlab::Markdown for details on the supported syntax
-  def gfm(text, html_options = {})
-    return text if text.nil?
-    return text if @project.nil?
-
-    # Extract pre blocks so they are not altered
-    # from http://github.github.com/github-flavored-markdown/
-    extractions = {}
-    text.gsub!(%r{<pre>.*?</pre>|<code>.*?</code>}m) do |match|
-      md5 = Digest::MD5.hexdigest(match)
-      extractions[md5] = match
-      "{gfm-extraction-#{md5}}"
-    end
-
-    # TODO: add popups with additional information
-
-    parser = Gitlab::Markdown.new(@project, html_options)
-    text = parser.parse(text)
-
-    # Insert pre block extractions
-    text.gsub!(/\{gfm-extraction-(\h{32})\}/) do
-      extractions[$1]
-    end
-
-    sanitize text.html_safe, attributes:  ActionView::Base.sanitized_allowed_attributes + %w(id class )
-  end
+  include Gitlab::Markdown
  
   # Use this in places where you would normally use link_to(gfm(...), ...).
   #
@@ -103,7 +103,7 @@ class Note &lt; ActiveRecord::Base
   # Returns true if this is an upvote note,
   # otherwise false is returned
   def upvote?
-    note =~ /^\+1/ ? true : false
+    note.start_with?('+1') || note.start_with?(':+1:')
   end
 end
 # == Schema Information
 module Gitlab
   # Custom parser for GitLab-flavored Markdown
   #
-  # It replaces references in the text with links to the appropriate items in Gitlab.
+  # It replaces references in the text with links to the appropriate items in
+  # GitLab.
   #
   # Supported reference formats are:
   #   * @foo for team members
@@ -10,19 +11,20 @@ module Gitlab
   #   * $123 for snippets
   #   * 123456 for commits
   #
-  # Examples
+  # It also parses Emoji codes to insert images. See
+  # http://www.emoji-cheat-sheet.com/ for a list of the supported icons.
   #
-  #   >> m = Markdown.new(...)
+  # Examples
   #
-  #   >> m.parse("Hey @david, can you fix this?")
+  #   >> gfm("Hey @david, can you fix this?")
   #   => "Hey <a href="/gitlab/team_members/1">@david</a>, can you fix this?"
   #
-  #   >> m.parse("Commit 35d5f7c closes #1234")
+  #   >> gfm("Commit 35d5f7c closes #1234")
   #   => "Commit <a href="/gitlab/commits/35d5f7c">35d5f7c</a> closes <a href="/gitlab/issues/1234">#1234</a>"
-  class Markdown
-    include Rails.application.routes.url_helpers
-    include ActionView::Helpers
-
+  #
+  #   >> gfm(":trollface:")
+  #   => "<img alt=\":trollface:\" class=\"emoji\" src=\"/images/trollface.png" title=\":trollface:\" />
+  module Markdown
     REFERENCE_PATTERN = %r{
       ([^\w&;])?      # Prefix (1)
       (               # Reference (2)
@@ -33,15 +35,52 @@ module Gitlab
       ([^\w&;])?      # Suffix (6)
     }x.freeze
  
+    EMOJI_PATTERN = %r{(:(\S+):)}.freeze
+
     attr_reader :html_options
  
-    def initialize(project, html_options = {})
-      @project      = project
+    # Public: Parse the provided text with GitLab-Flavored Markdown
+    #
+    # text         - the source text
+    # html_options - extra options for the reference links as given to link_to
+    #
+    # Note: reference links will only be generated if @project is set
+    def gfm(text, html_options = {})
+      return text if text.nil?
+      return text if @project.nil?
+
       @html_options = html_options
+
+      # Extract pre blocks so they are not altered
+      # from http://github.github.com/github-flavored-markdown/
+      extractions = {}
+      text.gsub!(%r{<pre>.*?</pre>|<code>.*?</code>}m) do |match|
+        md5 = Digest::MD5.hexdigest(match)
+        extractions[md5] = match
+        "{gfm-extraction-#{md5}}"
+      end
+
+      # TODO: add popups with additional information
+
+      text = parse(text)
+
+      # Insert pre block extractions
+      text.gsub!(/\{gfm-extraction-(\h{32})\}/) do
+        extractions[$1]
+      end
+
+      sanitize text.html_safe, attributes: ActionView::Base.sanitized_allowed_attributes + %w(id class)
     end
  
+    private
+
+    # Private: Parses text for references and emoji
+    #
+    # text - Text to parse
+    #
+    # Returns parsed text
     def parse(text)
-      text.gsub(REFERENCE_PATTERN) do |match|
+      text = text.gsub(REFERENCE_PATTERN) do |match|
         prefix     = $1 || ''
         reference  = $2
         identifier = $3 || $4 || $5
@@ -53,9 +92,26 @@ module Gitlab
           match
         end
       end
+
+      text = text.gsub(EMOJI_PATTERN) do |match|
+        if valid_emoji?($2)
+          helper.image_tag("#{$2}.png", size: "20x20", class: 'emoji', title: $1, alt: $1)
+        else
+          match
+        end
+      end
+
+      text
     end
  
-    private
+    # Private: Checks if an emoji icon exists in the image asset directory
+    #
+    # emoji - Identifier of the emoji as a string (e.g., "+1", "heart")
+    #
+    # Returns boolean
+    def valid_emoji?(emoji)
+      File.exists?(Rails.root.join('app', 'assets', 'images', 'emoji', "#{emoji}.png"))
+    end
  
     # Private: Dispatches to a dedicated processing method based on reference
     #
@@ -208,6 +208,46 @@ describe GitlabMarkdownHelper do
         gfm(actual).should match(expected)
       end
     end
+
+    describe "emoji" do
+      it "matches at the start of a string" do
+        gfm(":+1:").should match(/<img/)
+      end
+
+      it "matches at the end of a string" do
+        gfm("This gets a :-1:").should match(/<img/)
+      end
+
+      it "matches with adjacent text" do
+        gfm("+1 (:+1:)").should match(/<img/)
+      end
+
+      it "has a title attribute" do
+        gfm(":-1:").should match(/title=":-1:"/)
+      end
+
+      it "has an alt attribute" do
+        gfm(":-1:").should match(/alt=":-1:"/)
+      end
+
+      it "has an emoji class" do
+        gfm(":+1:").should match('class="emoji"')
+      end
+
+      it "sets height and width" do
+        actual = gfm(":+1:")
+        actual.should match(/width="20"/)
+        actual.should match(/height="20"/)
+      end
+
+      it "keeps whitespace intact" do
+        gfm("This deserves a :+1: big time.").should match(/deserves a <img.+\/> big time/)
+      end
+
+      it "ignores invalid emoji" do
+        gfm(":invalid-emoji:").should_not match(/<img/)
+      end
+    end
   end
  
   describe "#link_to_gfm" do
@@ -35,6 +35,16 @@ describe Note do
       note = Factory(:note, note: "-1 for this")
       note.should_not be_upvote
     end
+
+    it "recognizes a +1 emoji as a vote" do
+      note = build(:note, note: ":+1: for this")
+      note.should be_upvote
+    end
+
+    it "recognizes a neutral emoji note" do
+      note = build(:note, note: "I would :+1: this, but I don't want to")
+      note.should_not be_upvote
+    end
   end
  
   let(:project) { create(:project) }
1	1	module GitlabMarkdownHelper
2		- # Replaces references (i.e. @abc, #123, !456, ...) in the text with links to
3		- # the appropriate items in GitLab.
4		- #
5		- # text - the source text
6		- # html_options - extra options for the reference links as given to link_to
7		- #
8		- # note: reference links will only be generated if @project is set
9		- #
10		- # see Gitlab::Markdown for details on the supported syntax
11		- def gfm(text, html_options = {})
12		- return text if text.nil?
13		- return text if @project.nil?
14		-
15		- # Extract pre blocks so they are not altered
16		- # from http://github.github.com/github-flavored-markdown/
17		- extractions = {}
18		- text.gsub!(%r{<pre>.?</pre>\|<code>.?</code>}m) do \|match\|
19		- md5 = Digest::MD5.hexdigest(match)
20		- extractions[md5] = match
21		- "{gfm-extraction-#{md5}}"
22		- end
23		-
24		- # TODO: add popups with additional information
25		-
26		- parser = Gitlab::Markdown.new(@project, html_options)
27		- text = parser.parse(text)
28		-
29		- # Insert pre block extractions
30		- text.gsub!(/\{gfm-extraction-(\h{32})\}/) do
31		- extractions[$1]
32		- end
33		-
34		- sanitize text.html_safe, attributes: ActionView::Base.sanitized_allowed_attributes + %w(id class )
35		- end
	2	+ include Gitlab::Markdown
36	3
37	4	# Use this in places where you would normally use link_to(gfm(...), ...).
38	5	#
...	...
...	...	@@ -103,7 +103,7 @@ class Note < ActiveRecord::Base
103	103	# Returns true if this is an upvote note,
104	104	# otherwise false is returned
105	105	def upvote?
106		- note =~ /^\+1/ ? true : false
	106	+ note.start_with?('+1') \|\| note.start_with?(':+1:')
107	107	end
108	108	end
109	109	# == Schema Information
...	...
1	1	module Gitlab
2	2	# Custom parser for GitLab-flavored Markdown
3	3	#
4		- # It replaces references in the text with links to the appropriate items in Gitlab.
	4	+ # It replaces references in the text with links to the appropriate items in
	5	+ # GitLab.
5	6	#
6	7	# Supported reference formats are:
7	8	# * @foo for team members
...	...	@@ -10,19 +11,20 @@ module Gitlab
10	11	# * $123 for snippets
11	12	# * 123456 for commits
12	13	#
13		- # Examples
	14	+ # It also parses Emoji codes to insert images. See
	15	+ # http://www.emoji-cheat-sheet.com/ for a list of the supported icons.
14	16	#
15		- # >> m = Markdown.new(...)
	17	+ # Examples
16	18	#
17		- # >> m.parse("Hey @david, can you fix this?")
	19	+ # >> gfm("Hey @david, can you fix this?")
18	20	# => "Hey <a href="/gitlab/team_members/1">@david</a>, can you fix this?"
19	21	#
20		- # >> m.parse("Commit 35d5f7c closes #1234")
	22	+ # >> gfm("Commit 35d5f7c closes #1234")
21	23	# => "Commit <a href="/gitlab/commits/35d5f7c">35d5f7c</a> closes <a href="/gitlab/issues/1234">#1234</a>"
22		- class Markdown
23		- include Rails.application.routes.url_helpers
24		- include ActionView::Helpers
25		-
	24	+ #
	25	+ # >> gfm(":trollface:")
	26	+ # => "<img alt=\":trollface:\" class=\"emoji\" src=\"/images/trollface.png" title=\":trollface:\" />
	27	+ module Markdown
26	28	REFERENCE_PATTERN = %r{
27	29	([^\w&;])? # Prefix (1)
28	30	( # Reference (2)
...	...	@@ -33,15 +35,52 @@ module Gitlab
33	35	([^\w&;])? # Suffix (6)
34	36	}x.freeze
35	37
	38	+ EMOJI_PATTERN = %r{(:(\S+):)}.freeze
	39	+
36	40	attr_reader :html_options
37	41
38		- def initialize(project, html_options = {})
39		- @project = project
	42	+ # Public: Parse the provided text with GitLab-Flavored Markdown
	43	+ #
	44	+ # text - the source text
	45	+ # html_options - extra options for the reference links as given to link_to
	46	+ #
	47	+ # Note: reference links will only be generated if @project is set
	48	+ def gfm(text, html_options = {})
	49	+ return text if text.nil?
	50	+ return text if @project.nil?
	51	+
40	52	@html_options = html_options
	53	+
	54	+ # Extract pre blocks so they are not altered
	55	+ # from http://github.github.com/github-flavored-markdown/
	56	+ extractions = {}
	57	+ text.gsub!(%r{<pre>.?</pre>\|<code>.?</code>}m) do \|match\|
	58	+ md5 = Digest::MD5.hexdigest(match)
	59	+ extractions[md5] = match
	60	+ "{gfm-extraction-#{md5}}"
	61	+ end
	62	+
	63	+ # TODO: add popups with additional information
	64	+
	65	+ text = parse(text)
	66	+
	67	+ # Insert pre block extractions
	68	+ text.gsub!(/\{gfm-extraction-(\h{32})\}/) do
	69	+ extractions[$1]
	70	+ end
	71	+
	72	+ sanitize text.html_safe, attributes: ActionView::Base.sanitized_allowed_attributes + %w(id class)
41	73	end
42	74
	75	+ private
	76	+
	77	+ # Private: Parses text for references and emoji
	78	+ #
	79	+ # text - Text to parse
	80	+ #
	81	+ # Returns parsed text
43	82	def parse(text)
44		- text.gsub(REFERENCE_PATTERN) do \|match\|
	83	+ text = text.gsub(REFERENCE_PATTERN) do \|match\|
45	84	prefix = $1 \|\| ''
46	85	reference = $2
47	86	identifier = $3 \|\| $4 \|\| $5
...	...	@@ -53,9 +92,26 @@ module Gitlab
53	92	match
54	93	end
55	94	end
	95	+
	96	+ text = text.gsub(EMOJI_PATTERN) do \|match\|
	97	+ if valid_emoji?($2)
	98	+ helper.image_tag("#{$2}.png", size: "20x20", class: 'emoji', title: $1, alt: $1)
	99	+ else
	100	+ match
	101	+ end
	102	+ end
	103	+
	104	+ text
56	105	end
57	106
58		- private
	107	+ # Private: Checks if an emoji icon exists in the image asset directory
	108	+ #
	109	+ # emoji - Identifier of the emoji as a string (e.g., "+1", "heart")
	110	+ #
	111	+ # Returns boolean
	112	+ def valid_emoji?(emoji)
	113	+ File.exists?(Rails.root.join('app', 'assets', 'images', 'emoji', "#{emoji}.png"))
	114	+ end
59	115
60	116	# Private: Dispatches to a dedicated processing method based on reference
61	117	#
...	...
...	...	@@ -208,6 +208,46 @@ describe GitlabMarkdownHelper do
208	208	gfm(actual).should match(expected)
209	209	end
210	210	end
	211	+
	212	+ describe "emoji" do
	213	+ it "matches at the start of a string" do
	214	+ gfm(":+1:").should match(/<img/)
	215	+ end
	216	+
	217	+ it "matches at the end of a string" do
	218	+ gfm("This gets a :-1:").should match(/<img/)
	219	+ end
	220	+
	221	+ it "matches with adjacent text" do
	222	+ gfm("+1 (:+1:)").should match(/<img/)
	223	+ end
	224	+
	225	+ it "has a title attribute" do
	226	+ gfm(":-1:").should match(/title=":-1:"/)
	227	+ end
	228	+
	229	+ it "has an alt attribute" do
	230	+ gfm(":-1:").should match(/alt=":-1:"/)
	231	+ end
	232	+
	233	+ it "has an emoji class" do
	234	+ gfm(":+1:").should match('class="emoji"')
	235	+ end
	236	+
	237	+ it "sets height and width" do
	238	+ actual = gfm(":+1:")
	239	+ actual.should match(/width="20"/)
	240	+ actual.should match(/height="20"/)
	241	+ end
	242	+
	243	+ it "keeps whitespace intact" do
	244	+ gfm("This deserves a :+1: big time.").should match(/deserves a <img.+\/> big time/)
	245	+ end
	246	+
	247	+ it "ignores invalid emoji" do
	248	+ gfm(":invalid-emoji:").should_not match(/<img/)
	249	+ end
	250	+ end
211	251	end
212	252
213	253	describe "#link_to_gfm" do
...	...
...	...	@@ -35,6 +35,16 @@ describe Note do
35	35	note = Factory(:note, note: "-1 for this")
36	36	note.should_not be_upvote
37	37	end
	38	+
	39	+ it "recognizes a +1 emoji as a vote" do
	40	+ note = build(:note, note: ":+1: for this")
	41	+ note.should be_upvote
	42	+ end
	43	+
	44	+ it "recognizes a neutral emoji note" do
	45	+ note = build(:note, note: "I would :+1: this, but I don't want to")
	46	+ note.should_not be_upvote
	47	+ end
38	48	end
39	49
40	50	let(:project) { create(:project) }
...	...