emojidex 0.0.23 → 0.1.0

data/spec/{categories_spec.rb → emojidex/data/categories_spec.rb}

@@ -1,17 +1,18 @@
 require 'spec_helper'
 
-describe Emojidex::Categories do
-  let(:categories) { Emojidex::Categories.new }
+describe Emojidex::Data::Categories do
+  let(:categories) { Emojidex::Data::Categories.new }
 
   describe '.initialize' do
     it 'initializes a new categories object' do
-      expect(categories).to be_an_instance_of(Emojidex::Categories)
+      expect(categories).to be_an_instance_of(Emojidex::Data::Categories)
     end
   end
 
   describe '.category' do
     it 'is a proper hash and can be referenced by key' do
       expect(categories.categories[:transportation].en).to eq('Transportation')
+      expect(categories.categories[:transportation].ja).to eq('乗り物')
     end
   end
 

data/spec/{collection_checker_spec.rb → emojidex/data/collection_checker_spec.rb}

@@ -1,15 +1,12 @@
-
 require 'spec_helper'
+require 'emojidex/data/collection_checker'
 
-describe Emojidex::CollectionChecker do
+describe Emojidex::Data::CollectionChecker do
 
   before(:all) do
    @sizes = [:px32]
   end
 
-
-
-
   let(:col_good) do
     sample_collection 'good'
   end
@@ -24,31 +21,31 @@ describe Emojidex::CollectionChecker do
 
   describe 'Spec Collections' do
     it 'load cleanly' do
-      expect(col_good).to be_an_instance_of(Emojidex::Collection)
-      expect(col_missing_assets).to be_an_instance_of(Emojidex::Collection)
-      expect(col_missing_index).to be_an_instance_of(Emojidex::Collection)
+      expect(col_good).to be_an_instance_of(Emojidex::Data::Collection)
+      expect(col_missing_assets).to be_an_instance_of(Emojidex::Data::Collection)
+      expect(col_missing_index).to be_an_instance_of(Emojidex::Data::Collection)
     end
   end
 
   describe '.new' do
     it 'creates a valid CollectionChecker instance and checks a valid collection' do
-      checker = Emojidex::CollectionChecker.new(col_good, {sizes: @sizes})
+      checker = Emojidex::Data::CollectionChecker.new(col_good, {sizes: @sizes})
 
-      expect(checker).to be_an_instance_of(Emojidex::CollectionChecker)
+      expect(checker).to be_an_instance_of(Emojidex::Data::CollectionChecker)
       expect(checker.index_only).to be_empty
       expect(checker.asset_only).to be_empty
     end
 
     it 'checks to see if a size of an asset exists' do
-      checker = Emojidex::CollectionChecker.new(col_good, {sizes: [:px64]})
+      checker = Emojidex::Data::CollectionChecker.new(col_good, {sizes: [:px64]})
 
-      expect(checker).to be_an_instance_of(Emojidex::CollectionChecker)
+      expect(checker).to be_an_instance_of(Emojidex::Data::CollectionChecker)
       expect(checker.index_only.size).to eq(4)
       expect(checker.asset_only).to be_empty
     end
 
     it 'checks for and identifies missing assets' do
-      checker = Emojidex::CollectionChecker.new(col_missing_assets, {sizes: @sizes})
+      checker = Emojidex::Data::CollectionChecker.new(col_missing_assets, {sizes: @sizes})
 
       expect(checker.asset_only).to be_empty
       expect(checker.index_only.size).to eq(2)
@@ -57,7 +54,7 @@ describe Emojidex::CollectionChecker do
     end
 
     it 'checks for and identifies missing index entries' do
-      checker = Emojidex::CollectionChecker.new(col_missing_index, {sizes: @sizes})
+      checker = Emojidex::Data::CollectionChecker.new(col_missing_index, {sizes: @sizes})
 
       expect(checker.index_only).to be_empty
       expect(checker.asset_only.size).to eq(1)
