emojidex 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea575d94d7d398288be6ce736bc20e366267943
-  data.tar.gz: e049cb63c893faef50480ece90d00ab4c9372195
+  metadata.gz: 9204688c02e7450be481699ce1444f6b2966ee20
+  data.tar.gz: c398c6963a4e691f2bd64c10cd33a9fb943753c3
 SHA512:
-  metadata.gz: 373cbf2c210c2b3f778c83e00b6d1b8196f4fd7c37fa857abca99e304d21c30657ccec4853b75824cc9a75769dbd43a0d252cbd8ef0523c42be670927da74945
-  data.tar.gz: a5bd556fd516939f75ed1531ad7c88d4fdcaa41c61ee102790d204f22d7af6b6887fddf5a94646307930b0430025eee45e4efd5d2e6c5161b7f9f9db4cac5028
+  metadata.gz: e2f4beac1e132008e2c7ce68767f1eebfeabdb2899d95a8eec6d0c944972b907908407a3648a42fc9d010c69999bc7a1b278c82569df557a4ee917b6d61d42bf
+  data.tar.gz: d6a497d83bbcb0ce9886cafa3ccfea81af4b4eb518700283bd57b7d1a4699ed973fa735e605ac04effa2ac0d154bc667f92ba712b8c2e645d6432fc3f79e5ef4

data/emojidex.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'emojidex'
-  s.version     = '0.2.3'
+  s.version     = '0.3.0'
   s.license     = 'emojiOL'
   s.summary     = 'emojidex Ruby tools'
   s.description = 'emojidex emoji handling, search and lookup, listing and caching functionality' \
@@ -17,4 +17,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency 'faraday', '~> 0.9', '~> 0.9.2'
   s.add_dependency 'faraday_middleware', '~> 0.10', '~> 0.10.0'
+  s.add_dependency 'typhoeus'
 end

data/lib/emojidex/data/collection/cache.rb

@@ -10,11 +10,13 @@ module Emojidex
     module CollectionCache
       include Emojidex::Data::CollectionAssetInformation
       attr_reader :cache_path, :download_queue
-      attr_accessor :download_threads
+      attr_accessor :download_threads, :formats, :sizes
 
       def setup_cache(path = nil)
+        @formats = Emojidex::Defaults.selected_formats unless @formats
+        @sizes = Emojidex::Defaults.selected_sizes unless @sizes
         @download_queue = []
-        @download_threads = 8
+        @download_threads = 4
         # check if cache dir is already set
         return @cache_path if @cache_path && path.nil?
         # setup cache
@@ -79,7 +81,7 @@ module Emojidex
         idx = JSON.parse idx
         idx.each do |moji|
           moji['paths'] = nil
-          moji['local_checksums'] = nil
+          moji['remote_checksums'] = nil
           moji.delete_if { |_k, v| v.nil? }
         end
         File.open("#{destination}/emoji.json", 'w') { |f| f.write idx.to_json }
@@ -88,24 +90,29 @@ module Emojidex
       private
 
       def _svg_check_copy(moji)
-        src = "#{@vector_source_path}/#{moji.code}.svg"
-        if File.exist? "#{src}"
-            FileUtils.cp("#{src}", @cache_path) unless @vector_source_path == @cache_path
-        else
-          @download_queue << { moji: moji, formats: :svg, sizes: [] }
+        if @vector_source_path != nil
+          src_d = "#{@vector_source_path}/#{moji.code}"
+          src = "#{src_d}.svg"
+
+          FileUtils.cp(src, @cache_path) if File.exist?(src) && @vector_source_path != @cache_path
+          FileUtils.cp_r(src_d, @cache_path) if File.directory?(src_d) && @vector_source_path != @cache_path # Copies source frames and data files if unpacked
+          @download_queue << { moji: moji, formats: :svg, sizes: [] } unless File.exist?("#{@cache_path}/#{moji.code}.svg") # nothing was copied, get from net
+          return
         end
-        FileUtils.cp_r src, @cache_path if File.directory? src # Copies source frames and data files if unpacked
+
+        @download_queue << { moji: moji, formats: :svg, sizes: [] }
       end
 
       def _raster_check_copy(moji, format, sizes)
         sizes.each do |size|
