gemojione 3.2.0 → 3.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d8b9116de3119085b28ef81bf5e6de01c6a80e7
-  data.tar.gz: 3da8d28d3037e223337088f0543d957a0e0d5b10
+  metadata.gz: 8aab09e3236a7c0dd58128746e1d216f23353203
+  data.tar.gz: 7945255d95f9cfc1b0d4ff5d4c5c7c0c1dc0bc70
 SHA512:
-  metadata.gz: 5a312ad089855a0c35f1a8f09c5221e231cbf635507b35dee45150c98f646b077da017c6c6b5b75dfe83a5ffbc9b46db9ad08fd48a8ec56b68cfe96ec23647ce
-  data.tar.gz: 2d97873bbcaea8ec1abdd9cd78dbdf5b18bfb4e61f21bc1e18b7442608b0df890ffa9ffc560ef59937969d68442af3a4aadf37c7337fc8e45e1f8fac75f3d05c
+  metadata.gz: 5003f6e18f3a5e44662530d6b0a53893bba029cdbe02ec8f236914b050c821eec52f8b85333c3441347465fdce9f6e7e138ae82f43e2e81ab75207090b208fee
+  data.tar.gz: acb844802acb12c5bea30f89dd922bee0e40dc56284ba66c534c583a56844549a9c839868220e9db6f8881c9c96301a5e49e9757e2b1e3d79ee6f26398b57717

data/.ruby-version

@@ -0,0 +1 @@
+2.3.1

data/.travis.yml

@@ -5,6 +5,7 @@ rvm:
   - 2.1.0
   - 2.2.5
   - 2.3.1
+  - 2.4.0
   - rbx-2
   - ruby-head
   - jruby-head
@@ -13,3 +14,10 @@ matrix:
   allow_failures:
     - rvm: ruby-head
     - rvm: jruby-head
+    - rvm: rbx-2
+
+addons:
+  code_climate:
+    repo_token: 418bd243b301fd0d29e8762626cc63ee2b3d2c41124c2d880e0e00d59057f639
+after_success:
+  - bundle exec codeclimate-test-reporter

data/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Change Log
 
