emojidex-converter 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea534ad4290bd9c97a733c96e8177a3b34f1eaf4
-  data.tar.gz: f44b2c861ae767acd75086443eaabaf1743efe26
+  metadata.gz: 76eaa52defa7cbbb6d31be156ed79139e8f19a86
+  data.tar.gz: 4de19d91db926a6ab641946e5c12b2f254a704e1
 SHA512:
-  metadata.gz: 4f7c9e79fdcd94889c97bc0f8d1c83c8fa591f5c103ad83d503e53638a7adc7de1fdd4887940395b9bcdd31d3dc294b46adaa84a9febae4767529d3159eaac90
-  data.tar.gz: 71a386652d6c03fa0c901f38be32c17435dc1d0eb69e6338927239ae2c44b4d0c8aee23cd3b867ff122322995dae109b3f087f04a581f9782aed7d17676308b2
+  metadata.gz: 5b6ba1485af79445f478137447b75f3ceb8408323ca8da20879e1b382c67bf72dc23d6bbdb370ce580ca7f1cc0576fbf81c59dd29d2867a76ac889f8e48c6b67
+  data.tar.gz: 4eacecf737b222d86b19cbc750116646f37abcd4e815c614c15c43dd46074694cc9f182c2dbc54577e05f3ada2b6f23bf2ee3a8db32a99c83e7f36dd2c0bcf84

data/Gemfile

@@ -2,7 +2,8 @@ source 'http://rubygems.org'
 
 gemspec
 
-gem 'emojidex', '~> 0.2.0'
+#gem 'emojidex', '~> 0.2.0'
+gem 'emojidex', path: '../emojidex'
 
 group :development do
   gem 'rb-inotify', require: false
@@ -11,10 +12,10 @@ group :development do
   gem 'guard-rspec'
   gem 'rubocop'
   gem 'guard-rubocop'
+
+  gem 'emojidex-vectors', require: false
 end
 
 group :test do
-  gem 'coveralls', require: false
   gem 'rspec'
-  gem 'webmock'
 end

data/Guardfile

@@ -1,38 +1,21 @@
-# A sample Guardfile
-# More info at https://github.com/guard/guard#readme
+group :red_green_refactor, halt_on_fail: true do
+  guard :rspec, cmd: "bundle exec rspec" do
+    require "guard/rspec/dsl"
+    dsl = Guard::RSpec::Dsl.new(self)
 
-# Note: The cmd option is now required due to the increasing number of ways
-#       rspec may be run, below are examples of the most common uses.
-#  * bundler: 'bundle exec rspec'
-#  * bundler binstubs: 'bin/rspec'
-#  * spring: 'bin/rsspec' (This will use spring if running and you have
-#                          installed the spring binstubs per the docs)
-#  * zeus: 'zeus rspec' (requires the server to be started separetly)
-#  * 'just' rspec: 'rspec'
-guard :rspec, cmd: 'bundle exec rspec' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/lib/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { "spec" }
+    # RSpec files
+    rspec = dsl.rspec
+    watch(rspec.spec_helper) { rspec.spec_dir }
+    watch(rspec.spec_support) { rspec.spec_dir }
+    watch(rspec.spec_files)
 
-  # Rails example
-  watch(%r{^app/(.+)\.rb$})                           { |m| "spec/#{m[1]}_spec.rb" }
-  watch(%r{^app/(.*)(\.erb|\.haml|\.slim)$})          { |m| "spec/#{m[1]}#{m[2]}_spec.rb" }
-  watch(%r{^app/controllers/(.+)_(controller)\.rb$})  { |m| ["spec/routing/#{m[1]}_routing_spec.rb", "spec/#{m[2]}s/#{m[1]}_#{m[2]}_spec.rb", "spec/acceptance/#{m[1]}_spec.rb"] }
-  watch(%r{^spec/support/(.+)\.rb$})                  { "spec" }
-  watch('config/routes.rb')                           { "spec/routing" }
-  watch('app/controllers/application_controller.rb')  { "spec/controllers" }
-  watch('spec/rails_helper.rb')                       { "spec" }
+    # Ruby files
+    ruby = dsl.ruby
+    dsl.watch_spec_files_for(ruby.lib_files)
+  end
 
-  # Capybara features specs
-  watch(%r{^app/views/(.+)/.*\.(erb|haml|slim)$})     { |m| "spec/features/#{m[1]}_spec.rb" }
-
-  # Turnip features and steps
-  watch(%r{^spec/acceptance/(.+)\.feature$})
-  watch(%r{^spec/acceptance/steps/(.+)_steps\.rb$})   { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'spec/acceptance' }
-end
-
-
-guard :rubocop do
-  watch(%r{.+\.rb$})
-  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  guard :rubocop, all_on_start: false do
+    watch(%r{.+\.rb$})
+    watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
+  end
 end

