unicode-emoji 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c4eb20ad652c14682be8230ae7d0055bbf20960
-  data.tar.gz: 74859c59a011fc5e6464fac81851ff1e1c0f14c8
+  metadata.gz: 8df3bb4dced2b4a7c36f11f331e562a3a841324d
+  data.tar.gz: 067d77562f9271d1b02a30fc20bf5c62e7fb9376
 SHA512:
-  metadata.gz: 42556f73e4623278ef522855822711fa133fbd7a0bd4c04b3a7c4aae8976e7678f5d8ea61408346517c768b3416f8808a37d0900ea7fdabd3a3bea96c0d3fe08
-  data.tar.gz: 9491eebda45d972a0a11df1ce9f688f1c7c66646b09d261a6aff91549ddc5c3eb881a0bb71a8551da1a5046e074a44c993fc7479df98f6c927eaf5774691a6cd
+  metadata.gz: d1b1d6a88ffc93560d2e07923dc3fc8cd410ed8fd28adc26f5665c6bbb4d544d3e0b648afd3642a0cd4cafb578be39ffb1d5552515181dec37e93436d2a1db97
+  data.tar.gz: 5e7f632b49306b0bee09e7702aa2ad32d5283898a2192c8920913ea47cfe7e95da3b39dc87ab9851eb7b3bc767b24808ef5ca5ff4b55f7d9622f68639142f4ea

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## CHANGELOG
 
+### 0.9.2
+
+- REGEX_TEXT: Do not match if the text emoji is followed by a emoji modifier
+
 ### 0.9.1
 
 - Include a categorized list of recommended Emoji

data/README.md

@@ -16,16 +16,6 @@ gem "unicode-emoji"
 
 ## Usage
 
-### Properties
-
-Allows you to access the codepoint data form Unicode's [emoji-data.txt](http://unicode.org/Public/emoji/5.0/emoji-data.txt) file:
-
-```ruby
-require "unicode/emoji"
-
-Unicode::Emoji.properties "☝" # => ["Emoji", "Emoji_Modifier_Base"]
-```
-
 ### Regex
 
 Five Emoji regexes are included, which are compiled out of various Emoji Unicode data.
@@ -56,7 +46,9 @@ Regex                         | Description | Example Matches | Example Non-Matc
 `Unicode::Emoji::REGEX_TEXT`  | Matches only textual singleton Emoji (except for singleton components, like digit 1) | `😴︎`, `▶` | `😴`, `▶️`, `🏻`, `🛌🏽`, `🇵🇹`, `🇵🇵`,`2️⃣`, `🏴󠁧󠁢󠁳󠁣󠁴󠁿`, `🏴󠁧󠁢󠁡󠁧󠁢󠁿`, `🤾🏽‍♀️`, `🤠‍🤢`
 `Unicode::Emoji::REGEX_ANY`   | Matches any Emoji-related codepoint (but no variation selectors or tags) | `😴`, `▶`, `🏻`, `🛌`, `🏽`, `🇵`, `🇹`, `2`, `🏴`, `🤾`, `♀`, `🤠`, `🤢` | -
 
-## List
+More info about valid vs. recommended emoji in this [blog article on Emojipedia](http://blog.emojipedia.org/unicode-behind-the-curtain/).
+
+### List
 
 Use `Unicode::Emoji::LIST` or the list method to get a grouped (and ordered) list of Emoji:
 
@@ -73,6 +65,16 @@ Unicode::Emoji.list("Food & Drink", "food-asian")
 
 A markdown file with all recommended emoji can be found [in this gist](https://gist.github.com/janlelis/72f9be1f0ecca07372c64cf13894b801).
 
+### Properties
+
+Allows you to access the codepoint data form Unicode's [emoji-data.txt](http://unicode.org/Public/emoji/5.0/emoji-data.txt) file:
+
+```ruby
+require "unicode/emoji"
+
+Unicode::Emoji.properties "☝" # => ["Emoji", "Emoji_Modifier_Base"]
+```
+
 ## Also See
 
 - [Unicode® Technical Standard #51](http://www.unicode.org/reports/tr51/proposed.html)

data/lib/unicode/emoji.rb

@@ -48,7 +48,7 @@ module Unicode
 
     text_presentation_sequence = \
       join[
-        pack_and_join[TEXT_PRESENTATION]+ "(?!" + pack[EMOJI_VARIATION_SELECTOR] + ")" + pack[TEXT_VARIATION_SELECTOR] + "?",
+        pack_and_join[TEXT_PRESENTATION]+ "(?!" + pack_and_join[EMOJI_MODIFIERS + [EMOJI_VARIATION_SELECTOR]] + ")" + pack[TEXT_VARIATION_SELECTOR] + "?",
         pack_and_join[EMOJI_PRESENTATION] + pack[TEXT_VARIATION_SELECTOR]
       ]
 

data/lib/unicode/emoji/constants.rb

@@ -2,7 +2,7 @@
 
 module Unicode
   module Emoji
-    VERSION = "0.9.1".freeze
+    VERSION = "0.9.2".freeze
     EMOJI_VERSION = "5.0".freeze
     DATA_DIRECTORY = File.expand_path(File.dirname(__FILE__) + '/../../../data/').freeze
     INDEX_FILENAME = (DATA_DIRECTORY + '/emoji.marshal.gz').freeze

data/spec/unicode_emoji_spec.rb

@@ -255,6 +255,11 @@ describe Unicode::Emoji do
       assert_nil $&
     end
 
+    it "does not match textual singleton emoji in combination with emoji modifiers" do
+      "✌🏻 victory hand" =~ Unicode::Emoji::REGEX_TEXT
+      assert_nil $&
+    end
+
     it "does not match singleton 'component' emoji codepoints" do
       "🏻 light skin tone" =~ Unicode::Emoji::REGEX_TEXT
       assert_nil $&

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: unicode-emoji
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Jan Lelis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-10 00:00:00.000000000 Z
+date: 2017-07-20 00:00:00.000000000 Z
 dependencies: []
 description: "[Emoji 5.0] Retrieve emoji data about Unicode codepoints. Also contains
   a regex to match emoji."
@@ -53,7 +53,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Retrieve Emoji data about Unicode codepoints.