@@ -65,7 +62,7 @@ describe Emojidex::CollectionChecker do
         {purple_heart: ["purple_heart.svg", "px32/purple_heart.png"]})
     end
     it 'checks collections against a specified asset directory' do
-      checker = Emojidex::CollectionChecker.new([col_missing_index, col_missing_assets],
+      checker = Emojidex::Data::CollectionChecker.new([col_missing_index, col_missing_assets],
                                                 {sizes: @sizes, asset_path: col_good.source_path})
 
       expect(checker.index_only).to be_empty

data/spec/{collection_spec.rb → emojidex/data/collection_spec.rb}

@@ -2,26 +2,31 @@
 
 require 'spec_helper'
 
-describe Emojidex::Collection do
-  let(:collection) { Emojidex::Collection.new(nil, './spec/support/sample_collections/good') }
+require 'emojidex/defaults'
+require 'emojidex/data/utf'
+require 'emojidex/data/extended'
+
+describe Emojidex::Data::Collection do
+  let(:collection) { Emojidex::Data::Collection.new(nil, './spec/support/sample_collections/good') }
+  before(:each) { clear_tmp_cache }
 
   describe '.load_local_collection' do
     it 'loads a local collection' do
-      expect(collection).to be_an_instance_of(Emojidex::Collection)
+      expect(collection).to be_an_instance_of(Emojidex::Data::Collection)
     end
   end
 
   describe '.each' do
     it 'provides each emoji' do
       collection.each do |emoji|
-        expect(emoji).to be_an_instance_of(Emojidex::Emoji)
+        expect(emoji).to be_an_instance_of(Emojidex::Data::Emoji)
       end
     end
   end
 
   describe '.find_by_moji' do
     it 'finds and returns an emoji object by UTF moji code' do
-      expect(collection.find_by_moji('👯')).to be_an_instance_of(Emojidex::Emoji)
+      expect(collection.find_by_moji('👯')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
 
     it 'returns nil when the moji code does not exist' do
@@ -31,14 +36,14 @@ describe Emojidex::Collection do
 
   describe '.文字検索' do
     it 'find_by_moji_codeをaliasして文字コードで検索する' do
-      expect(collection.文字検索('👯')).to be_an_instance_of(Emojidex::Emoji)
+      expect(collection.文字検索('👯')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
   describe '.find_by_code' do
     it 'finds and returns an emoji by code' do
       ss = collection.find_by_code('nut_and_bolt')
-      expect(ss).to be_an_instance_of(Emojidex::Emoji)
+      expect(ss).to be_an_instance_of(Emojidex::Data::Emoji)
     end
 
     it 'returns nil when a code does not exist' do
@@ -48,53 +53,47 @@ describe Emojidex::Collection do
 
   describe '.find_by_code_ja' do
     it 'finds and returns an emoji by Japanese code' do
-      expect(collection.find_by_code_ja('ハート(紫)')).to be_an_instance_of(Emojidex::Emoji)
+      expect(collection.find_by_code_ja('ハート(紫)')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
   describe '.コード検索' do
     it 'find_by_code_jaをaliasして日本語の絵文字コードで検索する' do
-      expect(collection.コード検索('ハート(紫)')).to be_an_instance_of(Emojidex::Emoji)
+      expect(collection.コード検索('ハート(紫)')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
   describe '.cache!' do
     it 'caches emoji to local storage cache' do
-      tmp_cache_path = File.expand_path('../support/tmpcache', __FILE__)
-      collection.cache!(cache_path: tmp_cache_path)
-      expect(ENV['EMOJI_CACHE']).to eq(collection.cache_path)
+      collection.cache!(cache_path: tmp_cache_path, formats: [:svg])
+      expect(collection.cache_path).to eq "#{tmp_cache_path}/emoji"
+      expect(collection.vector_source_path).to eq collection.source_path
+      expect(File.exist? "#{collection.vector_source_path}/mouth.svg").to be_truthy
       expect(File.exist? tmp_cache_path).to be_truthy
-      expect(File.exist? tmp_cache_path + '/mouth.svg').to be_truthy
-      expect(File.exist? tmp_cache_path + '/emoji.json').to be_truthy
-
-      FileUtils.rm_rf tmp_cache_path # cleanup
+      expect(File.exist? "#{collection.cache_path}/mouth.svg").to be_truthy
+      expect(File.exist? "#{collection.cache_path}/emoji.json").to be_truthy
     end
   end
 
   describe '.cache_index' do
     it 'caches the  index to the specified location' do
-      tmp_cache_path = File.expand_path('../support/tmpcache', __FILE__)
       FileUtils.mkdir_p(tmp_cache_path)
       collection.cache_index tmp_cache_path
       expect(File.exist? tmp_cache_path + '/emoji.json').to be_truthy
-
-      FileUtils.rm_rf tmp_cache_path
     end
   end
 
   describe '.write_index' do
     it 'writes a cleaned index to the specified location' do
-      tmp_cache_path = File.expand_path('../support/tmpcache', __FILE__)
       FileUtils.mkdir_p(tmp_cache_path)
       collection.cache_index tmp_cache_path
       expect(File.exist? tmp_cache_path + '/emoji.json').to be_truthy
-
-      FileUtils.rm_rf tmp_cache_path
     end
   end
 
   describe '.generate_checksums' do
     it 'generates checksums for assets' do
+      collection.cache!(cache_path: tmp_cache_path, formats: [:svg, :png], sizes: [:px32])
       expect(collection.generate_checksums).to be_an_instance_of(Array)
       expect(collection.emoji.values.first.checksums[:svg]).to be_truthy
       expect(collection.emoji.values.first.checksum?(:svg)).to be_truthy
@@ -107,13 +106,31 @@ describe Emojidex::Collection do
 
   describe '.generate_paths' do
     it 'generates file paths for each emoji' do
+      collection.cache!(cache_path: tmp_cache_path, formats: [:svg, :png], sizes: [:px32])
       expect(collection.generate_paths).to be_an_instance_of(Array)
       expect(collection.emoji.values.first.paths[:svg]).to be_truthy
       expect(collection.emoji.values.first.path?(:svg)).to be_truthy
       expect(collection.emoji.values.first.paths[:png][:px32]).to be_truthy
       expect(collection.emoji.values.first.path?(:png, :px32)).to be_truthy
       expect(collection.emoji.values.first.paths[:png][:px64]).to be_nil
-      expect(collection.emoji.values.first.path?(:png, :px64)).to be_nil
+      expect(collection.emoji.values.first.path?(:png, :px64)).to be_nil 
+    end
+  end
+
+  describe 'collections should chain combine' do
+    it 'chain combines' do
+      col = Emojidex::Data::Collection.new
+      col.emoji = {}
+      expect(col.emoji.count).to eq 0
+
+      col << Emojidex::Data::UTF.new
+      expect(col.emoji.count > 0).to be true
+      expect(col.emoji.count).to eq (Emojidex::Data::UTF.new()).emoji.count
+
+      col << Emojidex::Data::Extended.new
+      expect(col.emoji.count > (Emojidex::Data::UTF.new()).emoji.count).to be true
+      expect(col.emoji.count).to eq ((Emojidex::Data::UTF.new()).emoji.count + 
+                                     (Emojidex::Data::Extended.new()).emoji.count)
     end
   end
 end

data/spec/{emoji_spec.rb → emojidex/data/emoji_spec.rb}

@@ -2,9 +2,9 @@
 
 require 'spec_helper'
 
-describe Emojidex::Emoji do
+describe Emojidex::Data::Emoji do
   let(:emoji) do
-    Emojidex::Emoji.new moji: '🌠', code: 'shooting_star',
+    Emojidex::Data::Emoji.new moji: '🌠', code: 'shooting_star',
                         code_ja: '流れ星', category: 'cosmos',
                         unicode: '1f320', uri: '/dummy/uri'
   end

data/spec/{extended_spec.rb → emojidex/data/extended_spec.rb}

@@ -1,14 +1,15 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'emojidex/data/extended'
 
-describe Emojidex::Extended do
-  let(:ext) { Emojidex::Extended.new }
+describe Emojidex::Data::Extended do
+  let(:ext) { Emojidex::Data::Extended.new }
 
   describe '.each' do
     it 'provides each emoji' do
       ext.each do |emoji|
-        expect(emoji).to be_an_instance_of(Emojidex::Emoji)
+        expect(emoji).to be_an_instance_of(Emojidex::Data::Emoji)
       end
     end
   end
@@ -16,12 +17,12 @@ describe Emojidex::Extended do
   describe 'find_by_code' do
     it 'finds and returns an emoji by code' do
       expect(ext.find_by_code('combat_knife'))
-      .to be_an_instance_of(Emojidex::Emoji)
+      .to be_an_instance_of(Emojidex::Data::Emoji)
     end
 
     it 'finds and returns an emoji by code, converting spaces to underscores' do
       expect(ext.find_by_code('combat knife'))
-      .to be_an_instance_of(Emojidex::Emoji)
+      .to be_an_instance_of(Emojidex::Data::Emoji)
     end
 
     it 'returns nil when a code does not exist' do
@@ -31,20 +32,20 @@ describe Emojidex::Extended do
 
   describe 'find_by_code_ja' do
     it 'finds and returns an emoji by Japanese code' do
-      expect(ext.find_by_code_ja('ユニコーン'))
-        .to be_an_instance_of(Emojidex::Emoji)
+      expect(ext.find_by_code_ja('忍者'))
+        .to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
   describe 'コード検索' do
     it 'find_by_code_jaをaliasして日本語の絵文字コードで検索する' do
-      expect(ext.コード検索('ユニコーン')).to be_an_instance_of(Emojidex::Emoji)
+      expect(ext.コード検索('忍者')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
   describe 'category' do
     it 'returns a collection of the specificed category' do
-      expect(categorized = ext.category(:tools)).to be_an_instance_of(Emojidex::Collection)
+      expect(categorized = ext.category(:tools)).to be_an_instance_of(Emojidex::Data::Collection)
       expect(categorized.emoji.count).to be > 1
     end
   end
@@ -100,8 +101,18 @@ describe Emojidex::Extended do
 
     it 'evaluates regular expressions' do
       col = ext.search(code: 'emoji(?!.*dex$).*', category: 'symbols')
-      expect(col.find_by_code('emoji')).to be_an_instance_of Emojidex::Emoji
+      expect(col.find_by_code('emoji')).to be_an_instance_of Emojidex::Data::Emoji
       expect(col.find_by_code('emojidex')).to be_nil
     end
   end
+
+  describe 'load_from_server' do
+    it 'loads index from server' do
+      ext.emoji = {}
+      expect(ext.emoji.count == 0).to be true
+      expect(ext.load_from_server).to be true
+      expect(ext.emoji.count > 0).to be true
+    end
+  end
+
 end

data/spec/{utf_spec.rb → emojidex/data/utf_spec.rb}

@@ -1,21 +1,23 @@
 # encoding: utf-8
 
 require 'spec_helper'
+require 'emojidex/data/utf'
 
-describe Emojidex::UTF do
-  let(:utf) { Emojidex::UTF.new }
+describe Emojidex::Data::UTF do
+  let(:utf) { Emojidex::Data::UTF.new }
+  before(:each) { clear_tmp_cache }
 
   describe '.each' do
     it 'provides each emoji' do
       utf.each do |emoji|
-        expect(emoji).to be_an_instance_of(Emojidex::Emoji)
+        expect(emoji).to be_an_instance_of(Emojidex::Data::Emoji)
       end
     end
   end
 
   describe '.find_by_moji' do
     it 'finds and returns an emoji object by UTF moji code' do
-      expect(utf.find_by_moji('🌠')).to be_an_instance_of(Emojidex::Emoji)
+      expect(utf.find_by_moji('🌠')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
 
     it 'returns nil when the moji code does not exist' do
@@ -25,14 +27,14 @@ describe Emojidex::UTF do
 
   describe '.文字検索' do
     it 'find_by_moji_codeをaliasして文字コードで検索する' do
-      expect(utf.文字検索('🌠')).to be_an_instance_of(Emojidex::Emoji)
+      expect(utf.文字検索('🌠')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
   describe '.find_by_code' do
     it 'finds and returns an emoji by code' do
       ss = utf.find_by_code('stars')
-      expect(ss).to be_an_instance_of(Emojidex::Emoji)
+      expect(ss).to be_an_instance_of(Emojidex::Data::Emoji)
     end
 
     it 'returns nil when a code does not exist' do
@@ -42,13 +44,13 @@ describe Emojidex::UTF do
 
   describe '.find_by_code_ja' do
     it 'finds and returns an emoji by Japanese code' do
-      expect(utf.find_by_code_ja('流れ星')).to be_an_instance_of(Emojidex::Emoji)
+      expect(utf.find_by_code_ja('流れ星')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
   describe '.コード検索' do
     it 'find_by_code_jaをaliasして日本語の絵文字コードで検索する' do
-      expect(utf.コード検索('流れ星')).to be_an_instance_of(Emojidex::Emoji)
+      expect(utf.コード検索('流れ星')).to be_an_instance_of(Emojidex::Data::Emoji)
     end
   end
 
@@ -62,25 +64,28 @@ describe Emojidex::UTF do
 
   describe '.cache!' do
     it 'caches emoji to local storage cache' do
-      tmp_cache_path = File.expand_path('../support/tmpcache', __FILE__)
-      utf.cache!(cache_path: tmp_cache_path)
-      expect(ENV['EMOJI_CACHE']).to eq(utf.cache_path)
+      utf.cache!(cache_path: tmp_cache_path, formats: [:svg])
       expect(File.exist? tmp_cache_path).to be_truthy
-      expect(File.exist? tmp_cache_path + '/sushi.svg').to be_truthy
-      expect(File.exist? tmp_cache_path + '/emoji.json').to be_truthy
-
-      FileUtils.rm_rf tmp_cache_path # cleanup
+      expect(File.exist? tmp_cache_path + '/emoji/sushi.svg').to be_truthy
+      expect(File.exist? tmp_cache_path + '/emoji/emoji.json').to be_truthy
     end
   end
 
   describe 'cache_index' do
     it 'caches the collection index to the specified location' do
-      tmp_cache_path = File.expand_path('../support/tmpcache', __FILE__)
       FileUtils.mkdir_p(tmp_cache_path)
       utf.cache_index tmp_cache_path
       expect(File.exist? tmp_cache_path + '/emoji.json').to be_truthy
+    end
+  end
 
-      FileUtils.rm_rf tmp_cache_path
+  describe 'load_from_server' do
+    it 'loads index from server' do
+      utf.emoji = {}
+      expect(utf.emoji.count == 0).to be true
+      expect(utf.load_from_server).to be true
+      expect(utf.emoji.count > 0).to be true
     end
   end
+
 end

data/spec/emojidex/service/collection_spec.rb

@@ -0,0 +1,20 @@
+# encoding: utf-8
+
+require 'spec_helper'
+
+require 'emojidex/service/collection'
+
+describe Emojidex::Service::Collection do
+  describe '.initialize' do
+    it 'defaults to the emoji index with 50 results per page undetailed' do
+      sc = Emojidex::Service::Collection.new
+      expect(sc.emoji.count).to eq 50
+      expect(sc.detailed).to be false
+      expect(sc.endpoint).to eq 'emoji'
+      expect(sc.page).to eq 1
+      expect(sc.source_path).to be nil
+      expect(sc.vector_source_path).to be nil
+      expect(sc.raster_source_path).to be nil
+    end
+  end
+end