emojidex 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3a4fe5b07ba97a8446a72ba1472aec77755938a5
-  data.tar.gz: f7c10750a8e941a070bb99ae732a8bdc3651a3cd
+  metadata.gz: 2e959579357aeba554ee22e943695350f4e8531e
+  data.tar.gz: 2a35e42c90834d6324fef0beabd2fbebfc728d09
 SHA512:
-  metadata.gz: 9430016328967b61b6dd6d96ea9f461ed39e41d0b7c1aa82843d2e3e61ac329594eb4d346454cb159f6dbd606b4c55fefd9c3f31d5bd8079cabdfe23d0ee3a83
-  data.tar.gz: 6a3e95ae8f0a5cd2c5d3dda012e2a01a40539cc0a6b5302deb09d1447d0325a64c46835f10ada71f5ec91c979d909a940ee565a6e13a2a1489162d28829a9723
+  metadata.gz: 47764eda85a0f7fbb57db70dddbd267b377b7db322bb04c9f10d652bc3883d585467cf45ee7059cb144731787441c4a6f02dab6253becac0c443be4734ac6427
+  data.tar.gz: 2349ecb35576c0b56026905657c017848ee764cdf508bc4f89789905184998a138327e383c960272c320cf91da44ca2b1eee165a4cd1b267283bfc445bcd78f5

data/emojidex.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'emojidex'
-  s.version     = '0.3.5'
+  s.version     = '0.4.0'
   s.license     = 'emojiOL'
   s.summary     = 'emojidex Ruby tools'
   s.description = 'emojidex emoji handling, search and lookup, listing and caching functionality' \

data/lib/emojidex/data/collection.rb

@@ -128,6 +128,7 @@ module Emojidex
         _add_list(list)
         categorize
         associate_variants
+        associate_customizations
         condense_moji_code_data
         @emoji
       end
@@ -174,6 +175,14 @@ module Emojidex
         end
       end
 
+      def associate_customizations
+        @emoji.values.each do |emoji_obj|
+          emoji_obj.combinations.each do |combo|
+            @emoji[combo.base.to_sym].add_customization(combo)
+          end
+        end
+      end
+
       def _sub_search(list, criteria = {})
         cr = criteria.shift
         return list if cr.nil?

data/lib/emojidex/data/collection/asset_information.rb

@@ -9,6 +9,9 @@ module Emojidex
                              sizes = Emojidex::Defaults.sizes)
         @emoji.values.each do |moji|
           moji.checksums = get_checksums(moji, formats, sizes)
+          moji.combinations.each do |combo|
+            combo.checksums = get_combo_checksums(moji, combo, formats, sizes)
+          end
         end
       end
 
@@ -25,9 +28,34 @@ module Emojidex
         sums
       end
 
+      def get_combo_checksums(moji, combo, formats = Emojidex::Defaults.formats,
+                        sizes = Emojidex::Defaults.sizes)
+        sums = combo.generate_blank_entry_set
+        if formats.include? :svg
+          for i in 0..(combo.components.length - 1)
+            combo.components[i].each do |component|
+              sums[i][component][:svg] = _checksum_for_file("#{@vector_source_path}/#{combo.base}/#{i}/#{component}.svg")
+            end
+          end
+        end
+        if formats.include? :png
+          sizes.keys.each do |size|
+            for i in 0..(combo.components.length - 1)
+              combo.components[i].each do |component|
+                sums[i][component][:png] = _checksum_for_file("#{@raster_source_path}/#{size}/#{combo.base}/#{i}/#{component}.png")
+              end
+            end
+          end
+        end
+        sums
+      end
+
       def generate_paths(formats = Emojidex::Defaults.formats, sizes = Emojidex::Defaults.sizes)
         @emoji.values.each do |moji|
           moji.paths = get_paths(moji, formats, sizes)
+          moji.combinations.each do |combo|
+            combo.paths = get_combo_paths(moji, combo, formats, sizes)
+          end
         end
       end
 
@@ -58,6 +86,18 @@ module Emojidex
         paths
       end
 
