somemoji 0.4.6 → 0.5.0

data/data/emoji_definitions/wrench.json

@@ -6,7 +6,6 @@
   "code_points": [
     "1F527"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "diy",
     "ikea",

data/data/emoji_definitions/wrestlers.json

@@ -8,7 +8,6 @@
   "code_points": [
     "1F93C"
   ],
-  "code_points_alternates": [],
   "keywords": [],
   "name": "wrestlers"
 }

data/data/emoji_definitions/wrestlers_tone1.json

@@ -9,7 +9,6 @@
     "1F93C",
     "1F3FB"
   ],
-  "code_points_alternates": [],
   "keywords": [],
   "name": "wrestlers tone 1"
 }

data/data/emoji_definitions/wrestlers_tone2.json

@@ -9,7 +9,6 @@
     "1F93C",
     "1F3FC"
   ],
-  "code_points_alternates": [],
   "keywords": [],
   "name": "wrestlers tone 2"
 }

data/data/emoji_definitions/wrestlers_tone3.json

@@ -9,7 +9,6 @@
     "1F93C",
     "1F3FD"
   ],
-  "code_points_alternates": [],
   "keywords": [],
   "name": "wrestlers tone 3"
 }

data/data/emoji_definitions/wrestlers_tone4.json

@@ -9,7 +9,6 @@
     "1F93C",
     "1F3FE"
   ],
-  "code_points_alternates": [],
   "keywords": [],
   "name": "wrestlers tone 4"
 }

data/data/emoji_definitions/wrestlers_tone5.json

@@ -9,7 +9,6 @@
     "1F93C",
     "1F3FF"
   ],
-  "code_points_alternates": [],
   "keywords": [],
   "name": "wrestlers tone 5"
 }

data/data/emoji_definitions/writing_hand.json

