md_emoji 0.0.7 → 0.0.8

data/README.markdown

@@ -1,14 +1,20 @@
 # Markdown Emoji for Rails
 
-Want to include [emoji](http://www.emoji-cheat-sheet.com/) in your rails app? Well now you can!
+Want to include [emoji](http://www.emoji-cheat-sheet.com/) in your rails app?
+Well now you can!
 
-![:balloon:](https://github.com/mendicant-university/md_emoji/raw/master/vendor/assets/images/emojis/balloon.png)
-![:smile:](https://github.com/mendicant-university/md_emoji/raw/master/vendor/assets/images/emojis/smile.png)
-![:balloon:](https://github.com/mendicant-university/md_emoji/raw/master/vendor/assets/images/emojis/balloon.png)
+![:balloon:](/mendicant-original/md_emoji/raw/master/vendor/assets/images/emojis/balloon.png)
+![:smile:](/mendicant-original/md_emoji/raw/master/vendor/assets/images/emojis/smile.png)
+![:balloon:](/mendicant-original/md_emoji/raw/master/vendor/assets/images/emojis/balloon.png)
 
-Markdown Emoji was designed to work with the [Redcarpet](https://github.com/tanoku/redcarpet) markdown processor and [Rails 3.1](https://github.com/rails/rails) with the asset pipeline enabled.
+Markdown Emoji was designed to work with the
+[Redcarpet](https://github.com/tanoku/redcarpet) markdown processor and
+[Rails 3.1](https://github.com/rails/rails) with the asset pipeline enabled.
 
-**Warning** This gem is very new and under heavy development. Use at your own risk :)
+**Warning** This gem does some scary stuff under the hood, so please check out
+the code, test first, and don't hesitate to ask questions :)
+
+[![Build Status](https://secure.travis-ci.org/mendicant-original/md_emoji.png?branch=master)](http://travis-ci.org/mendicant-original/md_emoji)
 
 ## Installation
 
@@ -23,12 +29,17 @@ gem 'md_emoji'
 When creating a new markdown renderer, just use `MdEmoji::Render`
 
 ```ruby
-markdown = Redcarpet::Markdown.new(MdEmoji::Render)
+markdown = Redcarpet::Markdown.new(MdEmoji::Render, :no_intra_emphasis => true)
 
 markdown.render("Hello :smile: world!")
 ```
 
-Emoji assets will automatically be picked up by the asset pipeline and made available to your app at:
+__Please take note__ that due to inconsistencies with the RedCarpet gem,
+`:no_intra_emphasis => true` is required for emoji with multiple underscores:
+`:eight_pointed_black_star:`
+
+Emoji assets will automatically be picked up by the asset pipeline and made
+available to your app at:
 
 `/assets/emojis/<EMOJI_NAME>.png`
 
@@ -36,31 +47,15 @@ For a full list of supported emoji, just run `MdEmoji::EMOJI` in your console.
 
 ## Contributing
 
-Features and bugs are tracked through [Github Issues](https://github.com/mendicant-university/md_emoji/issues).
-
-Contributors retain copyright to their work but must agree to release their
-contributions under the same terms as this project. For details, please see the LICENSE file.
-
-If you would like to help with developing MD Emoji, please get in touch!
-Contact Jordan through [GitHub (@jordanbyron)](https://github.com/jordanbyron) or [Twitter (@jordan_byron)](http://twitter.com/jordan_byron)
-
-### Submitting a Pull Request
-
-1. If a ticket doesn't exist for your bug or feature, create one on GitHub.
-    - **NOTE:** Don't be afraid to get feedback on your idea before you begin development work. In fact it is encouraged.
-2. Fork the project.
-3. Create a topic branch.
-4. Implement your feature or bug fix.
-5. Add documentation for your feature or bug fix.
-6. Add tests for your feature or bug fix.
-7. Run `rake test`. If your changes are not 100% covered, go back to step 6.
-8. If your change affects something in this README, please update it
-9. Commit and push your changes.
-10. Submit a pull request.
+See our [CONTRIBUTING.md](/mendicant-original/md_emoji/blob/master/CONTRIBUTING.md)
+document for more details.
 
 ## Authorship
 
-Emoji images are from [emoji-cheat-sheet.com](http://emoji-cheat-sheet.com)'s [github project](https://github.com/arvida/emoji-cheat-sheet.com). This project was inspired by [GitHub's emoji implementation](https://github.com/blog/816-emoji) and hacked together by [Jordan Byron](http://jordanbyron.com).
+Emoji images are from [emoji-cheat-sheet.com](http://emoji-cheat-sheet.com)'s
+[github project](https://github.com/arvida/emoji-cheat-sheet.com). This project
+was inspired by [GitHub's emoji implementation](https://github.com/blog/816-emoji)
+and hacked together by [Jordan Byron](http://jordanbyron.com).
 
 ## License
 

data/lib/md_emoji/render.rb

@@ -1,8 +1,8 @@
 module MdEmoji
   class Render < Redcarpet::Render::HTML
     def initialize(options={})
-      @options = options
-      super options
+      @options = options.merge(:no_intra_emphasis => true)
+      super @options
     end
 
     def paragraph(text)

data/lib/md_emoji/version.rb

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

data/lib/md_emoji.rb

@@ -5,58 +5,118 @@ require 'md_emoji/render'
 require 'md_emoji/version'
 
 module MdEmoji
-  EMOJI = %w{-1 0 1 109 2 3 4 5 6 7 8 8ball 9 a ab airplane alien ambulance
-  angel anger angry apple aquarius aries arrow_backward arrow_down arrow_forward
-  arrow_left arrow_lower_left arrow_lower_right arrow_right arrow_up
-  arrow_upper_left arrow_upper_right art astonished atm b baby baby_chick
-  baby_symbol balloon bamboo bank barber baseball basketball bath bear beer
-  beers beginner bell bento bike bikini bird birthday black_square blue_car
-  blue_heart blush boar boat bomb book boot bouquet bow bowtie boy bread
-  briefcase broken_heart bug bulb bullettrain_front bullettrain_side bus busstop
-  cactus cake calling camel camera cancer capricorn car cat cd chart
-  checkered_flag cherry_blossom chicken christmas_tree church cinema
-  city_sunrise city_sunset clap clapper clock1 clock10 clock11 clock12 clock2
-  clock3 clock4 clock5 clock6 clock7 clock8 clock9 closed_umbrella cloud clubs
-  cn cocktail coffee cold_sweat computer confounded congratulations construction
-  construction_worker convenience_store cool cop copyright couple couple_with_heart
-  couplekiss cow crossed_flags crown cry cupid currency_exchange curry cyclone
-  dancer dancers dango dart dash de department_store diamonds disappointed dog
-  dolls dolphin dress dvd ear ear_of_rice egg eggplant egplant
-  eight_pointed_black_star eight_spoked_asterisk elephant email es
-  european_castle exclamation eyes factory fallen_leaf fast_forward fax fearful
-  feelsgood feet ferris_wheel finnadie fire fire_engine fireworks fish fist flags
-  flushed football fork_and_knife fountain four_leaf_clover fr fries frog fuelpump
-  gb gem gemini ghost gift gift_heart girl goberserk godmode golf green_heart
-  grey_exclamation grey_question grin guardsman guitar gun haircut hamburger
-  hammer hamster hand handbag hankey hash headphones heart heart_decoration
-  heart_eyes heartbeat heartpulse hearts hibiscus high_heel horse hospital hotel
-  hotsprings house hurtrealbad icecream id ideograph_advantage imp
-  information_desk_person iphone it jack_o_lantern japanese_castle joy jp key
-  kimono kiss kissing_face kissing_heart koala koko kr leaves leo libra lips
-  lipstick lock loop loudspeaker love_hotel mag mahjong mailbox man
-  man_with_gua_pi_mao man_with_turban maple_leaf mask massage mega memo mens
-  metal metro microphone minidisc mobile_phone_off moneybag monkey monkey_face
-  moon mortar_board mount_fuji mouse movie_camera muscle musical_note nail_care
-  necktie new no_good no_smoking nose notes o o2 ocean octocat octopus oden
-  office ok ok_hand ok_woman older_man older_woman open_hands ophiuchus palm_tree
-  parking part_alternation_mark pencil penguin pensive persevere
-  person_with_blond_hair phone pig pill pisces +1 point_down point_left
-  point_right point_up point_up_2 police_car poop post_office postbox pray
-  princess punch purple_heart question rabbit racehorse radio rage rage1 rage2
-  rage3 rage4 rainbow raised_hands ramen red_car red_circle registered relaxed
-  relieved restroom rewind ribbon rice rice_ball rice_cracker rice_scene ring
-  rocket roller_coaster rose ru runner sa sagittarius sailboat sake sandal santa
-  satellite satisfied saxophone school school_satchel scissors scorpius scream
-  seat secret shaved_ice sheep shell ship shipit shirt shit shoe signal_strength
-  six_pointed_star ski skull sleepy slot_machine smile smiley smirk smoking snake
-  snowman sob soccer space_invader spades spaghetti sparkler sparkles speaker
-  speedboat squirrel star star2 stars station statue_of_liberty stew strawberry
-  sunflower sunny sunrise sunrise_over_mountains surfer sushi suspect sweat
-  sweat_drops swimmer syringe tada tangerine taurus taxi tea telephone tennis
-  tent thumbsdown thumbsup ticket tiger tm toilet tokyo_tower tomato tongue top
-  tophat traffic_light train trident trollface trophy tropical_fish truck trumpet
-  tshirt tulip tv u5272 u55b6 u6307 u6708 u6709 u6e80 u7121 u7533 u7a7a umbrella
-  unamused underage unlock up us v vhs vibration_mode virgo vs walking warning
-  watermelon wave wc wedding whale wheelchair white_square wind_chime wink wink2
-  wolf woman womans_hat womens x yellow_heart zap zzz}
+  EMOJI = %w{+1 -1 0 1 100 109 1234 2 3 4 5 6 7 8 8ball 9 a ab
+  abc abcd accept aerial_tramway airplane alarm_clock alien ambulance anchor
+  angel anger angry ant apple aquarius aries arrow_backward arrow_double_down
+  arrow_double_up arrow_down arrow_down_small arrow_forward arrow_heading_down
+  arrow_heading_up arrow_left arrow_lower_left arrow_lower_right arrow_right
+  arrow_right_hook arrow_up arrow_up_down arrow_up_small arrow_upper_left
+  arrow_upper_right arrows_clockwise arrows_counterclockwise art
+  articulated_lorry astonished atm b baby baby_bottle baby_chick baby_symbol
+  baggage_claim balloon ballot_box_with_check bamboo banana bangbang bank
+  bar_chart barber baseball basketball bath bathtub battery bear beer beers
+  beetle beginner bell bento bicyclist bike bikini bird birthday black_circle
+  black_joker black_nib black_square blossom blowfish blue_book blue_car
+  blue_heart blush boar boat bomb book bookmark bookmark_tabs books boot bouquet
+  bow bowling bowtie boy bread bride_with_veil bridge_at_night briefcase
+  broken_heart bug bulb bullettrain_front bullettrain_side bus busstop
+  bust_in_silhouette busts_in_silhouette cactus cake calendar calling camel camera
+  cancer candy capital_abcd capricorn car card_index carousel_horse cat cat2 cd
+  chart chart_with_downwards_trend chart_with_upwards_trend checkered_flag
+  cherries cherry_blossom chestnut chicken children_crossing chocolate_bar
+  christmas_tree church cinema circus_tent city_sunrise city_sunset cl clap
+  clapper clipboard clock1 clock10 clock1030 clock11 clock1130 clock12 clock1230
+  clock130 clock2 clock230 clock3 clock330 clock4 clock430 clock5 clock530 clock6
+  clock630 clock7 clock730 clock8 clock830 clock9 clock930 closed_book
+  closed_lock_with_key closed_umbrella cloud clubs cn cocktail coffee cold_sweat
+  collision computer confetti_ball confounded congratulations construction
+  construction_worker convenience_store cookie cool cop copyright corn couple
+  couple_with_heart couplekiss cow cow2 credit_card crocodile crossed_flags crown
+  cry crying_cat_face crystal_ball cupid curly_loop currency_exchange curry
+  custard customs cyclone dancer dancers dango dart dash date de deciduous_tree
+  department_store diamond_shape_with_a_dot_inside diamonds disappointed dizzy
+  dizzy_face do_not_litter dog dog2 dollar dolls dolphin door doughnut dragon
+  dragon_face dress dromedary_camel droplet dvd e-mail ear ear_of_rice
+  earth_africa earth_americas earth_asia egg eggplant egplant eight
+  eight_pointed_black_star eight_spoked_asterisk electric_plug elephant email end
+  envelope es euro european_castle european_post_office evergreen_tree exclamation
+  eyeglasses eyes facepunch factory fallen_leaf family fast_forward fax fearful
+  feelsgood feet ferris_wheel file_folder finnadie fire fire_engine fireworks
+  first_quarter_moon first_quarter_moon_with_face fish fish_cake
+  fishing_pole_and_fish fist five flags flashlight floppy_disk
+  flower_playing_cards flushed foggy football fork_and_knife fountain four
+  four_leaf_clover fr free fried_shrimp fries frog fuelpump full_moon
+  full_moon_with_face game_die gb gem gemini ghost gift gift_heart girl
+  globe_with_meridians goat goberserk godmode golf grapes green_apple green_book
+  green_heart grey_exclamation grey_question grin guardsman guitar gun haircut
+  hamburger hammer hamster hand handbag hankey hash hatched_chick hatching_chick
+  headphones hear_no_evil heart heart_decoration heart_eyes heart_eyes_cat
+  heartbeat heartpulse hearts heavy_check_mark heavy_division_sign
+  heavy_dollar_sign heavy_exclamation_mark heavy_minus_sign heavy_multiplication_x
+  heavy_plus_sign helicopter herb hibiscus high_brightness high_heel hocho
+  honey_pot honeybee horse horse_racing hospital hotel hotsprings hourglass house
+  hurtrealbad ice_cream icecream id ideograph_advantage imp inbox_tray
+  incoming_envelope information_desk_person information_source innocent
+  interrobang iphone it izakaya_lantern jack_o_lantern japan japanese_castle
+  japanese_goblin japanese_ogre jeans joy joy_cat jp key keycap_ten kimono kiss
+  kissing_cat kissing_face kissing_heart koala koko kr large_blue_circle
+  large_blue_diamond large_orange_diamond last_quarter_moon
+  last_quarter_moon_with_face laughing leaves ledger left_luggage left_right_arrow
+  leftwards_arrow_with_hook lemon leo leopard libra light_rail link lips lipstick
+  lock lock_with_ink_pen lollipop loop loudspeaker love_hotel love_letter
+  low_brightness m mag mag_right mahjong mailbox mailbox_closed mailbox_with_mail
+  mailbox_with_no_mail man man_with_gua_pi_mao man_with_turban mans_shoe
+  maple_leaf mask massage meat_on_bone mega melon memo mens metal metro microphone
+  microscope milky_way minibus minidisc mobile_phone_off money_with_wings moneybag
+  monkey monkey_face monorail moon mortar_board mount_fuji mountain_bicyclist
+  mountain_cableway mountain_railway mouse mouse2 movie_camera moyai muscle
+  mushroom musical_keyboard musical_note musical_score mute nail_care name_badge
+  neckbeard necktie negative_squared_cross_mark neutral_face new new_moon
+  new_moon_with_face newspaper ng nine no_bell no_bicycles no_entry no_entry_sign
+  no_good no_mobile_phones no_mouth no_pedestrians no_smoking non-potable_water
+  nose notebook notebook_with_decorative_cover notes nut_and_bolt o o2 ocean
+  octocat octopus oden office ok ok_hand ok_woman older_man older_woman on
+  oncoming_automobile oncoming_bus oncoming_police_car oncoming_taxi one
+  open_file_folder open_hands ophiuchus orange_book outbox_tray ox page_facing_up
+  page_with_curl pager palm_tree panda_face paperclip parking
+  part_alternation_mark partly_sunny passport_control paw_prints peach pear pencil
+  pencil2 penguin pensive performing_arts persevere person_frowning
+  person_with_blond_hair person_with_pouting_face phone pig pig2 pig_nose pill
+  pineapple pisces pizza plus1 point_down point_left point_right point_up
+  point_up_2 police_car poodle poop post_office postal_horn postbox potable_water
+  pouch poultry_leg pound pouting_cat pray princess punch purple_heart purse
+  pushpin put_litter_in_its_place question rabbit rabbit2 racehorse radio
+  radio_button rage rage1 rage2 rage3 rage4 railway_car rainbow raised_hand
+  raised_hands ram ramen rat recycle red_car red_circle registered relaxed
+  relieved repeat repeat_one restroom revolving_hearts rewind ribbon rice
+  rice_ball rice_cracker rice_scene ring rocket roller_coaster rooster rose
+  rotating_light round_pushpin rowboat ru rugby_football runner running
+  running_shirt_with_sash sa sagittarius sailboat sake sandal santa satellite
+  satisfied saxophone school school_satchel scissors scorpius scream scream_cat
+  scroll seat secret see_no_evil seedling seven shaved_ice sheep shell ship shipit
+  shirt shit shoe shower signal_strength six six_pointed_star ski skull sleepy
+  slot_machine small_blue_diamond small_orange_diamond small_red_triangle
+  small_red_triangle_down smile smile_cat smiley smiley_cat smiling_imp smirk
+  smirk_cat smoking snail snake snowboarder snowflake snowman sob soccer soon sos
+  sound space_invader spades spaghetti sparkler sparkles speak_no_evil speaker
+  speech_balloon speedboat squirrel star star2 stars station statue_of_liberty
+  steam_locomotive stew straight_ruler strawberry sun_with_face sunflower
+  sunglasses sunny sunrise sunrise_over_mountains surfer sushi suspect
+  suspension_railway sweat sweat_drops sweat_smile sweet_potato swimmer symbols
+  syringe tada tanabata_tree tangerine taurus taxi tea telephone
+  telephone_receiver telescope tennis tent thought_balloon three thumbsdown
+  thumbsup ticket tiger tiger2 tired_face tm toilet tokyo_tower tomato tongue
+  tongue2 top tophat tractor traffic_light train train2 tram
+  triangular_flag_on_post triangular_ruler trident triumph trolleybus trollface
+  trophy tropical_drink tropical_fish truck trumpet tshirt tulip turtle tv
+  twisted_rightwards_arrows two two_hearts two_men_holding_hands
+  two_women_holding_hands u5272 u5408 u55b6 u6307 u6708 u6709 u6e80 u7121 u7533
+  u7981 u7a7a uk umbrella unamused underage unlock up us v vertical_traffic_light
+  vhs vibration_mode video_camera video_game violin virgo volcano vs walking
+  waning_crescent_moon waning_gibbous_moon warning watch water_buffalo watermelon
+  wave wavy_dash waxing_crescent_moon waxing_gibbous_moon wc weary wedding whale
+  whale2 wheelchair white_circle white_flower white_square wind_chime wine_glass
+  wink wink2 wolf woman womans_clothes womans_hat womens wrench x yellow_heart yen
+  yum zap zero zzz}
+
 end

data/test/asset_test.rb

@@ -0,0 +1,20 @@
+require 'test_helper'
+
+class AssetTest < ActionDispatch::IntegrationTest
+
+  test "emojis are rendered to the page" do
+    visit root_path
+
+    MdEmoji::EMOJI.each do |emoji|
+      assert_emoji emoji, page.body
+    end
+  end
+
+  test "emoji assets are present" do
+    MdEmoji::EMOJI.each do |emoji|
+      emoji = emoji.gsub('+', 'plus')
+      assert Dummy::Application.assets.find_asset("emojis/#{emoji}.png"),
+        "Emoji (#{emoji}) asset missing"
+    end
+  end
+end

data/test/dummy/app/controllers/emoji_controller.rb

@@ -0,0 +1,5 @@
+class EmojiController < ApplicationController
+  def index
+
+  end
+end

data/test/dummy/app/helpers/application_helper.rb

@@ -1,2 +1,8 @@
 module ApplicationHelper
+  def md(text)
+    markdown = Redcarpet::Markdown.new(MdEmoji::Render,
+      :no_intra_emphasis => true)
+
+    markdown.render(text).html_safe
+  end
 end

data/test/dummy/app/views/emoji/index.html.erb

@@ -0,0 +1,3 @@
+<% MdEmoji::EMOJI.each do |emoji| %>
+  <%= md(":#{emoji}:") %>
+<% end %>

data/test/dummy/config/application.rb

@@ -5,7 +5,13 @@ require "action_mailer/railtie"
 require "active_resource/railtie"
 require "rails/test_unit/railtie"
 
-Bundler.require
+if defined?(Bundler)
+  # If you precompile assets before deploying to production, use this line
+  Bundler.require *Rails.groups(:assets => %w(development test))
+  # If you want your assets lazily compiled in production, use this line
+  # Bundler.require(:default, :assets, Rails.env)
+end
+
 require "md_emoji"
 
 module Dummy

data/test/dummy/config/routes.rb

@@ -1,4 +1,6 @@
 Dummy::Application.routes.draw do
+  root to: 'emoji#index'
+
   # The priority is based upon order of creation:
   # first created -> highest priority.