emoji-datasource 7.0.2 → 14.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff37e9f02831eb01ad39be6947d601f844e228e36ff66f772f0549e661213ce
-  data.tar.gz: 7a5cbe593ea2e618b2d0755df9a11fe22f764af8267496711ed980cb7ce1825e
+  metadata.gz: b821544f15170c9489e0ce8938978549829e3c925d3ec6444dfacb7c125b94ca
+  data.tar.gz: bf4e9c21d3c5ea9de80132de4aa56bfec68c705aba979863151d650facc73f77
 SHA512:
-  metadata.gz: 7cfa33ddb0a3472bc47db53279c7aa4a83c7ede61897a556cdb28c115852f3b40e2d11c1444ae1ae4ac98b6815785c131615e3fe7ba1cd530f1f7fb6c9f8d463
-  data.tar.gz: f6bde81f5d4d6825590d15cc2cf4a0330424a1e482d7cddc4c8cbcb77ee3f3eb6e8459ba80abb998e58766ae04ea9d52fb5c01fd090d85e0a63b2e6431cd42e5
+  metadata.gz: 03d5041a86c4d7bccde94965634abffd3194c7cc3dcfa70e1de6f573ea1b6d444c6382cc0275b88165597247dd1e97f1ced2050ca671c51183fcb62412a8dcea
+  data.tar.gz: 994db50c5e4221bf51ed491d108d0b3fb48dea1fae2837d3129d39586d8eb7d080e0423bec5aac775eba4ffc0360299bd20cb64b607f4333c0b9f36a6b2805f2

data/.github/workflows/main.yml

@@ -7,37 +7,38 @@ jobs:
     name: Test
     strategy:
       matrix:
-        ruby: [2.5, 2.6, 2.7, 3.0, head]
+        ruby: [2.6, 2.7, '3.0', 3.1, head]
 
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v3
+
     - name: Set up Ruby ${{ matrix.ruby }}
       uses: ruby/setup-ruby@v1
       with:
         ruby-version: ${{ matrix.ruby }}
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        bundler-cache: true
+
     - name: RSpec
       run: |
         bundle exec rspec
+
   rubocop:
     name: RuboCop
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+    - name: Checkout
+      uses: actions/checkout@v3
+
     - name: Set up Ruby
       uses: ruby/setup-ruby@v1
       with:
-        ruby-version: 2.7
-    - name: Install dependencies
-      run: |
-        gem install bundler
-        bundle install --jobs 4 --retry 3
+        ruby-version: 3.1
+        bundler-cache: true
+
     - name: RuboCop
       run: |
         bundle exec rubocop

data/.gitignore

@@ -6,6 +6,7 @@
 /pkg/
 /spec/reports/
 /tmp/
+/Gemfile.lock
 
 node_modules
 

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.5
+  TargetRubyVersion: 2.6
   NewCops: enable
   SuggestExtensions: false
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2021 Justas Palumickas
+Copyright (c) 2023 Justas Palumickas
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README.md

@@ -22,6 +22,21 @@ Find emoji by short name
 
 ```ruby
 EmojiDatasource.find_by_short_name('+1')
+#=> EmojiDatasource::Emoji: :+1: (👍)
+```
+
+Find emoji by raw string:
+
+```ruby
+EmojiDatasource.find_by_char('👍🏾')
+#=> EmojiDatasource::Emoji: :+1::skin-tone-5: (👍🏾)
+```
+
+Find emoji by unicode hex character code:
+
+```ruby
+EmojiDatasource.find_by_unified("1F469-200D-2764-FE0F-200D-1F468")
+#=> EmojiDatasource::Emoji: :woman-heart-man: (👩‍❤️‍👨)
 ```
 
 Convert emoji short name to character
@@ -33,19 +48,27 @@ EmojiDatasource.short_name_to_char('+1') # => 👍
 this also supports skin variations
 
 ```ruby
-EmojiDatasource.short_name_to_char('+1::skin-tone-2') # => 👍
+EmojiDatasource.short_name_to_char('+1::skin-tone-2') # => 👍🏻
 ```
 
+Get base emoji for skin variation:
+
+```ruby
+emoji = EmojiDatasource.find_by_short_name(':+1::skin-tone-5:')
+#=> EmojiDatasource::Emoji: :+1::skin-tone-5: (👍🏾)
+emoji.base
+#=> EmojiDatasource::Emoji: :+1: (👍)
+```
 
 ## Supported Ruby Versions
 
 This library aims to support and is [tested against][github_actions] the following Ruby
 implementations:
 