@@ -4,13 +4,8 @@
   "category": "people",
   "code": "writing_hand",
   "code_points": [
-    "270D"
-  ],
-  "code_points_alternates": [
-    [
-      "270D",
-      "FE0F"
-    ]
+    "270D",
+    "FE0F"
   ],
   "keywords": [
     "body",

data/data/emoji_definitions/writing_hand_tone1.json

@@ -7,7 +7,6 @@
     "270D",
     "1F3FB"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "draw",
     "sign",

data/data/emoji_definitions/writing_hand_tone2.json

@@ -7,7 +7,6 @@
     "270D",
     "1F3FC"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "draw",
     "sign",

data/data/emoji_definitions/writing_hand_tone3.json

@@ -7,7 +7,6 @@
     "270D",
     "1F3FD"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "draw",
     "sign",

data/data/emoji_definitions/writing_hand_tone4.json

@@ -7,7 +7,6 @@
     "270D",
     "1F3FE"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "draw",
     "sign",

data/data/emoji_definitions/writing_hand_tone5.json

@@ -7,7 +7,6 @@
     "270D",
     "1F3FF"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "draw",
     "sign",

data/data/emoji_definitions/x.json

@@ -6,7 +6,6 @@
   "code_points": [
     "274C"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "delete",
     "no",

data/data/emoji_definitions/yellow_heart.json

@@ -6,7 +6,6 @@
   "code_points": [
     "1F49B"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "affection",
     "caring",

data/data/emoji_definitions/yen.json

@@ -6,7 +6,6 @@
   "code_points": [
     "1F4B4"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "banknote",
     "bill",

data/data/emoji_definitions/yin_yang.json

@@ -6,7 +6,6 @@
   "code_points": [
     "262F"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "religion",
     "sign",

data/data/emoji_definitions/yum.json

@@ -6,7 +6,6 @@
   "code_points": [
     "1F60B"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "delicious",
     "eat",

data/data/emoji_definitions/zap.json

@@ -4,13 +4,8 @@
   "category": "nature",
   "code": "zap",
   "code_points": [
-    "26A1"
-  ],
-  "code_points_alternates": [
-    [
-      "26A1",
-      "FE0F"
-    ]
+    "26A1",
+    "FE0F"
   ],
   "keywords": [
     "diarrhea",

data/data/emoji_definitions/zero.json

@@ -5,15 +5,9 @@
   "code": "zero",
   "code_points": [
     "0030",
+    "FE0F",
     "20E3"
   ],
-  "code_points_alternates": [
-    [
-      "0030",
-      "FE0F",
-      "20E3"
-    ]
-  ],
   "keywords": [
     "blue-square",
     "math",

data/data/emoji_definitions/zipper_mouth.json

@@ -8,7 +8,6 @@
   "code_points": [
     "1F910"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "mad",
     "smiley"

data/data/emoji_definitions/zzz.json

@@ -6,7 +6,6 @@
   "code_points": [
     "1F4A4"
   ],
-  "code_points_alternates": [],
   "keywords": [
     "goodnight",
     "sleepy",

data/lib/somemoji.rb

@@ -52,7 +52,7 @@ module Somemoji
 
     # @return [Somemoji::EmojiCollection] an emoji collection including Noto emojis
     # @example
-    #   Somemoji.noto_emoji_collection.count #=> 1541
+    #   Somemoji.noto_emoji_collection.count #=> 1428
     def noto_emoji_collection
       @noto_emoji_collection ||= ::Somemoji::EmojiCollection.new(noto_emojis)
     end
@@ -64,7 +64,7 @@ module Somemoji
 
     # @return [Somemoji::EmojiCollection] an emoji collection including Twemoji emojis
     # @example
-    #   Somemoji.twemoji_emoji_collection.count #=> 1626
+    #   Somemoji.twemoji_emoji_collection.count #=> 1513
     def twemoji_emoji_collection
       @twemoji_emoji_collection ||= ::Somemoji::EmojiCollection.new(twemoji_emojis)
     end
@@ -107,7 +107,6 @@ module Somemoji
           aliases: hash["aliases"],
           ascii_arts: hash["ascii_arts"],
           category: hash["category"],
-          code_points_alternates: hash["code_points_alternates"],
           code_points: hash["code_points"],
           code: hash["code"],
           keywords: hash["keywords"],

data/lib/somemoji/emoji.rb

@@ -15,9 +15,6 @@ module Somemoji
     # @return [Array<String>, nil]
     attr_reader :code_points
 
-    # @return [Array<Array<String>>]
-    attr_reader :code_points_alternates
-
     # @return [Array<String>, nil]
     attr_reader :keywords
 
@@ -27,7 +24,6 @@ module Somemoji
     # @param aliases [Array<String>, nil]
     # @param ascii_arts [Array<String>, nil]
     # @param category [String, nil]
-    # @param code_points_alternates [Array<Array<String>>, nil]
     # @param code_points [Array<String>, nil]
     # @param code [String] a unique emoji code (required)
     # @param keywords [Array<String>, nil]
@@ -41,7 +37,6 @@ module Somemoji
     #     code_points: [
     #       "1F4AF"
     #     ],
-    #     code_points_alternates: [],
     #     keywords: [
     #       "100",
     #       "a",
@@ -68,7 +63,6 @@ module Somemoji
       category: nil,
       code:,
       code_points: nil,
-      code_points_alternates: nil,
       keywords: nil,
       name: nil
     )
@@ -77,17 +71,14 @@ module Somemoji
       @category = category
       @code = code
       @code_points = code_points || []
-      @code_points_alternates = code_points_alternates || []
       @keywords = keywords || []
       @name = name
     end
 
     # @return [Array<String>]
-    def alternate_characters
-      code_points_alternates.map do |code_points_alternate|
-        code_points_alternate.map do |code_point|
-          code_point.to_i(16)
-        end.pack("U*")
+    def abbreviated_code_points
+      code_points.reject do |code_point|
+        %w(200D FE0F).include?(code_point)
       end
     end
 
@@ -115,9 +106,8 @@ module Somemoji
         aliases: aliases,
         ascii_arts: ascii_arts,
         category: category,
-        code:code,
+        code: code,
         code_points: code_points,
-        code_points_alternates: code_points_alternates,
         keywords: keywords,
         name: name,
       }

data/lib/somemoji/emoji_collection.rb

@@ -148,9 +148,6 @@ module Somemoji
     def index_by_character
       @index_by_character ||= each_with_object({}) do |emoji, hash|
         hash[emoji.character] = emoji
-        emoji.alternate_characters.each do |alternate_character|
-          hash[alternate_character] = emoji
-        end
       end
     end
 

data/lib/somemoji/emoji_extractors/apple_emoji_extractor.rb

@@ -9,7 +9,36 @@ module Somemoji
 
       # @note Implementation for Somemoji::EmojiExtractors::BaseEmojiExtractor
       def extract
-        ::Emoji::Extractor.new(IMAGE_SIZE, @destination).extract!
+        extract_images_into_temporary_directory
+        extracted_image_paths.map do |image_path|
+          if emoji = emoji_table[::File.basename(image_path, ".png").upcase.split("-")]
+            ::FileUtils.mkdir_p("#{@destination}/unicode")
+            ::FileUtils.move(
+              image_path,
+              "#{@destination}/#{emoji.base_path}.png",
+            )
+          end
+        end
+      end
+
+      private
+
+      def emoji_table
+        @emoji_table ||= ::Somemoji.emoji_collection.each_with_object({}) do |emoji, object|
+          object[emoji.abbreviated_code_points] = emoji
+        end
+      end
+
+      def extract_images_into_temporary_directory
+        ::Emoji::Extractor.new(IMAGE_SIZE, temporary_directory_path).extract!
+      end
+
+      def extracted_image_paths
+        ::Dir.glob("#{temporary_directory_path}/unicode/*.png")
+      end
+
+      def temporary_directory_path
+        @temporary_directory_path ||= ::Dir.tmpdir
       end
     end
   end

data/lib/somemoji/emoji_extractors/base_emoji_extractor.rb

@@ -1,5 +1,3 @@
-require "fileutils"
-
 module Somemoji
   module EmojiExtractors
     class BaseEmojiExtractor
@@ -20,10 +18,6 @@ module Somemoji
 
       private
 
-      def make_destination_directory
-        ::FileUtils.mkdir_p(@destination)
-      end
-
       def silence?
         !!@silence
       end

data/lib/somemoji/emoji_extractors/downloadable_emoji_extractor.rb

@@ -6,7 +6,6 @@ module Somemoji
     class DownloadableEmojiExtractor < BaseEmojiExtractor
       # @note Implementation for Somemoji::EmojiExtractors::BaseEmojiExtractor
       def extract
-        make_destination_directory
         emojis.each do |emoji|
           download(emoji)
           print emoji.character unless silence?

data/lib/somemoji/version.rb

@@ -1,3 +1,3 @@
 module Somemoji
-  VERSION = "0.4.6"
+  VERSION = "0.5.0"
 end

data/script/generate_apple_supported_characters.rb

@@ -9,14 +9,18 @@ Pathname.new(Somemoji.apple_supported_characters_path).parent.mkpath
 temporary_directory_path = Dir.tmpdir
 unicode_directory_path = "#{temporary_directory_path}/unicode"
 Emoji::Extractor.new(64, temporary_directory_path).extract!
-characters = Dir.glob("#{unicode_directory_path}/*.png").map do |image_path|
-  ::File.basename(image_path, ".png").split("-").map do |code_point|
-    code_point.to_i(16)
-  end.pack("U*")
+
+table = Somemoji.emoji_collection.each_with_object({}) do |emoji, object|
+  object[emoji.abbreviated_code_points] = emoji
 end
+
+emojis = Dir.glob("#{unicode_directory_path}/*.png").map do |image_path|
+  table[::File.basename(image_path, ".png").upcase.split("-")]
+end.compact
+
 FileUtils.rm_rf(unicode_directory_path)
 
 File.write(
   Somemoji.apple_supported_characters_path,
-  JSON.pretty_generate(characters.sort),
+  JSON.pretty_generate(emojis.map(&:character).uniq.sort),
 )

data/script/generate_emoji_definitions_from_gemojione.rb

@@ -14,8 +14,7 @@ index.each do |shortname, data|
       ascii_arts: data["aliases_ascii"].sort,
       category: data["category"],
       code: shortname,
-      code_points: data["unicode"].split("-"),
-      code_points_alternates: data["unicode_alternates"].sort.map { |string| string.split("-") },
+      code_points: (data["unicode_alternates"].any? ? data["unicode_alternates"].first : data["unicode"]).split("-"),
       keywords: data["keywords"].sort,
       name: data["name"],
     ).gsub("[\n\n  ]", "[]"),

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: somemoji
 version: !ruby/object:Gem::Version
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-21 00:00:00.000000000 Z
+date: 2016-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gemoji