data/README.md

@@ -3,6 +3,12 @@ Emojidex Converter
 ==================
 A set of tools for converting emoji arrays to and from vectors [SVG] and rasters [PNG].
 
+This tool is primarily for internal use. You can find converted assets here:
+* Vectors: [emojidex-vectors](https://github.com/emojidex/emojidex-vectors)  
+* Rasters: [emojidex-rasters](https://github.com/emojidex/emojidex-rasters)
+  
+or on-line from the asset repository or CDN, [see documentation here](http://developer.emojidex.com/#assets)
+
 Requirements
 ------------
 Uses Phantom SVG, which in turn uses rapngasm.  
@@ -14,10 +20,11 @@ Usage
 The default destination will be your local emojidex cache (set with environment variable $EMOJI_CACHE, defaults to $HOME/.emojidex/cache) or the current directory if $EMOJI_CACHE is not set.  
 - You can specify the destination manually with an options hash key of :destination.  
 - You can sepcify your own sizes using a :sizes hash. The keys to the hash become the directory names.
+
 ```ruby
 converter = Emojidex::Converter.new(destination: "/output/destination/file/path", sizes: {super_huge: 2000, px12: 12})
-
-# sizes and output destination can be changed after initialization as well
+  
+# Sizes and output destination can be changed after initialization:  
 converter.destination = '/new/destination'
 converter.sizes = {superTiny: 3, '720p': 720}
 ```
@@ -45,5 +52,9 @@ Contributing
 Fork, edit, commit, push, pull request!  
 emojidex-converter is a very primitivate, fairly single-purpose tool. If you can think of any features that could extend its functionality we'd love to see it!
 
-----
-exmojidex-toolkit©2014 emojidex™/Genshin Souzou K.K. [Phantom Creation Inc.]
+License
+=======
+emojidex and emojidex tools are licensed under the 
+[emojidex Open License](https://www.emojidex.com/emojidex/emojidex_open_license).
+
+©2013 the emojidex project / Genshin Souzou K.K. [Phantom Creation Inc.]

data/emojidex-converter.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name          = 'emojidex-converter'
-  s.version       = '0.2.1'
+  s.version       = '0.3.0'
   s.license       = 'emojiOL'
   s.summary       = 'Image conversion modules for emojidex'
   s.description   = 'Adds the convert method to Emojidex::Collection and Emojidex::Emoji, which\
@@ -17,6 +17,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'rapngasm'
   s.add_dependency 'nokogiri'
   s.add_dependency 'cairo'
-  s.add_dependency 'emojidex'
+  s.add_dependency 'emojidex', '~> 0.3'
   s.add_dependency 'phantom_svg'
 end

data/lib/emojidex/converter.rb

@@ -18,6 +18,7 @@ module Emojidex
 
       start_time = Time.now
       emoji.each do |moji|
+        puts "Source: #{source_dir}/#{moji.code}.svg" if @noisy
         render_threads = []
         @sizes.each do |key, val|
           render_threads << Thread.new do
@@ -30,6 +31,7 @@ module Emojidex
             phantom_svg.save_apng("#{out_dir}/#{moji.code}.png")
             phantom_svg.reset
             phantom_svg = nil
+            moji.paths[:png][key] = "#{out_dir}/#{moji.code}.png" 
           end
         end
         render_threads.each { |th| th.join }
@@ -43,7 +45,21 @@ module Emojidex
 
     def rasterize_collection(collection)
       rasterize(collection.emoji.values, collection.source_path)
-      collection.cache_index @destination
+      collection.generate_checksums
+      puts "Rasterization completed. Writing index." if @noisy
+      collection.write_index @destination
+      
+      puts "Re-opening collection at #{@destination} to generate meta data" if @noisy
+      converted_collection = Emojidex::Data::Collection.new(local_load_path: @destination)
+      converted_collection.raster_source_path = @destination
+      converted_collection.generate_paths
+
+      puts "Generating checksums..." if @noisy
+      converted_collection.generate_checksums
+
+      puts "Checksums generated. Writing index to emoji.json..." if @noisy
+      converted_collection.write_index @destination
+      converted_collection
     end
 
     def preprocess(path)
@@ -54,8 +70,11 @@ module Emojidex
     private
 
     def _create_output_paths
-      @sizes.each do |key, val|
+      @sizes.each do |key, _val|
         out_dir = "#{@destination}/#{key}"
+        puts "*Clearning #{@destination}/#{key}" if @noisy
+        FileUtils.rm_rf(out_dir)
+        puts "*Creating #{@destination}/#{key}" if @noisy
         FileUtils.mkdir_p(out_dir)
       end
     end

data/lib/emojidex/preprocessor.rb

@@ -7,13 +7,13 @@ module Emojidex
       Dir.entries(path).each do |file|
         current_path = "#{path}/#{file}"
         next unless File.ftype(current_path) == 'directory'
-        compile(current_path) unless file.start_with?('.')
+        _svg_compile(current_path) unless file.start_with?('.')
       end
     end
 
     private
 
-    def compile(source_dir)
+    def _svg_compile(source_dir)
       json_path = "#{source_dir}/animation.json"
 
       return unless File.exist?(json_path)

data/spec/converter_spec.rb

@@ -28,41 +28,44 @@ describe Emojidex::Converter do
   describe '.preprocess' do
     it 'preprocesses folders with SVG frame and animation.json files into frame-animated SVGs' do
       setup_working_collection
-      converter.preprocess("#{@support_dir}/tmp/collection")
-      expect(File.exist?("#{@support_dir}/tmp/collection/heartbeat.svg")).to be true
+      converter.preprocess("#{@collection_out_path}")
+      expect(File.exist?("#{@collection_out_path}/heartbeat.svg")).to be true
     end
   end
 
   describe '.rasterize' do
     it 'converts base SVG from the source directory to PNG in the destination directory' do
       setup_working_collection
-      converter.preprocess("#{@support_dir}/tmp/collection")
+      converter.preprocess("#{@collection_out_path}")
       converter.rasterize([Emojidex::Data::Emoji.new(code: 'kiss')],
-                          "#{@support_dir}/tmp/collection")
+                          "#{@collection_out_path}")
 
-      expect(File.exist?("#{@destination}/ldpi/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/mdpi/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/hdpi/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/xhdpi/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/px8/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/px16/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/px32/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/px64/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/px128/kiss.png")).to be_truthy
-      expect(File.exist?("#{@destination}/px256/kiss.png")).to be_truthy
+      expect(File.exist?("#{@destination}/ldpi/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/mdpi/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/hdpi/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/xhdpi/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/px8/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/px16/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/px32/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/px64/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/px128/kiss.png")).to be true
+      expect(File.exist?("#{@destination}/px256/kiss.png")).to be true
     end
   end
 
   describe '.rasterize_collection' do
     it 'converts an emojidex collection' do
       setup_working_collection
-      converter.preprocess("#{@support_dir}/tmp/collection")
-      collection = Emojidex::Data::Collection.new
-      collection.load_local_collection("#{@support_dir}/tmp/collection")
-      converter.rasterize_collection(collection)
+      converter.preprocess(@collection_out_path)
+      collection = Emojidex::Data::Collection.new(local_load_path: @collection_out_path)
+      processed_collection = converter.rasterize_collection(collection)
 
       expect(File.exist?("#{@destination}/ldpi/kiss.png")).to be_truthy
       expect(File.exist?("#{@destination}/emoji.json")).to be_truthy
+
+      processed_collection.generate_checksums
+      puts "CHECKSUM IS #{collection.emoji.values.first.checksums[:png][:ldpi]}"
+      expect(processed_collection.emoji.values.first.checksums[:png][:ldpi]).to be_truthy
     end
   end
 end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
 require 'emojidex_converter'
 require 'emojidex'
 
+
 def setup_working_collection
   @support_dir = File.expand_path('../support', __FILE__)
 
@@ -8,5 +9,6 @@ def setup_working_collection
   FileUtils.mkdir_p("#{@support_dir}/tmp")
   FileUtils.cp_r("#{@support_dir}/collection", "#{@support_dir}/tmp")
 
-  "#{@support_dir}/tmp/collection"
+  @collection_out_path = "#{@support_dir}/tmp/collection"
+  @collection_out_path
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emojidex-converter
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Rei Kagetsuki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-20 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rsvg2
@@ -99,16 +99,16 @@ dependencies:
   name: emojidex
   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'
 - !ruby/object:Gem::Dependency
   name: phantom_svg
   requirement: !ruby/object:Gem::Requirement
@@ -140,7 +140,6 @@ files:
 - ".travis.yml"
 - Gemfile
 - Guardfile
-- LICENSE.md
 - README.md
 - Rakefile
 - emojidex-converter.gemspec

data/LICENSE.md

@@ -1,3 +0,0 @@
-License
--------
-Equivilent to emojidex-toolkit. If you have a special license for emojidex-toolkit that license is also applied to emojidex-converter.