emojidex-static-collector 0.0.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 912cbd47de163e05167f0d834b7a69cc9c0365a0
-  data.tar.gz: 60e67d9accdb2d9a0c4ceb3ee86131744e262248
+  metadata.gz: e9ffb813f3555a51b8fcdeec9e3e3e19492c843c
+  data.tar.gz: d6226db06139639a65bf25cbd56c5fd08dba8a6f
 SHA512:
-  metadata.gz: 6c00316b25db04a5841f57def1e2134a7ef788862a94d1f97b011f1e1451e91033d0f34b3a110d2cfdc16201a2ffb272ed2802beb343b8d206b1e7e027eb4791
-  data.tar.gz: 9822f9cbe2928894eb15a82b619ab433af6820f8d9834591a6dd519c9183aa5e7be25022b0d4befc3f499155327838b71197c3dd5a6e35474352215dca0ce451
+  metadata.gz: 6e00286c61492cf6461effd9aeacbe9d960d17828acead33a29ba970d8a8383f2b2668ad5fc01bb0c5849c99ff1350cd099006a2eacfd4b73b007f3b9b96ada0
+  data.tar.gz: d82cfdbd856b88266456048e083270ce83d332777aa926fa76932b7e792cb521d6ff30251cc0a8b21174b2f7065719e05fdcbe6639139876839bbdd97031f93f

data/bin/emojidex-static-collector

@@ -3,10 +3,10 @@ require 'optparse'
 require 'fileutils'
 require_relative '../lib/emojidex_static_collector'
 
-puts '⊂ em😜 jidex Static Collector⊃'
+puts '⊂ em😜🏼jidex Static Collector⊃'
 
 # s:size, t:type, o:output
-params = ARGV.getopts('s:t:o:h', 'utf-only', 'clean-cache')
+params = ARGV.getopts('s:t:o:h', 'utf-only', 'uncategorized', 'clean-cache')
 
 # Set params.
 params['s'] = '256' if params['s'].nil?
@@ -23,8 +23,10 @@ if params['h']
     "       \"en\" (standard English codes)\n" \
     "       \"ja\" (Japanese codes)\n" \
     "       \"char\" (raw character codes)\n" \
-    "       \"moji\" (moji code (:char with Japanese category directories))\n" \
-    "--utf-only    UTF/Unicode only (does not export Extended)" \
+    "       \"moji\" (moji code (character code with Japanese category directories))\n" \
+    "       \"unicode\" (unicode/utf code)\n" \
+    "--utf-only    UTF/Unicode only (does not export Extended)\n" \
+    "--uncategorized    doesn't separate emoji into categorized folders" \
 else
   # Create folder.
   out_dir = File.expand_path(params['o'], __FILE__)
@@ -33,5 +35,5 @@ else
   # Generate
   collector = EmojidexStaticCollector.new
   collector.generate(params['o'], params['s'].to_i, params['utf-only'],
-                     params['t'].to_sym)
+                     params['t'].to_sym, !(params['uncategorized']))
 end

data/emojidex-static-collector.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'emojidex-static-collector'
-  s.version     = '0.0.1'
+  s.version     = '0.2.0'
   s.license     = 'emojiOL'
   s.summary     = 'Create static collections from emojidex assets'
   s.description = 'Generates PNG rasters from emojidex vectors in a ' \
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
   s.executables << 'emojidex-static-collector'
   s.homepage    = 'http://developer.emojidex.com'
 
-  s.add_dependency 'emojidex'
-  s.add_dependency 'emojidex-vectors'
-  s.add_dependency 'emojidex-converter'
+  s.add_dependency 'emojidex', '~> 0.3', '~> 0.3.2'
+  s.add_dependency 'emojidex-vectors', '~> 1.0'
+  s.add_dependency 'emojidex-converter', '~> 0.3'
 end

data/lib/emojidex_static_collector.rb

@@ -1,15 +1,17 @@
 require 'emojidex-vectors'
 require 'emojidex_converter'
-require 'emojidex/categories'
+require 'emojidex/data/utf'
+require 'emojidex/data/extended'
+require 'emojidex/data/categories'
 
 require 'fileutils'
 
 # Generates static collections of emojidex assets
 class EmojidexStaticCollector
   def initialize
-    @utf = Emojidex::UTF.new
-    @extended = Emojidex::Extended.new
-    @categories = Emojidex::Categories.new
+    @utf = Emojidex::Data::UTF.new
+    @extended = Emojidex::Data::Extended.new
+    @categories = Emojidex::Data::Categories.new
   end
 
   # Generates a static collection
@@ -17,23 +19,29 @@ class EmojidexStaticCollector
   #   path: path to export to
   #   size: export size
   #   utf_only: weather or not to limit to unicode standard emoji
+  #   categorized: put emoji in categorized folders
   #   code_type: can be
   #     :en (standard English codes)
   #     :ja (Japanese codes)
   #     :char (raw character codes)
   #     :moji (moji code (:char with Japanese category directories))
-  def generate(path = './', size = 64, utf_only = false, code_type = :en, clean_cache = true)
+  #     :unicode (unicode codes as file names)
+  def generate(path = './', size = 64, utf_only = false, code_type = :en, categorized = true, clean_cache = true)
     cache_dir = File.join(path, '.cache')
