jpmobile 5.0.1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0a59b2d91b6623e62be44818ffad569c1a30bb3f
-  data.tar.gz: a4737c7bfa0e802747202254c43162022213c3c0
+SHA256:
+  metadata.gz: 6a3282bc38e1341f5732641f7fbcb39a45f6067ea93796d9ddf39d17198b8efa
+  data.tar.gz: 8ec05a3964dee4fd9a731ff61f38f946ca0a06049dc8d5709a8dec89ea701ff1
 SHA512:
-  metadata.gz: 478a46e5f1d336ad58d7cf51605cd51fe11c5e5159b507e7c602d054d2bd953d1939b713b130bae46a5f1425afd921470dcf37e133042d149269a2ec7d614776
-  data.tar.gz: 40699b70bfb7eeefc58dc071effa2abcafae6484ab0a59adb0f84e793313a8e15e63ef5e24b9ce6d861415f97bbda074ae908ad69e465968e4d2e3a0a100b870
+  metadata.gz: cb4b41c43846247d7f2462793925ba8ac7313490f9f019145122c7e0e91d6574b862bcd81ef0d2d44be80e34e58f62c52b776995a0a4df31dc46e2f7d678fdce
+  data.tar.gz: 92b5f532f143b28226b949b1cb384d4fc7d382c268ba102ee0700580f0f49ec37f83496b1b5c40f3e87273b2f222c8e3ee2b71d6840099663a50d2c4faa40547

data/.gitignore

@@ -15,5 +15,4 @@ rdoc
 spec/reports
 test/tmp
 test/version_tmp
-.ruby-version
-.envrc
+.envrc

data/.rubocop.yml

@@ -7,7 +7,7 @@ inherit_gem:
     # - "config/rspec.yml"
 
 AllCops:
-  TargetRubyVersion: 2.3
+  TargetRubyVersion: 2.4
   Exclude:
     - 'bin/bundle'
     - 'bin/rails'
@@ -38,17 +38,27 @@ Style/BlockDelimiters:
     - 'lib/jpmobile/mail.rb'
   EnforcedStyle: braces_for_chaining
 
-Style/IndentationConsistency:
+Layout/IndentationConsistency:
   EnforcedStyle: normal
 
-Style/AccessorMethodName:
+Naming/AccessorMethodName:
   Exclude:
     - 'lib/jpmobile/mail.rb'
 
+Naming/ConstantName:
+  Exclude:
+    - 'lib/jpmobile/datum_conv.rb'
+
+Naming/MemoizedInstanceVariableName:
+  Enabled: false
+
 Style/BlockComments:
   Exclude:
     - 'test/rails/overrides/spec/spec_helper.rb'
 
+Style/FormatStringToken:
+  Enabled: false
+
 Metrics/AbcSize:
   Exclude:
     - 'lib/jpmobile/datum_conv.rb'
@@ -121,3 +131,7 @@ Lint/HandleExceptions:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/fallback_view_selector.rb'
     - 'lib/jpmobile/position.rb'
+
+Lint/Void:
+  Exclude:
+    - 'lib/jpmobile/filter.rb'

data/.ruby-version

@@ -0,0 +1 @@
+2.5.1

data/Gemfile

@@ -4,3 +4,4 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'onkcop', require: false
+gem 'rubocop', require: false

data/Gemfile.lock

@@ -1,181 +1,190 @@
 PATH
   remote: .
   specs:
-    jpmobile (5.0.0)
+    jpmobile (5.2.0.beta1)
+      mail (~> 2.7.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.0.3)
-      actionpack (= 5.0.3)
-      nio4r (>= 1.2, < 3.0)
-      websocket-driver (~> 0.6.1)
-    actionmailer (5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
+    actioncable (5.2.0)
+      actionpack (= 5.2.0)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.0.3)
-      actionview (= 5.0.3)
-      activesupport (= 5.0.3)
+    actionpack (5.2.0)
+      actionview (= 5.2.0)
+      activesupport (= 5.2.0)
       rack (~> 2.0)
-      rack-test (~> 0.6.3)
+      rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.0.3)
-      activesupport (= 5.0.3)
+    actionview (5.2.0)
+      activesupport (= 5.2.0)
       builder (~> 3.1)
-      erubis (~> 2.7.0)
+      erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.0.3)
-      activesupport (= 5.0.3)
+    activejob (5.2.0)
+      activesupport (= 5.2.0)
       globalid (>= 0.3.6)