+## [v3.3.0](https://github.com/jonathanwiesel/gemojione/tree/v3.3.0) (2017-07-14)
+
+[Full Changelog](https://github.com/jonathanwiesel/gemojione/compare/v3.2.0...v3.3.0)
+
+**Implemented enhancements:**
+
+- Add aliases search support in `replace_named_moji_with_images`.
+- Add emoji finder by shortname.
+- Add access to emoji list.
+- Add emoji finder by category.
+
+**Fixed bugs:**
+
+- Remove trailing comma from `cartwheel_tone4`.
+
+**Merged pull requests:**
+
+- Add aliases search support in replace_named_moji_with_images [\#38](https://github.com/jonathanwiesel/gemojione/pull/38) ([jonathanwiesel](https://github.com/jonathanwiesel))
+
+- Enable emoji retrieval by shortname [\#42](https://github.com/jonathanwiesel/gemojione/pull/42) ([amyspark](https://github.com/amyspark))
+
+- Remove misplaced comma [\#49](https://github.com/jonathanwiesel/gemojione/pull/49) ([connorshea](https://github.com/connorshea))
+
+- Enable emoji access to emoji list [\#43](https://github.com/jonathanwiesel/gemojione/pull/43) ([ryosuke-endo](https://github.com/ryosuke-endo))
+
+- emoji group find by category [\#44](https://github.com/jonathanwiesel/gemojione/pull/44) ([ryosuke-endo](https://github.com/ryosuke-endo))
+
+- Be clearer about spritesheet sizing [\#47](https://github.com/jonathanwiesel/gemojione/pull/47) ([gnclmorais](https://github.com/gnclmorais))
+
 ## [v3.2.0](https://github.com/jonathanwiesel/gemojione/tree/v3.2.0) (2016-08-22)
 
 [Full Changelog](https://github.com/jonathanwiesel/gemojione/compare/v3.1.0...v3.2.0)

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gemojione.gemspec
-gemspec
+gemspec

data/README.md

@@ -1,6 +1,6 @@
 # Gemojione
 
-[![Build Status][travisUrl]][travisProject] [![Downloads][downs]][rubyUrl] [![Version][version]][rubyUrl] [![Dependencies][gemnasiumDeps]][gemnasiumProject]
+[![Build Status][travisUrl]][travisProject] [![Downloads][downs]][rubyUrl] [![Version][version]][rubyUrl] [![Dependencies][gemnasiumDeps]][gemnasiumProject] [![Coverage][coverage]][codeclimate] [![GPA][gpa]][codeClimate]
 
 A gem for EmojiOne
 
@@ -157,7 +157,7 @@ gem 'escape_utils'
 ```
 
 ## Spritesheet scaling
-Default size for sprite tag is 64px x 64px, [zoom](http://caniuse.com/#feat=css-zoom) or [transform: scale()](http://caniuse.com/#feat=transforms2d) can be used for custom scaling. transform: scale() is more widely supported.
+If you’re using spritesheets, customising `Gemojione.default_size` at `config/initializers/gemojione.rb` won’t work. Default size for sprite tag is 64px x 64px, but [`zoom`](http://caniuse.com/#feat=css-zoom) or [`transform: scale()`](http://caniuse.com/#feat=transforms2d) can be used for custom scaling. transform: scale() is more widely supported.
 
 ```css
 .emojione{
@@ -190,6 +190,10 @@ This gem is a former fork of the [emoji](https://github.com/wpeterson/emoji) gem
 * [@kendrikat](https://github.com/kendrikat): Railtie dependecy checker, default size option support and new `replace_named_moji_with_images` feature.
 * [@gnclmorais](https://github.com/gnclmorais): Add `replace_named_moji_with_images ` missing ext helper.
 * [@naveed-ahmad](https://github.com/naveed-ahmad): ASCII replacement API and Spritesheet support.
+* [@Eric-Guo](https://github.com/Eric-Guo): Usage of `.ruby-version` instead of `.rvmrc`.
+* [@amyspark](https://github.com/amyspark): Add `find_by_shortname` 
+* [@ryosuke-endo](https://github.com/ryosuke-endo): Access to emoji list and `find_by_category`.
+* [@connorshea](https://github.com/connorshea): Bugfixing.
 
 ## Contributing
 
@@ -211,3 +215,6 @@ Run `rake resprite` to regenerate the spritesheets if you're adding new images
 [rubyUrl]: https://rubygems.org/gems/gemojione
 [gemnasiumDeps]: https://img.shields.io/gemnasium/jonathanwiesel/gemojione.svg
 [gemnasiumProject]: https://gemnasium.com/jonathanwiesel/gemojione
+[coverage]: https://img.shields.io/codeclimate/coverage/github/jonathanwiesel/gemojione.svg
+[codeclimate]: https://codeclimate.com/github/jonathanwiesel/gemojione
+[gpa]: https://img.shields.io/codeclimate/github/jonathanwiesel/gemojione.svg

data/config/index.json

@@ -4023,7 +4023,7 @@
     ],
     "aliases_ascii": [],
     "keywords": [],
-    "moji": "🤸🏾,"
+    "moji": "🤸🏾"
   },
   "cartwheel_tone5": {
     "unicode": "1F938-1F3FF",

data/gemojione.gemspec

@@ -24,5 +24,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "sprite-factory"
-  spec.add_development_dependency 'rmagick'
+  spec.add_development_dependency "rmagick"
+  spec.add_development_dependency "simplecov"
+  spec.add_development_dependency "codeclimate-test-reporter", "~> 1.0.0"
 end

data/lib/gemojione/index.rb

@@ -1,5 +1,7 @@
 module Gemojione
   class Index
+    attr_reader :all
+
     def initialize(emoji_list=nil)
       emoji_list ||= begin
         emoji_json = File.read(File.absolute_path(File.dirname(__FILE__) + '/../../config/index.json'))
@@ -11,6 +13,8 @@ module Gemojione
       @emoji_by_ascii = {}
       @emoji_by_code = {}
       @emoji_by_keyword = {}
+      @emoji_by_category = {}
+      @all = emoji_list
 
       emoji_list.each do |key, emoji_hash|
 
@@ -21,6 +25,7 @@ module Gemojione
         emoji_hash["aliases"].each do |emoji_alias|
           aliased = emoji_alias.tr(':','')
           @emoji_by_name[aliased] = emoji_hash if aliased
+          @emoji_by_code[emoji_alias] = emoji_hash if aliased
         end
 
         emoji_hash['aliases_ascii'].each do |emoji_ascii|
@@ -37,6 +42,12 @@ module Gemojione
           @emoji_by_keyword[emoji_keyword] ||= []
           @emoji_by_keyword[emoji_keyword] << emoji_hash
         end
+
+        category = emoji_hash['category']
+        if category
+          @emoji_by_category[category] ||= {}
+          @emoji_by_category[category][key] = emoji_hash
+        end
       end
 
       @emoji_code_regex = /#{@emoji_by_code.keys.map{|ec| Regexp.escape(ec)}.join('|')}/
@@ -60,6 +71,14 @@ module Gemojione
       @emoji_by_keyword[keyword]
     end
 
+    def find_by_category(category)
+      @emoji_by_category[category]
+    end
+
+    def find_by_shortname(shortname)
+      @emoji_by_code[shortname]
+    end
+
     def unicode_moji_regex
       @emoji_moji_regex
     end

data/lib/gemojione/version.rb

@@ -1,3 +1,3 @@
 module Gemojione
-  VERSION = "3.2.0"
+  VERSION = "3.3.0"
 end

data/test/gemojione_test.rb

@@ -186,6 +186,12 @@ describe Gemojione do
       assert_equal "I <img alt=\"❤\" class=\"emoji\" src=\"http://localhost:3000/2764.png\"> Emoji", replaced_string
     end
 
+    it 'should replace aliased moji with img tag' do
+      base_string = "Good one :+1:"
+      replaced_string = Gemojione.replace_named_moji_with_images(base_string)
+      assert_equal "Good one <img alt=\"👍\" class=\"emoji\" src=\"http://localhost:3000/1F44D.png\">", replaced_string
+    end
+
     it 'should handle nil string' do
       assert_equal nil, Gemojione.replace_named_moji_with_images(nil)
     end

data/test/index_test.rb

@@ -5,6 +5,12 @@ require File.absolute_path File.dirname(__FILE__) + '/test_helper'
 describe Gemojione::Index do
   let(:index) { Gemojione::Index.new }
 
+  describe "all" do
+    it "return emoji_list" do
+      assert index.all, index.instance_variable_get(:@emoji_by_name)
+    end
+  end
+
   describe "find_by_name" do
     it 'should find cyclone emoji' do
       assert index.find_by_name('cyclone')
@@ -33,6 +39,18 @@ describe Gemojione::Index do
       assert index.find_by_ascii('<3')['unicode'] == "2764"
     end
   end
+  
+  describe 'find by shortname' do
+    it 'returns the heart emoji' do
+      assert index.find_by_shortname(':heart:')['unicode'] == '2764'
+    end
+  end
+
+  describe 'find by category' do
+    it 'should find people category by category name' do
+      assert index.find_by_category('people')
+    end
+  end
 
   describe "unicode_moji_regex" do
     it "should return complex moji regex" do

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'rubygems'
 require 'bundler/setup'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gemojione
 version: !ruby/object:Gem::Version
-  version: 3.2.0
+  version: 3.3.0
 platform: ruby
 authors:
 - Steve Klabnik
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-22 00:00:00.000000000 Z
+date: 2017-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -96,6 +96,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 description: A gem for EmojiOne
 email:
 - steve@steveklabnik.com
@@ -106,7 +134,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".rvmrc"
+- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - Gemfile
@@ -3735,7 +3763,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: A gem for EmojiOne

data/.rvmrc

@@ -1 +0,0 @@
-rvm use ruby-2.0.0-p247@gemojione --create