gemoji 2.1.0

Replace MAINTAINING with CONTRIBUTING
Refactor test to remove Ruby syntax warning
2014-08-06 17:56:17 -07:00 · 2014-08-06 17:54:19 -07:00 · 2014-08-06 17:38:26 -07:00 · 2014-08-06 17:24:48 -07:00 · 2014-08-06 07:51:55 -07:00 · 2014-08-06 00:08:47 -07:00
126 changed files with 346 additions and 187 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,3 +1,4 @@
+script: script/test
 rvm:
  - 1.9.3
  - 2.1.2
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -0,0 +1,49 @@
+Our emoji set is based off Apple's emoji character palette, plus some custom
+emoji such as :octocat: :shipit: :metal:.
+
+Some useful tools in development are:
+
+```
+script/bootstrap
+```
+
+Sets up the development environment. The prerequisites are:
+
+* Ruby 1.9+
+* Bundler
+
+```
+rake db:generate
+```
+
+On OS X, this will rebuild the `db/Category-Emoji.json` file from the system
+one, pulling in any new emoji that Apple may have added in the meantime.
+
+```
+script/test
+```
+
+Runs the test suite, including the integrity test where we assert that we have
+covered each of Apple's emoji.
+
+```
+script/regenerate
+```
+
+Rebuilds the `db/emoji.json` file which is our main list of emoji: their
+canonical representations, descriptions, aliases, and tags. This requires OS X
+because Safari is used in the process to verify which character render as emoji
+and which render as ordinary Unicode glyphs from the current font.
+
+```
+script/console
+```
+
+Opens `irb` console with gemoji library preloded for experimentation.
+
+```
+script/release
+```
+
+For maintainers only: after the gemspec has been edited, this commits the
+change, tags a release, and pushes it to both GitHub and RubyGems.org.
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 PATH
  remote: .
  specs:
-    gemoji (1.5.0)
+    gemoji (2.1.0)

 GEM
  remote: https://rubygems.org/
