emojidex 0.0.22 → 0.0.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18eaa63af54aa2ee525eb36a906cdd76936484c6
-  data.tar.gz: 96d09a92dd33fbd8cefc09ad70d4533979cad1a2
+  metadata.gz: c1f1c37ec62d2ad3daa5af377d01369009f4d734
+  data.tar.gz: aa303bb871cb90133a0607a5fe2c50ff7af35162
 SHA512:
-  metadata.gz: b51d890e00a1bc1f5aa9852fa39b5431b8455bf71750f663b2a289c34ebaf0df9e6f395e336d6bbfad5efc446407a62b8abc999de0e4d0cd31cae310083757af
-  data.tar.gz: 2cbec3a818d5000c662dd6a1608a6064963e2620493cb2b615fc5dd5ccf4c9a9054314075b144e9ae4d4b0bcdf290c3b43c8ebc662df2184c86702fd712f5530
+  metadata.gz: 96ad63027965d46efa54858616f1b5409b8e7cab814ee9d6114ae8273351b993584ca914baccd906dc1d5e0351852eb08f639ca00c5f90e9ddfb6717639c6838
+  data.tar.gz: 32bc08ccfe71137b7cc2c900870cbf8e66d5b58e696e0f82e2f969ead86b1514f3baa41ab7a852aca32ab7271d241283e00ae7b0ac669153e2be94bab77c9c0f

data/.travis.yml

@@ -3,8 +3,9 @@ language: ruby
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.2
-  - jruby-19mode
+  - 2.1.5
+  - 2.2.0
+  - rbx
 
 bundler_args: -j4 --without development
 

data/README.md

