Bump actions/checkout from 3 to 6

Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 6.
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v3...v6)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: '6'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yaml

@@ -0,0 +1,11 @@
+---
+version: 2
+updates:
+  - package-ecosystem: 'bundler'
+    directory: '/'
+    schedule:
+        interval: 'weekly'
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+        interval: 'weekly'

.github/workflows/test.yml

@@ -0,0 +1,24 @@
+name: Test
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: ["2.7", "3.0", "3.1"]
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v6
+    
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{matrix.ruby}}
+        bundler-cache: true
+    
+    - name: Run tests
+      run: bundle exec rake

.gitignore

@@ -1,9 +1,6 @@
 /bin/*
-!/bin/gemoji
 .bundle
 .ruby-version
 Gemfile.lock
-db/emoji-test.txt
-db/ucd.nounihan.grouped.xml
-images/unicode/*.png
-vendor/
+vendor/*
+!vendor/unicode-emoji-test.txt

.travis.yml

@@ -1,9 +0,0 @@
-sudo: false
-script: script/test
-rvm:
-  - 1.9.3
-  - '2.1'
-  - '2.2'
-  - 2.3.0
-notifications:
-  email: false

CONTRIBUTING.md

@@ -1,8 +1,4 @@
-This project adheres to the [Open Code of Conduct][code-of-conduct]. By participating, you are expected to uphold this code.
-[code-of-conduct]: http://todogroup.org/opencodeofconduct/#gemoji/opensource@github.com
-
-Our emoji set is based off Apple's emoji character palette, plus some custom
-emoji such as :octocat: :shipit: :metal:.
+Contributions to this project are [released](https://help.github.com/articles/github-terms-of-service/#6-contributions-under-repository-license) to the public under the [project's open source license](LICENSE).
 
 Some useful tools in development are:
 
@@ -15,28 +11,11 @@ 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.
+Runs the test suite.
 
 ```
 script/console

Gemfile

@@ -2,5 +2,6 @@ source "https://rubygems.org"
 
 gem "rake", "~> 10.3.2"
 gem "minitest", "~> 5.3.5"
+gem "i18n", "~> 1.8.5"
 
 gemspec

Gemfile.lock

@@ -0,0 +1,25 @@
+PATH
+  remote: .
+  specs:
+    gemoji (4.1.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    concurrent-ruby (1.1.7)
+    i18n (1.8.5)
+      concurrent-ruby (~> 1.0)
+    minitest (5.3.5)
+    rake (10.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  gemoji!
+  i18n (~> 1.8.5)
+  minitest (~> 5.3.5)
+  rake (~> 10.3.2)
+
+BUNDLED WITH
+   2.4.10

LICENSE

@@ -1,18 +1,4 @@
-octocat, squirrel, shipit
-Copyright (c) 2013 GitHub Inc. All rights reserved.
-
-bowtie, neckbeard, fu
-Copyright (c) 2013 37signals, LLC. All rights reserved.
-
-feelsgood, finnadie, goberserk, godmode, hurtrealbad, rage 1-4, suspect
-Copyright (c) 2013 id Software. All rights reserved.
-
-trollface
-Copyright (c) 2013 whynne@deviantart. All rights reserved.
-
-Source code:
-
-Copyright (c) 2013 GitHub, Inc.
+Copyright (c) 2019 GitHub, Inc.
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

README.md

@@ -1,8 +1,7 @@
 gemoji
 ======
 
-This library contains character information about native emoji, as well as image
-files for a few custom emoji.
+This library contains character information about native emojis.
 
 
 Installation
@@ -14,20 +13,6 @@ Add `gemoji` to your Gemfile.
 gem 'gemoji'
 ```
 
-### Extract images
-
-To obtain image files as fallbacks for browsers and OS's that don't support
-emoji, run the `gemoji extract` command **on macOS Sierra or later**:
-
-``` sh
-bundle exec gemoji extract public/images/emoji
-```
-
-This will extract images into filenames such as:
-
-* `public/images/emoji/octocat.png`
-* `public/images/emoji/unicode/1f9c0.png` (the `:cheese:` emoji)
-
 
 Example Rails Helper
 --------------------

Rakefile

@@ -10,9 +10,7 @@ end
 namespace :db do
   desc %(Generate Emoji data files needed for development)
   task :generate => [
-    'db/Category-Emoji.json',
-    'db/ucd.nounihan.grouped.xml',
-    'db/emoji-test.txt',
+    'vendor/unicode-emoji-test.txt',
   ]
 
   desc %(Dump a list of supported Emoji with Unicode descriptions and aliases)
@@ -21,25 +19,6 @@ namespace :db do
   end
 end
 
-task 'db/Category-Emoji.json' do |t|
-  system 'plutil', '-convert', 'json', '-r',
-    '/System/Library/Input Methods/CharacterPalette.app/Contents/Resources/Category-Emoji.plist',
-    '-o', t.name
-end
-
-file 'db/ucd.nounihan.grouped.xml' do
-  Dir.chdir('db') do
-    system 'curl', '-fsSLO', 'http://www.unicode.org/Public/9.0.0/ucdxml/ucd.nounihan.grouped.zip'
-    system 'unzip', '-q', 'ucd.nounihan.grouped.zip'
-    rm 'ucd.nounihan.grouped.zip'
-  end
-end
-
-file 'db/emoji-test.txt' do |t|
-  system 'curl', '-fsSL', 'http://unicode.org/Public/emoji/4.0/emoji-test.txt', '-o', t.name
-end
-
-directory 'images/unicode' do
-  require 'emoji/extractor'
-  Emoji::Extractor.new(64, Emoji.images_path).extract!
+file 'vendor/unicode-emoji-test.txt' do |t|
+  system 'curl', '-fsSL', 'http://unicode.org/Public/emoji/15.0/emoji-test.txt', '-o', t.name
 end

bin/gemoji

@@ -1,5 +0,0 @@
-#!/usr/bin/env ruby
-require 'emoji/cli'
-
-exit_code = Emoji::CLI.dispatch(ARGV)
-exit exit_code

db/Category-Emoji.json

@@ -1,71 +0,0 @@
-{
-  "EmojiDataArray" : [
-    {
-      "CVDataTitle" : "EmojiCategory-People",
-      "CVCategoryImage" : "Emoji-HumanImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "😀,😃,😄,😁,😆,😅,😂,🤣,☺️,😊,😇,🙂,🙃,😉,😌,😍,😘,😗,😙,😚,😋,😜,😝,😛,🤑,🤗,🤓,😎,🤡,🤠,😏,😒,😞,😔,😟,😕,🙁,☹️,😣,😖,😫,😩,😤,😠,😡,😶,😐,😑,😯,😦,😧,😮,😲,😵,😳,😱,😨,😰,😢,😥,🤤,😭,😓,😪,😴,🙄,🤔,🤥,😬,🤐,🤢,🤧,😷,🤒,🤕,😈,👿,👹,👺,💩,👻,💀,☠️,👽,👾,🤖,🎃,😺,😸,😹,😻,😼,😽,🙀,😿,😾,👐,🙌,👏,🙏,🤝,👍,👎,👊,✊,🤛,🤜,🤞,✌️,🤘,👌,👈,👉,👆,👇,☝️,✋,🤚,🖐,🖖,👋,🤙,💪,🖕,✍️,🤳,💅,💍,💄,💋,👄,👅,👂,👃,👣,👁,👀,🗣,👤,👥,👶,👦,👧,👨,👩,👱‍♀️,👱,👴,👵,👲,👳‍♀️,👳,👮‍♀️,👮,👷‍♀️,👷,💂‍♀️,💂,🕵️‍♀️,🕵️,👩‍⚕️,👨‍⚕️,👩‍🌾,👨‍🌾,👩‍🍳,👨‍🍳,👩‍🎓,👨‍🎓,👩‍🎤,👨‍🎤,👩‍🏫,👨‍🏫,👩‍🏭,👨‍🏭,👩‍💻,👨‍💻,👩‍💼,👨‍💼,👩‍🔧,👨‍🔧,👩‍🔬,👨‍🔬,👩‍🎨,👨‍🎨,👩‍🚒,👨‍🚒,👩‍✈️,👨‍✈️,👩‍🚀,👨‍🚀,👩‍⚖️,👨‍⚖️,🤶,🎅,👸,🤴,👰,🤵,👼,🤰,🙇‍♀️,🙇,💁,💁‍♂️,🙅,🙅‍♂️,🙆,🙆‍♂️,🙋,🙋‍♂️,🤦‍♀️,🤦‍♂️,🤷‍♀️,🤷‍♂️,🙎,🙎‍♂️,🙍,🙍‍♂️,💇,💇‍♂️,💆,💆‍♂️,🕴,💃,🕺,👯,👯‍♂️,🚶‍♀️,🚶,🏃‍♀️,🏃,👫,👭,👬,💑,👩‍❤️‍👩,👨‍❤️‍👨,💏,👩‍❤️‍💋‍👩,👨‍❤️‍💋‍👨,👪,👨‍👩‍👧,👨‍👩‍👧‍👦,👨‍👩‍👦‍👦,👨‍👩‍👧‍👧,👩‍👩‍👦,👩‍👩‍👧,👩‍👩‍👧‍👦,👩‍👩‍👦‍👦,👩‍👩‍👧‍👧,👨‍👨‍👦,👨‍👨‍👧,👨‍👨‍👧‍👦,👨‍👨‍👦‍👦,👨‍👨‍👧‍👧,👩‍👦,👩‍👧,👩‍👧‍👦,👩‍👦‍👦,👩‍👧‍👧,👨‍👦,👨‍👧,👨‍👧‍👦,👨‍👦‍👦,👨‍👧‍👧,👚,👕,👖,👔,👗,👙,👘,👠,👡,👢,👞,👟,👒,🎩,🎓,👑,⛑,🎒,👝,👛,👜,💼,👓,🕶,🌂,☂️"
-      }
-    },
-    {
-      "CVDataTitle" : "EmojiCategory-Nature",
-      "CVCategoryImage" : "Emoji-NatureImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "🐶,🐱,🐭,🐹,🐰,🦊,🐻,🐼,🐨,🐯,🦁,🐮,🐷,🐽,🐸,🐵,🙈,🙉,🙊,🐒,🐔,🐧,🐦,🐤,🐣,🐥,🦆,🦅,🦉,🦇,🐺,🐗,🐴,🦄,🐝,🐛,🦋,🐌,🐚,🐞,🐜,🕷,🕸,🐢,🐍,🦎,🦂,🦀,🦑,🐙,🦐,🐠,🐟,🐡,🐬,🦈,🐳,🐋,🐊,🐆,🐅,🐃,🐂,🐄,🦌,🐪,🐫,🐘,🦏,🦍,🐎,🐖,🐐,🐏,🐑,🐕,🐩,🐈,🐓,🦃,🕊,🐇,🐁,🐀,🐿,🐾,🐉,🐲,🌵,🎄,🌲,🌳,🌴,🌱,🌿,☘️,🍀,🎍,🎋,🍃,🍂,🍁,🍄,🌾,💐,🌷,🌹,🥀,🌻,🌼,🌸,🌺,🌎,🌍,🌏,🌕,🌖,🌗,🌘,🌑,🌒,🌓,🌔,🌚,🌝,🌞,🌛,🌜,🌙,💫,⭐️,🌟,✨,⚡️,🔥,💥,☄️,☀️,🌤,⛅️,🌥,🌦,🌈,☁️,🌧,⛈,🌩,🌨,☃️,⛄️,❄️,🌬,💨,🌪,🌫,🌊,💧,💦,☔️"
-      }
-    },
-    {
-      "CVDataTitle" : "EmojiCategory-Foods",
-      "CVCategoryImage" : "Emoji-FoodsImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "🍏,🍎,🍐,🍊,🍋,🍌,🍉,🍇,🍓,🍈,🍒,🍑,🍍,🥝,🥑,🍅,🍆,🥒,🥕,🌽,🌶,🥔,🍠,🌰,🥜,🍯,🥐,🍞,🥖,🧀,🥚,🍳,🥓,🥞,🍤,🍗,🍖,🍕,🌭,🍔,🍟,🥙,🌮,🌯,🥗,🥘,🍝,🍜,🍲,🍥,🍣,🍱,🍛,🍚,🍙,🍘,🍢,🍡,🍧,🍨,🍦,🍰,🎂,🍮,🍭,🍬,🍫,🍿,🍩,🍪,🥛,🍼,☕️,🍵,🍶,🍺,🍻,🥂,🍷,🥃,🍸,🍹,🍾,🥄,🍴,🍽"
-      }
-    },
-    {
-      "CVDataTitle" : "EmojiCategory-Activity",
-      "CVCategoryImage" : "Emoji-ActivityImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "⚽️,🏀,🏈,⚾️,🎾,🏐,🏉,🎱,🏓,🏸,🥅,🏒,🏑,🏏,⛳️,🏹,🎣,🥊,🥋,⛸,🎿,⛷,🏂,🏋️‍♀️,🏋️,🤺,🤼‍♀️,🤼‍♂️,🤸‍♀️,🤸‍♂️,⛹️‍♀️,⛹️,🤾‍♀️,🤾‍♂️,🏌️‍♀️,🏌️,🏄‍♀️,🏄,🏊‍♀️,🏊,🤽‍♀️,🤽‍♂️,🚣‍♀️,🚣,🏇,🚴‍♀️,🚴,🚵‍♀️,🚵,🎽,🏅,🎖,🥇,🥈,🥉,🏆,🏵,🎗,🎫,🎟,🎪,🤹‍♀️,🤹‍♂️,🎭,🎨,🎬,🎤,🎧,🎼,🎹,🥁,🎷,🎺,🎸,🎻,🎲,🎯,🎳,🎮,🎰"
-      }
-    },
-    {
-      "CVDataTitle" : "EmojiCategory-Places",
-      "CVCategoryImage" : "Emoji-PlacesImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "🚗,🚕,🚙,🚌,🚎,🏎,🚓,🚑,🚒,🚐,🚚,🚛,🚜,🛴,🚲,🛵,🏍,🚨,🚔,🚍,🚘,🚖,🚡,🚠,🚟,🚃,🚋,🚞,🚝,🚄,🚅,🚈,🚂,🚆,🚇,🚊,🚉,🚁,🛩,✈️,🛫,🛬,🚀,🛰,💺,🛶,⛵️,🛥,🚤,🛳,⛴,🚢,⚓️,🚧,⛽️,🚏,🚦,🚥,🗺,🗿,🗽,⛲️,🗼,🏰,🏯,🏟,🎡,🎢,🎠,⛱,🏖,🏝,⛰,🏔,🗻,🌋,🏜,🏕,⛺️,🛤,🛣,🏗,🏭,🏠,🏡,🏘,🏚,🏢,🏬,🏣,🏤,🏥,🏦,🏨,🏪,🏫,🏩,💒,🏛,⛪️,🕌,🕍,🕋,⛩,🗾,🎑,🏞,🌅,🌄,🌠,🎇,🎆,🌇,🌆,🏙,🌃,🌌,🌉,🌁"
-      }
-    },
-    {
-      "CVDataTitle" : "EmojiCategory-Objects",
-      "CVCategoryImage" : "Emoji-ObjectsImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "⌚️,📱,📲,💻,⌨️,🖥,🖨,🖱,🖲,🕹,🗜,💽,💾,💿,📀,📼,📷,📸,📹,🎥,📽,🎞,📞,☎️,📟,📠,📺,📻,🎙,🎚,🎛,⏱,⏲,⏰,🕰,⌛️,⏳,📡,🔋,🔌,💡,🔦,🕯,🗑,🛢,💸,💵,💴,💶,💷,💰,💳,💎,⚖️,🔧,🔨,⚒,🛠,⛏,🔩,⚙️,⛓,🔫,💣,🔪,🗡,⚔️,🛡,🚬,⚰️,⚱️,🏺,🔮,📿,💈,⚗️,🔭,🔬,🕳,💊,💉,🌡,🚽,🚰,🚿,🛁,🛀,🛎,🔑,🗝,🚪,🛋,🛏,🛌,🖼,🛍,🛒,🎁,🎈,🎏,🎀,🎊,🎉,🎎,🏮,🎐,✉️,📩,📨,📧,💌,📥,📤,📦,🏷,📪,📫,📬,📭,📮,📯,📜,📃,📄,📑,📊,📈,📉,🗒,🗓,📆,📅,📇,🗃,🗳,🗄,📋,📁,📂,🗂,🗞,📰,📓,📔,📒,📕,📗,📘,📙,📚,📖,🔖,🔗,📎,🖇,📐,📏,📌,📍,✂️,🖊,🖋,✒️,🖌,🖍,📝,✏️,🔍,🔎,🔏,🔐,🔒,🔓"
-      }
-    },
-    {
-      "CVDataTitle" : "EmojiCategory-Symbols",
-      "CVCategoryImage" : "Emoji-SymbolImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "❤️,💛,💚,💙,💜,🖤,💔,❣️,💕,💞,💓,💗,💖,💘,💝,💟,☮️,✝️,☪️,🕉,☸️,✡️,🔯,🕎,☯️,☦️,🛐,⛎,♈️,♉️,♊️,♋️,♌️,♍️,♎️,♏️,♐️,♑️,♒️,♓️,🆔,⚛️,🉑,☢️,☣️,📴,📳,🈶,🈚️,🈸,🈺,🈷️,✴️,🆚,💮,🉐,㊙️,㊗️,🈴,🈵,🈹,🈲,🅰️,🅱️,🆎,🆑,🅾️,🆘,❌,⭕️,🛑,⛔️,📛,🚫,💯,💢,♨️,🚷,🚯,🚳,🚱,🔞,📵,🚭,❗️,❕,❓,❔,‼️,⁉️,🔅,🔆,〽️,⚠️,🚸,🔱,⚜️,🔰,♻️,✅,🈯️,💹,❇️,✳️,❎,🌐,💠,Ⓜ️,🌀,💤,🏧,🚾,♿️,🅿️,🈳,🈂️,🛂,🛃,🛄,🛅,🚹,🚺,🚼,🚻,🚮,🎦,📶,🈁,🔣,ℹ️,🔤,🔡,🔠,🆖,🆗,🆙,🆒,🆕,🆓,0️⃣,1️⃣,2️⃣,3️⃣,4️⃣,5️⃣,6️⃣,7️⃣,8️⃣,9️⃣,🔟,🔢,#️⃣,*️⃣,▶️,⏸,⏯,⏹,⏺,⏭,⏮,⏩,⏪,⏫,⏬,◀️,🔼,🔽,➡️,⬅️,⬆️,⬇️,↗️,↘️,↙️,↖️,↕️,↔️,↪️,↩️,⤴️,⤵️,🔀,🔁,🔂,🔄,🔃,🎵,🎶,➕,➖,➗,✖️,💲,💱,™️,©️,®️,〰️,➰,➿,🔚,🔙,🔛,🔝,🔜,✔️,☑️,🔘,⚪️,⚫️,🔴,🔵,🔺,🔻,🔸,🔹,🔶,🔷,🔳,🔲,▪️,▫️,◾️,◽️,◼️,◻️,⬛️,⬜️,🔈,🔇,🔉,🔊,🔔,🔕,📣,📢,👁‍🗨,💬,💭,🗯,♠️,♣️,♥️,♦️,🃏,🎴,🀄️,🕐,🕑,🕒,🕓,🕔,🕕,🕖,🕗,🕘,🕙,🕚,🕛,🕜,🕝,🕞,🕟,🕠,🕡,🕢,🕣,🕤,🕥,🕦,🕧"
-      }
-    },
-    {
-      "CVDataTitle" : "EmojiCategory-Flags",
-      "CVCategoryImage" : "Emoji-FlagsImage",
-      "CVCategoryData" : {
-        "CVSkipNullGlyphs" : false,
-        "Data" : "🏳️,🏴,🏁,🚩,🏳️‍🌈,🇦🇫,🇦🇽,🇦🇱,🇩🇿,🇦🇸,🇦🇩,🇦🇴,🇦🇮,🇦🇶,🇦🇬,🇦🇷,🇦🇲,🇦🇼,🇦🇺,🇦🇹,🇦🇿,🇧🇸,🇧🇭,🇧🇩,🇧🇧,🇧🇾,🇧🇪,🇧🇿,🇧🇯,🇧🇲,🇧🇹,🇧🇴,🇧🇶,🇧🇦,🇧🇼,🇧🇷,🇮🇴,🇻🇬,🇧🇳,🇧🇬,🇧🇫,🇧🇮,🇨🇻,🇰🇭,🇨🇲,🇨🇦,🇮🇨,🇰🇾,🇨🇫,🇹🇩,🇨🇱,🇨🇳,🇨🇽,🇨🇨,🇨🇴,🇰🇲,🇨🇬,🇨🇩,🇨🇰,🇨🇷,🇨🇮,🇭🇷,🇨🇺,🇨🇼,🇨🇾,🇨🇿,🇩🇰,🇩🇯,🇩🇲,🇩🇴,🇪🇨,🇪🇬,🇸🇻,🇬🇶,🇪🇷,🇪🇪,🇪🇹,🇪🇺,🇫🇰,🇫🇴,🇫🇯,🇫🇮,🇫🇷,🇬🇫,🇵🇫,🇹🇫,🇬🇦,🇬🇲,🇬🇪,🇩🇪,🇬🇭,🇬🇮,🇬🇷,🇬🇱,🇬🇩,🇬🇵,🇬🇺,🇬🇹,🇬🇬,🇬🇳,🇬🇼,🇬🇾,🇭🇹,🇭🇳,🇭🇰,🇭🇺,🇮🇸,🇮🇳,🇮🇩,🇮🇷,🇮🇶,🇮🇪,🇮🇲,🇮🇱,🇮🇹,🇯🇲,🇯🇵,🎌,🇯🇪,🇯🇴,🇰🇿,🇰🇪,🇰🇮,🇽🇰,🇰🇼,🇰🇬,🇱🇦,🇱🇻,🇱🇧,🇱🇸,🇱🇷,🇱🇾,🇱🇮,🇱🇹,🇱🇺,🇲🇴,🇲🇰,🇲🇬,🇲🇼,🇲🇾,🇲🇻,🇲🇱,🇲🇹,🇲🇭,🇲🇶,🇲🇷,🇲🇺,🇾🇹,🇲🇽,🇫🇲,🇲🇩,🇲🇨,🇲🇳,🇲🇪,🇲🇸,🇲🇦,🇲🇿,🇲🇲,🇳🇦,🇳🇷,🇳🇵,🇳🇱,🇳🇨,🇳🇿,🇳🇮,🇳🇪,🇳🇬,🇳🇺,🇳🇫,🇲🇵,🇰🇵,🇳🇴,🇴🇲,🇵🇰,🇵🇼,🇵🇸,🇵🇦,🇵🇬,🇵🇾,🇵🇪,🇵🇭,🇵🇳,🇵🇱,🇵🇹,🇵🇷,🇶🇦,🇷🇪,🇷🇴,🇷🇺,🇷🇼,🇧🇱,🇸🇭,🇰🇳,🇱🇨,🇵🇲,🇻🇨,🇼🇸,🇸🇲,🇸🇹,🇸🇦,🇸🇳,🇷🇸,🇸🇨,🇸🇱,🇸🇬,🇸🇽,🇸🇰,🇸🇮,🇸🇧,🇸🇴,🇿🇦,🇬🇸,🇰🇷,🇸🇸,🇪🇸,🇱🇰,🇸🇩,🇸🇷,🇸🇿,🇸🇪,🇨🇭,🇸🇾,🇹🇼,🇹🇯,🇹🇿,🇹🇭,🇹🇱,🇹🇬,🇹🇰,🇹🇴,🇹🇹,🇹🇳,🇹🇷,🇹🇲,🇹🇨,🇹🇻,🇺🇬,🇺🇦,🇦🇪,🇬🇧,🇺🇸,🇻🇮,🇺🇾,🇺🇿,🇻🇺,🇻🇦,🇻🇪,🇻🇳,🇼🇫,🇪🇭,🇾🇪,🇿🇲,🇿🇼"
-      }
-    }
-  ],
-  "CVViewFontList" : [
-    "AppleColorEmoji"
-  ]
-}

db/aliases.applescript

@@ -1,13 +0,0 @@
-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

db/aliases.html

@@ -1,81 +0,0 @@
-<!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>

db/dump.rb

@@ -1,131 +1,60 @@
+# frozen_string_literal: true
+
+require "i18n"
 require 'emoji'
 require 'json'
-require 'rexml/document'
-
-class UnicodeCharacter
-  attr_reader :code, :description, :version, :aliases
-
-  class CharListener
-    CHAR_TAG = "char".freeze
-
-    def self.parse(io, &block)
-      REXML::Document.parse_stream(io, self.new(&block))
-    end
-
-    def initialize(&block)
-      @callback = block
-    end
-
-    def tag_start(name, attributes)
-      if CHAR_TAG == name
-        @callback.call(
-          attributes.fetch("cp") { return },
-          attributes.fetch("na") { return },
-          attributes.fetch("age", nil),
-        )
-      end
-    end
-
-    def method_missing(*) end
-  end
-
-  def self.index
-    return @index if defined? @index
-    @index = {}
-    File.open(File.expand_path('../ucd.nounihan.grouped.xml', __FILE__)) do |source|
-      CharListener.parse(source) do |char, desc, age|
-        uc = UnicodeCharacter.new(char, desc, age)
-        @index[uc.code] = uc
-      end
-    end
-    @index
-  end
-
-  def self.fetch(code)
-    code = code.to_s(16).rjust(4, '0') if code.is_a?(Integer)
-    self.index.fetch(code)
-  end
-
-  def initialize(code, description, version)
-    @code = code.downcase
-    @description = description.downcase
-    @version = version
-    @aliases = []
-    @references = []
-  end
-
-  def add_alias(string)
-    @aliases.concat string.split(/\s*,\s*/)
-  end
-
-  def add_reference(code)
-    @references << code.downcase
-  end
-end
-
-unless $stdin.tty?
-  codepoints = STDIN.read.chomp.codepoints.map { |code|
-    UnicodeCharacter.fetch(code)
-  }
-  codepoints.each do |char|
-    printf "%5s: %s", char.code.upcase, char.description
-    printf " (%s)", char.version if char.version
-    puts
-  end
-  exit
-end
-
-trap(:PIPE) { abort }
-
-normalize = -> (raw) {
-  raw.sub(Emoji::VARIATION_SELECTOR_16, '')
-}
-
-emojidesc = {}
-File.open(File.expand_path('../emoji-test.txt', __FILE__)) do |file|
-  file.each do |line|
-    next if line =~ /^(#|$)/
-    line = line.chomp.split('# ', 2)[1]
-    emoji, description = line.split(' ', 2)
-    emojidesc[normalize.(emoji)] = description
-  end
-end
+require_relative './emoji-test-parser'
 
+I18n.config.available_locales = :en
 items = []
 
-for category, emojis in Emoji.apple_palette
-  for raw in emojis
-    emoji = Emoji.find_by_unicode(raw)
-    unicode_version = emoji ? emoji.unicode_version : ''
-    ios_version = emoji ? emoji.ios_version : ''
+_, categories = EmojiTestParser.parse(File.expand_path("../../vendor/unicode-emoji-test.txt", __FILE__))
+seen_existing = {}
 
-    unless raw.include?(Emoji::ZERO_WIDTH_JOINER)
-      uchar = UnicodeCharacter.fetch(raw.codepoints[0])
-      unicode_version = uchar.version unless uchar.version.nil?
+for category in categories
+  for sub_category in category[:emoji]
+    for emoji_item in sub_category[:emoji]
+      raw = emoji_item[:sequences][0]
+      existing_emoji = Emoji.find_by_unicode(raw) || Emoji.find_by_unicode("#{raw}\u{fe0f}")
+      if seen_existing.key?(existing_emoji)
+        existing_emoji = nil
+      else
+        seen_existing[existing_emoji] = true
+      end
+      description = emoji_item[:description].sub(/^E\d+(\.\d+)? /, '')
+      output_item = {
+        emoji: raw,
+        description: description,
+        category: category[:name],
+      }
+      if existing_emoji
+        output_item.update(
+          aliases: existing_emoji.aliases,
+          tags: existing_emoji.tags,
+          unicode_version: existing_emoji.unicode_version,
+          ios_version: existing_emoji.ios_version,
+        )
+      else
+        output_item.update(
+          aliases: [I18n.transliterate(description).gsub(/\W+/, '_').downcase],
+          tags: [],
+          unicode_version: "15.0",
+          ios_version: "16.4",
+        )
+      end
+      output_item[:skin_tones] = true if emoji_item[:skin_tones]
+      items << output_item
     end
-
-    description = emojidesc.fetch(normalize.(raw))
-
-    if unicode_version == ''
-      warn "#{description} (#{raw}) doesn't have Unicode version"
-    end
-
-    if ios_version == ''
-      ios_version = '10.2'
-    end
-
-    items << {
-      emoji: raw,
-      description: description,
-      category: category,
-      aliases: emoji ? emoji.aliases : [description.gsub(/\W+/, '_').downcase],
-      tags: emoji ? emoji.tags : [],
-      unicode_version: unicode_version,
-      ios_version: ios_version,
-    }
   end
 end
 
+missing_emoji = Emoji.all.reject { |e| e.custom? || seen_existing.key?(e) }
+if missing_emoji.any?
+  $stderr.puts "Error: these `emoji.json` entries were not matched:"
+  $stderr.puts missing_emoji.map { |e| "%s (%s)" % [e.hex_inspect, e.name] }
+  exit 1
+end
+
 for emoji in Emoji.all.select(&:custom?)
   items << {
     aliases: emoji.aliases,
@@ -133,6 +62,8 @@ for emoji in Emoji.all.select(&:custom?)
   }
 end
 
+trap(:PIPE) { abort }
+
 puts JSON.pretty_generate(items)
   .gsub("\n\n", "\n")
   .gsub(/,\n( +)/) { "\n%s, " % $1[2..-1] }

db/emoji-test-parser.rb

@@ -0,0 +1,117 @@
+# frozen_string_literal: true
+
+module EmojiTestParser
+  VARIATION_SELECTOR_16 = "\u{fe0f}"
+  SKIN_TONES = [
+    "\u{1F3FB}", # light skin tone
+    "\u{1F3FC}", # medium-light skin tone
+    "\u{1F3FD}", # medium skin tone
+    "\u{1F3FE}", # medium-dark skin tone
+    "\u{1F3FF}", # dark skin tone
+  ]
+  SKIN_TONES_RE = /(#{SKIN_TONES.join("|")})/o
+  SKIP_TYPES = ["unqualified", "component"]
+
+  module_function
+
+  def parse(filename)
+    File.open(filename, "r:UTF-8") do |file|
+      parse_file(file)
+    end
+  end
+
+  def parse_file(io)
+    data = []
+    emoji_map = {}
+    category = nil
+    sub_category = nil
+
+    io.each do |line|
+      begin
+        if line.start_with?("# group: ")
+          _, group_name = line.split(":", 2)
+          category = {
+            name: group_name.strip,
+            emoji: [],
+          }
+          data << category
+          sub_category = nil
+        elsif line.start_with?("# subgroup: ")
+          _, group_name = line.split(":", 2)
+          sub_category = {
+            name: group_name.strip,
+            emoji: [],
+          }
+          category[:emoji] << sub_category
+        elsif line.start_with?("#") || line.strip.empty?
+          next
+        else
+          row, desc = line.split("#", 2)
+          desc = desc.strip.split(" ", 2)[1]
+          codepoints, qualification = row.split(";", 2)
+          next if SKIP_TYPES.include?(qualification.strip)
+          emoji_raw = codepoints.strip.split.map { |c| c.hex }.pack("U*")
+          emoji_normalized = emoji_raw
+            .gsub(VARIATION_SELECTOR_16, "")
+            .gsub(SKIN_TONES_RE, "")
+          emoji_item = emoji_map[emoji_normalized]
+          if SKIN_TONES.any? { |s| emoji_raw.include?(s) }
+            emoji_item[:skin_tones] = true if emoji_item
+            next
+          end
+          if emoji_item
+            emoji_item[:sequences] << emoji_raw
+          else
+            emoji_item = {
+              sequences: [emoji_raw],
+              description: desc,
+            }
+            emoji_map[emoji_normalized] = emoji_item
+            sub_category[:emoji] << emoji_item
+          end
+        end
+      rescue
+        warn "line: %p" % line
+        raise
+      end
+    end
+
+    [emoji_map, data]
+  end
+end
+
+if $0 == __FILE__
+  html_output = false
+  if ARGV[0] == "--html"
+    ARGV.shift
+    html_output = true
+  end
+
+  _, categories = EmojiTestParser.parse(File.expand_path("../../vendor/unicode-emoji-test.txt", __FILE__))
+
+  trap(:PIPE) { abort }
+
+  if html_output
+    puts "<!doctype html>"
+    puts "<meta charset=utf-8>"
+    for category in categories
+      puts "<h2>#{category[:name]}</h2>"
+      for sub_category in category[:emoji]
+        puts "<h3>#{sub_category[:name]}</h3>"
+        puts "<ol>"
+        for char in sub_category[:emoji]
+          puts "<li>"
+          for sequence in char[:sequences]
+            codepoints = sequence.unpack("U*").map { |c| c.to_s(16).upcase }.join(" ")
+            printf '<span class=emoji title="%s">%s</span> ', codepoints, sequence
+          end
+          puts "#{char[:description]}</li>"
+        end
+        puts "</ol>"
+      end
+    end
+  else
+    require "json"
+    puts JSON.pretty_generate(categories)
+  end
+end

db/index.html

@@ -66,7 +66,7 @@ li > span {
       if (emoji.emoji) els[0].textContent = emoji.emoji
       else {
         var img = document.createElement('img')
-        img.src = "../images/emoji/" + emoji.aliases[0] + ".png"
+        img.src = "../images/" + emoji.aliases[0] + ".png"
         els[0].appendChild(img)
       }
       els[1].textContent = emoji.description || ''

gemoji.gemspec

@@ -1,9 +1,8 @@
 Gem::Specification.new do |s|
   s.name    = "gemoji"
-  s.version = "3.0.0.rc2"
-  s.summary = "Emoji library"
-  s.description = "Character information and metadata for standard and custom emoji."
-  s.executables = ["gemoji"]
+  s.version = "4.1.0"
+  s.summary = "Unicode emoji library"
+  s.description = "Character information and metadata for Unicode emoji."
 
   s.required_ruby_version = '> 1.9'
 
@@ -14,9 +13,7 @@ Gem::Specification.new do |s|
 
   s.files = Dir[
     "README.md",
-    "bin/gemoji",
-    "images/*.png",
-    "db/Category-Emoji.json",
+    "LICENSE",
     "db/emoji.json",
     "lib/**/*.rb",
   ]

lib/emoji.rb

@@ -1,4 +1,6 @@
 # encoding: utf-8
+# frozen_string_literal: true
+
 require 'emoji/character'
 require 'json'
 
@@ -9,14 +11,6 @@ module Emoji
     File.expand_path('../../db/emoji.json', __FILE__)
   end
 
-  def apple_palette_file
-    File.expand_path('../../db/Category-Emoji.json', __FILE__)
-  end
-
-  def images_path
-    File.expand_path("../../images", __FILE__)
-  end
-
   def all
     return @all if defined? @all
     @all = []
@@ -24,17 +18,6 @@ module Emoji
     @all
   end
 
-  def apple_palette
-    return @apple_palette if defined? @apple_palette
-    data = File.open(apple_palette_file, 'r:UTF-8') { |f| JSON.parse(f.read) }
-    @apple_palette = data.fetch('EmojiDataArray').each_with_object({}) do |group, all|
-      title = group.fetch('CVDataTitle').split('-', 2)[1]
-      all[title] = group.fetch('CVCategoryData').fetch('Data').split(',').map do |raw|
-        TEXT_GLYPHS.include?(raw) ? raw + VARIATION_SELECTOR_16 : raw
-      end
-    end
-  end
-
   # Public: Initialize an Emoji::Character instance and yield it to the block.
   # The character is added to the `Emoji.all` set.
   def create(name)
@@ -68,50 +51,75 @@ module Emoji
 
   # Public: Find an emoji by its unicode character. Return nil if missing.
   def find_by_unicode(unicode)
-    unicodes_index[unicode]
+    unicodes_index[unicode] || unicodes_index[unicode.sub(SKIN_TONE_RE, "")]
   end
 
   private
     VARIATION_SELECTOR_16 = "\u{fe0f}".freeze
-    ZERO_WIDTH_JOINER = "\u{200d}".freeze
-    FEMALE_SYMBOL = "\u{2640}".freeze
-    MALE_SYMBOL = "\u{2642}".freeze
+    SKIN_TONE_RE = /[\u{1F3FB}-\u{1F3FF}]/
 
-    # Chars from Apple's palette which must have VARIATION_SELECTOR_16 to render:
-    TEXT_GLYPHS = ["🈷", "🈂", "🅰", "🅱", "🅾", "©", "®", "™", "〰"].freeze
+    # Characters which must have VARIATION_SELECTOR_16 to render as color emoji:
+    TEXT_GLYPHS = [
+      "\u{1f237}", # Japanese “monthly amount” button
+      "\u{1f202}", # Japanese “service charge” button
+      "\u{1f170}", # A button (blood type)
+      "\u{1f171}", # B button (blood type)
+      "\u{1f17e}", # O button (blood type)
+      "\u{00a9}",  # copyright
+      "\u{00ae}",  # registered
+      "\u{2122}",  # trade mark
+      "\u{3030}",  # wavy dash
+    ].freeze
+
+    private_constant :VARIATION_SELECTOR_16, :TEXT_GLYPHS, :SKIN_TONE_RE
 
     def parse_data_file
-      data = File.open(data_file, 'r:UTF-8') { |file| JSON.parse(file.read) }
-      data.each do |raw_emoji|
-        self.create(nil) do |emoji|
-          raw_emoji.fetch('aliases').each { |name| emoji.add_alias(name) }
-          if raw = raw_emoji['emoji']
-            unicodes = [raw, raw.sub(VARIATION_SELECTOR_16, '') + VARIATION_SELECTOR_16].uniq
-            unicodes.each { |uni| emoji.add_unicode_alias(uni) }
-          end
-          raw_emoji.fetch('tags').each { |tag| emoji.add_tag(tag) }
+      data = File.open(data_file, 'r:UTF-8') do |file|
+        JSON.parse(file.read, symbolize_names: true)
+      end
 
-          emoji.category = raw_emoji['category']
-          emoji.description = raw_emoji['description']
-          emoji.unicode_version = raw_emoji['unicode_version']
-          emoji.ios_version = raw_emoji['ios_version']
+      if "".respond_to?(:-@)
+        # Ruby >= 2.3 this is equivalent to .freeze
+        # Ruby >= 2.5 this will freeze and dedup
+        dedup = lambda { |str| -str }
+      else
+        dedup = lambda { |str| str.freeze }
+      end
+
+      append_unicode = lambda do |emoji, raw|
+        unless TEXT_GLYPHS.include?(raw) || emoji.unicode_aliases.include?(raw)
+          emoji.add_unicode_alias(dedup.call(raw))
         end
       end
 
-      # Add an explicit gendered variant to emoji that historically imply a gender
       data.each do |raw_emoji|
-        raw = raw_emoji['emoji']
-        next unless raw
-        no_gender = raw.sub(/(#{VARIATION_SELECTOR_16})?#{ZERO_WIDTH_JOINER}(#{FEMALE_SYMBOL}|#{MALE_SYMBOL})/, '')
-        next unless $2
-        emoji = find_by_unicode(no_gender)
-        next unless emoji
-        edit_emoji(emoji) do
-          emoji.add_unicode_alias(
-            $2 == FEMALE_SYMBOL ?
-              raw.sub(FEMALE_SYMBOL, MALE_SYMBOL) :
-              raw.sub(MALE_SYMBOL, FEMALE_SYMBOL)
-          )
+        self.create(nil) do |emoji|
+          raw_emoji.fetch(:aliases).each { |name| emoji.add_alias(dedup.call(name)) }
+          if raw = raw_emoji[:emoji]
+            append_unicode.call(emoji, raw)
+            start_pos = 0
+            while found_index = raw.index(VARIATION_SELECTOR_16, start_pos)
+              # register every variant where one VARIATION_SELECTOR_16 is removed
+              raw_alternate = raw.dup
+              raw_alternate[found_index] = ""
+              append_unicode.call(emoji, raw_alternate)
+              start_pos = found_index + 1
+            end
+            if start_pos > 0
+              # register a variant with all VARIATION_SELECTOR_16 removed
+              append_unicode.call(emoji, raw.gsub(VARIATION_SELECTOR_16, ""))
+            else
+              # register a variant where VARIATION_SELECTOR_16 is added
+              append_unicode.call(emoji, "#{raw}#{VARIATION_SELECTOR_16}")
+            end
+          end
+          raw_emoji.fetch(:tags).each { |tag| emoji.add_tag(dedup.call(tag)) }
+
+          emoji.category = dedup.call(raw_emoji[:category])
+          emoji.description = dedup.call(raw_emoji[:description])
+          emoji.unicode_version = dedup.call(raw_emoji[:unicode_version])
+          emoji.ios_version = dedup.call(raw_emoji[:ios_version])
+          emoji.skin_tones = raw_emoji.fetch(:skin_tones, false)
         end
       end
     end

lib/emoji/character.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Emoji
   class Character
     # Inspect individual Unicode characters in a string by dumping its
@@ -9,6 +11,11 @@ module Emoji
     # True if the emoji is not a standard Emoji character.
     def custom?() !raw end
 
+    # True if the emoji supports Fitzpatrick scale skin tone modifiers
+    def skin_tones?() @skin_tones end
+
+    attr_writer :skin_tones
+
     # A list of names uniquely referring to this emoji.
     attr_reader :aliases
 
@@ -36,6 +43,28 @@ module Emoji
     # Raw Unicode string for an emoji. Nil if emoji is non-standard.
     def raw() unicode_aliases.first end
 
+    # Raw Unicode strings for each skin tone variant of this emoji. The result is an empty array
+    # unless the emoji supports skin tones.
+    #
+    # Note: for emojis that depict multiple people (e.g. couples or families), this will not produce
+    # every possible permutation of skin tone per person.
+    def raw_skin_tone_variants
+      return [] if custom? || !skin_tones?
+      raw_normalized = raw.sub(VARIATION_SELECTOR_16, "")
+      idx = raw_normalized.index(ZERO_WIDTH_JOINER)
+      SKIN_TONES.map do |modifier|
+        if raw_normalized == PEOPLE_HOLDING_HANDS
+          # special case to apply the modifier to both persons
+          raw_normalized[0...idx] + modifier + raw_normalized[idx..nil] + modifier
+        elsif idx
+          # insert modifier before zero-width joiner
+          raw_normalized[0...idx] + modifier + raw_normalized[idx..nil]
+        else
+          raw_normalized + modifier
+        end
+      end
+    end
+
     def add_unicode_alias(str)
       unicode_aliases << str
     end
@@ -52,6 +81,7 @@ module Emoji
       @aliases = Array(name)
       @unicode_aliases = []
       @tags = []
+      @skin_tones = false
     end
 
     def inspect
@@ -75,6 +105,20 @@ module Emoji
 
     private
 
+    VARIATION_SELECTOR_16 = "\u{fe0f}".freeze
+    ZERO_WIDTH_JOINER = "\u{200d}".freeze
+    PEOPLE_HOLDING_HANDS = "\u{1f9d1}\u{200d}\u{1f91d}\u{200d}\u{1f9d1}".freeze
+
+    SKIN_TONES = [
+      "\u{1F3FB}", # light skin tone
+      "\u{1F3FC}", # medium-light skin tone
+      "\u{1F3FD}", # medium skin tone
+      "\u{1F3FE}", # medium-dark skin tone
+      "\u{1F3FF}", # dark skin tone
+    ]
+
+    private_constant :VARIATION_SELECTOR_16, :ZERO_WIDTH_JOINER, :PEOPLE_HOLDING_HANDS, :SKIN_TONES
+
     def default_image_filename
       if custom?
         '%s.png' % name

lib/emoji/cli.rb

@@ -1,47 +0,0 @@
-require 'emoji/extractor'
-require 'fileutils'
-
-module Emoji
-  module CLI
-    extend self
-
-    def dispatch(argv)
-      cmd = argv[0]
-      argv = argv[1..-1]
-
-      case cmd
-      when "extract"
-        public_send(cmd, argv)
-      when "help", "--help", "-h"
-        help
-      else
-        raise ArgumentError
-      end
-
-      return 0
-    rescue ArgumentError
-      $stderr.puts usage_text
-      return 1
-    end
-
-    def help
-      puts usage_text
-    end
-
-    def extract(argv)
-      path = argv.shift
-      raise ArgumentError if path.to_s.empty?
-
-      Emoji::Extractor.new(64, path).extract!
-      Dir["#{Emoji.images_path}/*.png"].each do |png|
-        FileUtils.cp(png, File.join(path, File.basename(png)))
-      end
-    end
-
-    def usage_text
-      <<EOF
-Usage: gemoji extract <path>
-EOF
-    end
-  end
-end

lib/emoji/extractor.rb

@@ -1,190 +0,0 @@
-require 'emoji'
-require 'fileutils'
-
-module Emoji
-  class Extractor
-    EMOJI_TTF = "/System/Library/Fonts/Apple Color Emoji.ttc"
-
-    attr_reader :size, :images_path
-
-    def initialize(size, images_path)
-      @size = size
-      @images_path = images_path
-    end
-
-    def each(&block)
-      return to_enum(__method__) unless block_given?
-
-      File.open(EMOJI_TTF, 'rb') do |file|
-        font_offsets = parse_ttc(file)
-        file.pos = font_offsets[0]
-
-        tables = parse_tables(file)
-        glyph_index = extract_glyph_index(file, tables)
-
-        each_glyph_bitmap(file, tables, glyph_index, &block)
-      end
-    end
-
-    def extract!
-      each do |glyph_name, type, binread|
-        if emoji = glyph_name_to_emoji(glyph_name)
-          image_filename = "#{images_path}/#{emoji.image_filename}"
-          FileUtils.mkdir_p(File.dirname(image_filename))
-          File.open(image_filename, 'wb') { |f| f.write binread.call }
-        end
-      end
-    end
-
-  private
-
-    GENDER_MAP = {
-      "M" => "\u{2642}",
-      "W" => "\u{2640}",
-    }
-
-    FAMILY_MAP = {
-      "B" => "\u{1f466}",
-      "G" => "\u{1f467}",
-      "M" => "\u{1f468}",
-      "W" => "\u{1f469}",
-    }.freeze
-
-    FAMILY = "1F46A"
-    COUPLE = "1F491"
-    KISS = "1F48F"
-
-    def glyph_name_to_emoji(glyph_name)
-      return if glyph_name =~ /\.[1-5]($|\.)/
-      zwj = Emoji::ZERO_WIDTH_JOINER
-      v16 = Emoji::VARIATION_SELECTOR_16
-
-      if glyph_name =~ /^u(#{FAMILY}|#{COUPLE}|#{KISS})\.([#{FAMILY_MAP.keys.join('')}]+)$/
-        if $1 == FAMILY ? $2 == "MWB" : $2 == "WM"
-          raw = [$1.hex].pack('U')
-        else
-          if $1 == COUPLE
-            middle = "#{zwj}\u{2764}#{v16}#{zwj}" # heavy black heart
-          elsif $1 == KISS
-            middle = "#{zwj}\u{2764}#{v16}#{zwj}\u{1F48B}#{zwj}" # heart + kiss mark
-          else
-            middle = zwj
-          end
-          raw = $2.split('').map { |c| FAMILY_MAP.fetch(c) }.join(middle)
-        end
-        candidates = [raw]
-      else
-        raw = glyph_name.gsub(/(^|_)u([0-9A-F]+)/) { ($1.empty?? $1 : zwj) + [$2.hex].pack('U') }
-        raw.sub!(/\.0\b/, '')
-        raw.sub!(/\.(#{GENDER_MAP.keys.join('|')})$/) { v16 + zwj + GENDER_MAP.fetch($1) }
-        candidates = [raw]
-        candidates << raw.sub(v16, '') if raw.include?(v16)
-        candidates << raw.gsub(zwj, '') if raw.include?(zwj)
-        candidates.dup.each { |c| candidates << (c + v16) }
-      end
-
-      candidates.map { |c| Emoji.find_by_unicode(c) }.compact.first
-    end
-
-    # https://www.microsoft.com/typography/otspec/otff.htm
-    def parse_ttc(io)
-      header_name = io.read(4).unpack('a*')[0]
-      raise unless "ttcf" == header_name
-      header_version, num_fonts = io.read(4*2).unpack('l>N')
-      # parse_version(header_version) #=> 2.0
-      io.read(4 * num_fonts).unpack('N*')
-    end
-
-    def parse_tables(io)
-      sfnt_version, num_tables = io.read(4 + 2*4).unpack('Nn')
-      # sfnt_version #=> 0x00010000
-      num_tables.times.each_with_object({}) do |_, tables|
-        tag, checksum, offset, length = io.read(4 + 4*3).unpack('a4N*')
-        tables[tag] = {
-          checksum: checksum,
-          offset: offset,
-          length: length,
-        }
-      end
-    end
-
-    GlyphIndex = Struct.new(:length, :name_index, :names) do
-      def name_for(glyph_id)
-        index = name_index[glyph_id]
-        names[index - 257]
-      end
-
-      def each(&block)
-        length.times(&block)
-      end
-
-      def each_with_name
-        each do |glyph_id|
-          yield glyph_id, name_for(glyph_id)
-        end
-      end
-    end
-
-    def extract_glyph_index(io, tables)
-      postscript_table = tables.fetch('post')
-      io.pos = postscript_table[:offset]
-      end_pos = io.pos + postscript_table[:length]
-
-      parse_version(io.read(32).unpack('l>')[0]) #=> 2.0
-      num_glyphs = io.read(2).unpack('n')[0]
-      glyph_name_index = io.read(2*num_glyphs).unpack('n*')
-
-      glyph_names = []
-      while io.pos < end_pos
-        length = io.read(1).unpack('C')[0]
-        glyph_names << io.read(length)
-      end
-
-      GlyphIndex.new(num_glyphs, glyph_name_index, glyph_names)
-    end
-
-    # https://developer.apple.com/fonts/TrueType-Reference-Manual/RM06/Chap6sbix.html
-    def each_glyph_bitmap(io, tables, glyph_index)
-      io.pos = sbix_offset = tables.fetch('sbix')[:offset]
-      strike = extract_sbix_strike(io, glyph_index.length, size)
-
-      glyph_index.each_with_name do |glyph_id, glyph_name|
-        glyph_offset = strike[:glyph_data_offset][glyph_id]
-        next_glyph_offset = strike[:glyph_data_offset][glyph_id + 1]
-
-        if glyph_offset && next_glyph_offset && glyph_offset < next_glyph_offset
-          io.pos = sbix_offset + strike[:offset] + glyph_offset
-          x, y, type = io.read(2*2 + 4).unpack('s2A4')
-          yield glyph_name, type, -> { io.read(next_glyph_offset - glyph_offset - 8) }
-        end
-      end
-    end
-
-    def extract_sbix_strike(io, num_glyphs, image_size)
-      sbix_offset = io.pos
-      version, flags, num_strikes = io.read(2*2 + 4).unpack('n2N')
-      strike_offsets = num_strikes.times.map { io.read(4).unpack('N')[0] }
-
-      strike_offsets.each do |strike_offset|
-        io.pos = sbix_offset + strike_offset
-        ppem, resolution = io.read(4*2).unpack('n2')
-        next unless ppem == size
-
-        data_offsets = io.read(4 * (num_glyphs+1)).unpack('N*')
-        return {
-          ppem: ppem,
-          resolution: resolution,
-          offset: strike_offset,
-          glyph_data_offset: data_offsets,
-        }
-      end
-      return nil
-    end
-
-    def parse_version(num)
-      major = num >> 16
-      minor = num & 0xFFFF
-      "#{major}.#{minor}"
-    end
-  end
-end

lib/gemoji.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'emoji'

script/regenerate

@@ -1,33 +0,0 @@
-#!/bin/bash
-# Usage: script/regenerate
-#
-# Note: only usable on OS X
-#
-# Combines `rake db:dump` and `db/aliases.html` filter to regenerate the
-# `db/emoji.json` file using only emoji that are guaranteed to not render as
-# ordinary characters on OS X.
-
-set -e
-
-case "$1" in
--h | --help )
-  sed -ne '/^#/!q;s/.\{1,2\}//;1d;p' < "$0"
-  exit 0
-  ;;
-esac
-
-if [ "$(uname -s)" != "Darwin" ]; then
-  echo "Error: this script must be run under Mac OS X." >&2
-  exit 1
-fi
-
-bundle exec rake db:dump > db/emoji2.json
-mv db/emoji2.json db/emoji.json
-
-open -g -a Safari db/aliases.html
-osascript db/aliases.applescript | sed '/^$/d' > db/emoji2.json
-mv db/emoji2.json db/emoji.json
-
-if git diff --exit-code --stat -- db/emoji.json; then
-  echo "Done. The file \`db/emoji.json\` remains unchanged."
-fi

test/emoji_test.rb

@@ -1,4 +1,5 @@
 require 'test_helper'
+require_relative '../db/emoji-test-parser'
 
 class EmojiTest < TestCase
   test "fetching all emoji" do
@@ -7,7 +8,7 @@ class EmojiTest < TestCase
   end
 
   test "unicodes set contains the unicodes" do
-    min_size = Emoji.all.reject(&:custom?).size
+    min_size = Emoji.all.size
     count = Emoji.all.map(&:unicode_aliases).flatten.size
     assert count > min_size, "there were too few unicode mappings: #{count}"
   end
@@ -21,7 +22,8 @@ class EmojiTest < TestCase
   end
 
   test "finding emoji by unicode" do
-    assert_equal "\u{1f604}", Emoji.find_by_unicode("\u{1f604}").raw
+    emoji = Emoji.find_by_unicode("\u{1f604}") # grinning face with smiling eyes
+    assert_equal "\u{1f604}", emoji.raw
   end
 
   test "finding nonexistent emoji by unicode returns nil" do
@@ -29,23 +31,13 @@ class EmojiTest < TestCase
   end
 
   test "unicode_aliases" do
-    emoji = Emoji.find_by_unicode("\u{2728}")
-    assert_equal ["\u{2728}", "\u{2728}\u{fe0f}"], emoji.unicode_aliases
-  end
-
-  test "unicode_aliases includes alternate position of VARIATION_SELECTOR_16" do
-    emoji = Emoji.find_by_unicode("\u{0031}\u{fe0f}\u{20e3}")
-    assert_equal ["\u{0031}\u{fe0f}\u{20e3}", "\u{0031}\u{20e3}\u{fe0f}"], emoji.unicode_aliases
+    emoji = Emoji.find_by_unicode("\u{2728}") # sparkles
+    assert_equal ["2728", "2728-fe0f"], emoji.unicode_aliases.map { |u| Emoji::Character.hex_inspect(u) }
   end
 
   test "unicode_aliases doesn't necessarily include form without VARIATION_SELECTOR_16" do
-    emoji = Emoji.find_by_unicode("\u{00a9}\u{fe0f}")
-    assert_equal ["\u{00a9}\u{fe0f}"], emoji.unicode_aliases
-  end
-
-  test "unicode_aliases for emoji that have gender variant include form with explicit gender" do
-    male_spy = Emoji.find_by_unicode("\u{1f575}\u{fe0f}")
-    assert_equal male_spy, Emoji.find_by_unicode("\u{1f575}\u{fe0f}\u{200d}\u{2642}\u{fe0f}")
+    emoji = Emoji.find_by_unicode("\u{00a9}\u{fe0f}") # copyright symbol
+    assert_equal ["00a9-fe0f"], emoji.unicode_aliases.map { |u| Emoji::Character.hex_inspect(u) }
   end
 
   test "emojis have tags" do
@@ -55,49 +47,97 @@ class EmojiTest < TestCase
     assert emoji.tags.include?('pleased')
   end
 
+  GENDER_EXCEPTIONS = [
+    "man_with_gua_pi_mao",
+    "woman_with_headscarf",
+    "isle_of_man",
+    "blonde_woman", # blond_haired_man
+    /^couple(kiss)?_/,
+    /^family_/,
+  ]
+
+  DASH_EXCEPTIONS = [
+    "-1",
+    "t-rex",
+    "e-mail",
+    "non-potable_water",
+  ]
+
   test "emojis have valid names" do
     aliases = Emoji.all.flat_map(&:aliases)
 
+    gender_mismatch = []
+    to_another_gender = lambda do |name|
+      case name
+      when *GENDER_EXCEPTIONS then name
+      else
+        name.sub(/(?<=^|_)(?:wo)?man(?=_|$)/) do |match|
+          match == "woman" ? "man" : "woman"
+        end
+      end
+    end
+
     invalid = []
     alias_count = Hash.new(0)
     aliases.each do |name|
       alias_count[name] += 1
-      invalid << name if name !~ /\A[\w+-]+\Z/
+      invalid << name if name !~ /\A[\w+]+\Z/ && !DASH_EXCEPTIONS.include?(name)
+      another_gender = to_another_gender.call(name)
+      gender_mismatch << another_gender unless aliases.include?(another_gender)
     end
 
     duplicates = alias_count.select { |_, count| count > 1 }.keys
 
     assert_equal [], invalid, "some emoji have invalid names"
     assert_equal [], duplicates, "some emoji aliases have duplicates"
+    assert_equal [], gender_mismatch, "missing gender variants"
   end
 
   test "missing or incorrect unicodes" do
-    source_unicode_emoji = Emoji.apple_palette.values.flatten
-    missing = source_unicode_emoji - Emoji.all.flat_map(&:unicode_aliases)
+    emoji_map, _ = EmojiTestParser.parse(File.expand_path("../../vendor/unicode-emoji-test.txt", __FILE__))
+    source_unicode_emoji = emoji_map.values
+    text_glyphs = Emoji.const_get(:TEXT_GLYPHS)
 
+    missing = 0
     message = "Missing or incorrect unicodes:\n"
-    missing.each do |raw|
-      message << "#{raw}  (#{Emoji::Character.hex_inspect(raw)})"
-      codepoint = raw.codepoints[0]
-      if candidate = Emoji.all.detect { |e| !e.custom? && e.raw.codepoints[0] == codepoint }
-        message << " - might be #{candidate.raw}  (#{candidate.hex_inspect}) named #{candidate.name}"
+    source_unicode_emoji.each do |emoji|
+      emoji[:sequences].each do |raw|
+        next if text_glyphs.include?(raw) || Emoji.find_by_unicode(raw)
+        message << "%s (%s)" % [Emoji::Character.hex_inspect(raw), emoji[:description]]
+        if found = Emoji.find_by_unicode(raw.gsub("\u{fe0f}", ""))
+          message << " - could be %s (:%s:)" % [found.hex_inspect, found.name]
+        end
+        message << "\n"
+        missing += 1
       end
-      message << "\n"
     end
 
-    assert_equal 0, missing.size, message
+    assert_equal 0, missing, message
   end
 
   test "emoji have category" do
-    missing = Emoji.all.select { |e| !e.custom? && e.category.to_s.empty? }
+    missing = Emoji.all.select { |e| e.category.to_s.empty? }
     assert_equal [], missing.map(&:name), "some emoji don't have a category"
 
     emoji = Emoji.find_by_alias('family_man_woman_girl')
-    assert_equal 'People', emoji.category
+    assert_equal 'People & Body', emoji.category
+
+    categories = Emoji.all.map(&:category).uniq.compact
+    assert_equal [
+      "Smileys & Emotion",
+      "People & Body",
+      "Animals & Nature",
+      "Food & Drink",
+      "Travel & Places",
+      "Activities",
+      "Objects",
+      "Symbols",
+      "Flags",
+    ], categories
   end
 
   test "emoji have description" do
-    missing = Emoji.all.select { |e| !e.custom? && e.description.to_s.empty? }
+    missing = Emoji.all.select { |e| e.description.to_s.empty? }
     assert_equal [], missing.map(&:name), "some emoji don't have a description"
 
     emoji = Emoji.find_by_alias('family_man_woman_girl')
@@ -110,27 +150,46 @@ class EmojiTest < TestCase
   end
 
   test "emoji have iOS version" do
-    missing = Emoji.all.select { |e| !e.custom? && e.ios_version.to_s.empty? }
+    missing = Emoji.all.select { |e| e.ios_version.to_s.empty? }
     assert_equal [], missing.map(&:name), "some emoji don't have an iOS version"
 
     emoji = Emoji.find_by_alias('family_man_woman_girl')
     assert_equal '8.3', emoji.ios_version
   end
 
-  test "custom emojis" do
-    custom = Emoji.all.select(&:custom?)
-    assert custom.size > 0
+  test "skin tones" do
+    smiley = Emoji.find_by_alias("smiley")
+    assert_equal false, smiley.skin_tones?
+    assert_equal [], smiley.raw_skin_tone_variants
 
-    custom.each do |emoji|
-      assert_nil emoji.raw
-      assert_equal [], emoji.unicode_aliases
-    end
+    wave = Emoji.find_by_alias("wave")
+    assert_equal true, wave.skin_tones?
+
+    wave = Emoji.find_by_unicode("\u{1f44b}\u{1f3ff}") # wave + dark skin tone
+    assert_equal "wave", wave.name
+
+    woman_with_beard = Emoji.find_by_unicode("\u{1f9d4}\u{200d}\u{2640}\u{fe0f}")
+    assert_equal [
+      "1f9d4-1f3fb-200d-2640",
+      "1f9d4-1f3fc-200d-2640",
+      "1f9d4-1f3fd-200d-2640",
+      "1f9d4-1f3fe-200d-2640",
+      "1f9d4-1f3ff-200d-2640",
+    ], woman_with_beard.raw_skin_tone_variants.map { |u| Emoji::Character.hex_inspect(u) }
+
+    people_holding_hands = Emoji.find_by_alias("people_holding_hands")
+    assert_equal [
+      "1f9d1-1f3fb-200d-1f91d-200d-1f9d1-1f3fb",
+      "1f9d1-1f3fc-200d-1f91d-200d-1f9d1-1f3fc",
+      "1f9d1-1f3fd-200d-1f91d-200d-1f9d1-1f3fd",
+      "1f9d1-1f3fe-200d-1f91d-200d-1f9d1-1f3fe",
+      "1f9d1-1f3ff-200d-1f91d-200d-1f9d1-1f3ff",
+    ], people_holding_hands.raw_skin_tone_variants.map { |u| Emoji::Character.hex_inspect(u) }
   end
 
-  test "custom emoji names" do
-    custom_names = Emoji.all.select(&:custom?).map(&:name)
-    assert custom_names.include?("shipit")
-    assert !custom_names.include?("+1")
+  test "no custom emojis" do
+    custom = Emoji.all.select(&:custom?)
+    assert 0, custom.size
   end
 
   test "create" do

test/integrity_test.rb

@@ -1,56 +0,0 @@
-require 'test_helper'
-require 'json'
-require 'digest/md5'
-
-unless images_extracted = File.directory?(File.join(Emoji.images_path, 'unicode'))
-  warn "Warning: skipping image integrity tests. Run \`rake images/unicode' on macOS to enable."
-end
-
-class IntegrityTest < TestCase
-  test "images on disk correlate 1-1 with emojis" do
-    images_on_disk = Dir["#{Emoji.images_path}/**/*.png"].map {|f| f.sub(Emoji.images_path, '') }
-    expected_images = Emoji.all.map { |emoji| '/%s' % emoji.image_filename }
-
-    missing_images = expected_images - images_on_disk
-    assert_equal 0, missing_images.size, "these images are missing on disk:\n  #{missing_images.join("\n  ")}\n"
-
-    extra_images = images_on_disk - expected_images
-    assert_equal 0, extra_images.size, "these images don't match any emojis:\n  #{extra_images.join("\n  ")}\n"
-  end
-
-  test "images on disk have no duplicates" do
-    hashes = Hash.new { |h,k| h[k] = [] }
-    Emoji.all.each do |emoji|
-      checksum = Digest::MD5.file(File.join(Emoji.images_path, emoji.image_filename)).to_s
-      hashes[checksum] << emoji
-    end
-
-    hashes.each do |checksum, emojis|
-      assert_equal 1, emojis.length,
-        "These images share the same checksum: " +
-        emojis.map(&:image_filename).join(', ')
-    end
-  end
-
-  test "images on disk are 64x64" do
-    mismatches = []
-    Dir["#{Emoji.images_path}/**/*.png"].each do |image_file|
-      width, height = png_dimensions(image_file)
-      unless width == 64 && height == 64
-        mismatches << "%s: %dx%d" % [
-          image_file.sub(Emoji.images_path, ''),
-          width,
-          height
-        ]
-      end
-    end
-    assert_equal ["/shipit.png: 75x75"], mismatches
-  end
-
-  private
-
-  def png_dimensions(file)
-    png = File.open(file, "rb") { |f| f.read(1024) }
-    png.unpack("x16N2")
-  end
-end if images_extracted