md_emoji 0.0.3 → 0.0.4

data/lib/md_emoji/render.rb

@@ -1,26 +1,38 @@
 module MdEmoji
   class Render < Redcarpet::Render::HTML
-    def normal_text(text)
-      if include_emoji?(text)
-        replace_emoji(text)
+    def preprocess(document)
+      if include_emoji?(document)
+        replace_emoji(document)
       else
-        text
+        document
       end
     end
 
+    def block_code(text, lang)
+      "<pre><code#{%{ class="#{lang}"} if lang}>#{revert_emoji(text)}</code></pre>"
+    end
+
+    def codespan(text)
+      "<code>#{revert_emoji(text)}</code>"
+    end
+
     # Replaces valid emoji characters, ie :smile:, with img tags
     #
     # Valid emoji charaters are listed in +MdEmoji::EMOJI+
     def replace_emoji(text)
       text.gsub(/:(\S+):/) do |emoji|
-        if MdEmoji::EMOJI.include?($1)
-          file_name    = "#{$1.gsub('+', 'plus')}.png"
+
+        emoji_code = emoji #.gsub("|", "_")
+        emoji      = emoji_code.gsub(":", "")
+
+        if MdEmoji::EMOJI.include?(emoji)
+          file_name    = "#{emoji.gsub('+', 'plus')}.png"
           default_size = %{height="20" width="20"}
 
           %{<img src="/assets/emojis/#{file_name}" class="emoji" } +
-            %{title="#{emoji}" alt="#{emoji}" #{default_size}>}
+            %{title="#{emoji_code}" alt="#{emoji_code}" #{default_size}>}
         else
-          emoji
+          emoji_code
         end
       end
     end
@@ -31,5 +43,12 @@ module MdEmoji
     def include_emoji?(text)
       text && text[/:\S+:/]
     end
+
+    # Replaces emoji images with plain text
+    def revert_emoji(text)
+      text.gsub(/<[^>]+class="emoji"\stitle="(:\S+:)"[^>]+>/) do |emoji|
+        ":#{$1}:"
+      end
+    end
   end
 end

data/lib/md_emoji/version.rb

@@ -1,3 +1,3 @@
 module MdEmoji
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/md_emoji_test.rb

@@ -3,7 +3,8 @@ require 'test_helper'
 class MdEmojiTest < ActiveSupport::TestCase
 
   def setup
-    @markdown = Redcarpet::Markdown.new(MdEmoji::Render)
+    @markdown = Redcarpet::Markdown.new(MdEmoji::Render,
+      :fenced_code_blocks  => true)
   end
 
   test "adds emoji to text when the emoji exists" do
@@ -22,6 +23,14 @@ class MdEmojiTest < ActiveSupport::TestCase
     assert_emoji 'plus1', parsed_text
   end
 
+  test "works on emoji with underscores" do
+    text = "This is tense :sweat_drops:"
+
+    parsed_text = @markdown.render(text)
+
+    assert_emoji 'sweat_drops', parsed_text
+  end
+
   test "skips emoji which aren't supported" do
     text = "Hello :jordan_byron: world!"
 
@@ -31,8 +40,6 @@ class MdEmojiTest < ActiveSupport::TestCase
   end
 
   test "works with autolink enabled" do
-    skip "autolink messes everything up :("
-
     @markdown = Redcarpet::Markdown.new(MdEmoji::Render, :autolink => true)
 
     text        = ":wink2: http://www.jordanbyron.com"
@@ -44,13 +51,16 @@ class MdEmojiTest < ActiveSupport::TestCase
   end
 
   test "does not render emoji in codeblocks" do
-    text = %{Look at my codez
-      ```
-      def hello
-        :wink:
-      end
-      ```
-      Everything is ok :smile:}
+    text = %{```ruby
+def hello
+  :wink:
+end
+```
+Everything is ok :smile: `:wink2`
+
+```
+:fireengine:
+```}
 
     parsed_text = @markdown.render(text)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md_emoji
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-29 00:00:00.000000000Z
+date: 2012-02-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &2169729360 !ruby/object:Gem::Requirement
+  requirement: &2163314640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,18 +21,18 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169729360
+  version_requirements: *2163314640
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2169728760 !ruby/object:Gem::Requirement
+  requirement: &2163313940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.0b3
+        version: '2.1'
   type: :runtime
   prerelease: false
-  version_requirements: *2169728760
+  version_requirements: *2163313940
 description: Rails gem which adds emoji parsing to markdown
 email:
 - jordan@ducksoupsoftware.com
@@ -587,7 +587,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1133397691911705144
+      hash: 2938624612538269085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -596,7 +596,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1133397691911705144
+      hash: 2938624612538269085
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15