-    activemodel (5.0.3)
-      activesupport (= 5.0.3)
-    activerecord (5.0.3)
-      activemodel (= 5.0.3)
-      activesupport (= 5.0.3)
-      arel (~> 7.0)
-    activesupport (5.0.3)
+    activemodel (5.2.0)
+      activesupport (= 5.2.0)
+    activerecord (5.2.0)
+      activemodel (= 5.2.0)
+      activesupport (= 5.2.0)
+      arel (>= 9.0)
+    activestorage (5.2.0)
+      actionpack (= 5.2.0)
+      activerecord (= 5.2.0)
+      marcel (~> 0.3.1)
+    activesupport (5.2.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (~> 0.7)
+      i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    addressable (2.5.1)
-      public_suffix (~> 2.0, >= 2.0.2)
-    arel (7.1.4)
-    ast (2.3.0)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    ast (2.4.0)
     builder (3.2.3)
-    capybara (2.13.0)
+    capybara (3.0.1)
       addressable
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    capybara-webkit (1.14.0)
-      capybara (>= 2.3.0, < 2.14.0)
+      mini_mime (>= 0.1.3)
+      nokogiri (~> 1.8)
+      rack (>= 1.6.0)
+      rack-test (>= 0.6.3)
+      xpath (~> 3.0)
+    capybara-webkit (1.15.0)
+      capybara (>= 2.3, < 4.0)
       json
-    coderay (1.1.1)
+    coderay (1.1.2)
     concurrent-ruby (1.0.5)
+    crass (1.0.4)
     diff-lcs (1.3)
-    erubis (2.7.0)
+    erubi (1.7.1)
     geokit (1.11.0)
     git (1.3.0)
-    globalid (0.4.0)
+    globalid (0.4.1)
       activesupport (>= 4.2.0)
     hpricot (0.8.6)
-    i18n (0.8.1)
+    i18n (1.0.0)
+      concurrent-ruby (~> 1.0)
     json (2.1.0)
-    loofah (2.0.3)
+    loofah (2.2.2)
+      crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
-    mail (2.6.5)
-      mime-types (>= 1.16, < 4)
-    method_source (0.8.2)
-    mime-types (3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2016.0521)
-    mini_portile2 (2.1.0)
-    minitest (5.10.2)
-    nio4r (2.0.0)
-    nokogiri (1.7.2)
-      mini_portile2 (~> 2.1.0)
-    onkcop (0.48.1.1)
-      rubocop (~> 0.48.1)
-      rubocop-rspec (>= 1.15.0)
-    parser (2.4.0.0)
-      ast (~> 2.2)
+    mail (2.7.0)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.2)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.0)
+    mimemagic (0.3.2)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    minitest (5.11.3)
+    nio4r (2.3.0)
+    nokogiri (1.8.2)
+      mini_portile2 (~> 2.3.0)
+    onkcop (0.53.0.0)
+      rubocop (~> 0.53.0)
+      rubocop-rspec (>= 1.24.0)
+    parallel (1.12.1)
+    parser (2.5.0.5)
+      ast (~> 2.4.0)
     powerpack (0.1.1)
-    pry (0.10.4)
+    pry (0.11.3)
       coderay (~> 1.1.0)