@@ -12,6 +12,23 @@ Assets
 You can find Vectors here: [emojidex-vectors](https://github.com/emojidex/emojidex-vectors)  
 You can find Rasters here: [emojidex-rasters](https://github.com/emojidex/emojidex-rasters)
 
+Notes / Caution
+===============
+
+Pre 1.8 or non 1.9+ compliant Ruby
+----------------------------------
+emojidex uses a variety of tricks and extensively utilizes UTF8/Unicode in ways most other code does not. As such, we do not recommend attempting 
+to run emojidex on non 1.9+ compliant Ruby variants, and instead recommend the latest official Ruby. If you are/must use a non 1.9+ official Ruby 
+and find an issue that can be remedied without imparing functionality or significantly impacting performance please notify us with an issue or 
+submit a pull request with a patch.
+
+jRuby
+-----
+From 1.9 on Ruby is an m17n compliant Code Set Independent languge. jRuby, however, does not fulfill this requirement and has a variety of issues 
+dealing with UTF8 code -and- content. It should be noted that this is NOT so much a fault of jRuby as it is the JRE/JVM, which simply imposes a 
+code set (which in many/most cases is NOT UTF8) on jRuby. Due to this, caution must be excercised when using jRuby. You must make absolutely sure 
+that the Java environment you are using is being run with UTF8 as the code set.
+
 License
 =======
 emojidex and emojidex tools are licensed under the [emojidex Open License](https://www.emojidex.com/emojidex/emojidex_open_license).

data/emojidex.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'emojidex'
-  s.version     = '0.0.22'
+  s.version     = '0.0.23'
   s.license     = 'emojiOL'
   s.summary     = 'emojidex Ruby tools'
   s.description = 'emojidex emoji handling, search and lookup, listing and caching functionality' \

data/lib/emojidex/category.rb

@@ -6,7 +6,7 @@ module Emojidex
     attr_accessor :code, :en, :ja
 
     def initialize(details = {})
-      @code = details[:code]
+      @code = details[:code].to_sym
       @en = details[:en]
       @ja = details[:ja]
     end

data/lib/emojidex/collection.rb

@@ -54,11 +54,10 @@ module Emojidex
     # Retreives an Emoji object by the actual moji code/character code
     # Will likely only return moji from UTF collection
     def find_by_moji(moji)
-      result = nil
-      each do |emoji|
-        result = emoji if emoji[:moji] == moji
+      each do |m|
+        return m if m[:moji] == moji
       end
-      result
+      nil
     end
 
     alias_method :文字検索, :find_by_moji
@@ -73,13 +72,22 @@ module Emojidex
     # Only applies to collections that contain JA codes, this function is mapped to
     # find_by_code for all other implementations (such as client)
     def find_by_code_ja(code_ja)
-      each do |emoji|
-        return emoji if emoji[:code_ja] == code_ja
+      each do |m|
+        return m if m[:code_ja] == code_ja
       end
+      nil
     end
 
     alias_method :コード検索, :find_by_code_ja
 
+    def find_by_unicode(unicode)
+      unicode = unicode.downcase
+      each do |m|
+        return m if m[:unicode] == unicode
+      end
+      nil
+    end
+
     def search(criteria = {})
       Emojidex::Collection.new _sub_search(@emoji.values.dup, criteria)
     end
@@ -109,6 +117,7 @@ module Emojidex
         end
       end
       categorize
+      associate_variants
       condense_moji_code_data
       @emoji
     end
@@ -123,6 +132,19 @@ module Emojidex
       @categories.uniq!
     end
 
+    def associate_variants
+      @emoji.values.each do |emoji_obj|
+        if emoji_obj.code.match(/\(.*\)$/) # this emoji is a variant
+          # check for base
+          base_code = emoji_obj.code.sub(/\(.*\)$/, '').to_sym
+          if @emoji.has_key? base_code
+            @emoji[base_code].variants << emoji_obj.code.to_sym
+            emoji_obj.base = base_code
+          end
+        end
+      end
+    end
+
     def _sub_search(list, criteria = {})
       cr = criteria.shift
       return list if cr.nil?

data/lib/emojidex/emoji.rb

@@ -4,7 +4,7 @@ module Emojidex
   # emoji base class
   class Emoji
     attr_accessor :moji, :category, :code, :code_ja,
-                  :unicode, :tags, :emoticon
+                  :unicode, :tags, :emoticon, :variants, :base
 
     include Emojidex::EmojiAssetInformation
 
@@ -16,6 +16,7 @@ module Emojidex
       @category = details[:category] ? details[:category].to_sym : :other
       @tags = details[:tags].map { |tag| tag.to_sym } unless details[:tags].nil?
       @link = details[:link]
+      @variants, @base = details[:variants] || [], details[:base]
       @is_wide = details[:is_wide]
     end
 

data/spec/extended_spec.rb

@@ -95,13 +95,13 @@ describe Emojidex::Extended do
     end
 
     it 'returns all emoji containing the search term as a substring' do
-      expect(ext.search(code: 'round', category: 'symbols').emoji.count).to be > 12
+      expect(ext.search(code: 'square', category: 'symbols').emoji.count).to be > 12
     end
 
     it 'evaluates regular expressions' do
-      col = ext.search(code: 'Taurus.(?!round).+', category: 'symbols')
-      expect(col.find_by_code('Taurus_plain')).to be_an_instance_of Emojidex::Emoji
-      expect(col.find_by_code('Taurus_round')).to be_nil
+      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('emojidex')).to be_nil
     end
   end
 end

data/spec/utf_spec.rb

@@ -52,6 +52,14 @@ describe Emojidex::UTF do
     end
   end
 
+  describe 'emoji[#code].variants' do
+    it 'has collected variants for an emoji' do
+      expect(utf.emoji[:ice_skate].variants).to be_empty
+      expect(utf.emoji[:persevere].variants).to include(:"persevere(p)")
+      expect(utf.emoji[:"persevere(p)"].base).to be(:persevere)
+    end
+  end
+
   describe '.cache!' do
     it 'caches emoji to local storage cache' do
       tmp_cache_path = File.expand_path('../support/tmpcache', __FILE__)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: emojidex
 version: !ruby/object:Gem::Version
-  version: 0.0.22
+  version: 0.0.23
 platform: ruby
 authors:
 - Rei Kagetsuki
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-27 00:00:00.000000000 Z
+date: 2015-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday