unicode-emoji 2.2.0 → 2.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 19509b0d69c0a7936f00d86c857e09ce901fe8fe054ae218ef9f9a3fbeb83d02
-  data.tar.gz: 47df3f9305acb0ddf24c7e6e53fb06bfa4cdc64e1b5c7d768522386719290b19
+  metadata.gz: 2fb3046ca8836aca666cb064f9adcab5bc4bc0a238c0442b269de0c055203c7b
+  data.tar.gz: 7fb3d7a6726cca61c400c7198f5b754a50cce8cb5dc5c7e74e037c7daea8e712
 SHA512:
-  metadata.gz: 414b87bb48ef0796bec0febe837107c0500ee59c909b4648f396f5c77a657e77a97840ce7aaef66b9ad64744a6d5d0e678132e3e70b5e89d624313c52909f533
-  data.tar.gz: d815de65334d9e52ea25754f921ad2a42aca585d1e1110e436886bf3568c2449fe3cd82b5dc4d2c763aeddc05cc37c40b1c6a455555185a68560cc5ee418ef98
+  metadata.gz: 6e89d3365011031037920d1a86e35316d54ea609f080c9e8625164c8782f85de1b14d2295858e3934e7baa6e1c27c8ccf8485ea0adf9632d34e8e8211d21b83a
+  data.tar.gz: 20f8dc2f79f3578510539ab5911beade994f22b666406a526ab90974c741db4bb11e710eac9c8fc4ae24a1a84061543f89af3f3bda1c4e94d131cc814a44832c

data/.travis.yml

@@ -2,16 +2,19 @@ sudo: false
 language: ruby
 
 rvm:
-- 2.6.1
-- 2.5.3
-- 2.4.5
-- 2.3.8
+- 2.7
+- 2.6
+- 2.5
+- 2.4
+- 2.3
 - ruby-head
-- jruby-head
-- jruby-9.2.6.0
+- jruby-9.2.11.1
+- truffleruby-20.2.0
 
 matrix:
   allow_failures:
-    - rvm: jruby-head
+    - rvm: 2.4
+    - rvm: 2.3
     - rvm: ruby-head
+    - rvm: truffleruby-20.2.0
 #   fast_finish: true

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 ## CHANGELOG
 
+### 2.6.0
+
+- Emoji 13.1
+
+### 2.5.0
+
+- Use native Emoji regex properties when current Ruby's Emoji support is the same as our current Emoji version
+- Update valid subdivisions to CLDR 37
+
+### 2.4.0
+
+- Emoji 13.0
+
+### 2.3.1
+
+- Fix index to actually include Emoji 12.1
+
+### 2.3.0
+
+- Emoji 12.1
+
 ### 2.2.0
 
 - Update subdivisions to CLDR 36

data/Gemfile

@@ -4,4 +4,4 @@ gemspec
 
 gem "minitest"
 gem "rake"
-gem "irb"
+gem "irb" unless RUBY_ENGINE == "jruby"

data/MIT-LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2019 Jan Lelis, mail@janlelis.de
+Copyright (c) 2017-2020 Jan Lelis, https://janlelis.com
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -1,14 +1,16 @@
 # Unicode::Emoji [![[version]](https://badge.fury.io/rb/unicode-emoji.svg)](https://badge.fury.io/rb/unicode-emoji)  [![[travis]](https://travis-ci.org/janlelis/unicode-emoji.svg)](https://travis-ci.org/janlelis/unicode-emoji)
 
-A small Ruby library which provides Unicode Emoji data and regexes.
+Provides Unicode Emoji data and regexes, incorporating the latest Unicode and Emoji standards.
 
 Also includes a categorized list of recommended Emoji.
 
-Emoji version: **12.0** (February 2019)
+Emoji version: **13.1** (September 2020)
 
-CLDR version (used for sub-region flags): **36** (October 2019)
+CLDR version (used for sub-region flags): **37** (April 2020)
 