-      method_source (~> 0.8.1)
-      slop (~> 3.4)
-    public_suffix (2.0.5)
-    rack (2.0.2)
-    rack-test (0.6.3)
-      rack (>= 1.0)
-    rails (5.0.3)
-      actioncable (= 5.0.3)
-      actionmailer (= 5.0.3)
-      actionpack (= 5.0.3)
-      actionview (= 5.0.3)
-      activejob (= 5.0.3)
-      activemodel (= 5.0.3)
-      activerecord (= 5.0.3)
-      activesupport (= 5.0.3)
-      bundler (>= 1.3.0, < 2.0)
-      railties (= 5.0.3)
+      method_source (~> 0.9.0)
+    public_suffix (3.0.2)
+    rack (2.0.4)
+    rack-test (1.0.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.0)
+      actioncable (= 5.2.0)
+      actionmailer (= 5.2.0)
+      actionpack (= 5.2.0)
+      actionview (= 5.2.0)
+      activejob (= 5.2.0)
+      activemodel (= 5.2.0)
+      activerecord (= 5.2.0)
+      activestorage (= 5.2.0)
+      activesupport (= 5.2.0)
+      bundler (>= 1.3.0)
+      railties (= 5.2.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.3)
-      loofah (~> 2.0)
-    railties (5.0.3)
-      actionpack (= 5.0.3)
-      activesupport (= 5.0.3)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.0)
+      actionpack (= 5.2.0)
+      activesupport (= 5.2.0)
       method_source
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rainbow (2.2.2)
-      rake
-    rake (12.0.0)
-    rspec (3.6.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-    rspec-core (3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-expectations (3.6.0)
+    rainbow (3.0.0)
+    rake (12.3.1)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.1)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
+      rspec-support (~> 3.7.0)
     rspec-its (1.2.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.6.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.6.0)
-    rspec-rails (3.6.0)
+      rspec-support (~> 3.7.0)
+    rspec-rails (3.7.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       railties (>= 3.0)
-      rspec-core (~> 3.6.0)
-      rspec-expectations (~> 3.6.0)
-      rspec-mocks (~> 3.6.0)
-      rspec-support (~> 3.6.0)
-    rspec-support (3.6.0)
-    rubocop (0.48.1)
-      parser (>= 2.3.3.1, < 3.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.1)
+    rubocop (0.53.0)
+      parallel (~> 1.10)
+      parser (>= 2.5)
       powerpack (~> 0.1)
-      rainbow (>= 1.99.1, < 3.0)
+      rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.15.1)
-      rubocop (>= 0.42.0)
-    ruby-progressbar (1.8.1)
-    slop (3.6.0)
+    rubocop-rspec (1.25.0)
+      rubocop (>= 0.53.0)
+    ruby-progressbar (1.9.0)
     sprockets (3.7.1)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.0)
+    sprockets-rails (3.2.1)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
     sqlite3 (1.3.13)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    thor (0.19.4)
+    thor (0.20.0)
     thread_safe (0.3.6)
-    tzinfo (1.2.3)
+    tzinfo (1.2.5)
       thread_safe (~> 0.1)
-    unicode-display_width (1.2.1)
-    websocket-driver (0.6.5)
+    unicode-display_width (1.3.0)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.2)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    websocket-extensions (0.1.3)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   ruby
@@ -188,11 +197,12 @@ DEPENDENCIES
   jpmobile!
   onkcop
   pry
-  rails (~> 5.0.0)
+  rails (~> 5.2.0)
   rspec
   rspec-its
   rspec-rails
+  rubocop
   sqlite3-ruby
 
 BUNDLED WITH
-   1.14.6
+   1.16.1

data/Rakefile

@@ -3,7 +3,6 @@ require 'rake/testtask'
 require 'fileutils'
 require 'pathname'
 require 'git'
-include FileUtils
 
 desc 'Default: run unit tests.'
 task :default => :test

data/circle.yml

@@ -2,7 +2,7 @@ machine:
   timezone:
     Asia/Tokyo
   ruby:
-    version: 2.4.0
+    version: 2.4.2
 
 database:
   override:

data/jpmobile.gemspec

@@ -1,4 +1,4 @@
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jpmobile/version'
 
@@ -10,19 +10,21 @@ Gem::Specification.new do |gem|
   gem.description   = 'A Rails plugin for mobile devices in Japan'
   gem.summary       = 'Rails plugin for mobile devices in Japan'
   gem.homepage      = 'http://jpmobile-rails.org'
+  gem.license       = 'MIT'
 
   gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency 'rails', '~> 5.0.0'
-  gem.add_development_dependency 'rspec'
-  gem.add_development_dependency 'rspec-rails'
-  gem.add_development_dependency 'rspec-its'
+  gem.add_dependency 'mail', '~> 2.7.0'
   gem.add_development_dependency 'capybara-webkit'
   gem.add_development_dependency 'geokit'
-  gem.add_development_dependency 'sqlite3-ruby'
-  gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'git'
+  gem.add_development_dependency 'hpricot'
   gem.add_development_dependency 'pry'
+  gem.add_development_dependency 'rails', '~> 5.2.0'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-its'
+  gem.add_development_dependency 'rspec-rails'
+  gem.add_development_dependency 'sqlite3-ruby'
 end

data/lib/jpmobile/docomo_guid.rb

@@ -17,6 +17,7 @@ module Jpmobile::DocomoGuid #:nodoc:
     result = super || {}
     return result unless request # for test process
     return result unless apply_add_guid?
+
     result.merge({ guid: 'ON' })
   end
 

data/lib/jpmobile/email.rb

@@ -48,7 +48,7 @@ module Jpmobile
       def convertable?(content_type)
         if converting_content_type.respond_to?(:each)
           converting_content_type.each do |c|
-            return true if content_type.match(c)
+            return true if content_type.match?(c)
           end
         end
 