+      def get_combo_paths(moji, combo, formats = Emojidex::Defaults.formats,
+                    sizes = Emojidex::Defaults.sizes)
+        paths = combo.generate_blank_path_set
+        paths[:svg] = "#{@vector_source_path}/#{moji.code}"
+        if formats.include? :png
+          sizes.keys.each do |size|
+            paths[:png][size] = "#{@raster_source_path}/#{size}/#{moji.code}"
+          end
+        end
+        paths
+      end
+
       private
 
       def _checksum_for_file(path)

data/lib/emojidex/data/emoji.rb

@@ -1,19 +1,33 @@
 require_relative '../../emojidex'
+require_relative 'emoji/combination_information'
 require_relative 'emoji/asset_information'
 
 module Emojidex
   module Data
     # emoji base class
     class Emoji
+      # Attribute Definitions:
+      # * moji: the actual character code associated with this emoji (if any)
+      # * category: category this emoji belongs to (usually as defined by Unicode)
+      # * code: the "short code" for the emoji
+      # * code_ja: the Japanese version of the "short code"
+      # * unicode: a string representing the hex of the unicode characters with - between multiples
+      # * tags: the tags registered to this emoji (usually only from the service)
+      # * emoticon: the emoticon that maps to this emoji (rarely used/not recommended)
+      # * variants: different (variants) of the emoji EG: racial modifiers
+      # * base: the base variant EG: the base emoji without modifiers
+      # * r18: flag indicating adult content
       attr_accessor :moji, :category, :code, :code_ja,
                     :unicode, :tags, :emoticon, :variants, :base,
                     :r18
 
+      include Emojidex::Data::EmojiCombinationInformation
       include Emojidex::Data::EmojiAssetInformation
 
       def initialize(details = {})
         _init_identifier_info(details)
         _init_descriptor_info(details)
+        init_combination_info(details)
         init_asset_info(details)
       end
 
@@ -22,7 +36,12 @@ module Emojidex
       end
 
       def to_json(*args)
-        to_hash.to_json(*args)
+        hash = to_hash
+        hash.each do |key, val|
+          hash.delete(key) if (val.instance_of?(Array) && val.length == 0)
+          hash.delete(key) if (val.instance_of?(String) && val == "")
+        end
+        hash.to_json(*args)
       end
 
       def to_hash

data/lib/emojidex/data/emoji/asset_information.rb

@@ -63,6 +63,7 @@ module Emojidex
         Emojidex::Defaults.sizes.keys.each do |size|
           @paths[:png][size] = paths[:png][size] if paths[:png].include? size
         end
+        @combinations.each { |combo| combo.fill_paths(paths) }
         @paths
       end
 
@@ -112,6 +113,7 @@ module Emojidex
         @paths[:png].keys.each do |size|
           @checksums[:png][size] = _checksum_for_file(@paths[:png][size])
         end
+        @combinations.each { |combo| combo.generate_checksums }
         @checksums
       end
 

data/lib/emojidex/data/emoji/combination.rb

@@ -0,0 +1,44 @@
+require_relative 'combination_asset_information.rb'
+
+module Emojidex
+  module Data
+    # Combination information container
+    class Combination
+      # * base: the named base that this combination belongs to
+      # * combinations: combinations starting with this emoji; base/components/component order
+      # * cutomizations: emoji which start customization of this emoji (this is combination base)
+      attr_accessor :base, :component_layer_order, :components
+
+      include Emojidex::Data::EmojiCombinationAssetInformation
+
+      def initialize(code, combination_info, details = {})
+        @base = combination_info[:base]
+
+        @components = []
+        @components << [Emojidex.escape_code(code.to_s)]
+        combination_info[:components].each { |component_set| @components << component_set }
+        if combination_info.include? :component_layer_order
+          @component_layer_order = combination_info[:component_layer_order]
+        else
+          @component_layer_order = []
+          for i in 0..(@components.length - 1)
+            @component_layer_order << i
+          end
+        end
+
+        init_asset_info(details)
+      end
+
+      def to_json(options = {})
+        truncated_components = @components.dup
+        truncated_components.shift
+        {
+          base: @base,
+          component_layer_order: @component_layer_order,
+          components: truncated_components,
+          checksums: @checksums
+        }.to_json
+      end
+    end
+  end
+end

data/lib/emojidex/data/emoji/combination_asset_information.rb

