emojidex 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6f88686eccedc6de0ac1cc7fae3d7cbe5ecea2
-  data.tar.gz: 7c50835110dd0241205e3793b2a557cc1b31fce8
+  metadata.gz: 4ea575d94d7d398288be6ce736bc20e366267943
+  data.tar.gz: e049cb63c893faef50480ece90d00ab4c9372195
 SHA512:
-  metadata.gz: 1f0bc60a900cdf724fc878d5b4c7cb0f13921c105c017a61ce9443ed920dc412717af1fd10a86f0b3ce513ac6192e209f93293e4dbc1670391e654a103e2107f
-  data.tar.gz: 088cdba0c8bed81cebee332c1bec647dbf41c797c4b7d9466a5a6d0dc764ae67c751752cc5b80f94c7ab34eaf85af60543f65d08e95833b4dff0d929889c7807
+  metadata.gz: 373cbf2c210c2b3f778c83e00b6d1b8196f4fd7c37fa857abca99e304d21c30657ccec4853b75824cc9a75769dbd43a0d252cbd8ef0523c42be670927da74945
+  data.tar.gz: a5bd556fd516939f75ed1531ad7c88d4fdcaa41c61ee102790d204f22d7af6b6887fddf5a94646307930b0430025eee45e4efd5d2e6c5161b7f9f9db4cac5028

data/emojidex.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'emojidex'
-  s.version     = '0.2.2'
+  s.version     = '0.2.3'
   s.license     = 'emojiOL'
   s.summary     = 'emojidex Ruby tools'
   s.description = 'emojidex emoji handling, search and lookup, listing and caching functionality' \
@@ -9,12 +9,12 @@ Gem::Specification.new do |s|
   s.email       = 'info@emojidex.com'
   s.homepage    = 'http://developer.emojidex.com'
 
-  s.required_ruby_version = '>= 2.0'
+  s.required_ruby_version = '>= 2.2'
   s.files       = Dir.glob('emoji/**/*') +
                   Dir.glob('lib/**/*.rb') +
                   ['emojidex.gemspec']
   s.require_paths = ['lib']
 
   s.add_dependency 'faraday', '~> 0.9', '~> 0.9.2'
-  s.add_dependency 'faraday_middleware', '~> 0.9', '~> 0.9.2'
+  s.add_dependency 'faraday_middleware', '~> 0.10', '~> 0.10.0'
 end

data/lib/emojidex/data/collection.rb

@@ -37,13 +37,17 @@ module Emojidex
 
       # Loads an emoji collection on local storage
       def load_local_collection(path)
-        @source_path =  File.expand_path(path)
+        @source_path = @vector_source_path = @raster_source_path = File.expand_path(path)
         json = IO.read(@source_path + '/emoji.json')
         list = JSON.parse(json, symbolize_names: true)
         add_emoji(list)
         generate_paths
       end
 
+      def emojis
+        @emoji.values
+      end
+
       # each override to map each functionality to the emoji hash values
       def each(&block)
         @emoji.values.each(&block)

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

@@ -15,11 +15,11 @@ module Emojidex
       def get_checksums(moji, formats = Emojidex::Defaults.formats,
                         sizes = Emojidex::Defaults.sizes)
         sums = {}
-        sums[:svg] = _checksum_for_file("#{@cache_path}/#{moji.code}.svg") if formats.include? :svg
+        sums[:svg] = _checksum_for_file("#{@vector_source_path}/#{moji.code}.svg") if formats.include? :svg
         if formats.include? :png
           sums[:png] = {}
           sizes.keys.each do |size|
-            sums[:png][size] = _checksum_for_file("#{@cache_path}/#{size}/#{moji.code}.png")
+            sums[:png][size] = _checksum_for_file("#{@raster_source_path}/#{size}/#{moji.code}.png")
           end
         end
         sums
@@ -33,12 +33,12 @@ module Emojidex
 
       def get_paths?(moji, formats = Emojidex::Defaults.formats, sizes = Emojidex::Defaults.sizes)
         paths = {}
-        path = "#{@cache_path}/#{moji.code}.svg"
+        path = "#{@vector_source_path}/#{moji.code}.svg"
         paths[:svg] = path if File.exist? path
         if formats.include? :png
           paths[:png] = {}
           sizes.keys.each do |size|
-            path = "#{@cache_path}/#{size}/#{moji.code}.png"
+            path = "#{@raster_source_path}/#{size}/#{moji.code}.png"
             paths[:png][size] = path if File.exist? path
           end
         end
@@ -48,11 +48,11 @@ module Emojidex
       def get_paths(moji, formats = Emojidex::Defaults.formats,
                     sizes = Emojidex::Defaults.sizes)
         paths = {}
-        paths[:svg] = "#{@cache_path}/#{moji.code}.svg"
+        paths[:svg] = "#{@vector_source_path}/#{moji.code}.svg"
         if formats.include? :png
           paths[:png] = {}
           sizes.keys.each do |size|
-            paths[:png][size] = "#{@cache_path}/#{size}/#{moji.code}.png"
+            paths[:png][size] = "#{@raster_source_path}/#{size}/#{moji.code}.png"
           end
         end
         paths