-          src = "#{@raster_source_path}/#{size}/#{moji.code}"
-          if File.exist? "#{src}.#{format}"
-            FileUtils.cp("#{src}.#{format}", ("#{@cache_path}/#{size}")) unless @raster_source_path == @cache_path
-          else
-            @download_queue << { moji: moji, formats: [format], sizes: [size] }
+          if @raster_source_path != nil
+            src_d = "#{@raster_source_path}/#{size}/#{moji.code}"
+            src = "#{src_d}.#{format}"
+
+            FileUtils.cp("#{src}", ("#{@cache_path}/#{size}")) if File.exist?(src) && @raster_source_path != @cache_path
+            FileUtils.cp_r(src, @cache_path) if File.directory?(src_d) && @raster_source_path != @cache_path # Copies source frames and data files if unpacked
+            @download_queue << { moji: moji, formats: [format], sizes: [size] } unless File.exist?("#{@cache_path}/#{size}/#{moji.code}.#{format}") # nothing was copied, get from net
           end
-          FileUtils.cp_r(src, @cache_path) if File.directory? src # Copies source frames and data files if unpacked
         end
       end
 
@@ -113,7 +120,7 @@ module Emojidex
         thr = []
         @download_queue.each do |dl|
           thr << Thread.new { _cache_from_net(dl[:moji], dl[:formats], dl[:sizes]) }
-          thr.each(&:join) if thr.length >= @download_threads
+          thr.each(&:join) if thr.length >= (@download_threads - 1)
         end
         thr.each(&:join) # grab end of queue
       end
@@ -128,12 +135,9 @@ module Emojidex
 
       def _cache(options)
         setup_cache options[:cache_path]
-        formats = options[:formats] || Emojidex::Defaults.selected_formats
-        sizes = options[:sizes] || Emojidex::Defaults.selected_sizes
-        
-        @vector_source_path = @cache_path if @vector_source_path.nil?
-        @raster_source_path = @cache_path if @raster_source_path.nil?
-        
+        formats = options[:formats] || @formats
+        sizes = options[:sizes] || @sizes
+
         @emoji.values.each do |moji|
           _svg_check_copy(moji) if formats.include? :svg
           _raster_check_copy(moji, :png, sizes) if formats.include? :png

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

@@ -5,11 +5,12 @@ module Emojidex
   module Data
     # Asset information for emoji
     module EmojiAssetInformation
-      attr_accessor :checksums, :paths, :local_checksums
+      attr_accessor :checksums, :paths, :remote_checksums
 
       def init_asset_info(details)
+        blank_paths
         blank_checksums
-        fill_checksums(details[:checksums]) if details.include? :checksums
+        fill_remote_checksums(details[:checksums]) if details.include? :checksums
       end
 
       # returns asset checksum
@@ -26,7 +27,16 @@ module Emojidex
         Emojidex::Defaults.sizes.keys.each do |size|
           @checksums[:png][size] = nil
         end
-        @local_checksums = @checksums.dup
+        @remote_checksums = @checksums.dup
+      end
+
+      def fill_remote_checksums(checksums)
+        @remote_checksums[:svg] = checksums[:svg] if checksums.include? :svg
+        return unless checksums.include? :png
+        Emojidex::Defaults.sizes.keys.each do |size|
+          @remote_checksums[:png][size] = checksums[:png][size] if checksums[:png].include? size
+        end
+        @remote_checksums
       end
 
       def fill_checksums(checksums)
@@ -35,6 +45,7 @@ module Emojidex
         Emojidex::Defaults.sizes.keys.each do |size|
           @checksums[:png][size] = checksums[:png][size] if checksums[:png].include? size
         end
+        @checksums
       end
 
       def blank_paths
@@ -52,6 +63,7 @@ module Emojidex
         Emojidex::Defaults.sizes.keys.each do |size|
           @paths[:png][size] = paths[:png][size] if paths[:png].include? size
         end
+        @paths
       end
 
       # Acquires path and caches the target file if not found or out of date
@@ -75,7 +87,7 @@ module Emojidex
 
       # Caches a file of the specified format in the specified sizes
       def cache(format, sizes = nil)
-        generate_local_checksums
+        generate_checksums
         case format
         when :png
           _cache_png(sizes) unless sizes.nil?
@@ -85,33 +97,33 @@ module Emojidex
       end
 
       # Generates a checksum for each locally cached file
-      def generate_local_checksum(format, size = nil)
+      def generate_checksum(format, size = nil)
         case format
         when :png
-          return @local_checksums[:png][size] = _checksum_for_file(@paths[:png][size])
+          return @checksums[:png][size] = _checksum_for_file(@paths[:png][size])
         when :svg
-          return @local_checksum[:svg] = _checksum_for_file(@paths[:svg])
+          return @checksums[:svg] = _checksum_for_file(@paths[:svg])
         end
         nil
       end
 
