md_emoji 0.0.6 → 0.0.7

data/lib/md_emoji/engine.rb

@@ -1,3 +1,5 @@
+require 'rails/engine'
+
 module MdEmoji
   class Engine < ::Rails::Engine
   end

data/lib/md_emoji/render.rb

@@ -1,6 +1,13 @@
 module MdEmoji
   class Render < Redcarpet::Render::HTML
+    def initialize(options={})
+      @options = options
+      super options
+    end
+
     def paragraph(text)
+      text.gsub!("\n", "<br>\n") if @options[:hard_wrap]
+
       "<p>#{replace_emoji(text)}</p>\n"
     end
 

data/lib/md_emoji/version.rb

@@ -1,3 +1,3 @@
 module MdEmoji
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/test/md_emoji_test.rb

@@ -58,6 +58,26 @@ class MdEmojiTest < ActiveSupport::TestCase
            "Hyperlink not present in parsed text: #{parsed_text}"
   end
 
+  test "works with no_styles enabled" do
+    @markdown = Redcarpet::Markdown.new(MdEmoji::Render.new(:no_styles => true))
+
+    text        = ":wink2: <a style='color: red;'></a>"
+    parsed_text = @markdown.render(text)
+
+    assert_emoji 'wink2', parsed_text
+  end
+
+  test "works with hard_wrap enabled" do
+    @markdown = Redcarpet::Markdown.new(MdEmoji::Render.new(:hard_wrap => true))
+
+    text        = ":wink2:\nline"
+    parsed_text = @markdown.render(text)
+
+    assert_emoji 'wink2', parsed_text
+    assert parsed_text.include?(%{<br>}),
+           "<br> not present in parsed text: #{parsed_text}"
+  end
+
   test "does not render emoji in codeblocks" do
     text = %{```ruby
 def hello

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: md_emoji
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-08 00:00:00.000000000Z
+date: 2012-06-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
-  requirement: &2163509160 !ruby/object:Gem::Requirement
+  name: railties
+  requirement: &2159043500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2163509160
+  version_requirements: *2159043500
 - !ruby/object:Gem::Dependency
   name: redcarpet
-  requirement: &2163508660 !ruby/object:Gem::Requirement
+  requirement: &2159043000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,18 @@ dependencies:
         version: '2.0'
   type: :runtime
   prerelease: false
-  version_requirements: *2163508660
+  version_requirements: *2159043000
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: &2159042540 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.1.0
+  type: :development
+  prerelease: false
+  version_requirements: *2159042540
 description: Rails gem which adds emoji parsing to markdown
 email:
 - jordan@ducksoupsoftware.com
@@ -587,7 +598,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2508333947300250217
+      hash: 2878078479402414121
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -596,7 +607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2508333947300250217
+      hash: 2878078479402414121
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.15