data/lib/jpmobile/emoticon/z_combine.rb

@@ -9,37 +9,37 @@ module Jpmobile
     # for au email
     SJIS_TO_EMAIL_JIS = { 0x81ac => 0x222E }.update(AU_SJIS_TO_EMAIL_JIS).freeze
 
-    SJIS_REGEXP = Regexp.union(*SJIS_TO_UNICODE.keys.map { |s| Jpmobile::Util.sjis_regexp(s) })
-    SOFTBANK_WEBCODE_REGEXP = Regexp.union(*([/(?!)/n] + SOFTBANK_WEBCODE_TO_UNICODE.keys.map { |x| "\x1b\x24#{x}\x0f" }))
+    SJIS_REGEXP = Regexp.union(*SJIS_TO_UNICODE.keys.map {|s| Jpmobile::Util.sjis_regexp(s) })
+    SOFTBANK_WEBCODE_REGEXP = Regexp.union(*([/(?!)/n] + SOFTBANK_WEBCODE_TO_UNICODE.keys.map {|x| "\x1b\x24#{x}\x0f" }))
 
-    DOCOMO_SJIS_REGEXP      = Regexp.union(*DOCOMO_SJIS_TO_UNICODE.keys.map { |s| Jpmobile::Util.sjis_regexp(s) })
-    AU_SJIS_REGEXP          = Regexp.union(*AU_SJIS_TO_UNICODE.keys.map { |s| Jpmobile::Util.sjis_regexp(s) })
-    SOFTBANK_UNICODE_REGEXP = Regexp.union(*SOFTBANK_UNICODE_TO_WEBCODE.keys.map { |x| [x].pack('U') }).freeze
+    DOCOMO_SJIS_REGEXP      = Regexp.union(*DOCOMO_SJIS_TO_UNICODE.keys.map {|s| Jpmobile::Util.sjis_regexp(s) })
+    AU_SJIS_REGEXP          = Regexp.union(*AU_SJIS_TO_UNICODE.keys.map {|s| Jpmobile::Util.sjis_regexp(s) })
+    SOFTBANK_UNICODE_REGEXP = Regexp.union(*SOFTBANK_UNICODE_TO_WEBCODE.keys.map {|x| [x].pack('U') }).freeze
 
-    EMOTICON_UNICODES = UNICODE_TO_SJIS.keys | SOFTBANK_UNICODE_TO_WEBCODE.keys.map { |k| k + 0x1000 }
-    UTF8_REGEXP = Regexp.union(*EMOTICON_UNICODES.map { |x| [x].pack('U') }).freeze
+    EMOTICON_UNICODES = UNICODE_TO_SJIS.keys | SOFTBANK_UNICODE_TO_WEBCODE.keys.map {|k| k + 0x1000 }
+    UTF8_REGEXP = Regexp.union(*EMOTICON_UNICODES.map {|x| [x].pack('U') }).freeze
 
     # for PC conversion "GETA"
-    CONVERSION_TABLE_TO_PC_EMAIL = Hash[*(CONVERSION_TABLE_TO_SOFTBANK.keys | CONVERSION_TABLE_TO_DOCOMO.keys | CONVERSION_TABLE_TO_AU.keys).map { |k| [k, GETA] }.flatten]
+    CONVERSION_TABLE_TO_PC_EMAIL = Hash[*(CONVERSION_TABLE_TO_SOFTBANK.keys | CONVERSION_TABLE_TO_DOCOMO.keys | CONVERSION_TABLE_TO_AU.keys).map {|k| [k, GETA] }.flatten]
 
-    SOFTBANK_SJIS_REGEXP = Regexp.union(*SOFTBANK_SJIS_TO_UNICODE.keys.map { |s| Jpmobile::Util.sjis_regexp(s) }).freeze
-    AU_EMAILJIS_REGEXP = Regexp.union(*AU_EMAILJIS_TO_UNICODE.keys.map { |s| Jpmobile::Util.jis_regexp(s) })
+    SOFTBANK_SJIS_REGEXP = Regexp.union(*SOFTBANK_SJIS_TO_UNICODE.keys.map {|s| Jpmobile::Util.sjis_regexp(s) }).freeze
+    AU_EMAILJIS_REGEXP = Regexp.union(*AU_EMAILJIS_TO_UNICODE.keys.map {|s| Jpmobile::Util.jis_regexp(s) })
 
     # for unicode/google emoticons
     UNICODE_EMOTICONS = (UNICODE_TO_DOCOMO_UNICODE.keys | UNICODE_TO_AU_UNICODE.keys | UNICODE_TO_SOFTBANK_UNICODE.keys).uniq
     GOOGLE_EMOTICONS = (GOOGLE_TO_DOCOMO_UNICODE.keys | GOOGLE_TO_AU_UNICODE.keys | GOOGLE_TO_SOFTBANK_UNICODE.keys).uniq
 
