rails_emoji 1.6.2 → 1.7.0

data/README.md

@@ -9,18 +9,24 @@
 
 ## Installation
 
-* Add to your Gemfile: `gem 'rails_emoji', '~> 1.6.2'`, then: `$ bundle`.
+* Add to your Gemfile: `gem 'rails_emoji', '~> 1.7.0'`, then: `$ bundle`.
 
-* Or, download the [rails_emoji-1.6.2.gem](https://rubygems.org/downloads/rails_emoji-1.6.2.gem), then `$ gem install ./rails_emoji-1.6.2.gem --no-ri --no-rdoc`.
+* Or, download the [rails_emoji-1.7.0.gem](https://rubygems.org/downloads/rails_emoji-1.7.0.gem), then `$ gem install ./rails_emoji-1.7.0.gem --no-ri --no-rdoc`.
 
 ## Usage
 
 ```ruby
-":smile:".emojify
-# output: "<img src="/assets/emojis/smile.png" width="20" height="20" title=":smile:" alt=":smile:" class="emoji" />"
+':smile:'.emojify
+# <img src="/assets/emojis/smile.png" class="emoji" width="20" height="20" alt=":smile:" title=":smile:" />
 
-RailsEmoji.render ":smile:", :host => "http://MrZhang.me", :size => 64, :class => "emoji-smile"
-# output: "<img src="http://MrZhang.me/assets/emojis/smile.png" width="64" height="64" title=":smile:" alt=":smile:" class="emoji-smile" />"
+RailsEmoji.render ':smile:', size: '64x64', class: 'emoji-smile'
+# <img src="/assets/emojis/smile.png" class="emoji-smile" width="64" height="64" alt=":smile:" title=":smile:" />
+
+RailsEmoji.render ':smile:', size: nil, title: 'Smile!'
+# <img src="/assets/emojis/smile.png" class="emoji" alt=":smile:" title="Smile!" />
+
+RailsEmoji.render ':smile:', size: 32, host: 'http://MrZhang.me'
+# <img src="http://MrZhang.me/assets/emojis/smile.png" class="emoji" width="32" height="32" alt=":smile:" title=":smile:" />
 ```
 
 ## License

data/lib/rails_emoji.rb

@@ -5,7 +5,7 @@ require 'rails_emoji/version'
 module RailsEmoji
   # People, Nature, Objects, Places, Symbols
   EMOJI = %w{
-    bowtie smile laughing blush smiley relaxed smirk heart_eyes kissing_heart kissing_closed_eyes flushed relieved satisfied grin wink wink2 stuck_out_tongue_winking_eye stuck_out_tongue_closed_eyes grinning kissing kissing_smiling_eyes stuck_out_tongue sleeping worried frowning anguished open_mouth grimacing confused hushed expressionless unamused sweat_smile sweat weary pensive disappointed confounded fearful cold_sweat persevere cry sob joy astonished scream neckbeard tired_face angry rage triumph sleepy yum mask sunglasses dizzy_face imp smiling_imp neutral_face no_mouth innocent alien yellow_heart blue_heart purple_heart heart green_heart broken_heart heartbeat heartpulse two_hearts revolving_hearts cupid sparkling_heart sparkles star star2 dizzy boom collision 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 facepunch 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 running couple family two_men_holding_hands two_women_holding_hands dancer dancers ok_woman no_good information_desk_person raised_hand bride_with_veil person_with_pouting_face person_frowning 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 smiley_cat smile_cat heart_eyes_cat kissing_cat smirk_cat scream_cat crying_cat_face joy_cat pouting_cat japanese_ogre japanese_goblin see_no_evil hear_no_evil speak_no_evil guardsman skull feet lips kiss droplet ear eyes nose tongue love_letter bust_in_silhouette busts_in_silhouette speech_balloon thought_balloon feelsgood finnadie goberserk godmode hurtrealbad rage1 rage2 rage3 rage4 suspect trollface
+    bowtie smile laughing blush smiley relaxed smirk heart_eyes kissing_heart kissing_closed_eyes flushed relieved satisfied grin wink stuck_out_tongue_winking_eye stuck_out_tongue_closed_eyes grinning kissing kissing_smiling_eyes stuck_out_tongue sleeping worried frowning anguished open_mouth grimacing confused hushed expressionless unamused sweat_smile sweat disappointed_relieved weary pensive disappointed confounded fearful cold_sweat persevere cry sob joy astonished scream neckbeard tired_face angry rage triumph sleepy yum mask sunglasses dizzy_face imp smiling_imp neutral_face no_mouth innocent alien yellow_heart blue_heart purple_heart heart green_heart broken_heart heartbeat heartpulse two_hearts revolving_hearts cupid sparkling_heart sparkles star star2 dizzy boom collision 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 facepunch fist v wave hand raised_hand open_hands point_up point_down point_left point_right raised_hands pray point_up_2 clap muscle metal fu walking runner running couple family two_men_holding_hands two_women_holding_hands dancer dancers ok_woman no_good information_desk_person raising_hand bride_with_veil person_with_pouting_face person_frowning 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 smiley_cat smile_cat heart_eyes_cat kissing_cat smirk_cat scream_cat crying_cat_face joy_cat pouting_cat japanese_ogre japanese_goblin see_no_evil hear_no_evil speak_no_evil guardsman skull feet lips kiss droplet ear eyes nose tongue love_letter bust_in_silhouette busts_in_silhouette speech_balloon thought_balloon feelsgood finnadie goberserk godmode hurtrealbad rage1 rage2 rage3 rage4 suspect trollface
     sunny umbrella cloud snowflake snowman zap cyclone foggy ocean cat dog mouse hamster rabbit wolf frog tiger koala bear pig pig_nose cow boar monkey_face monkey horse racehorse camel sheep elephant panda_face snake bird baby_chick hatched_chick hatching_chick chicken penguin turtle bug honeybee ant beetle snail octopus tropical_fish fish whale whale2 dolphin cow2 ram rat water_buffalo tiger2 rabbit2 dragon goat rooster dog2 pig2 mouse2 ox dragon_face blowfish crocodile dromedary_camel leopard cat2 poodle paw_prints bouquet cherry_blossom tulip four_leaf_clover rose sunflower hibiscus maple_leaf leaves fallen_leaf herb mushroom cactus palm_tree evergreen_tree deciduous_tree chestnut seedling blossom ear_of_rice shell globe_with_meridians sun_with_face full_moon_with_face new_moon_with_face new_moon waxing_crescent_moon first_quarter_moon waxing_gibbous_moon full_moon waning_gibbous_moon last_quarter_moon waning_crescent_moon last_quarter_moon_with_face first_quarter_moon_with_face moon earth_africa earth_americas earth_asia volcano milky_way partly_sunny octocat squirrel
     bamboo gift_heart dolls school_satchel mortar_board flags fireworks sparkler wind_chime rice_scene jack_o_lantern ghost santa christmas_tree gift bell no_bell tanabata_tree tada confetti_ball balloon crystal_ball cd dvd floppy_disk camera video_camera movie_camera computer tv iphone phone telephone telephone_receiver pager fax minidisc vhs sound speaker mute loudspeaker mega hourglass hourglass_flowing_sand alarm_clock watch radio satellite loop mag mag_right unlock lock lock_with_ink_pen closed_lock_with_key key bulb flashlight high_brightness low_brightness electric_plug battery calling email mailbox postbox bath bathtub shower toilet wrench nut_and_bolt hammer seat moneybag yen dollar pound euro credit_card money_with_wings e-mail inbox_tray outbox_tray envelope incoming_envelope postal_horn mailbox_closed mailbox_with_mail mailbox_with_no_mail door smoking bomb gun hocho pill syringe page_facing_up page_with_curl bookmark_tabs bar_chart chart_with_upwards_trend chart_with_downwards_trend scroll clipboard calendar date card_index file_folder open_file_folder scissors pushpin paperclip black_nib pencil2 straight_ruler triangular_ruler closed_book green_book blue_book orange_book notebook notebook_with_decorative_cover ledger books bookmark name_badge microscope telescope newspaper football basketball soccer baseball tennis 8ball rugby_football bowling golf mountain_bicyclist bicyclist horse_racing snowboarder swimmer surfer ski spades hearts clubs diamonds gem ring trophy musical_score musical_keyboard violin space_invader video_game black_joker flower_playing_cards game_die dart mahjong clapper memo pencil book art microphone headphones trumpet saxophone guitar shoe sandal high_heel lipstick boot shirt tshirt necktie womans_clothes dress running_shirt_with_sash jeans kimono bikini ribbon tophat crown womans_hat mans_shoe closed_umbrella briefcase handbag pouch purse eyeglasses fishing_pole_and_fish coffee tea sake baby_bottle beer beers cocktail tropical_drink wine_glass fork_and_knife pizza hamburger fries poultry_leg meat_on_bone spaghetti curry fried_shrimp bento sushi fish_cake rice_ball rice_cracker rice ramen stew oden dango egg bread doughnut custard icecream ice_cream shaved_ice birthday cake cookie chocolate_bar candy lollipop honey_pot apple green_apple tangerine lemon cherries grapes watermelon strawberry peach melon banana pear pineapple sweet_potato eggplant tomato corn
     house house_with_garden school office post_office hospital bank convenience_store love_hotel hotel wedding church department_store european_post_office city_sunrise city_sunset japanese_castle european_castle tent factory tokyo_tower japan mount_fuji sunrise_over_mountains sunrise stars statue_of_liberty bridge_at_night carousel_horse rainbow ferris_wheel fountain roller_coaster ship speedboat boat sailboat rowboat anchor rocket airplane helicopter steam_locomotive tram mountain_railway bike aerial_tramway suspension_railway mountain_cableway tractor blue_car oncoming_automobile car red_car taxi oncoming_taxi articulated_lorry bus oncoming_bus rotating_light police_car oncoming_police_car fire_engine ambulance minibus truck train station train2 bullettrain_front bullettrain_side light_rail monorail railway_car trolleybus ticket fuelpump vertical_traffic_light traffic_light warning construction beginner atm slot_machine busstop barber hotsprings checkered_flag crossed_flags izakaya_lantern moyai circus_tent performing_arts round_pushpin triangular_flag_on_post jp kr cn us fr es it ru gb uk de

data/lib/rails_emoji/engine.rb

@@ -1,4 +1,4 @@
 module RailsEmoji
   class Engine < ::Rails::Engine
   end
-end
+end

data/lib/rails_emoji/render.rb

@@ -1,26 +1,34 @@
 module RailsEmoji
   class << self
 
-    def render(text, *args)
-      options = args.extract_options!
-
-      host = options[:host] || ''
-      size = options[:size] || 20
-      class_name = options[:class] || 'emoji'
-
-      # Replace
-      text.gsub(/:([a-z0-9_+-]+):/) do |emoji|
-        emoji_code = emoji
-        emoji = emoji_code.gsub(':', '')
-
-        if RailsEmoji::EMOJI.include?(emoji)
-          %{<img src="#{ host }/assets/emojis/#{ emoji }.png" } +
-            %{width="#{ size }" height="#{ size }" } +
-            %{title="#{ emoji_code }" alt="#{ emoji_code }" class="#{ class_name }" />}
+    def render(*args)
+      options = args.extract_options!.stringify_keys
+      host = options['host']
+      return if args[0].blank?
+
+      if options.key? 'size'
+        if options['size'] =~ %r{\A\d+x\d+\z}
+          options['width'], options['height'] = options['size'].split('x')
         else
-          emoji_code
+          options['width'] = options['height'] = options['size']
         end
       end
+
+      options.slice! 'class', 'width', 'height', 'title', 'alt'
+      options.reverse_merge! 'class' => 'emoji', 'width' => 20, 'height' => 20
+
+      # replace emoji code to image tag
+      args[0].gsub(/:([a-z0-9_+-]+):/) do |emoji|
+        return emoji unless RailsEmoji::EMOJI.include? emoji[1..-2]
+
+        attrs = options.reverse_merge(
+          'src' => "#{host}/assets/emojis/#{emoji[1..-2]}.png",
+          'alt' => emoji,
+          'title' => emoji
+        ).select{ |k, v| !v.blank? }.collect{ |k, v| %(#{k}="#{v}") }
+
+        %(<img #{attrs * ' '} />)
+      end
     end
 
   end

data/lib/rails_emoji/version.rb

@@ -1,3 +1,3 @@
 module RailsEmoji
-  VERSION = '1.6.2'
+  VERSION = '1.7.0'
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rails_emoji
 version: !ruby/object:Gem::Version
-  version: 1.6.2
+  version: 1.7.0
   prerelease: 
 platform: ruby
 authors:
-- Jay-Jay.Zhang (http://MrZhang.me/)
+- junjun.zhang <http://MrZhang.me>
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-03 00:00:00.000000000 Z
+date: 2013-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -267,6 +267,7 @@ files:
 - vendor/assets/images/emojis/diamond_shape_with_a_dot_inside.png
 - vendor/assets/images/emojis/diamonds.png
 - vendor/assets/images/emojis/disappointed.png
+- vendor/assets/images/emojis/disappointed_relieved.png
 - vendor/assets/images/emojis/dizzy.png
 - vendor/assets/images/emojis/dizzy_face.png
 - vendor/assets/images/emojis/do_not_litter.png
@@ -275,6 +276,7 @@ files:
 - vendor/assets/images/emojis/dollar.png
 - vendor/assets/images/emojis/dolls.png
 - vendor/assets/images/emojis/dolphin.png
+- vendor/assets/images/emojis/donut.png
 - vendor/assets/images/emojis/door.png
 - vendor/assets/images/emojis/doughnut.png
 - vendor/assets/images/emojis/dragon.png
@@ -347,6 +349,7 @@ files:
 - vendor/assets/images/emojis/fries.png
 - vendor/assets/images/emojis/frog.png
 - vendor/assets/images/emojis/frowning.png
+- vendor/assets/images/emojis/fu.png
 - vendor/assets/images/emojis/fuelpump.png
 - vendor/assets/images/emojis/full_moon.png
 - vendor/assets/images/emojis/full_moon_with_face.png
@@ -652,6 +655,7 @@ files:
 - vendor/assets/images/emojis/rainbow.png
 - vendor/assets/images/emojis/raised_hand.png
 - vendor/assets/images/emojis/raised_hands.png
+- vendor/assets/images/emojis/raising_hand.png
 - vendor/assets/images/emojis/ram.png
 - vendor/assets/images/emojis/ramen.png
 - vendor/assets/images/emojis/rat.png
@@ -888,7 +892,6 @@ files:
 - vendor/assets/images/emojis/wind_chime.png
 - vendor/assets/images/emojis/wine_glass.png
 - vendor/assets/images/emojis/wink.png
-- vendor/assets/images/emojis/wink2.png
 - vendor/assets/images/emojis/wolf.png
 - vendor/assets/images/emojis/woman.png
 - vendor/assets/images/emojis/womans_clothes.png
@@ -905,7 +908,8 @@ files:
 - vendor/assets/images/emojis/zzz.png
 - README.md
 homepage: https://github.com/jsw0528/rails_emoji
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -924,7 +928,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Emoji for Ruby on Rails