-      def generate_local_checksums
-        @local_checksums[:svg] = _checksum_for_file(@paths[:svg])
+      def generate_checksums
+        @checksums[:svg] = _checksum_for_file(@paths[:svg])
         @paths[:png].keys.each do |size|
-          @local_checksums[:png][size] = _checksum_for_file(@paths[:png][size])
+          @checksums[:png][size] = _checksum_for_file(@paths[:png][size])
         end
-        @local_checksums
+        @checksums
       end
 
       private
 
       def _cache_svg
         @paths[:svg] = Dir.pwd unless (@paths.include? :svg) && !@paths[:svg].nil?
-        return if File.exist?(@paths[:svg]) && !@checksums[:svg].nil? &&
-                  @checksums[:svg] == generate_local_checksum(:svg)
+        return if File.exist?(@paths[:svg]) && (!@remote_checksums[:svg].nil? &&
+                  @remote_checksums[:svg] == generate_checksum(:svg))
         response = Emojidex::Service::Transactor.download("#{@code}.svg")
         File.open(@paths[:svg], 'wb') { |fp| fp.write(response.body) }
-        generate_local_checksum(:svg)
+        generate_checksum(:svg)
       end
 
       def _cache_png(sizes)
@@ -123,12 +135,12 @@ module Emojidex
                  @paths[:png].include?(size) && @paths[:png][size].nil? == false
             @paths[:png][size] = "#{Dir.pwd}/#{size}/#{@code}.png"
           end
-          next if File.exist?(@paths[:png][size]) &&
-                  !@checksums[:png][size].nil? &&
-                  @checksums[:png][size] == generate_local_checksum(:png, size)
+          next if File.exist?(@paths[:png][size]) && (
+                  !@remote_checksums[:png][size].nil? &&
+                  @remote_checksums[:png][size] == generate_checksum(:png, size))
           response = Emojidex::Service::Transactor.download("#{size}/#{@code}.png")
           File.open(@paths[:png][size], 'wb') { |fp| fp.write(response.body) }
-          generate_local_checksum(:png, size)
+          generate_checksum(:png, size)
         end
       end
 

data/lib/emojidex/service/collection.rb

@@ -13,17 +13,23 @@ module Emojidex
 
         @status = ''
 
-        _init_emoji
-        _init_user_info
-        _init_endpoint
-        _init_cache
-
         @auto_cache = @opts[:auto_cache] || true
         @opts.delete(:auto_cache)
 
+        @formats = @opts[:formats] || Emojidex::Defaults.selected_formats
+        @opts.delete(:formats)
+
+        @sizes = @opts[:sizes] || Emojidex::Defaults.selected_sizes
+        @opts.delete(:sizes)
+
         auto_init = @opts[:auto_init] || true
         @opts.delete(:auto_init)
 
+        _init_emoji
+        _init_user_info
+        _init_endpoint
+        _init_cache
+
         more if auto_init
 
         @emoji
@@ -49,6 +55,10 @@ module Emojidex
         end
 
         _process_moji_page(moji_page)
+        
+        cache! if @auto_cache
+
+        moji_page
       end
 
       private
@@ -89,7 +99,6 @@ module Emojidex
         end
 
         add_emoji(moji_page)
-        cache! if @auto_cache
         moji_page
       end
 

data/lib/emojidex/service/transactor.rb

@@ -1,4 +1,6 @@
 require 'faraday'
+require 'typhoeus'
+require 'typhoeus/adapters/faraday'
 require 'json'
 require_relative '../../emojidex'
 require_relative 'error'
@@ -8,7 +10,7 @@ module Emojidex
     # API transaction utility
     class Transactor
       @@connection = nil
-      @@retries = 3
+      @@retries = 10
 
       @@settings = {
         api: {
@@ -56,10 +58,10 @@ module Emojidex
         return @@connection if @@connection
         @@connection = Faraday.new do |conn|
           conn.request :url_encoded
-          conn.request :retry, max: @@retries, interval: 0.05, interval_randomness: 0.05,
+          conn.request :retry, max: @@retries, interval: 0.05, interval_randomness: 0.5,
                         backoff_factor: 2
           # conn.response :logger
-          conn.adapter Faraday.default_adapter
+          conn.adapter :typhoeus #Faraday.default_adapter
         end
         _kludge_windows if Gem.win_platform?
         @@connection

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emojidex
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-07 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -50,6 +50,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.0
+- !ruby/object:Gem::Dependency
+  name: typhoeus
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: emojidex emoji handling, search and lookup, listing and caching functionality
   and user info (favorites/etc).
 email: info@emojidex.com