twemoji 3.1.2 → 3.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9e8e331f42d9cf8b602c4466ade46546a733277f
-  data.tar.gz: 0a337ff8837085faf8e5e8b6605f38f812e1b8f3
+SHA256:
+  metadata.gz: d9a1954a7f67da596f244eda65edc096ff49e2ad2b99d1f5953ebd80eb4db463
+  data.tar.gz: 5769167d7fe63671ac1a4270b7a7091559693aa3011f026c58904bf2ef2bb866
 SHA512:
-  metadata.gz: 159906c1634d0afee8d1793157afcf9e7bba286816aa545f501ab5569b82e557c05c6b4ab5bef0f1411a8d8527f80098a61ded5f064723e5ac84c3aa53a9e942
-  data.tar.gz: 34102f8e46e2b6405f709c2eb8228e0aef8bc60e8d6b6e78505d92d75189bb9aa7c16e22fc76c58477e9d8d0e8bd066172f5edb951296066a99e2124fdda1c44
+  metadata.gz: 7b17055f1396ed5bf86453c5bf81fea0a341eddb3bf0ef2566f809697a07a0c6a54426c4fa55f94607f6423b60e30ab54f13dcd2ff853e07d9869fb402b291a1
+  data.tar.gz: 4ab9fcd8d6f1c66a64c90eb8704edfc70a75e80600eeb4d6610289adabcf9a1f5ee72b66379dd52c1f1381e59b44a09cb318ad73560916421c741efb2df8b64d

data/CHANGELOG.md

@@ -2,6 +2,27 @@
 
 ## Unreleased
 
+## 3.1.7 - 2020.09.28
+
+- Relax required ruby version
+
+## 3.1.6 - 2019.12.21
+
+- Moved expensive computations to constant [#53](https://github.com/jollygoodcode/twemoji/pull/53)
+
+## 3.1.5 - 2019.06.02
+
+- Introduced `Twemoji::Utils::Unicode.unpack` [#51](https://github.com/jollygoodcode/twemoji/pull/51)
+- Do not set attribute on generated element if not specified [#49](https://github.com/jollygoodcode/twemoji/pull/49)
+
+## 3.1.4 - 2017.07.22
+
+- Fixes woman skin 6 emoji [#44](https://github.com/jollygoodcode/twemoji/pull/44)
+
+## 3.1.3 - 2017.07.22
+
+- Fixes name of kiss emoji [#42](https://github.com/jollygoodcode/twemoji/pull/42)
+
 ## 3.1.2 - 2017.03.20
 
 - Abstract constants into yaml files [#39](https://github.com/jollygoodcode/twemoji/pull/39)

data/README.md

@@ -297,7 +297,7 @@ To properly support emoji, the document character must be set to UTF-8. This can
 
 ## Attribution Requirements
 
-**IMPORTANT:** Please follow the [Attribution Requirements](https://github.com/twitter/twemoji#attribution-requirements) as stated on the official Twemoji (JS) repo.
+**IMPORTANT:** Please follow the [Attribution Requirements](https://github.com/twitter/twemoji#attribution-requirements) as stated on the official Twemoji (JavaScript) repo.
 
 ## Contributing
 

data/lib/twemoji.rb

@@ -5,6 +5,7 @@ require "json"
 require "twemoji/version"
 require "twemoji/map"
 require "twemoji/configuration"
+require "twemoji/utils/unicode"
 
 # Twemoji is a Ruby implementation, parses your text, replace emoji text
 # with corresponding emoji image. Default emoji images are from Twiiter CDN.
@@ -125,7 +126,7 @@ module Twemoji
   #
   # @return [RegExp] A Regular expression consists of all emojis text.
   def self.emoji_pattern
-    @emoji_pattern ||= /(#{codes.keys.map { |name| Regexp.quote(name) }.join("|") })/
+    EMOJI_PATTERN
   end
 
   # Return all emoji patterns' regular expressions in unicode.
@@ -133,21 +134,31 @@ module Twemoji
   #
   # @return [RegExp] A Regular expression consists of all emojis unicode.
   def self.emoji_pattern_unicode
-    @emoji_pattern_unicode ||= /(#{sorted_codepoint_values.map { |name| Regexp.quote(name.split('-').collect {|n| n.hex}.pack("U*")) }.join("|") })/
+    EMOJI_PATTERN_UNICODE
   end
 
   # Return all emoji patterns' regular expressions in unicode and name.
   #
   # @return [RegExp] A Regular expression consists of all emojis unicode codepoint and names.
   def self.emoji_pattern_all
-    names = codes.keys.map { |name| Regexp.quote(name) }.join("|")
-    codepoints = sorted_codepoint_values.map { |name| Regexp.quote(name.split('-').collect {|n| n.hex}.pack("U*")) }.join("|")
-
-    @emoji_pattern_all ||= /(#{names}|#{codepoints})/
+    EMOJI_PATTERN_ALL
   end
 
   private
 
+    # Return sorted codepoint values by descending length.
+    #
+    # @return [Array] An array of emoji codepoint values sorted by descending length
+    def self.sorted_codepoint_values
+      # has to be sorted to match the combined codepoint (2-3 char emojis) before single char emojis
+      @sorted_codepoint_values ||= invert_codes.keys.sort_by {|key| key.length }.reverse
+    end
+
+    EMOJI_PATTERN = /#{codes.keys.map { |name| Regexp.quote(name) }.join("|")}/.freeze
+    EMOJI_PATTERN_UNICODE = /#{sorted_codepoint_values.map { |name| Regexp.quote(name.split('-').collect {|n| n.hex}.pack("U*")) }.join("|")}/.freeze
+    EMOJI_PATTERN_ALL = /(#{EMOJI_PATTERN}|#{EMOJI_PATTERN_UNICODE})/.freeze
+    private_constant :EMOJI_PATTERN, :EMOJI_PATTERN_UNICODE, :EMOJI_PATTERN_ALL
+
     # Ensure text is a string.
     #
     # @param text [String] Text to ensure to be a string.
@@ -309,7 +320,7 @@ module Twemoji
     # @return String representation of unicode codepoint
     # @private
     def self.unicode_to_str(unicode)
-      unicode.split("").map { |r| "%x" % r.ord }.join("-")
+      Twemoji::Utils::Unicode.unpack(unicode)
     end
 
     # Coverts hash of attributes into HTML attributes.
@@ -318,14 +329,6 @@ module Twemoji
     # @return [String] HTML attributes suitable for use in tag
     # @private
     def self.hash_to_html_attrs(hash)
-      hash.map { |attr, value| %(#{attr}="#{value}") }.join(" ")
-    end
-
-    # Return sorted codepoint values by descending length.
-    #
-    # @return [Array] An array of emoji codepoint values sorted by descending length
-    def self.sorted_codepoint_values
-      # has to be sorted to match the combined codepoint (2-3 char emojis) before single char emojis
-      @sorted_codepoint_values ||= invert_codes.keys.sort_by {|key| key.length }.reverse
+      hash.reject { |key, value| value.nil? || value == '' }.map { |attr, value| %(#{attr}="#{value}") }.join(" ")
     end
 end

data/lib/twemoji/data/emoji-unicode-png.yml

@@ -797,7 +797,7 @@
 ":woman::skin-tone-3:": https://twemoji.maxcdn.com/2/72x72/1f469-1f3fc.png
 ":woman::skin-tone-4:": https://twemoji.maxcdn.com/2/72x72/1f469-1f3fd.png
 ":woman::skin-tone-5:": https://twemoji.maxcdn.com/2/72x72/1f469-1f3fe.png
-":woman::skin-tone-6": https://twemoji.maxcdn.com/2/72x72/1f469-1f3ff.png
+":woman::skin-tone-6:": https://twemoji.maxcdn.com/2/72x72/1f469-1f3ff.png
 ":woman:": https://twemoji.maxcdn.com/2/72x72/1f469.png
 ":woman-woman-boy:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-1f469-200d-1f466.png
 ":woman-woman-boy-boy:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-1f469-200d-1f466-200d-1f466.png
@@ -806,7 +806,7 @@
 ":woman-woman-girl-girl:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-1f469-200d-1f467-200d-1f467.png
 ":woman-heart-man:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-2764-fe0f-200d-1f468.png
 ":woman-heart-woman:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-2764-fe0f-200d-1f469.png
-":kiss::man:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.png
+":woman-kiss-man:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.png
 ":woman-kiss-woman:": https://twemoji.maxcdn.com/2/72x72/1f469-200d-2764-fe0f-200d-1f48b-200d-1f469.png
 ":family:": https://twemoji.maxcdn.com/2/72x72/1f46a.png
 ":couple:": https://twemoji.maxcdn.com/2/72x72/1f46b.png

data/lib/twemoji/data/emoji-unicode-svg.yml

@@ -797,7 +797,7 @@
 ":woman::skin-tone-3:": https://twemoji.maxcdn.com/2/svg/1f469-1f3fc.svg
 ":woman::skin-tone-4:": https://twemoji.maxcdn.com/2/svg/1f469-1f3fd.svg
 ":woman::skin-tone-5:": https://twemoji.maxcdn.com/2/svg/1f469-1f3fe.svg
-":woman::skin-tone-6": https://twemoji.maxcdn.com/2/svg/1f469-1f3ff.svg
+":woman::skin-tone-6:": https://twemoji.maxcdn.com/2/svg/1f469-1f3ff.svg
 ":woman:": https://twemoji.maxcdn.com/2/svg/1f469.svg
 ":woman-woman-boy:": https://twemoji.maxcdn.com/2/svg/1f469-200d-1f469-200d-1f466.svg
 ":woman-woman-boy-boy:": https://twemoji.maxcdn.com/2/svg/1f469-200d-1f469-200d-1f466-200d-1f466.svg
@@ -806,7 +806,7 @@
 ":woman-woman-girl-girl:": https://twemoji.maxcdn.com/2/svg/1f469-200d-1f469-200d-1f467-200d-1f467.svg
 ":woman-heart-man:": https://twemoji.maxcdn.com/2/svg/1f469-200d-2764-fe0f-200d-1f468.svg
 ":woman-heart-woman:": https://twemoji.maxcdn.com/2/svg/1f469-200d-2764-fe0f-200d-1f469.svg
-":kiss::man:": https://twemoji.maxcdn.com/2/svg/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
+":woman-kiss-man:": https://twemoji.maxcdn.com/2/svg/1f469-200d-2764-fe0f-200d-1f48b-200d-1f468.svg
 ":woman-kiss-woman:": https://twemoji.maxcdn.com/2/svg/1f469-200d-2764-fe0f-200d-1f48b-200d-1f469.svg
 ":family:": https://twemoji.maxcdn.com/2/svg/1f46a.svg
 ":couple:": https://twemoji.maxcdn.com/2/svg/1f46b.svg

data/lib/twemoji/data/emoji-unicode.yml

@@ -797,7 +797,7 @@
 ":woman::skin-tone-3:": 1f469-1f3fc
 ":woman::skin-tone-4:": 1f469-1f3fd
 ":woman::skin-tone-5:": 1f469-1f3fe
-":woman::skin-tone-6": 1f469-1f3ff
+":woman::skin-tone-6:": 1f469-1f3ff
 ":woman:": 1f469
 ":woman-woman-boy:": 1f469-200d-1f469-200d-1f466
 ":woman-woman-boy-boy:": 1f469-200d-1f469-200d-1f466-200d-1f466

data/lib/twemoji/utils/unicode.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module Twemoji
+  module Utils
+    module Unicode
+      # Convert raw unicode to string key version.
+      #
+      # e.g. 🇲🇾 converts to "1f1f2-1f1fe"
+      #
+      # @param unicode [String] Unicode codepoint.
+      # @param connector [String] (optional) connector to join codepoints
+      #
+      # @return [String] codepoints of unicode join by connector argument, defaults to "-".
+      def self.unpack(unicode, connector: "-")
+        unicode.split("").map { |r| "%x" % r.ord }.join(connector)
+      end
+    end
+  end
+end

data/lib/twemoji/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Twemoji
-  VERSION = "3.1.2"
+  VERSION = "3.1.7"
 end

data/twemoji.gemspec

@@ -17,7 +17,5 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f =~ %r(^(test)/) }
   spec.require_paths = %w(lib)
 
-  spec.required_ruby_version = "~> 2.0"
-
   spec.add_dependency "nokogiri", "~> 1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: twemoji
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.7
 platform: ruby
 authors:
 - Juanito
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2020-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -49,6 +49,7 @@ files:
 - lib/twemoji/map.rb
 - lib/twemoji/png.rb
 - lib/twemoji/svg.rb
+- lib/twemoji/utils/unicode.rb
 - lib/twemoji/version.rb
 - twemoji.gemspec
 homepage: https://github.com/jollygoodcode/twemoji
@@ -61,17 +62,16 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: 'A RubyGem to convert :heart: to Twitter cdn url'