emojidex 0.4.2 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a0ce4435f22fc24586dd81a50e2d1ad58209908
-  data.tar.gz: 475b4a67442a8516d0b4c067afd836366d349e02
+  metadata.gz: bd1e35d3a2d4cc4350a48bf41217d73f69eb4a43
+  data.tar.gz: 924813dae07d7e993807321a890ec8c3bee659bf
 SHA512:
-  metadata.gz: cd73c2ec186fa8573b00d3a2adba27a1b1483411deefc01e4ecaeec90264dac79894346b75b71b2da31e43aabbce1daf2972accd4bb081a214fd2892ecd6e9ed
-  data.tar.gz: 5a1ad7ae00db88d7ac8c5fea6db5653d17f8160de03450a571ee58c7cc908589a184c82fa25a9827896130d6795e27ac853b089e933dffe278325ec2a799d363
+  metadata.gz: 3d069673ce17204952df7b76792684bd87c254dbd800856da603466f838a32076af19696ce4c54c72af1deb825e0c129c5c77c9ebae5712cf1d10bfb279fa50b
+  data.tar.gz: 9c5dbf7cfd034b23ba9e80d9178e0694e647c41490d4ca20aec0aeb8ba8518df267ccc2e85a9065ef6f5cee536d7e6fecc3f3e730afccaf93dde8116cdb9bb31

data/emojidex.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'emojidex'
-  s.version     = '0.4.2'
+  s.version     = '0.5.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

@@ -178,7 +178,7 @@ module Emojidex
       def associate_customizations
         @emoji.values.each do |emoji_obj|
           emoji_obj.combinations.each do |combo|
-            @emoji[combo.base.to_sym].add_customization(combo)
+            @emoji[combo.base.to_sym].add_customization(combo) if @emoji.include? combo.base.to_sym
           end
         end
       end

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

@@ -37,6 +37,7 @@ module Emojidex
         if formats.include? :svg
           for i in 0..(combo.components.length - 1)
             combo.components[i].each do |component|
+              next if component == ''
               sums[i][component][:svg] = _checksum_for_file("#{@vector_source_path}/#{combo.base}/#{i}/#{component}.svg")
             end
           end
@@ -45,6 +46,7 @@ module Emojidex
           sizes.keys.each do |size|
             for i in 0..(combo.components.length - 1)
               combo.components[i].each do |component|
+                next if component == ''
                 sums[i][component][:png][size] = _checksum_for_file("#{@raster_source_path}/#{size}/#{combo.base}/#{i}/#{component}.png")
               end
             end

data/lib/emojidex/data/emoji.rb

@@ -1,5 +1,5 @@
 require_relative '../../emojidex'
-require_relative 'emoji/combination_information'
+require_relative 'emoji/component_set_information'
 require_relative 'emoji/asset_information'
 
 module Emojidex
@@ -21,7 +21,7 @@ module Emojidex
                     :unicode, :tags, :emoticon, :variants, :base,
                     :r18
 
-      include Emojidex::Data::EmojiCombinationInformation
+      include Emojidex::Data::EmojiComponentSetInformation
       include Emojidex::Data::EmojiAssetInformation
 
       def initialize(details = {})

data/lib/emojidex/data/emoji/{combination.rb → component_set.rb}

@@ -1,22 +1,20 @@
-require_relative 'combination_asset_information.rb'
+require_relative 'component_set_asset_information.rb'
 
 module Emojidex
   module Data
     # Combination information container
-    class Combination
+    class ComponentSet
       # * 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
+      include Emojidex::Data::EmojiComponentSetAssetInformation
 
       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 }
+        @components = combination_info[:components]
         if combination_info.include? :component_layer_order
           @component_layer_order = combination_info[:component_layer_order]
         else
@@ -30,12 +28,10 @@ module Emojidex
       end
 
       def to_json(options = {})
-        truncated_components = @components.dup
-        truncated_components.shift
         {
           base: @base,
           component_layer_order: @component_layer_order,
-          components: truncated_components,
+          components: @components,
           checksums: @checksums
         }.to_json
       end

data/lib/emojidex/data/emoji/{combination_asset_information.rb → component_set_asset_information.rb}

@@ -4,7 +4,7 @@ require_relative '../../defaults'
 module Emojidex
   module Data
     # Asset information for emoji
-    module EmojiCombinationAssetInformation
+    module EmojiComponentSetAssetInformation
       attr_accessor :checksums, :paths, :remote_checksums
 
       def init_asset_info(details = {})
@@ -18,6 +18,7 @@ module Emojidex
         @components.each do |component_set|
           component_group = {}
           component_set.each do |single_component|
+            next if single_component == ''
             component_group[single_component] = {}
             component_group[single_component][:svg] = nil
             component_group[single_component][:png] = {}

data/lib/emojidex/data/emoji/{combination_information.rb → component_set_information.rb}

@@ -1,10 +1,10 @@
 require_relative '../../defaults'
-require_relative 'combination'
+require_relative 'component_set'
 
 module Emojidex
   module Data
     # Combination information for emoji
-    module EmojiCombinationInformation
+    module EmojiComponentSetInformation
       attr_accessor :combinations, :customizations
 
       def init_combination_info(details)
@@ -21,7 +21,7 @@ module Emojidex
 
       def add_combination(combination_info)
         _check_and_init_combinations
-        @combinations << Combination.new(@code, combination_info) 
+        @combinations << ComponentSet.new(@code, combination_info) 
       end
 
       def add_customization(combo)
@@ -30,8 +30,8 @@ module Emojidex
         @customizations.each do |customization|
           if (customization.base == combo.base) &&
               (customization.component_layer_order == combo.component_layer_order)
-            for i in 0..(customization.components.length - 1)
-              customization.components[i] = customization.components[i] | combo.components[i]
+            customization.components.each_with_index do |components, i|
+              customization.components[i] = components | combo.components[i]
             end
             added = true
           end

data/lib/emojidex/service/transactor.rb

@@ -1,4 +1,5 @@
 require 'faraday'
+require 'faraday_middleware'
 require 'typhoeus'
 require 'typhoeus/adapters/faraday'
 require 'json'
@@ -61,6 +62,7 @@ module Emojidex
           conn.request :retry, max: @@retries, interval: 0.05, interval_randomness: 0.5,
                         backoff_factor: 2
           # conn.response :logger
+          conn.use FaradayMiddleware::FollowRedirects, limit: 5
           conn.adapter :typhoeus #Faraday.default_adapter
         end
         _kludge_windows if Gem.win_platform?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emojidex
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.5.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-31 00:00:00.000000000 Z
+date: 2017-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -90,9 +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/emoji/component_set.rb
+- lib/emojidex/data/emoji/component_set_asset_information.rb
+- lib/emojidex/data/emoji/component_set_information.rb
 - lib/emojidex/data/extended.rb
 - lib/emojidex/data/utf.rb
 - lib/emojidex/defaults.rb