-* Ruby 2.5.0
 * Ruby 2.6.0
 * Ruby 2.7.0
 * Ruby 3.0.0
+* Ruby 3.1.0
 
 ## License
 

data/emoji-datasource.gemspec

@@ -13,12 +13,13 @@ Gem::Specification.new do |spec|
                        '(https://github.com/iamcal/emoji-data) npm package'
   spec.homepage      = 'http://github.com/jpalumickas/emoji-datasource-ruby'
   spec.license       = 'MIT'
-  spec.required_ruby_version = Gem::Requirement.new('>= 2.5.0')
+  spec.required_ruby_version = Gem::Requirement.new('>= 2.6.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = 'https://github.com/jpalumickas/emoji-datasource-ruby'
   spec.metadata['changelog_uri'] = 'https://github.com/jpalumickas/emoji-datasource-ruby/releases'
   spec.metadata['bug_tracker_uri'] = 'https://github.com/jpalumickas/emoji-datasource-ruby/issues'
+  spec.metadata['rubygems_mfa_required'] = 'true'
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
@@ -33,7 +34,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'pry', '~> 0.14'
   spec.add_development_dependency 'rake', '~> 13.0'
-  spec.add_development_dependency 'rspec', '~> 3.10'
-  spec.add_development_dependency 'rubocop', '~> 1.16'
-  spec.add_development_dependency 'simplecov', '~> 0.21'
+  spec.add_development_dependency 'rspec', '~> 3.12'
+  spec.add_development_dependency 'rubocop', '~> 1.45'
+  spec.add_development_dependency 'simplecov', '~> 0.22'
 end

data/lib/emoji_datasource/emoji.rb

@@ -2,38 +2,75 @@
 
 module EmojiDatasource
   class Emoji
-    attr_reader :data
+    attr_reader :data, :unified
 
-    def initialize(data)
+    def initialize(data, variation: nil)
       @data = data
+      @variation = variation
+      @unified = variation ? @data.dig('skin_variations', variation, 'unified') : @data['unified']
     end
 
+    # Raw emoji string
     def to_char
-      EmojiDatasource.unified_to_char(data[:unified])
+      EmojiDatasource.unified_to_char(unified)
     end
 
-    def skin_variations
-      return unless @data[:skin_variations]
+    # Official emoji name (pretty long)
+    def name
+      return @data['name'] unless @variation
 
-      @data[:skin_variations].transform_keys(&:to_s)
+      "#{@data['name']} (#{variation_emojis.map(&:name).join(', ')})"
+    end
+
+    # Short code that often can be used to find emoji in pickers and chat apps
+    def short_name
+      return @data['short_name'] unless @variation
+
+      "#{@data['short_name']}::#{variation_emojis.map(&:short_name).join('::')}"
+    end
+
+    # All known short names (base +short_name+ and maybe some aliases)
+    def short_names
+      return @data['short_names'] unless @variation
+
+      @data['short_names'].map do |short_name|
+        "#{short_name}::#{variation_emojis.map(&:short_name).join('::')}"
+      end
+    end
+
+    # All known skin tone variations
+    def variations
+      return @variations = [] if @variation
+
+      @variations ||= @data.fetch('skin_variations', {}).each_key.map do |key|
+        self.class.new(data, variation: key)
+      end
+    end
+
+    # Base emoji, without variations applied.
+    # E.g. for `:+1::skin-tone-2:` base will be just `:+1:`
+    def base
+      return self unless @variation
+
+      EmojiDatasource.find_by_unified(@data['unified'])
     end
 
     def method_missing(method_name, *arguments, &block)
-      if @data.key?(method_name)
-        @data[method_name]
+      if @data.key?(method_name.to_s)
+        @data[method_name.to_s]
       else
         super
       end
     end
 
     def respond_to_missing?(method_name, include_private = false)
-      return true if @data.key?(method_name)
+      return true if @data.key?(method_name.to_s)
 
       super
     end
 
     def inspect
-      "#{self.class.name}:#{short_name}"
+      "#{self.class.name}: :#{short_name}: (#{to_char})"
     end
 
     def to_s
@@ -47,5 +84,15 @@ module EmojiDatasource
     def to_json(**args)
       @data.to_json(**args)
     end
+
+    private
+
+    def variation_emojis
+      return [] unless @variation
+
+      @variation.split('-').map do |unified|
+        EmojiDatasource.find_by_unified(unified)
+      end
+    end
   end
 end

data/lib/emoji_datasource/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module EmojiDatasource
-  VERSION = '7.0.2'
+  VERSION = '14.0.1'
 end

data/lib/emoji_datasource.rb

@@ -4,23 +4,50 @@ require 'json'
 
 require_relative 'emoji_datasource/version'
 require_relative 'emoji_datasource/emoji'
-require_relative 'emoji_datasource/short_name_to_char'
 
 module EmojiDatasource
   class Error < StandardError; end
 
   EMOJI_DATA_PATH = File.join(__dir__, '..', 'vendor', 'emoji-datasource', 'emoji.json')
 
+  # @example
+  #   short_name_to_char('+1') #=> "👍"
   def self.short_name_to_char(name)
-    EmojiDatasource::ShortNameToChar.generate(name)
+    find_by_short_name(name)&.to_char
   end
 
+  # Finds emoji by short code (e.g. `+1`, `:+1:`, `:+1::skin-tone-5:`)
+  # @param name [String] short code with or without wrapping colons.
+  # @return [EmojiDatasource::Emoji] if there is an emoji matching +name+
+  # @return [nil] if there are no emojis matching +name+
+  # @example
+  #   find_by_short_name('+1') #=> EmojiDatasource::Emoji: :+1: (👍)
   def self.find_by_short_name(name)
     return unless name
 
-    data.detect do |emoji|
-      emoji.short_name == name || emoji.short_names.include?(name)
-    end
+    name = name.delete_prefix(':').delete_suffix(':') # Allow to find `+1` by `:+1:`
+    name.delete_suffix!('::skin-tone-1') # special case for default skin tone
+    short_name_lookup_map[name]
+  end
+
+  # Finds emoji by unified hex representation of Unicode codepoints
+  # @param unified [String] Dash separated hexadecimal Unicode character codes for a single emoji
+  # @return [EmojiDatasource::Emoji] if given Unicode codepoints is a known emoji
+  # @return [nil] if there are no emojis with given codepoints in the dataset
+  # @example
+  #   short_name_to_char('1F44D') #=> EmojiDatasource::Emoji: :+1: (👍)
+  def self.find_by_unified(unified)
+    unified_lookup_map[unified.upcase]
+  end
+
+  # Find emoji object by raw Unicode string with a single emoji in it
+  # @param raw_emoji [String] Single emoji
+  # @return [EmojiDatasource::Emoji] if given string contains a single known emoji
+  # @return [nil] if there are no such emoji in the dataset
+  # @example
+  #   find_by_char('👍') #=> EmojiDatasource::Emoji: :+1: (👍)
+  def self.find_by_char(raw_emoji)
+    find_by_unified(char_to_unified(raw_emoji))
   end
 
   def self.unified_to_char(unified_name)
@@ -29,10 +56,38 @@ module EmojiDatasource
     unified_name.split('-').map(&:hex).pack('U*')
   end
 
+  def self.char_to_unified(raw_emoji)
+    return unless raw_emoji
+
+    raw_emoji.unpack('U*').map { |c| c.to_s(16).upcase }.join('-')
+  end
+
   def self.data
-    @data ||= JSON.parse(File.read(EMOJI_DATA_PATH), symbolize_names: true)
+    @data ||= JSON.parse(File.read(EMOJI_DATA_PATH))
       .map { |emoji_data| EmojiDatasource::Emoji.new(emoji_data) }
   end
+
+  # Utility hash map to search by emoji short code, including variants
+  # @api private
+  def self.short_name_lookup_map
+    @short_name_lookup_map ||= data.each_with_object({}) do |emoji, result|
+      emoji.short_names.each { |short_name| result[short_name] = emoji }
+      emoji.variations.each do |emoji_variant|
+        emoji_variant.short_names.each { |short_name| result[short_name] = emoji_variant }
+      end
+    end
+  end
+
+  # Utility hash map to search by unicode character sequence hex codes, including variants
+  # @api private
+  def self.unified_lookup_map
+    @unified_lookup_map ||= data.each_with_object({}) do |emoji, result|
+      result[emoji.unified] = emoji
+      emoji.variations.each do |emoji_variant|
+        result[emoji_variant.unified] = emoji_variant
+      end
+    end
+  end
 end
 
 # Preload emojies on startup

data/package.json

@@ -6,7 +6,7 @@
   "private": true,
   "dependencies": {},
   "devDependencies": {
-    "emoji-datasource": "^7.0.2"
+    "emoji-datasource": "^14.0.0"
   },
   "scripts": {
     "postinstall": "cp ./node_modules/emoji-datasource/emoji.json ./vendor/emoji-datasource/emoji.json"