emojidex 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5410198fbf7a8a192c52c7f321bf0c82549a7076
-  data.tar.gz: fc92c715b7aa8f648adadfe0ed2212b280c8e449
+  metadata.gz: 3e6f88686eccedc6de0ac1cc7fae3d7cbe5ecea2
+  data.tar.gz: 7c50835110dd0241205e3793b2a557cc1b31fce8
 SHA512:
-  metadata.gz: 575d1d4702c789d39b5189af25acead411053da281431cb4ac0d34ab79d9d26a4994249058f5246e9cd47173c1e0012dee779c0b9adb5988d67aa1268da2eb81
-  data.tar.gz: 6c4edaf23c04dbe9cb81f51ea21a53b4f3b2bcdfeedf5c43d54fdc56b0fe2f1b0ebefa803f27c4c46165e5a0753e5067f399698d1b65af50af81a3612cc580f7
+  metadata.gz: 1f0bc60a900cdf724fc878d5b4c7cb0f13921c105c017a61ce9443ed920dc412717af1fd10a86f0b3ce513ac6192e209f93293e4dbc1670391e654a103e2107f
+  data.tar.gz: 088cdba0c8bed81cebee332c1bec647dbf41c797c4b7d9466a5a6d0dc764ae67c751752cc5b80f94c7ab34eaf85af60543f65d08e95833b4dff0d929889c7807

data/emojidex.gemspec

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

@@ -16,12 +16,14 @@ module Emojidex
       include Emojidex::Data::CollectionAssetInformation
       include Emojidex::Data::CollectionMojiData
       attr_accessor :emoji, :categories,
-                    :source_path, :vector_source_path, :raster_source_path
+                    :source_path, :vector_source_path, :raster_source_path,
+                    :r18 # set to true if collection contains R-18 emoji
 
       # Initialize Collection. You can pass a list of emoji to seed the collection
       def initialize(opts = {})
         @emoji = {}
         @raster_source_path = @vector_source_path = @source_path = nil
+        @r18 = opts[:r18] || false
         if opts.include? :cache_path
           setup_cache(opts[:cache_path])
           opts.delete :cache_path
@@ -35,7 +37,7 @@ module Emojidex
 
       # Loads an emoji collection on local storage
       def load_local_collection(path)
-        @source_path = @vector_source_path = @raster_source_path = File.expand_path(path)
+        @source_path =  File.expand_path(path)
         json = IO.read(@source_path + '/emoji.json')
         list = JSON.parse(json, symbolize_names: true)
         add_emoji(list)
@@ -134,11 +136,14 @@ module Emojidex
       private
 
       def _add_list(list)
+        return if list.nil?
         list.each do |moji_info|
           if moji_info.instance_of? Emojidex::Data::Emoji
+            next if @r18 == false && moji_info.r18 == true
             @emoji[moji_info.code.to_sym] = moji_info.dup
             @emoji[moji_info.code.to_sym].paths = get_paths(moji_info)
           else
+            next if @r18 == false && moji_info.include?(:r18) && moji_info[:r18] == true
             emoji = Emojidex::Data::Emoji.new moji_info
             emoji.paths = get_paths(emoji)
             @emoji[Emojidex.escape_code(emoji.code.to_s).to_sym] = emoji

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

@@ -43,15 +43,22 @@ module Emojidex
       #     (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 = {})
+        _cache(options)
+        cache_index
+      end
+
+      # Caches emoji to local emoji storage cache
+      # +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 = {})
-        setup_cache options[:cache_path]
-        formats = options[:formats] || Emojidex::Defaults.selected_formats
-        sizes = options[:sizes] || Emojidex::Defaults.selected_sizes
-        @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
+        _cache(options)
+        generate_paths
+        generate_checksums
         cache_index
       end
 
@@ -63,7 +70,8 @@ module Emojidex
         idx = Emojidex::Data::Collection.new
         idx.load_local_collection(destination) if FileTest.exist? "#{destination}/emoji.json"
         idx.add_emoji @emoji.values
-        File.open("#{destination}/emoji.json", 'w') { |f| f.write idx.emoji.values.to_json }
+        #File.open("#{destination}/emoji.json", 'w') { |f| f.write idx.emoji.values.to_json }
+        write_index(destination)
       end
 
       # [over]writes a sanitized index to the specified destination.
@@ -71,7 +79,11 @@ module Emojidex
       def write_index(destination)
         idx = @emoji.values.to_json
         idx = JSON.parse idx
-        idx.each { |moji| moji.delete_if { |_k, v| v.nil? } }
+        idx.each do |moji|
+          moji['paths'] = nil
+          moji['local_checksums'] = nil
+          moji.delete_if { |_k, v| v.nil? }
+        end
         File.open("#{destination}/emoji.json", 'w') { |f| f.write idx.to_json }
       end
 
@@ -127,6 +139,17 @@ module Emojidex
         dls << Thread.new { moji.cache(:png, sizes) } if formats.include? :png
         dls.each(&:join)
       end
+
+      def _cache(options)
+        setup_cache options[:cache_path]
+        formats = options[:formats] || Emojidex::Defaults.selected_formats
+        sizes = options[:sizes] || Emojidex::Defaults.selected_sizes
+        @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
+      end
     end
   end
 end

data/lib/emojidex/data/emoji.rb

@@ -6,7 +6,8 @@ module Emojidex
     # emoji base class
     class Emoji
       attr_accessor :moji, :category, :code, :code_ja,
-                    :unicode, :tags, :emoticon, :variants, :base
+                    :unicode, :tags, :emoticon, :variants, :base,
+                    :r18
 
       include Emojidex::Data::EmojiAssetInformation
 
@@ -49,6 +50,7 @@ module Emojidex
         @unicode = details[:unicode].to_s
         @full_name = details[:full_name].to_s
         @emoticon = details[:emoticon].to_s
+        @r18 = details[:r18] || false
       end
 
       def _init_descriptor_info(details)

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

@@ -37,6 +37,15 @@ module Emojidex
         end
       end
 
+      def blank_paths
+        @paths = {}
+        @paths[:svg] = nil
+        @paths[:png] = {}
+        Emojidex::Defaults.sizes.keys.each do |size|
+          @paths[:png][size] = nil
+        end
+      end
+
       def fill_paths(paths)
         @paths[:svg] = paths[:svg] if paths.include? :svg
         return unless paths.include? :png

data/lib/emojidex/service/search.rb

@@ -78,6 +78,15 @@ module Emojidex
         end
         col
       end
+
+      def self._check_auth(opts)
+        if !(opts.include? :auth_token) && Emojidex::Client.USER.authorized?
+          opts[:username] = Emojidex::Client::USER.username
+          opts[:auth_token] = Emojidex::Client::USER.auth_token
+        end
+
+        opts
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emojidex
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday