tanuki_emoji 0.7.0 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31696b93726ca04628ec4659e4f0a0f41dafa4223791e1a51ec3ad08760c66af
-  data.tar.gz: 9784c1d059e0a3cf8db903a97375636b5679e40ddb59dee450ceb721e0178a89
+  metadata.gz: 813531e905727359e63b0cc535a5c2e7f4f418536d1aa22c1fc93515f47fbbe9
+  data.tar.gz: fa5fe7bbeddee299620bc45ba7fe1fb387ae963b2e0d4f5c9b26d229732631e1
 SHA512:
-  metadata.gz: df6ef5d255eef71dca9c1a17b2f67d01116d55cdc2c24ed1c26b62b04d9b8ac40c04c25b432d5cf64dd29043965457669906bbe57f57e9120e09a728b1011c35
-  data.tar.gz: f2c23bfc342a090d801bd09d1e952cc9aa8cfdd9905b5fc6e3c7be96b75b16ccccd6b3e07cf5ccaf389775baaa34ecb801416d78beeb050441465a758454d4e5
+  metadata.gz: 7c0268dbd2f81f2994171dfc6aa42373537824fd7ce4568555a60ee8a5608241ace1386e6f2e063997e7d148261c386174427793d46ef4dd53675c57add48928
+  data.tar.gz: 46c771d114d9f0529dfcd47b161988ccf57f1f73674b12253b1d28241ca75445ce1e678aa801cdc96547cbf9a9e37911b0007a45421ddaa25df2d1f7600c3eaa

data/.gitlab-ci.yml

@@ -17,7 +17,7 @@ workflow:
     - bundle install -j $(nproc)                # Install dependencies into ./vendor/ruby
   parallel:
     matrix:
-      - RUBY_VERSION: ['2.7', '3.0', '3.1', '3.2']
+      - RUBY_VERSION: ['3.0', '3.1', '3.2']
   image: "ruby:$RUBY_VERSION"
   cache:
     paths:
@@ -79,7 +79,7 @@ secret_detection:
 
 update-changelog:
   stage: deploy
-  image: ruby:2.7
+  image: ruby:3.0
   rules:
     - if: '$GITLAB_API_TOKEN == null'
       when: never
@@ -93,4 +93,4 @@ update-changelog:
     - |
       version=$(ruby -e "print Gem::Specification.load('${GEMSPEC_FILE}').version")
       [ -n "${version}" ] || (echo "VERSION could not be parsed in ${GEMSPEC_FILE}!" && exit 1)
-    - 'curl -X POST --header "PRIVATE-TOKEN: ${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/changelog?version=${version}&branch=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"'
+    - 'curl --fail --request POST --header "PRIVATE-TOKEN: ${GITLAB_API_TOKEN}" "${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/repository/changelog?version=${version}&branch=${CI_MERGE_REQUEST_SOURCE_BRANCH_NAME}"'

data/.rubocop.yml

@@ -1,5 +1,5 @@
 AllCops:
-  TargetRubyVersion: 2.7
+  TargetRubyVersion: 3.0
   Exclude:
     - '*.gemspec'
     - 'vendor/**/*'

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.4

data/CHANGELOG.md

@@ -4,6 +4,24 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## 0.9.0 (2023-10-17)
+
+### Added (1 change)
+
+- [Added ordering information to to `Character`](gitlab-org/ruby/gems/tanuki_emoji@c618fae04409067a38ddc454d3dfaee4678da520) ([merge request](gitlab-org/ruby/gems/tanuki_emoji!61))
+
+## 0.8.0 (2023-09-15)
+
+### Changed (1 change)
+
+- [Bump Ruby version to 3.1.4](gitlab-org/ruby/gems/tanuki_emoji@c7853e7b6aa5000358a8c99e402614926d479ef8) ([merge request](gitlab-org/ruby/gems/tanuki_emoji!58))
+
+## 0.7.0 (2023-09-04)
+
+### Added (1 change)
+
+- [Added EmojiData and EmojiDataParser](gitlab-org/ruby/gems/tanuki_emoji@8eba857db072e099fe10eeba6c93c6a7710e01a3) ([merge request](gitlab-org/ruby/gems/tanuki_emoji!2))
+
 ## 0.6.0 (2022-02-16)
 
 ### Added

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tanuki_emoji (0.7.0)
+    tanuki_emoji (0.9.0)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -97,9 +97,13 @@ To load an interactive console with the gem you can use `bin/console`.
 Before releasing a new gem, create a MR with the following changes:
 
 - Update the version number in `lib/tanuki_emoji/version.rb`.
+- Run `bundle install` to update `Gemfile.lock` and commit it.
+- Ensure that `CHANGELOG.md` is updated by the project bot in the MR.
 
-With that MR approved and merged, a [CI job](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/gem-release.yml) will
-create a new release, generate the changelog, generate a new `.gem` file and publish into [rubygems.org](https://rubygems.org).
+With that MR approved and merged, a [CI job](https://gitlab.com/gitlab-org/quality/pipeline-common/-/blob/master/ci/gem-release.yml):
+- Creates a [new release](https://gitlab.com/gitlab-org/ruby/gems/tanuki_emoji/-/releases)
+- Generates the changelog on the release page
+- Publishes new gem into [rubygems.org](https://rubygems.org)
 
 ## Contributing
 

data/lib/tanuki_emoji/character.rb

@@ -8,8 +8,8 @@ module TanukiEmoji
   class Character
     IMAGE_PREFIX = 'emoji_u'
     IMAGE_EXTENSION = '.png'
-    FLAG_REGEXP = /[🇦-🇿]{2}/u.freeze
-    ALPHA_CODE_REGEXP = /:(?<alpha_text>[_+\-a-z0-9]+):/.freeze
+    FLAG_REGEXP = /[🇦-🇿]{2}/u
+    ALPHA_CODE_REGEXP = /:(?<alpha_text>[_+\-a-z0-9]+):/
 
     # This denotes a "color" or "emoji" version
     EMOJI_VARIATION_SELECTOR = 0xFE0F
@@ -23,7 +23,7 @@ module TanukiEmoji
 
     attr_reader :name, :codepoints, :codepoints_alternates, :alpha_code, :aliases, :ascii_aliases, :description, :category
 
-    attr_accessor :unicode_version
+    attr_accessor :unicode_version, :sort_key
 
     # @param [String] name
     # @param [String] codepoints

data/lib/tanuki_emoji/db/unicode_ordering.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module TanukiEmoji
+  module Db
+    # Emoji Unicode Ordering database
+    class UnicodeOrdering
+      DATA_FILE = 'vendor/unicode/emoji-ordering.txt'
+
+      def self.data_file
+        File.expand_path(File.join(__dir__, '../../../', DATA_FILE))
+      end
+
+      attr_reader :data_file
+
+      def initialize(index:, data_file: nil)
+        @data_file = data_file || self.class.data_file
+        @index = index
+      end
+
+      def load!
+        db = {}
+        File.readlines(data_file, mode: 'r:UTF-8').each_with_index do |line, line_number|
+          next if line.start_with?('#')
+
+          tokens = line.split
+          semicolon_offset = tokens.index(';')
+          next if semicolon_offset.nil?
+
+          codepoints_array = tokens[0...semicolon_offset].map do |token|
+            token[2...token.length].hex
+          end
+          codepoints = codepoints_array.pack('U*')
+
+          db[codepoints] = line_number
+        end
+
+        db.each do |codepoints, sort_key|
+          emoji = @index.find_by_codepoints(codepoints)
+
+          next unless emoji
+
+          emoji.sort_key = sort_key
+        end
+      end
+    end
+  end
+end

data/lib/tanuki_emoji/db.rb

@@ -3,6 +3,7 @@
 module TanukiEmoji
   module Db
     autoload :Gemojione, 'tanuki_emoji/db/gemojione'
+    autoload :UnicodeOrdering, 'tanuki_emoji/db/unicode_ordering'
     autoload :UnicodeVersion, 'tanuki_emoji/db/unicode_version'
     autoload :EmojiData, 'tanuki_emoji/db/emoji_data'
     autoload :EmojiDataParser, 'tanuki_emoji/db/emoji_data_parser'

data/lib/tanuki_emoji/index.rb

@@ -114,6 +114,7 @@ module TanukiEmoji
     def load_data_files
       Db::Gemojione.new(index: self).load!
       Db::UnicodeVersion.new(index: self).load!
+      Db::UnicodeOrdering.new(index: self).load!
     end
 
     # Order the codepoints to match the most specific (longest) sequences first,

data/lib/tanuki_emoji/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TanukiEmoji
-  VERSION = "0.7.0"
+  VERSION = "0.9.0"
 end

data/tanuki_emoji.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.description   = %q{Tanuki Emoji provides Emoji character information and metadata with support for Noto Emoji resources as fallback}
   spec.homepage      = 'https://gitlab.com/gitlab-org/ruby/gems/tanuki_emoji'
   spec.licenses       = %w[MIT Apache2]
-  spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata['homepage_uri'] = spec.homepage
   spec.metadata['source_code_uri'] = spec.homepage