tanuki_emoji 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0cd69298cf8929ea174ffe7bbd233d4c109ea8718be551f5360d6fc5780de7aa
-  data.tar.gz: 9ebc786c9887e0653d970a201863030a7d1b6db7a8321ffa7a5aa71e45217b2b
+  metadata.gz: 03a9c7c072edee70643369a71de1b6bb85ecf044c4030ff355cc0caab71b081c
+  data.tar.gz: e697dfff9b354990fa2a6ef0c52cf368d968690008ffee415de66e010c9cf9ce
 SHA512:
-  metadata.gz: 074d89b94fb55ff415bc373a3a93c328c88a25a2d3ddb4f9c55f17531c8d666231c830aef305163159e62f1494969e995b4c8ea13204672a07d17811cd27c952
-  data.tar.gz: 66727db990cce5221e0c9008fb19ec033fed3ad47ddcc00c52ecbee3b7c52237d00d8c69cf05125463ff527d31859af3b341cdca2be16a139beee1a2cbbc81d6
+  metadata.gz: 4c1b8e5c498364ece688325c25f568d585cab71682380a56d58717f8f7e961bcac557f23b84b4126b34e9592515f26c30d48c9742f1affcaecbde7ba6bd11143
+  data.tar.gz: 64782dcf6b3b024f6d496b00e0265689fbffbaf4c4b8811b051a75eac8f9804bb4df6dd866f84cf1ec95c0c80c379e3122b7913fb9ddfb10786278c86e707f62

data/.gitignore

@@ -11,6 +11,8 @@
 /*.gem
 /app/assets/**/*
 .DS_Store
+/pages/_data/emojis.json
+/pages/_site/**/*
 
 # rspec failure tracking
 .rspec_status

data/.gitlab-ci.yml

@@ -102,3 +102,20 @@ 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 --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}"'
+
+pages:
+  stage: deploy
+  image: ruby:3.2
+  script:
+    - echo "The site will be deployed to $CI_PAGES_URL"
+    - gem install bundler
+    - cd pages
+    - bundle install
+    - bundle exec rake generate
+    - bundle exec jekyll build
+  artifacts:
+    paths:
+      - pages
+  publish: pages/_site
+  rules:
+    - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

data/CHANGELOG.md

@@ -4,6 +4,12 @@ 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.13.0 (2024-10-25)
+
+### Fixed (1 change)
+
+- [Ensure no Unicode aliases collide with gemojione](https://gitlab.com/gitlab-org/ruby/gems/tanuki_emoji/-/commit/e26557d826947b78733f1c9522f73918cf86d7c1) ([merge request](https://gitlab.com/gitlab-org/ruby/gems/tanuki_emoji/-/merge_requests/75))
+
 ## 0.12.0 (2024-10-22)
 
 ### Fixed (2 changes)

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tanuki_emoji (0.12.0)
+    tanuki_emoji (0.13.0)
       i18n (~> 1.14)
 
 GEM

data/Rakefile

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "bundler/setup"
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require "rubocop/rake_task"

data/lib/tanuki_emoji/character.rb

@@ -143,7 +143,9 @@ module TanukiEmoji
     end
 
     def inspect
-      "#<#{self.class.name}: #{codepoints} (#{hex}) #{alpha_code} aliases: #{aliases}>"
+      # rubocop:disable Layout/LineLength
+      %(#<#{self.class.name}: #{codepoints} (#{hex}), alpha_code: "#{alpha_code}", aliases: #{aliases}, name: "#{name}", description: "#{description}">)
+      # rubocop:enable Layout/LineLength
     end
 
     def ==(other)

data/lib/tanuki_emoji/db/gemojione.rb

@@ -50,10 +50,17 @@ module TanukiEmoji
 
           if emoji.alpha_code != emoji_data[:shortname]
             org_alpha_code = emoji.alpha_code
+            org_alpha_code_sym = TanukiEmoji::Character.format_name(org_alpha_code).to_sym
             emoji.replace_alpha_code(emoji_data[:shortname])
 
-            # add the unicode alias back only if it's not a different emoji
-            emoji.add_alias(org_alpha_code) unless EMOJI_DIFFERENCES[:unicode].include?(emoji.codepoints)
+            # rubocop:disable Style/AsciiComments
+            # Ensure that we're not adding an alias that is part of the gemonione data.
+            # For example, Unicode uses `sunglasses` for 🕶️, which is `dark_sunglasses` in gemojione.
+            # `sunglasses` is 😎 which is `smiling_face_with_sunglasses` in Unicode.
+            # We don't want `sunglasses` to be added as an alias of `dark_sunglasses`, because that
+            # would interfere with `sunglasses` being the primary code for `smiling_face_with_sunglasses`
+            # rubocop:enable Style/AsciiComments
+            emoji.add_alias(org_alpha_code) unless db.key?(org_alpha_code_sym) || EMOJI_DIFFERENCES[:unicode].include?(emoji.codepoints)
           end
 
           add_emoji_data(emoji, emoji_data)

data/lib/tanuki_emoji/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TanukiEmoji
-  VERSION = "0.12.0"
+  VERSION = '0.13.0'
 end

data/tanuki_emoji.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   # 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.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
-    git_files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features|bin)/}) }
+    git_files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features|bin|pages)/}) }
     asset_files = Dir.glob('app/assets/**/*').reject { |f| f.match(%r{\.DS_Store}) }
 
     git_files + asset_files

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanuki_emoji
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Gabriel Mazetto
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n