rails_emoji 1.1 → 1.2

data/README.md

@@ -1,12 +1,17 @@
 # [Emoji](http://www.emoji-cheat-sheet.com/) for Ruby on Rails
 
+![:kiss:](https://github.com/jsw0528/rails_emoji/raw/master/vendor/assets/images/emojis/kiss.png)
+![:dancer:](https://github.com/jsw0528/rails_emoji/raw/master/vendor/assets/images/emojis/dancer.png)
+![:octocat:](https://github.com/jsw0528/rails_emoji/raw/master/vendor/assets/images/emojis/octocat.png)
+![:trollface:](https://github.com/jsw0528/rails_emoji/raw/master/vendor/assets/images/emojis/trollface.png)
+
 ---
 
 ## Installation
 
-* Add to your Gemfile: `gem "rails_emoji"`, then: `$ bundle`.
+* Add to your Gemfile: `gem 'rails_emoji', '~> 1.2'`, then: `$ bundle`.
 
-* Or, download the [rails_emoji-1.1.gem](https://github.com/jsw0528/rails_emoji/blob/master/rails_emoji-1.1.gem), then `$ gem install ./rails_emoji-1.1.gem --no-ri --no-rdoc`.
+* Or, download the [rails_emoji-1.2.gem](https://github.com/jsw0528/rails_emoji/raw/master/rails_emoji-1.2.gem), then `$ gem install ./rails_emoji-1.2.gem --no-ri --no-rdoc`.
 
 ## Usage
 

data/lib/rails_emoji.rb

@@ -4,7 +4,7 @@ require 'rails_emoji/version'
 
 module RailsEmoji
   # People
-  EMOJI = %w{bowtie smile blush smiley relaxed smirk heart_eyes kissing_heart kissing_face flushed relieved satisfied grin wink wink2 tongue unamused sweat pensive disappointed confounded fearful cold_sweat persevere cry sob joy astonished scream angry rage sleepy mask imp alien yellow_heart blue_heart purple_heart heart green_heart broken_heart heartbeat heartpulse cupid sparkles star star2 anger exclamation question grey_exclamation grey_question zzz dash sweat_drops notes musical_note fire hankey poop shit plus1 thumbsup -1 thumbsdown ok_hand punch fist v wave hand open_hands point_up point_down point_left point_right raised_hands pray point_up_2 clap muscle metal walking runner couple dancer dancers ok_woman no_good information_desk_person bow couplekiss couple_with_heart massage haircut nail_care boy girl woman man baby older_woman older_man person_with_blond_hair man_with_gua_pi_mao man_with_turban construction_worker cop angel princess guardsman skull feet lips kiss ear eyes nose feelsgood finnadie goberserk godmode hurtrealbad rage1 rage2 rage3 rage4 suspect trollface}
+  EMOJI = %w{bowtie smile blush smiley relaxed smirk heart_eyes kissing_heart kissing_face flushed relieved satisfied grin wink wink2 tongue unamused sweat pensive disappointed confounded fearful cold_sweat persevere cry sob joy astonished scream angry rage sleepy mask imp alien yellow_heart blue_heart purple_heart heart green_heart broken_heart heartbeat heartpulse cupid sparkles star star2 anger exclamation question grey_exclamation grey_question zzz dash sweat_drops notes musical_note fire hankey poop shit +1 thumbsup -1 thumbsdown ok_hand punch fist v wave hand open_hands point_up point_down point_left point_right raised_hands pray point_up_2 clap muscle metal walking runner couple dancer dancers ok_woman no_good information_desk_person bow couplekiss couple_with_heart massage haircut nail_care boy girl woman man baby older_woman older_man person_with_blond_hair man_with_gua_pi_mao man_with_turban construction_worker cop angel princess guardsman skull feet lips kiss ear eyes nose feelsgood finnadie goberserk godmode hurtrealbad rage1 rage2 rage3 rage4 suspect trollface}
   # Nature
   EMOJI += %w{sunny umbrella cloud snowman moon zap cyclone ocean cat dog mouse hamster rabbit wolf frog tiger koala bear pig cow boar monkey_face monkey horse racehorse camel sheep elephant snake bird baby_chick chicken penguin bug octopus tropical_fish fish whale dolphin bouquet cherry_blossom tulip four_leaf_clover rose sunflower hibiscus maple_leaf leaves fallen_leaf palm_tree cactus ear_of_rice shell octocat squirrel}
   # Objects

data/lib/rails_emoji/render.rb

@@ -13,9 +13,13 @@ module RailsEmoji
         emoji_code = emoji
         emoji = emoji_code.gsub(":", "")
 
-        %{<img src="#{ host }/assets/emojis/#{ emoji.gsub('+', 'plus') }.png" } +
-          %{width="#{ size }" height="#{ size }" } +
-          %{title="#{ emoji_code }" alt="#{ emoji_code }" class="#{ class_name }" />}
+        if RailsEmoji::EMOJI.include?(emoji)
+          %{<img src="#{ host }/assets/emojis/#{ emoji.gsub('+', 'plus') }.png" } +
+            %{width="#{ size }" height="#{ size }" } +
+            %{title="#{ emoji_code }" alt="#{ emoji_code }" class="#{ class_name }" />}
+        else
+          emoji_code
+        end
       end
     end
 

data/lib/rails_emoji/version.rb

@@ -1,3 +1,3 @@
 module RailsEmoji
-  VERSION = "1.1"
+  VERSION = "1.2"
 end

metadata

@@ -1,12 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: rails_emoji
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: 
   segments: 
   - 1
-  - 1
-  version: "1.1"
+  - 2
+  version: "1.2"
 platform: ruby
 authors: 
 - Jay-Jay.Zhang (http://MrZhang.me/)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-05-29 00:00:00 Z
+date: 2012-05-30 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rails