-    @utf.cache!(cache_path: cache_dir, formats: [:svg])
-    @extended.cache!(cache_path: cache_dir, formats: [:svg]) unless utf_only
-    collection = Emojidex::Collection.new(nil, cache_dir)
-    _generate_categories(collection, path, size, utf_only, code_type)
+    @utf.cache(cache_path: cache_dir, formats: [:svg])
+    @extended.cache(cache_path: cache_dir, formats: [:svg]) unless utf_only
+    collection = Emojidex::Data::Collection.new(local_load_path: "#{cache_dir}/emoji")
+    if categorized
+      _generate_categories(collection, path, size, code_type)
+    else
+      _generate_consolidated(collection, path, size, code_type)
+    end
     FileUtils.rm_rf(cache_dir) if clean_cache
   end
 
   private
 
-  def _generate_categories(collection, path, size, _utf_only, code_type)
+  def _generate_categories(collection, path, size, code_type)
     @categories.categories.each_value do |category|
       cat_path = set_path(path, code_type, category)
       FileUtils.mkdir_p cat_path
@@ -46,11 +54,17 @@ class EmojidexStaticCollector
     end
   end
 
+  def _generate_consolidated(collection, path, size, code_type)
+     puts "Processing Consolidated Collection"
+     puts "Collection emoji Count: #{collection.emoji.count}"
+     _write_emoji(path, collection, size, code_type)
+  end
+
   def set_path(path, code_type, category)
     cat_path = ''
     if code_type == :ja || code_type == :moji
       cat_path = File.join(path, category.ja)
-    elsif code_type == :en || code_type == :char
+    elsif code_type == :en || code_type == :char || :unicode
       cat_path = File.join(path, category.en)
     end
     cat_path
@@ -67,10 +81,26 @@ class EmojidexStaticCollector
   def _rename_files(path, collection, code_type)
     collection.each do |emoji|
       case code_type
-      when :ja then FileUtils.mv "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.code_ja}.png"
-      when :moji then FileUtils.mv "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.moji}.png"
-      when :en then FileUtils.mv "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.code}.png"
-      when :char then FileUtils.mv "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.moji}.png"
+      when :ja then FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.code_ja}.png"
+      when :moji
+        if emoji.moji.nil? || emoji.moji == ""
+          FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.code}.png"
+        else
+          FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.moji}.png"
+        end
+      when :en then FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.code}.png"
+      when :char
+        if emoji.moji.nil? || emoji.moji == ""
+          FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.code}.png"
+        else
+          FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.moji}.png"
+        end
+      when :unicode
+        if emoji.unicode.nil? || emoji.unicode == ""
+          FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.code}.png"
+        else
+          FileUtils.cp "#{path}/working/#{emoji.code}.png", "#{path}/#{emoji.unicode.to_s}.png"
+        end
       end
     end
     FileUtils.rm_rf "#{path}/working/"

data/spec/emojidex_static_collector_spec.rb

@@ -17,22 +17,33 @@ describe EmojidexStaticCollector do
       expect(File.exist?(@tmpdir + '/emojidex/')).to be_truthy
     end
 
-    it 'generates a collection of UTF only' do
-      expect(collector.generate(@tmpdir + '/UTF', 512, false)).to be_truthy
-    end
-
     it '日本語のコードを使ってコレクションを作成する' do
-      expect(collector.generate(@tmpdir + '/日本語', 8, true, :ja)).to be_truthy
+      expect(collector.generate(@tmpdir + '/日本語', 8, false, :ja)).to be_truthy
+      expect(File.exist?(@tmpdir + '/日本語/抽象物/18禁.png')).to be_truthy
+      expect(File.exist?(@tmpdir + '/日本語/抽象物/糞.png')).to be_truthy
     end
 
     it 'generates a collection using moji character codes' do
       expect(collector.generate(@tmpdir + '/moji', 8, true, :moji)).to be_truthy
     end
 
-    it 'generates a collection of UTF only, extended emoji is not exist' do
+    it 'generates a collection of UTF only, extended emoji should not be included' do
       collector.generate(@tmpdir + '/UTF_only', 8, true, :en)
       expect(File.exist?(@tmpdir + '/UTF_only/Faces/angry.png')).to be_truthy
-      expect(File.exist?(@tmpdir + '/UTF_only/Faces/angry(bk).png')).to be_falsey
+      expect(File.exist?(@tmpdir + '/UTF_only/Abstract/shit.png')).to be_falsey
+    end
+
+    it 'generates a collection with unicode codes as file names' do
+      collector.generate(@tmpdir + '/unicode', 8, false, :unicode)
+      expect(File.exist?(@tmpdir + '/unicode/Symbols/00ae.png')).to be_truthy
+      expect(File.exist?(@tmpdir + '/unicode/Abstract/shit.png')).to be_truthy
+    end
+
+    it 'generates a collection, not sorted into categories, with unicode codes for file names' do
+      collector.generate(@tmpdir + '/uncategorized_charcodes', 300, false, :unicode, false)
+      expect(File.exist?(@tmpdir + '/uncategorized_charcodes/00ae.png')).to be_truthy
+      expect(File.exist?(@tmpdir + '/uncategorized_charcodes/0033-20e3.png')).to be_truthy
+      expect(File.exist?(@tmpdir + '/uncategorized_charcodes/shit.png')).to be_truthy
     end
   end
 end

metadata

@@ -1,57 +1,63 @@
 --- !ruby/object:Gem::Specification
 name: emojidex-static-collector
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-31 00:00:00.000000000 Z
+date: 2016-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: emojidex
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: emojidex-vectors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: emojidex-converter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.3'
 description: Generates PNG rasters from emojidex vectors in a specified size and manually
   sorts them into categorized folders.
 email: info@emojidex.com
@@ -90,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Create static collections from emojidex assets