-Supported Rubies: **2.6**, **2.5**, **2.4**, **2.3**
+Supported Rubies: **2.7**, **2.6**, **2.5**
+
+No longer supported Rubies, but might still work: **2.4**, **2.3**
 
 If you are stuck on an older Ruby version, checkout the latest [0.9 version](https://rubygems.org/gems/unicode-emoji/versions/0.9.3) of this gem.
 
@@ -114,22 +116,22 @@ Use `Unicode::Emoji::LIST` or the list method to get a grouped (and ordered) lis
 
 ```ruby
 Unicode::Emoji.list.keys
-# => ["Smileys & People", "Animals & Nature", "Food & Drink", "Travel & Places", "Activities", "Objects", "Symbols", "Flags"]
+# => ["Smileys & Emotion", "People & Body", "Component", "Animals & Nature", "Food & Drink", "Travel & Places", "Activities", "Objects", "Symbols", "Flags"]
 
 Unicode::Emoji.list("Food & Drink").keys
-# => ["food-fruit", "food-vegetable", "food-prepared", "food-asian", "food-sweet", "drink", "dishware"]
+# => ["food-fruit", "food-vegetable", "food-prepared", "food-asian", "food-marine", "food-sweet", "drink", "dishware"]
 
 Unicode::Emoji.list("Food & Drink", "food-asian")
-=> ["🍱", "🍘", "🍙", "🍚", "🍛", "🍜", "🍝", "🍠", "🍢", "🍣", "🍤", "🍥", "🍡", "\u{1F95F}", "\u{1F960}", "\u{1F961}"]
+=> ["🍱", "🍘", "🍙", "🍚", "🍛", "🍜", "🍝", "🍠", "🍢", "🍣", "🍤", "🍥", "🥮", "🍡", "🥟", "🥠", "🥡"]
 ```
 
-Please note that categories might change with future versions of the Emoji standard. This gem will issue warnings when attemting to retrieve old categories using the `#list` method.
+Please note that categories might change with future versions of the Emoji standard. This gem will issue warnings when attempting to retrieve old categories using the `#list` method.
 
 A list of all Emoji can be found at [character.construction](https://character.construction).
 
 ### Properties
 
-Allows you to access the codepoint data form Unicode's [emoji-data.txt](http://unicode.org/Public/emoji/11.0/emoji-data.txt) file:
+Allows you to access the codepoint data form Unicode's [emoji-data.txt](https://www.unicode.org/Public/13.0.0/ucd/emoji/emoji-data.txt) file:
 
 ```ruby
 require "unicode/emoji"
@@ -139,13 +141,12 @@ Unicode::Emoji.properties "☝" # => ["Emoji", "Emoji_Modifier_Base"]
 
 ## Also See
 
-- [Unicode® Technical Standard #51](http://www.unicode.org/reports/tr51/proposed.html)
-- [Emoji data](http://unicode.org/Public/emoji/11.0/)
-- [Emoji categories](http://unicode.org/emoji/charts/emoji-ordering.html)
+- [Unicode® Technical Standard #51](https://www.unicode.org/reports/tr51/proposed.html)
+- [Emoji categories](https://unicode.org/emoji/charts/emoji-ordering.html)
 - Ruby gem which displays [Emoji sequence names](https://github.com/janlelis/unicode-sequence_name)
 - Part of [unicode-x](https://github.com/janlelis/unicode-x)
 
 ## MIT
 
-- Copyright (C) 2017-2019 Jan Lelis <http://janlelis.com>. Released under the MIT license.
-- Unicode data: http://www.unicode.org/copyright.html#Exhibit1
+- Copyright (C) 2017-2020 Jan Lelis <https://janlelis.com>. Released under the MIT license.
+- Unicode data: https://www.unicode.org/copyright.html#Exhibit1

data/lib/unicode/emoji.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "unicode/version"
+
 require_relative "emoji/constants"
 require_relative "emoji/index"
 
@@ -41,14 +43,13 @@ module Unicode
     LIST                          = INDEX[:LIST].freeze.each_value(&:freeze)
     LIST_REMOVED_KEYS             = [
       "Smileys & People",
-      "Component",
     ]
 
     pack = ->(ord){ Regexp.escape(Array(ord).pack("U*")) }
     join = -> (*strings){ "(?:" + strings.join("|") + ")" }
     pack_and_join = ->(ords){  join[*ords.map{ |ord| pack[ord] }] }
 
-    if ENABLE_NATIVE_EMOJI_UNICODE_PROPERTIES
+    if EMOJI_VERSION == Unicode::Version.emoji_version
       emoji_character     = "\\p{Emoji}"
       emoji_modifier      = "\\p{Emoji Modifier}"
       emoji_modifier_base = "\\p{Emoji Modifier Base}"

data/lib/unicode/emoji/constants.rb

@@ -2,13 +2,11 @@
 
 module Unicode
   module Emoji
-    VERSION = "2.2.0"
-    EMOJI_VERSION = "12.0"
-    CLDR_VERSION = "36"
+    VERSION = "2.6.0"
+    EMOJI_VERSION = "13.1"
+    CLDR_VERSION = "37"
     DATA_DIRECTORY = File.expand_path(File.dirname(__FILE__) + "/../../../data/").freeze
     INDEX_FILENAME = (DATA_DIRECTORY + "/emoji.marshal.gz").freeze
-
-    ENABLE_NATIVE_EMOJI_UNICODE_PROPERTIES = false # As of Ruby 2.6.1, Emoji version 11 is included
   end
 end
 

data/spec/unicode_emoji_spec.rb

@@ -88,6 +88,21 @@ describe Unicode::Emoji do
       "🤠‍🤢 vomiting cowboy" =~ Unicode::Emoji::REGEX
       assert_equal "🤠", $&
     end
+
+    it "matches 12.1 emoji" do
+      "🧑‍🦱 person: curly hair" =~ Unicode::Emoji::REGEX
+      assert_equal "🧑‍🦱", $&
+    end
+
+    it "matches 13.0 emoji" do
+      "👨‍🍼 man feeding baby" =~ Unicode::Emoji::REGEX
+      assert_equal "👨‍🍼", $&
+    end
+
+    it "matches 13.1 emoji" do
+      "❤️‍🔥 heart on fire" =~ Unicode::Emoji::REGEX
+      assert_equal "❤️‍🔥", $&
+    end
   end
 
   describe "REGEX_VALID" do

data/unicode-emoji.gemspec

@@ -6,9 +6,9 @@ Gem::Specification.new do |gem|
   gem.name          = "unicode-emoji"
   gem.version       = Unicode::Emoji::VERSION
   gem.summary       = "Retrieve Emoji data about Unicode codepoints."
-  gem.description   = "[Emoji #{Unicode::Emoji::EMOJI_VERSION}] Retrieve emoji data about Unicode codepoints. Also contains a regex to match emoji."
+  gem.description   = "[Emoji #{Unicode::Emoji::EMOJI_VERSION}] A small Ruby library which provides Unicode Emoji data and regexes, incorporating the latest Unicode and Emoji standards. Includes a categorized list of recommended Emoji."
   gem.authors       = ["Jan Lelis"]
-  gem.email         = ["mail@janlelis.de"]
+  gem.email         = ["hi@ruby.consulting"]
   gem.homepage      = "https://github.com/janlelis/unicode-emoji"
   gem.license       = "MIT"
 
@@ -18,4 +18,6 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.required_ruby_version = "~> 2.3"
+
+  gem.add_dependency "unicode-version", "~> 1.0"
 end

metadata

@@ -1,19 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: unicode-emoji
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.6.0
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-06 00:00:00.000000000 Z
-dependencies: []
-description: "[Emoji 12.0] Retrieve emoji data about Unicode codepoints. Also contains
-  a regex to match emoji."
+date: 2020-09-21 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: unicode-version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+description: "[Emoji 13.1] A small Ruby library which provides Unicode Emoji data
+  and regexes, incorporating the latest Unicode and Emoji standards. Includes a categorized
+  list of recommended Emoji."
 email:
-- mail@janlelis.de
+- hi@ruby.consulting
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -52,7 +67,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Retrieve Emoji data about Unicode codepoints.