--- a/MAINTAINING.md
+++ b/MAINTAINING.md
@@ -1,27 +0,0 @@
-# Maintainers
-
-## Releasing a new gem
-
-If you are just adding new emoji or making a small fix, only increment the patch level "1.0.x". If you need to rename a ton of emojis or making any other radical (but still mostly backwards compatible changes), bump the minor version "1.x.x".
-
-### Make a release commit
-
-To prepare the release commit, edit the [gemoji.gemspec](https://github.com/github/gemoji/blob/master/gemoji.gemspec) `version` value. Then make a single commit with the description as "Gemoji 1.x.x". Finally, tag the commit with `v1.x.x`.
-
-Example commit https://github.com/github/gemoji/commit/v1.0.0
-
-```
-$ git ci -m "Gemoji 1.0.0"
-$ git tag v1.0.0
-$ git push
-$ git push --tags
-```
-
-### Publish the gem
-
-Build and push the new gem with
-
-```
-$ gem build gemoji.gemspec
-$ gem push gemoji-1.0.0.gem
-```
--- a/README.md
+++ b/README.md
@@ -56,7 +56,7 @@ See the [Emoji cheat sheet](http://www.emoji-cheat-sheet.com) for more examples.
 module EmojiHelper
  def emojify(content)
    h(content).to_str.gsub(/:([\w+-]+):/) do |match|
-      if emoji = Emoji.find_by_alias($1) { nil }
+      if emoji = Emoji.find_by_alias($1)
        %(<img alt="#$1" src="#{asset_path("emoji/#{emoji.image_filename}")}" style="vertical-align:middle" width="20" height="20" />)
      else
        match
--- a/db/aliases.applescript
+++ b/db/aliases.applescript
@@ -0,0 +1,13 @@
+set jsCode to "document.getElementById('output').value"
+set json to missing value
+
+tell application "Safari"
+  repeat
+    set json to (do JavaScript jsCode in current tab of window 1)
+    if (json is not missing value) then exit repeat
+    delay 0.5
+  end repeat
+  close current tab of window 1
+end tell
+
+return json
--- a/db/aliases.html
+++ b/db/aliases.html
@@ -0,0 +1,81 @@
+<!DOCTYPE html>
+<title>Emoji alias detection</title>
+<style>
+  textarea {
+    font-family: monospace;
+  }
+</style>
+
+<p>Save the following as <tt>emoji.json</tt>:</p>
+
+<textarea id="output" rows="50" cols="80"></textarea>
+
+<script>
+  const VARIATION_SELECTOR_15 = String.fromCharCode(0xfe0e);
+  const VARIATION_SELECTOR_16 = String.fromCharCode(0xfe0f);
+  const EMOJI_SIZE = 32
+
+  function detectAliases(db) {
+    for (var i = 0; i < db.length; ++i) {
+      var emoji = db[i];
+      var raw = emoji.emoji;
+      if (!raw) {
+        continue;
+      }
+
+      if (raw.indexOf(VARIATION_SELECTOR_16) > -1) {
+        var candidates = [raw.replace(VARIATION_SELECTOR_16, ""), raw];
+      } else {
+        var candidates = [raw, raw + VARIATION_SELECTOR_16];
+      }
+
+      var aliases = candidates.filter(isColorEmoji);
+      emoji.emoji = aliases[0];
+    }
+
+    dump(db);
+  }
+
+  function isColorEmoji(candidate) {
+    // Draw the emoji twice using a different color each time. If the emoji
+    // draws as the same color regardless of what color we set, it's a color
+    // emoji.
+    return color(candidate, "#f00") === color(candidate, "#0f0");
+  }
+
+  var canvas = document.createElement("canvas");
+  canvas.width = canvas.height = EMOJI_SIZE;
+
+  function color(emoji, rgb) {
+    var context = canvas.getContext("2d");
+    context.clearRect(0, 0, canvas.width, canvas.height);
+    context.fillStyle = rgb;
+    context.textBaseline = "top";
+    context.font = EMOJI_SIZE+"px Arial";
+    context.fillText(emoji, 0, 0);
+    var data = context.getImageData(0, 0, EMOJI_SIZE, EMOJI_SIZE).data;
+    for (var i = 0; i < data.length; i += 4) {
+      if (data[i] === 0 && data[i + 1] === 0 && data[i + 2] === 0) {
+        continue;
+      }
+      return data[i].toString(16)
+        + data[i + 1].toString(16)
+        + data[i + 2].toString(16);
+    }
+    return "no colored pixel found";
+  }
+
+  function dump(db) {
+    var json = JSON.stringify(db, null, "  ")
+      .replace(/^( +)(.+)\[\](,?)$/mg, "$1$2[\n$1]$3")
+      .replace(/,\n( *)  /g, "\n$1, ");
+    document.getElementById("output").value = json + "\n";
+  }
+
+  var xhr = new XMLHttpRequest;
+  xhr.onload = function() {
+    detectAliases(JSON.parse(this.responseText));
+  };
+  xhr.open("GET", "emoji.json", false);
+  xhr.send(null);
+</script>
--- a/db/dump.rb
+++ b/db/dump.rb
@@ -52,19 +52,14 @@ end
 trap(:PIPE) { abort }

 items = []
-variation = Emoji::VARIATION_SELECTOR_16
+variation_codepoint = Emoji::VARIATION_SELECTOR_16.codepoints[0]

 for emoji in Emoji.all
-  unicodes = emoji.unicode_aliases.dup
-
  item = {}

  unless emoji.custom?
-    variation_codepoint = variation.codepoints[0]
    chars = emoji.raw.codepoints.map { |code| UnicodeCharacter.fetch(code) unless code == variation_codepoint }.compact
-    unicodes.select { |u| u.index(variation) }.each { |u| unicodes.delete(u.sub(variation, '')) }
-    item[:emoji] = unicodes.shift
-    item[:unicodes] = unicodes if unicodes.any?
+    item[:emoji] = emoji.raw
    item[:description] = chars.map(&:description).join(' + ')
  end

--- a/db/emoji.json
+++ b/db/emoji.json
@@ -2904,7 +2904,7 @@
    ]
  }
 , {
-    "emoji": "⭐️"
+    "emoji": "⭐"
  , "description": "white medium star"
  , "aliases": [
      "star"
@@ -2923,7 +2923,7 @@
    ]
  }
 , {
-    "emoji": "⛅️"
+    "emoji": "⛅"
  , "description": "sun behind cloud"
  , "aliases": [
      "partly_sunny"
@@ -2943,7 +2943,7 @@
    ]
  }
 , {
-    "emoji": "⚡️"
+    "emoji": "⚡"
  , "description": "high voltage sign"
  , "aliases": [
      "zap"
@@ -2954,7 +2954,7 @@
    ]
  }
 , {
-    "emoji": "☔️"
+    "emoji": "☔"
  , "description": "umbrella with rain drops"
  , "aliases": [
      "umbrella"
@@ -2977,7 +2977,7 @@
    ]
  }
 , {
-    "emoji": "⛄️"
+    "emoji": "⛄"
  , "description": "snowman without snow"
  , "aliases": [
      "snowman"
@@ -3491,7 +3491,7 @@
    ]
  }
 , {
-    "emoji": "⌛️"
+    "emoji": "⌛"
  , "description": "hourglass"
  , "aliases": [
      "hourglass"
@@ -3511,7 +3511,7 @@
    ]
  }
 , {
-    "emoji": "⌚️"
+    "emoji": "⌚"
  , "description": "watch"
  , "aliases": [
      "watch"
@@ -4487,7 +4487,7 @@
    ]
  }
 , {
-    "emoji": "🀄️"
+    "emoji": "🀄"
  , "description": "mahjong tile red dragon"
  , "aliases": [
      "mahjong"
@@ -4537,7 +4537,7 @@
    ]
  }
 , {
-    "emoji": "⚽️"
+    "emoji": "⚽"
  , "description": "soccer ball"
  , "aliases": [
      "soccer"
@@ -4596,7 +4596,7 @@
    ]
  }
 , {
-    "emoji": "⛳️"
+    "emoji": "⛳"
  , "description": "flag in hole"
  , "aliases": [
      "golf"
@@ -4700,7 +4700,7 @@
    ]
  }
 , {
-    "emoji": "☕️"
+    "emoji": "☕"
  , "description": "hot beverage"
  , "aliases": [
      "coffee"
@@ -5358,7 +5358,7 @@
    ]
  }
 , {
-    "emoji": "⛪️"
+    "emoji": "⛪"
  , "description": "church"
  , "aliases": [
      "church"
@@ -5421,7 +5421,7 @@
    ]
  }
 , {
-    "emoji": "⛺️"
+    "emoji": "⛺"
  , "description": "tent"
  , "aliases": [
      "tent"
@@ -5530,7 +5530,7 @@
    ]
  }
 , {
-    "emoji": "⛲️"
+    "emoji": "⛲"
  , "description": "fountain"
  , "aliases": [
      "fountain"
@@ -5557,7 +5557,7 @@
    ]
  }
 , {
-    "emoji": "⛵️"
+    "emoji": "⛵"
  , "description": "sailboat"
  , "aliases": [
      "boat"
@@ -5586,7 +5586,7 @@
    ]
  }
 , {
-    "emoji": "⚓️"
+    "emoji": "⚓"
  , "description": "anchor"
  , "aliases": [
      "anchor"
@@ -6014,7 +6014,7 @@
    ]
  }
 , {
-    "emoji": "⛽️"
+    "emoji": "⛽"
  , "description": "fuel pump"
  , "aliases": [
      "fuelpump"
@@ -6696,10 +6696,7 @@
    ]
  }
 , {
-    "emoji": "🈯️"
-  , "unicodes": [
-      "指"
-    ]
+    "emoji": "🈯"
  , "description": "squared cjk unified ideograph-6307"
  , "aliases": [
      "u6307"
@@ -6709,9 +6706,6 @@
  }
 , {
    "emoji": "🈳"
-  , "unicodes": [
-      "空"
-    ]
  , "description": "squared cjk unified ideograph-7a7a"
  , "aliases": [
      "u7a7a"
@@ -6721,9 +6715,6 @@
  }
 , {
    "emoji": "🈵"
-  , "unicodes": [
-      "満"
-    ]
  , "description": "squared cjk unified ideograph-6e80"
  , "aliases": [
      "u6e80"
@@ -6733,9 +6724,6 @@
  }
 , {
    "emoji": "🈴"
-  , "unicodes": [
-      "合"
-    ]
  , "description": "squared cjk unified ideograph-5408"
  , "aliases": [
      "u5408"
@@ -6745,9 +6733,6 @@
  }
 , {
    "emoji": "🈲"
-  , "unicodes": [
-      "禁"
-    ]
  , "description": "squared cjk unified ideograph-7981"
  , "aliases": [
      "u7981"
@@ -6766,9 +6751,6 @@
  }
 , {
    "emoji": "🈹"
-  , "unicodes": [
-      "割"
-    ]
  , "description": "squared cjk unified ideograph-5272"
  , "aliases": [
      "u5272"
@@ -6778,9 +6760,6 @@
  }
 , {
    "emoji": "🈺"
-  , "unicodes": [
-      "営"
-    ]
  , "description": "squared cjk unified ideograph-55b6"
  , "aliases": [
      "u55b6"
@@ -6790,9 +6769,6 @@
  }
 , {
    "emoji": "🈶"
-  , "unicodes": [
-      "有"
-    ]
  , "description": "squared cjk unified ideograph-6709"
  , "aliases": [
      "u6709"
@@ -6801,10 +6777,7 @@
    ]
  }
 , {
-    "emoji": "🈚️"
-  , "unicodes": [
-      "無"
-    ]
+    "emoji": "🈚"
  , "description": "squared cjk unified ideograph-7121"
  , "aliases": [
      "u7121"
@@ -6888,7 +6861,7 @@
    ]
  }
 , {
-    "emoji": "♿️"
+    "emoji": "♿"
  , "description": "wheelchair symbol"
  , "aliases": [
      "wheelchair"
@@ -6907,10 +6880,7 @@
    ]
  }
 , {
-    "emoji": "🈷"
-  , "unicodes": [
-      "月"
-    ]
+    "emoji": "🈷️"
  , "description": "squared cjk unified ideograph-6708"
  , "aliases": [
      "u6708"
@@ -6920,9 +6890,6 @@
  }
 , {
    "emoji": "🈸"
-  , "unicodes": [
-      "申"
-    ]
  , "description": "squared cjk unified ideograph-7533"
  , "aliases": [
      "u7533"
@@ -6931,7 +6898,7 @@
    ]
  }
 , {
-    "emoji": "🈂"
+    "emoji": "🈂️"
  , "description": "squared katakana sa"
  , "aliases": [
      "sa"
@@ -7116,7 +7083,7 @@
    ]
  }
 , {
-    "emoji": "⛔️"
+    "emoji": "⛔"
  , "description": "no entry"
  , "aliases": [
      "no_entry"
@@ -7209,7 +7176,7 @@
    ]
  }
 , {
-    "emoji": "🅰"
+    "emoji": "🅰️"
  , "description": "negative squared latin capital letter a"
  , "aliases": [
      "a"
@@ -7218,7 +7185,7 @@
    ]
  }
 , {
-    "emoji": "🅱"
+    "emoji": "🅱️"
  , "description": "negative squared latin capital letter b"
  , "aliases": [
      "b"
@@ -7236,7 +7203,7 @@
    ]
  }
 , {
-    "emoji": "🅾"
+    "emoji": "🅾️"
  , "description": "negative squared latin capital letter o"
  , "aliases": [
      "o2"
@@ -7274,7 +7241,7 @@
    ]
  }
 , {
-    "emoji": "♈️"
+    "emoji": "♈"
  , "description": "aries"
  , "aliases": [
      "aries"
@@ -7283,7 +7250,7 @@
    ]
  }
 , {
-    "emoji": "♉️"
+    "emoji": "♉"
  , "description": "taurus"
  , "aliases": [
      "taurus"
@@ -7292,7 +7259,7 @@
    ]
  }
 , {
-    "emoji": "♊️"
+    "emoji": "♊"
  , "description": "gemini"
  , "aliases": [
      "gemini"
@@ -7301,7 +7268,7 @@
    ]
  }
 , {
-    "emoji": "♋️"
+    "emoji": "♋"
  , "description": "cancer"
  , "aliases": [
      "cancer"
@@ -7310,7 +7277,7 @@
    ]
  }
 , {
-    "emoji": "♌️"
+    "emoji": "♌"
  , "description": "leo"
  , "aliases": [
      "leo"
@@ -7319,7 +7286,7 @@
    ]
  }
 , {
-    "emoji": "♍️"
+    "emoji": "♍"
  , "description": "virgo"
  , "aliases": [
      "virgo"
@@ -7328,7 +7295,7 @@
    ]
  }
 , {
-    "emoji": "♎️"
+    "emoji": "♎"
  , "description": "libra"
  , "aliases": [
      "libra"
@@ -7337,7 +7304,7 @@
    ]
  }
 , {
-    "emoji": "♏️"
+    "emoji": "♏"
  , "description": "scorpius"
  , "aliases": [
      "scorpius"
@@ -7346,7 +7313,7 @@
    ]
  }
 , {
-    "emoji": "♐️"
+    "emoji": "♐"
  , "description": "sagittarius"
  , "aliases": [
      "sagittarius"
@@ -7355,7 +7322,7 @@
    ]
  }
 , {
-    "emoji": "♑️"
+    "emoji": "♑"
  , "description": "capricorn"
  , "aliases": [
      "capricorn"
@@ -7364,7 +7331,7 @@
    ]
  }
 , {
-    "emoji": "♒️"
+    "emoji": "♒"
  , "description": "aquarius"
  , "aliases": [
      "aquarius"
@@ -7373,7 +7340,7 @@
    ]
  }
 , {
-    "emoji": "♓️"
+    "emoji": "♓"
  , "description": "pisces"
  , "aliases": [
      "pisces"
@@ -7436,7 +7403,7 @@
    ]
  }
 , {
-    "emoji": "©"
+    "emoji": "©️"
  , "description": "copyright sign"
  , "aliases": [
      "copyright"
@@ -7445,7 +7412,7 @@
    ]
  }
 , {
-    "emoji": "®"
+    "emoji": "®️"
  , "description": "registered sign"
  , "aliases": [
      "registered"
@@ -7454,7 +7421,7 @@
    ]
  }
 , {
-    "emoji": "™"
+    "emoji": "™️"
  , "description": "trade mark sign"
  , "aliases": [
      "tm"
@@ -7491,7 +7458,7 @@
    ]
  }
 , {
-    "emoji": "❗️"
+    "emoji": "❗"
  , "description": "heavy exclamation mark symbol"
  , "aliases": [
      "exclamation"
@@ -7530,7 +7497,7 @@
    ]
  }
 , {
-    "emoji": "⭕️"
+    "emoji": "⭕"
  , "description": "heavy large circle"
  , "aliases": [
      "o"
@@ -7946,7 +7913,7 @@
    ]
  }
 , {
-    "emoji": "〰"
+    "emoji": "〰️"
  , "description": "wavy dash"
  , "aliases": [
      "wavy_dash"
@@ -7991,7 +7958,7 @@
    ]
  }
 , {
-    "emoji": "◾️"
+    "emoji": "◾"
  , "description": "black medium small square"
  , "aliases": [
      "black_medium_small_square"
@@ -8000,7 +7967,7 @@
    ]
  }
 , {
-    "emoji": "◽️"
+    "emoji": "◽"
  , "description": "white medium small square"
  , "aliases": [
      "white_medium_small_square"
@@ -8054,7 +8021,7 @@
    ]
  }
 , {
-    "emoji": "⚫️"
+    "emoji": "⚫"
  , "description": "medium black circle"
  , "aliases": [
      "black_circle"
@@ -8063,7 +8030,7 @@
    ]
  }
 , {
-    "emoji": "⚪️"
+    "emoji": "⚪"
  , "description": "medium white circle"
  , "aliases": [
      "white_circle"
@@ -8099,7 +8066,7 @@
    ]
  }
 , {
-    "emoji": "⬜️"
+    "emoji": "⬜"
  , "description": "white large square"
  , "aliases": [
      "white_large_square"
@@ -8108,7 +8075,7 @@
    ]
  }
 , {
-    "emoji": "⬛️"
+    "emoji": "⬛"
  , "description": "black large square"
  , "aliases": [
      "black_large_square"
--- a/gemoji.gemspec
+++ b/gemoji.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
  s.name    = "gemoji"
-  s.version = "2.0.0"
+  s.version = "2.1.0"
  s.summary = "Emoji conversion and image assets"
  s.description = "Image assets and character information for emoji."

--- a/images/emoji/unicode/0023-fe0f-20e3.png
+++ b/images/emoji/unicode/0023-fe0f-20e3.png
--- a/images/emoji/unicode/0030-fe0f-20e3.png
+++ b/images/emoji/unicode/0030-fe0f-20e3.png
--- a/images/emoji/unicode/0031-fe0f-20e3.png
+++ b/images/emoji/unicode/0031-fe0f-20e3.png
--- a/images/emoji/unicode/0032-fe0f-20e3.png
+++ b/images/emoji/unicode/0032-fe0f-20e3.png
--- a/images/emoji/unicode/0033-fe0f-20e3.png
+++ b/images/emoji/unicode/0033-fe0f-20e3.png
--- a/images/emoji/unicode/0034-fe0f-20e3.png
+++ b/images/emoji/unicode/0034-fe0f-20e3.png
--- a/images/emoji/unicode/0035-fe0f-20e3.png
+++ b/images/emoji/unicode/0035-fe0f-20e3.png
--- a/images/emoji/unicode/0036-fe0f-20e3.png
+++ b/images/emoji/unicode/0036-fe0f-20e3.png
--- a/images/emoji/unicode/0037-fe0f-20e3.png
+++ b/images/emoji/unicode/0037-fe0f-20e3.png
--- a/images/emoji/unicode/0038-fe0f-20e3.png
+++ b/images/emoji/unicode/0038-fe0f-20e3.png
--- a/images/emoji/unicode/0039-fe0f-20e3.png
+++ b/images/emoji/unicode/0039-fe0f-20e3.png
--- a/images/emoji/unicode/1f004-fe0f.png
+++ b/images/emoji/unicode/1f004-fe0f.png
--- a/images/emoji/unicode/1f17f-fe0f.png
+++ b/images/emoji/unicode/1f17f-fe0f.png
--- a/images/emoji/unicode/1f21a-fe0f.png
+++ b/images/emoji/unicode/1f21a-fe0f.png
--- a/images/emoji/unicode/1f22f-fe0f.png
+++ b/images/emoji/unicode/1f22f-fe0f.png
--- a/images/emoji/unicode/203c-fe0f.png
+++ b/images/emoji/unicode/203c-fe0f.png
--- a/images/emoji/unicode/2049-fe0f.png
+++ b/images/emoji/unicode/2049-fe0f.png
--- a/images/emoji/unicode/2139-fe0f.png
+++ b/images/emoji/unicode/2139-fe0f.png
--- a/images/emoji/unicode/2194-fe0f.png
+++ b/images/emoji/unicode/2194-fe0f.png
--- a/images/emoji/unicode/2195-fe0f.png
+++ b/images/emoji/unicode/2195-fe0f.png
--- a/images/emoji/unicode/2196-fe0f.png
+++ b/images/emoji/unicode/2196-fe0f.png
--- a/images/emoji/unicode/2197-fe0f.png
+++ b/images/emoji/unicode/2197-fe0f.png
--- a/images/emoji/unicode/2198-fe0f.png
+++ b/images/emoji/unicode/2198-fe0f.png
--- a/images/emoji/unicode/2199-fe0f.png
+++ b/images/emoji/unicode/2199-fe0f.png
--- a/images/emoji/unicode/21a9-fe0f.png
+++ b/images/emoji/unicode/21a9-fe0f.png
--- a/images/emoji/unicode/21aa-fe0f.png
+++ b/images/emoji/unicode/21aa-fe0f.png
--- a/images/emoji/unicode/231a-fe0f.png
+++ b/images/emoji/unicode/231a-fe0f.png
--- a/images/emoji/unicode/231b-fe0f.png
+++ b/images/emoji/unicode/231b-fe0f.png
--- a/images/emoji/unicode/24c2-fe0f.png
+++ b/images/emoji/unicode/24c2-fe0f.png
--- a/images/emoji/unicode/25aa-fe0f.png
+++ b/images/emoji/unicode/25aa-fe0f.png
--- a/images/emoji/unicode/25ab-fe0f.png
+++ b/images/emoji/unicode/25ab-fe0f.png
--- a/images/emoji/unicode/25b6-fe0f.png
+++ b/images/emoji/unicode/25b6-fe0f.png
--- a/images/emoji/unicode/25c0-fe0f.png
+++ b/images/emoji/unicode/25c0-fe0f.png
--- a/images/emoji/unicode/25fb-fe0f.png
+++ b/images/emoji/unicode/25fb-fe0f.png
--- a/images/emoji/unicode/25fc-fe0f.png
+++ b/images/emoji/unicode/25fc-fe0f.png
--- a/images/emoji/unicode/25fd-fe0f.png
+++ b/images/emoji/unicode/25fd-fe0f.png
--- a/images/emoji/unicode/25fe-fe0f.png
+++ b/images/emoji/unicode/25fe-fe0f.png
--- a/images/emoji/unicode/2600-fe0f.png
+++ b/images/emoji/unicode/2600-fe0f.png
--- a/images/emoji/unicode/2601-fe0f.png
+++ b/images/emoji/unicode/2601-fe0f.png
--- a/images/emoji/unicode/260e-fe0f.png
+++ b/images/emoji/unicode/260e-fe0f.png
--- a/images/emoji/unicode/2611-fe0f.png
+++ b/images/emoji/unicode/2611-fe0f.png
--- a/images/emoji/unicode/2614-fe0f.png
+++ b/images/emoji/unicode/2614-fe0f.png
--- a/images/emoji/unicode/2615-fe0f.png
+++ b/images/emoji/unicode/2615-fe0f.png
--- a/images/emoji/unicode/261d-fe0f.png
+++ b/images/emoji/unicode/261d-fe0f.png
--- a/images/emoji/unicode/263a-fe0f.png
+++ b/images/emoji/unicode/263a-fe0f.png
--- a/images/emoji/unicode/2648-fe0f.png
+++ b/images/emoji/unicode/2648-fe0f.png
--- a/images/emoji/unicode/2649-fe0f.png
+++ b/images/emoji/unicode/2649-fe0f.png
--- a/images/emoji/unicode/264a-fe0f.png
+++ b/images/emoji/unicode/264a-fe0f.png
--- a/images/emoji/unicode/264b-fe0f.png
+++ b/images/emoji/unicode/264b-fe0f.png
--- a/images/emoji/unicode/264c-fe0f.png
+++ b/images/emoji/unicode/264c-fe0f.png
--- a/images/emoji/unicode/264d-fe0f.png
+++ b/images/emoji/unicode/264d-fe0f.png
--- a/images/emoji/unicode/264e-fe0f.png
+++ b/images/emoji/unicode/264e-fe0f.png
--- a/images/emoji/unicode/264f-fe0f.png
+++ b/images/emoji/unicode/264f-fe0f.png
--- a/images/emoji/unicode/2650-fe0f.png
+++ b/images/emoji/unicode/2650-fe0f.png
--- a/images/emoji/unicode/2651-fe0f.png
+++ b/images/emoji/unicode/2651-fe0f.png
--- a/images/emoji/unicode/2652-fe0f.png
+++ b/images/emoji/unicode/2652-fe0f.png
--- a/images/emoji/unicode/2653-fe0f.png
+++ b/images/emoji/unicode/2653-fe0f.png
--- a/images/emoji/unicode/2660-fe0f.png
+++ b/images/emoji/unicode/2660-fe0f.png
--- a/images/emoji/unicode/2663-fe0f.png
+++ b/images/emoji/unicode/2663-fe0f.png
--- a/images/emoji/unicode/2665-fe0f.png
+++ b/images/emoji/unicode/2665-fe0f.png
--- a/images/emoji/unicode/2666-fe0f.png
+++ b/images/emoji/unicode/2666-fe0f.png
--- a/images/emoji/unicode/2668-fe0f.png
+++ b/images/emoji/unicode/2668-fe0f.png
--- a/images/emoji/unicode/267b-fe0f.png
+++ b/images/emoji/unicode/267b-fe0f.png
--- a/images/emoji/unicode/267f-fe0f.png
+++ b/images/emoji/unicode/267f-fe0f.png
--- a/images/emoji/unicode/2693-fe0f.png
+++ b/images/emoji/unicode/2693-fe0f.png
--- a/images/emoji/unicode/26a0-fe0f.png
+++ b/images/emoji/unicode/26a0-fe0f.png
--- a/images/emoji/unicode/26a1-fe0f.png
+++ b/images/emoji/unicode/26a1-fe0f.png
--- a/images/emoji/unicode/26aa-fe0f.png
+++ b/images/emoji/unicode/26aa-fe0f.png
--- a/images/emoji/unicode/26ab-fe0f.png
+++ b/images/emoji/unicode/26ab-fe0f.png
--- a/images/emoji/unicode/26bd-fe0f.png
+++ b/images/emoji/unicode/26bd-fe0f.png
--- a/images/emoji/unicode/26be-fe0f.png
+++ b/images/emoji/unicode/26be-fe0f.png
--- a/images/emoji/unicode/26c4-fe0f.png
+++ b/images/emoji/unicode/26c4-fe0f.png
--- a/images/emoji/unicode/26c5-fe0f.png
+++ b/images/emoji/unicode/26c5-fe0f.png
--- a/images/emoji/unicode/26d4-fe0f.png
+++ b/images/emoji/unicode/26d4-fe0f.png
--- a/images/emoji/unicode/26ea-fe0f.png
+++ b/images/emoji/unicode/26ea-fe0f.png
--- a/images/emoji/unicode/26f2-fe0f.png
+++ b/images/emoji/unicode/26f2-fe0f.png
--- a/images/emoji/unicode/26f3-fe0f.png
+++ b/images/emoji/unicode/26f3-fe0f.png
--- a/images/emoji/unicode/26f5-fe0f.png
+++ b/images/emoji/unicode/26f5-fe0f.png
--- a/images/emoji/unicode/26fa-fe0f.png
+++ b/images/emoji/unicode/26fa-fe0f.png
--- a/images/emoji/unicode/26fd-fe0f.png
+++ b/images/emoji/unicode/26fd-fe0f.png
--- a/images/emoji/unicode/2702-fe0f.png
+++ b/images/emoji/unicode/2702-fe0f.png
--- a/images/emoji/unicode/2708-fe0f.png
+++ b/images/emoji/unicode/2708-fe0f.png
--- a/images/emoji/unicode/2709-fe0f.png
+++ b/images/emoji/unicode/2709-fe0f.png
--- a/images/emoji/unicode/270c-fe0f.png
+++ b/images/emoji/unicode/270c-fe0f.png
--- a/images/emoji/unicode/270f-fe0f.png
+++ b/images/emoji/unicode/270f-fe0f.png
--- a/images/emoji/unicode/2712-fe0f.png
+++ b/images/emoji/unicode/2712-fe0f.png
--- a/images/emoji/unicode/2714-fe0f.png
+++ b/images/emoji/unicode/2714-fe0f.png
--- a/images/emoji/unicode/2716-fe0f.png
+++ b/images/emoji/unicode/2716-fe0f.png
--- a/images/emoji/unicode/2733-fe0f.png
+++ b/images/emoji/unicode/2733-fe0f.png
--- a/images/emoji/unicode/2734-fe0f.png
+++ b/images/emoji/unicode/2734-fe0f.png
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Mislav Marohnić	701f434b60	gemoji 2.1.0	2014-08-06 17:56:17 -07:00
Mislav Marohnić	112cc8fb8b	Replace MAINTAINING with CONTRIBUTING	2014-08-06 17:54:19 -07:00
Mislav Marohnić	5162959546	Refactor test to remove Ruby syntax warning	2014-08-06 17:38:26 -07:00
Mislav Marohnić	75ada7cc89	Merge pull request #60 from github/resolve-unicode-aliases Resolve the emoji.json "unicodes" mess	2014-08-06 17:24:48 -07:00
Mislav Marohnić	0bb789e3e6	Convert applescript to plain text format So that it's readable and diffable from the web interface [ci skip]	2014-08-06 07:51:55 -07:00
Mislav Marohnić	9beb9c0172	Remove need for explicit "unicodes" aliases in `emoji.json` We now operate on a new set of assumptions: - Characters with VARIATION_SELECTOR_15 shouldn't render as emoji, even if OS X doesn't respect that currently. This removes explicit aliases that include VARIATION_SELECTOR_15. - VARIATION_SELECTOR_16 is optional for most characters to render as emoji on OS X. For those that don't have it optional, we include VARIATION_SELECTOR_16 in their raw representation in `emoji.json`. Other characters list their form including VARIATION_SELECTOR_16 implicitly in `unicode_aliases`. - For emoji that consist of 2 characters + variation selector, we assume that the selector can come between the 2 characters or after them, so `find_by_unicode` now supports both forms. - The `db/aliases.html` script ensures that `emoji.json` only contains characters that Safari on OS X actually renders as emojis.	2014-08-06 00:08:47 -07:00
Mislav Marohnić	ea70c98946	Only create canvas elements of just the size required to create an emoji Otherwise canvas element defaults to a larger size.	2014-08-06 00:08:47 -07:00
Mislav Marohnić	7d416739ba	Merge pull request #59 from github/script-tools Add useful tools to `script/*`	2014-08-06 00:08:11 -07:00
Mislav Marohnić	96295d7871	Add `script/release`	2014-08-05 23:51:22 -07:00
Mislav Marohnić	584939127e	Add `script/regenerate` to rebuild `db/emoji.json` database Uses AppleScript to open Safari and filter the emojis by whether they render as actual emoji on OS X or not.	2014-08-05 23:25:35 -07:00
Mislav Marohnić	680d1bc59b	Add `script/console` for experimentation from Ruby	2014-08-05 23:08:01 -07:00
Mislav Marohnić	2c58377420	Configure Travis CI to use `script/test`	2014-08-05 23:07:39 -07:00
Mislav Marohnić	3bb3cea8d3	Add `script/bootstrap` & `script/test`	2014-08-05 23:06:52 -07:00
Mislav Marohnić	5e6dcae949	Merge pull request #58 from github/plain-copyright Don't treat plain "(c)" symbol or similar as emoji	2014-08-05 22:29:50 -07:00
Mislav Marohnić	2aaf9693a9	Ruby 1.9 compat in tests	2014-08-05 22:27:01 -07:00
Mislav Marohnić	0d1a82dc6a	Don't treat plain "(c)" symbol or similar as emoji Unless these characters are followed by VARIATION SELECTOR-16, which indicates that the should be rendered as emoji, OS X renders these characters using plain font glyphs. Previously we assumed that the emoji list we get from `Category-Emoji.json` (OS X emoji character picker) are all valid emoji, but for some reason some plain Unicode characters are included in there without being suffixed with VARIATION SELECTOR-16.	2014-08-05 22:16:54 -07:00
Mislav Marohnić	6b9cdd6eb5	Rename PNGs on disk to not contain VARIATION_SELECTOR_16 Even if the emoji contains it, the filename on disk doesn't have to. This will reduce having to keep renaming PNGs on disk while we tweak the emoji database in the future in regard to which are required to have VARIATION_SELECTOR_16 and which are not.	2014-08-05 22:16:27 -07:00
Mislav Marohnić	75f837e6b5	Improve failure message for images on disk test	2014-08-05 22:16:27 -07:00
Mislav Marohnić	c2286e7c5b	Fix failure message in tests This got broken by Emoji::Character API change in `3935375ca8`	2014-08-05 20:29:17 -07:00
Adam Roben	3e21d95409	Merge pull request #56 from github/match-osx-behavior Use the same unicode aliases as Safari 7.0.5 on OS X 10.9.4	2014-08-01 23:06:51 -04:00
Adam Roben	a86999a7f1	Fix tests	2014-08-01 14:11:13 -04:00
Adam Roben	b7c2b8e4d8	Remove incorrect unicode aliases db/aliases.html now clears out any incorrect aliases it finds.	2014-08-01 13:56:38 -04:00
Adam Roben	1212951bc6	Use the same unicode aliases as Safari 7.0.5 on OS X 10.9.4 Category-Emoji.json contains many code point sequences ending in U+FE0F VARIATION SELECTOR-16. OS X renders some of these code point sequences as color emoji even if you strip off VARIATION SELECTOR-16. (And in fact it even renders some of them as color emoji if you replace VARIATION SELECTOR-16 with VARIATION SELECTOR-15, even though that is explicitly requesting a "text" variant of the character). We used to assume that VARIATION SELECTOR-16 was optional for all emoji. But this doesn't match OS X's behavior. This could cause problems, e.g., if you were to use the unicode_aliases property to detect Unicode emoji and replace them with images for browsers that don't support emoji natively. The Ruby code no longer does anything special with VARIATION SELECTOR-16 other than to remove it from the description of each emoji. The new db/aliases.html file can be used to determine which the correct Unicode aliases for each emoji are. That page takes each emoji, generates a set of variants using VARIATION SELECTOR-16 and VARIATION SELECTOR-15, and renders each variant into a <canvas> element twice: once with a red font color, and once with a green font color. If the variant renders the same way, the OS is rendering the variant as a color emoji, and we add it to the "unicodes" array for that emoji. So the new process for generating db/emoji.json is: 1. rake db:dump > tmp 2. mv tmp db/emoji.json 3. open -a Safari db/aliases.html 4. Copy the resulting JSON from Safari 5. pbpaste > db/emoji.json This ensures that unicode_aliases only contains those code point sequences which actually render as color emoji on OS X.	2014-08-01 13:37:40 -04:00
Joshua Peek	b1736a387c	Merge pull request #54 from jeremy/nil_style_find_api Change find_by_* to return nil rather than raise an exception	2014-07-19 13:14:51 -07:00
Jeremy Kemper	f9aba615af	Change find_by_* to return nil rather than raise an exception. This is a breaking API change. You probably have code that looks like if emoji = Emoji.find_by_alias($1) { nil } that you can change to if emoji = Emoji.find_by_alias($1)	2014-07-18 09:16:21 -07:00
Jeremy Kemper	2741be5eb6	Reflect current 2.0.0 release in Gemfile.lock	2014-07-17 17:50:05 -07:00