-    UNICODE_EMOTICON_REGEXP = Regexp.union(*UNICODE_EMOTICONS.map { |x| x.is_a?(Array) ? x.pack('UU') : [x].pack('U') }).freeze
-    GOOGLE_EMOTICON_REGEXP = Regexp.union(*GOOGLE_EMOTICONS.map { |x| x.is_a?(Array) ? x.pack('UU') : [x].pack('U') }).freeze
+    UNICODE_EMOTICON_REGEXP = Regexp.union(*UNICODE_EMOTICONS.map {|x| x.is_a?(Array) ? x.pack('UU') : [x].pack('U') }).freeze
+    GOOGLE_EMOTICON_REGEXP = Regexp.union(*GOOGLE_EMOTICONS.map {|x| x.is_a?(Array) ? x.pack('UU') : [x].pack('U') }).freeze
 
     UNICODE_EMOTICON_TO_CARRIER_EMOTICON = UNICODE_TO_DOCOMO_UNICODE.merge(UNICODE_TO_AU_UNICODE.merge(UNICODE_TO_SOFTBANK_UNICODE))
     GOOGLE_EMOTICON_TO_CARRIER_EMOTICON = GOOGLE_TO_SOFTBANK_UNICODE.merge(GOOGLE_TO_AU_UNICODE.merge(GOOGLE_TO_DOCOMO_UNICODE))
 
     CONVERSION_TABLE_TO_UNICODE_EMOTICON = Jpmobile::Util.invert_table(UNICODE_TO_DOCOMO_UNICODE).merge(
-      Jpmobile::Util.invert_table(UNICODE_TO_AU_UNICODE).merge(Jpmobile::Util.invert_table(UNICODE_TO_SOFTBANK_UNICODE))
+      Jpmobile::Util.invert_table(UNICODE_TO_AU_UNICODE).merge(Jpmobile::Util.invert_table(UNICODE_TO_SOFTBANK_UNICODE)),
     )
     CONVERSION_TABLE_TO_GOOGLE_EMOTICON = Jpmobile::Util.invert_table(GOOGLE_TO_SOFTBANK_UNICODE).merge(
-      Jpmobile::Util.invert_table(GOOGLE_TO_AU_UNICODE).merge(Jpmobile::Util.invert_table(GOOGLE_TO_DOCOMO_UNICODE))
+      Jpmobile::Util.invert_table(GOOGLE_TO_AU_UNICODE).merge(Jpmobile::Util.invert_table(GOOGLE_TO_DOCOMO_UNICODE)),
     )
   end
 end

data/lib/jpmobile/emoticon.rb

@@ -181,7 +181,7 @@ module Jpmobile
           end
         when String
           # 変換先が数値参照だと、再変換する
-          if converted =~ /&#x([0-9a-f]{4});/i
+          if converted.match?(/&#x([0-9a-f]{4});/i)
             self.unicodecr_to_external(converted, conversion_table, to_sjis)
           else
             # 変換先が文字列で指定されている。
@@ -294,8 +294,8 @@ module Jpmobile
 
         begin
           yaml_hash = YAML.load_file(@pc_emoticon_yaml)
-          @pc_emoticon_hash = Hash[*(yaml_hash.values.inject([]) { |r, v| r += v.to_a.flatten; r })]
-          @pc_emoticon_image_path.chop if @pc_emoticon_image_path =~ %r{/$}
+          @pc_emoticon_hash = Hash[*(yaml_hash.values.inject([]) {|r, v| r += v.to_a.flatten; r })]
+          @pc_emoticon_image_path.chop if @pc_emoticon_image_path.match?(%r{/$})
 
           return true
         rescue

data/lib/jpmobile/fallback_view_selector.rb

@@ -8,7 +8,7 @@ module Jpmobile
         begin
           expected_view_file = lookup_context.find_template(options[:template], options[:prefixes])
 
-          _candidates = lookup_context.mobile.map { |variant|
+          _candidates = lookup_context.mobile.map {|variant|
             target_template = options[:template] + '_' + variant
             expected_view_file.virtual_path.match(target_template)
           }.compact