@@ -61,7 +61,11 @@ module Emojidex
       private
 
       def _checksum_for_file(path)
-        (File.exist? path) ? Digest::MD5.file(path).hexdigest : nil
+        sum = nil
+        if File.exist? path
+          sum = Digest::MD5.file(path).hexdigest
+        end
+        sum
       end
     end
   end

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

@@ -40,7 +40,6 @@ module Emojidex
       # Caches emoji to local emoji storage cache
       # Options:
       #   cache_path: manually specify cache location
-      #     (default is ENV['EMOJI_CACHE'] or '$HOME/.emoji_cache')
       #   formats: formats to cache (default is SVG only)
       #   sizes: sizes to cache (default is px32, but this is irrelivant for SVG)
       def cache(options = {})
@@ -52,7 +51,6 @@ module Emojidex
       # +regenerates checksums and paths
       # Options:
       #   cache_path: manually specify cache location
-      #     (default is ENV['EMOJI_CACHE'] or '$HOME/.emoji_cache')
       #   formats: formats to cache (default is SVG only)
       #   sizes: sizes to cache (default is px32, but this is irrelivant for SVG)
       def cache!(options = {})
@@ -90,37 +88,24 @@ module Emojidex
       private
 
       def _svg_check_copy(moji)
-        if @vector_source_path.nil? && @source_path.nil?
-          @download_queue << { moji: moji, formats: :svg, sizes: [] }
-        end
-        @vector_source_path = @source_path if @vector_source_path.nil?
         src = "#{@vector_source_path}/#{moji.code}.svg"
         if File.exist? "#{src}"
-          unless File.exist?("#{@cache_path}/#{moji.code}.svg") &&
-                 FileUtils.compare_file("#{src}", "#{@cache_path}/#{moji.code}.svg")
-            FileUtils.cp("#{src}", @cache_path)
-          end
+            FileUtils.cp("#{src}", @cache_path) unless @vector_source_path == @cache_path
         else
           @download_queue << { moji: moji, formats: :svg, sizes: [] }
         end
-        FileUtils.cp_r src, @cache_path if File.directory? src
+        FileUtils.cp_r src, @cache_path if File.directory? src # Copies source frames and data files if unpacked
       end
 
       def _raster_check_copy(moji, format, sizes)
-        if @raster_source_path.nil? && @source_path.nil?
-          @download_queue << { moji: moji, formats: [format], sizes: sizes }
-        end
-        @raster_source_path = @source_path if @raster_source_path.nil?
-        moji.cache(format, sizes) if @raster_source_path.nil?
         sizes.each do |size|
-          next if File.exist? "#{@cache_path}/#{size}/#{moji.code}.#{format}" # TODO: check checksums
           src = "#{@raster_source_path}/#{size}/#{moji.code}"
-          if FileTest.exist? "#{src}.#{format}"
-            FileUtils.cp("#{src}.#{format}", ("#{@cache_path}/#{size}"))
+          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] }
           end
-          FileUtils.cp_r(src, @cache_path) if File.directory? src
+          FileUtils.cp_r(src, @cache_path) if File.directory? src # Copies source frames and data files if unpacked
         end
       end
 
@@ -130,6 +115,7 @@ module Emojidex
           thr << Thread.new { _cache_from_net(dl[:moji], dl[:formats], dl[:sizes]) }
           thr.each(&:join) if thr.length >= @download_threads
         end
+        thr.each(&:join) # grab end of queue
       end
 
       def _cache_from_net(moji, formats, sizes)
@@ -144,11 +130,18 @@ module Emojidex
         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?
+        
         @emoji.values.each do |moji|
           _svg_check_copy(moji) if formats.include? :svg
           _raster_check_copy(moji, :png, sizes) if formats.include? :png
         end
         _process_download_queue
+
+        @vector_source_path = @cache_path if formats.include? :svg
+        @raster_source_path = @cache_path if formats.include? :png
       end
     end
   end

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

@@ -115,7 +115,10 @@ module Emojidex
       end
 
       def _cache_png(sizes)
+        sizes = sizes.keys if sizes.is_a?(Hash)
         sizes.each do |size|
+          size = size.first if size.is_a?(Array)
+          size = size.key if size.is_a?(Hash)
           unless @paths.include?(:png) &&
                  @paths[:png].include?(size) && @paths[:png][size].nil? == false
             @paths[:png][size] = "#{Dir.pwd}/#{size}/#{@code}.png"

data/lib/emojidex/service/collection.rb

@@ -100,6 +100,8 @@ module Emojidex
         else
           setup_cache
         end
+
+        @raster_source_path = @vector_source_path = @source_path = @cache_path
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emojidex
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-31 00:00:00.000000000 Z
+date: 2016-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -36,20 +36,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '0.10'
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.2
+        version: 0.10.0
 description: emojidex emoji handling, search and lookup, listing and caching functionality
   and user info (favorites/etc).
 email: info@emojidex.com
@@ -94,7 +94,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.0'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="