@@ -0,0 +1,92 @@
+require 'digest/md5'
+require_relative '../../defaults'
+
+module Emojidex
+  module Data
+    # Asset information for emoji
+    module EmojiCombinationAssetInformation
+      attr_accessor :checksums, :paths, :remote_checksums
+
+      def init_asset_info(details = {})
+        blank_paths
+        blank_checksums
+        fill_remote_checksums(details[:checksums]) if details.include? :checksums
+      end
+
+      def generate_blank_entry_set
+        entry_set = []
+        @components.each do |component_set|
+          component_group = {}
+          component_set.each do |single_component|
+            component_group[single_component] = {}
+            component_group[single_component][:svg] = nil
+            component_group[single_component][:png] = {}
+            Emojidex::Defaults.sizes.keys.each do |size|
+              component_group[single_component][:png][size] = nil
+            end
+          end
+          entry_set << component_group
+        end
+        entry_set
+      end
+
+      def blank_paths
+        @paths = generate_blank_path_set
+      end
+
+      def generate_blank_path_set
+        paths = {}
+        paths[:svg] = nil
+        paths[:png] = {}
+        Emojidex::Defaults.sizes.keys.each do |size|
+          paths[:png][size] = nil
+        end
+        paths
+      end
+
+      def fill_paths(paths)
+        @paths = paths
+        @paths[:svg].slice!(/\.svg$/)
+        @paths[:png].each { |png| png.slice!(/\.png$/) }
+      end
+
+      def blank_checksums
+        @checksums = generate_blank_entry_set
+        @remote_checksums = generate_blank_entry_set
+      end
+
+      def generate_checksum(component_set_num, component_name, format, size = nil)
+        case format
+        when :png
+          return @checksums[component_set_num][component_name][:png][size] =
+            _checksum_for_file("#{@paths[:png][size]}/#{component_set_num}/#{component_name}.png")
+        when :svg
+          return @checksums[component_set_num][component_name][:svg] =
+            _checksum_for_file("#{@paths[:svg]}/#{component_set_num}/#{component_name}.svg")
+        end
+        nil
+      end
+
+      def generate_checksums
+        @components.each_with_index do |component_set, i|
+          component_set.each do |component_name|
+            generate_checksum(i, component_name, :svg)
+            @checksums[i][component_name][:png].keys.each do |size_key|
+              generate_checksum(i, component_name, :png, size_key)
+            end
+          end
+        end
+      end
+
+      def fill_remote_checksums(checksums)
+        #todo once implemented in API
+      end
+
+      private
+
+      def _checksum_for_file(path)
+        (File.exist? path) ? Digest::MD5.file(path).hexdigest : nil
+      end
+    end
+  end
+end

data/lib/emojidex/data/emoji/combination_information.rb

@@ -0,0 +1,40 @@
+require_relative '../../defaults'
+require_relative 'combination'
+
+module Emojidex
+  module Data
+    # Combination information for emoji
+    module EmojiCombinationInformation
+      attr_accessor :combinations, :customizations
+
+      def init_combination_info(details)
+        _check_and_init_combinations
+        fill_combinations(details[:combinations]) if details.include? :combinations
+      end
+
+      def fill_combinations(combinations)
+        _check_and_init_combinations
+        combinations.each do |combination|
+          add_combination(combination)
+        end
+      end
+
+      def add_combination(combination_info)
+        _check_and_init_combinations
+        @combinations << Combination.new(@code, combination_info) 
+      end
+
+      def add_customization(combo)
+        _check_and_init_combinations
+        @customizations << combo
+        @customizations.uniq!
+      end
+
+      private
+      def _check_and_init_combinations
+        @combinations = [] if @combinations.nil?
+        @customizations = [] if @customizations.nil?
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emojidex
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -90,6 +90,9 @@ files:
 - lib/emojidex/data/collection/static_collection.rb
 - lib/emojidex/data/emoji.rb
 - lib/emojidex/data/emoji/asset_information.rb
+- lib/emojidex/data/emoji/combination.rb
+- lib/emojidex/data/emoji/combination_asset_information.rb
+- lib/emojidex/data/emoji/combination_information.rb
 - lib/emojidex/data/extended.rb
 - lib/emojidex/data/utf.rb
 - lib/emojidex/defaults.rb
@@ -122,7 +125,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: emojidex Ruby tools