gemoji 3.0.0.rc2

Merge branch 'ios-10.2'
Update integrity test
2016-12-20 17:36:21 +01:00 · 2016-12-20 17:34:49 +01:00 · 2016-12-20 17:34:00 +01:00 · 2016-12-20 17:34:00 +01:00 · 2016-12-20 17:34:00 +01:00 · 2016-12-20 17:34:00 +01:00
11 changed files with 3283 additions and 1838 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,8 @@
 !/bin/gemoji
 .bundle
 .ruby-version
-db/NamesList.txt
+Gemfile.lock
+db/emoji-test.txt
+db/ucd.nounihan.grouped.xml
 images/unicode/*.png
 vendor/
--- a/4
+++ b/4
@@ -1,6 +1,6 @@
 source "https://rubygems.org"

-gem "rake"
-gem "minitest"
+gem "rake", "~> 10.3.2"
+gem "minitest", "~> 5.3.5"

 gemspec
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,21 +0,0 @@
-PATH
-  remote: .
-  specs:
-    gemoji (2.1.0)
-
-GEM
-  remote: https://rubygems.org/
-  specs:
-    minitest (5.3.5)
-    rake (10.3.2)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  gemoji!
-  minitest
-  rake
-
-BUNDLED WITH
-   1.11.2
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ 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 Seirra or later**:
+emoji, run the `gemoji extract` command **on macOS Sierra or later**:

 ``` sh
 bundle exec gemoji extract public/images/emoji
--- a/25
+++ b/25
@@ -9,7 +9,11 @@ end

 namespace :db do
  desc %(Generate Emoji data files needed for development)
-  task :generate => ['db/Category-Emoji.json', 'db/NamesList.txt']
+  task :generate => [
+    'db/Category-Emoji.json',
+    'db/ucd.nounihan.grouped.xml',
+    'db/emoji-test.txt',
+  ]

  desc %(Dump a list of supported Emoji with Unicode descriptions and aliases)
  task :dump => :generate do
@@ -17,15 +21,22 @@ namespace :db do
  end
 end

-emoji_plist = '/System/Library/Input Methods/CharacterPalette.app/Contents/Resources/Category-Emoji.plist'
-nameslist_url = 'http://www.unicode.org/Public/6.3.0/ucd/NamesList.txt'
-
 task 'db/Category-Emoji.json' do |t|
-  system "plutil -convert json -r '#{emoji_plist}' -o '#{t.name}'"
+  system 'plutil', '-convert', 'json', '-r',
+    '/System/Library/Input Methods/CharacterPalette.app/Contents/Resources/Category-Emoji.plist',
+    '-o', t.name
 end

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

 class UnicodeCharacter
-  attr_reader :code, :description, :aliases
+  attr_reader :code, :description, :version, :aliases

-  @index = {}
-  class << self
-    attr_reader :index
+  class CharListener
+    CHAR_TAG = "char".freeze

-    def fetch(code, *args, &block)
-      code = code.to_s(16).rjust(4, '0') if code.is_a?(Integer)
-      index.fetch(code, *args, &block)
+    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 initialize(code, description)
+  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 = []
-
-    self.class.index[@code] = self
  end

  def add_alias(string)
@@ -34,39 +63,74 @@ class UnicodeCharacter
  end
 end

-char = nil
-
-File.foreach(names_list) do |line|
-  case line
-  when /^[A-F0-9]{4,5}\t/
-    code, desc = line.chomp.split("\t", 2)
-    codepoint = code.hex
-    char = UnicodeCharacter.new(code, desc)
-  when /^\t= /
-    char.add_alias($')
-  when /^\tx .+ - ([A-F0-9]{4,5})\)$/
-    char.add_reference($1)
+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 }

-items = []
-variation_codepoint = Emoji::VARIATION_SELECTOR_16.codepoints[0]
+normalize = -> (raw) {
+  raw.sub(Emoji::VARIATION_SELECTOR_16, '')
+}

-for emoji in Emoji.all
-  item = {}
-
-  unless emoji.custom?
-    chars = emoji.raw.codepoints.map { |code| UnicodeCharacter.fetch(code) unless code == variation_codepoint }.compact
-    item[:emoji] = emoji.raw
-    item[:description] = chars.map(&:description).join(' + ')
+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

-  item[:aliases] = emoji.aliases
-  item[:tags] = emoji.tags
+items = []

-  items << item
+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 : ''
+
+    unless raw.include?(Emoji::ZERO_WIDTH_JOINER)
+      uchar = UnicodeCharacter.fetch(raw.codepoints[0])
+      unicode_version = uchar.version unless uchar.version.nil?
+    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
+
+for emoji in Emoji.all.select(&:custom?)
+  items << {
+    aliases: emoji.aliases,
+    tags: emoji.tags,
+  }
 end

 puts JSON.pretty_generate(items)
--- a/db/emoji.json
+++ b/db/emoji.json
--- a/gemoji.gemspec
+++ b/gemoji.gemspec
@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
  s.name    = "gemoji"
-  s.version = "3.0.0.rc1"
+  s.version = "3.0.0.rc2"
  s.summary = "Emoji library"
  s.description = "Character information and metadata for standard and custom emoji."
  s.executables = ["gemoji"]
--- a/lib/emoji.rb
+++ b/lib/emoji.rb
@@ -104,7 +104,9 @@ module Emoji
        next unless raw
        no_gender = raw.sub(/(#{VARIATION_SELECTOR_16})?#{ZERO_WIDTH_JOINER}(#{FEMALE_SYMBOL}|#{MALE_SYMBOL})/, '')
        next unless $2
-        edit_emoji(find_by_unicode(no_gender)) do |emoji|
+        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) :
@@ -124,3 +126,6 @@ module Emoji
      @unicodes_index
    end
 end
+
+# Preload emoji into memory
+Emoji.all
--- a/test/integrity_test.rb
+++ b/test/integrity_test.rb
@@ -26,9 +26,7 @@ class IntegrityTest < TestCase
    end

    hashes.each do |checksum, emojis|
-      # Apple uses the same image for "black_medium_square" and "black_large_square":
-      expected_length = ("black_medium_square" == emojis[0].name) ? 2 : 1
-      assert_equal expected_length, emojis.length,
+      assert_equal 1, emojis.length,
        "These images share the same checksum: " +
        emojis.map(&:image_filename).join(', ')
    end
Author	SHA1	Message	Date
Mislav Marohnić	09f66fc38a	gemoji 3.0.0.rc2	2016-12-20 17:36:21 +01:00
Mislav Marohnić	342b76f06e	Merge branch 'ios-10.2'	2016-12-20 17:34:49 +01:00
Mislav Marohnić	6b556ba8b2	Update integrity test These images are finally no longer identical.	2016-12-20 17:34:00 +01:00
Mislav Marohnić	74a321c07a	Fix filling in emoji that historically had default gender Now in iOS 10.2 there are gendered emoji that don't have a default genderless unicode variant.	2016-12-20 17:34:00 +01:00
Mislav Marohnić	7e10d1a38a	Change egg in a pan to "fried_egg" since "egg" is now an emoji	2016-12-20 17:34:00 +01:00
Mislav Marohnić	8ff20db97f	Add new iOS 10.2 emoji	2016-12-20 17:34:00 +01:00
Mislav Marohnić	492e18f849	Reorder existing emoji according to iOS 10.2 palette	2016-12-20 17:34:00 +01:00
Mislav Marohnić	cf852befd9	Improve dump script for new emoji	2016-12-20 17:33:52 +01:00
Mislav Marohnić	9d313238bd	Remove Gemfile.lock from version control I don't like that Bundler now makes Gemfile.lock change whenever I bump up gemoji version. There aren't many dependencies, so a missing Gemfile.lock won't slow down CI too much.	2016-12-20 15:15:28 +01:00
Alexander Kotov	840655ad6b	Fix NoMethodError in multithreading Fixes #109, closes #111	2016-12-20 15:13:35 +01:00
Mislav Marohnić	f394c85d80	Fix Gemfile.lock	2016-09-30 13:18:43 -04:00
Mislav Marohnić	42a606c804	Merge pull request #99 from mikeastock/fix-sierra-typo Fix typo in README of Sierra	2016-09-30 08:17:27 -09:00
Michael Stock	21c4cfe247	Fix typo in README of Sierra	2016-09-29 23:14:17 -07:00