jpmobile 5.0.0 → 5.0.1

data/Rakefile

@@ -1,4 +1,4 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'
 require 'rake/testtask'
 require 'fileutils'
 require 'pathname'
@@ -8,28 +8,28 @@ include FileUtils
 desc 'Default: run unit tests.'
 task :default => :test
 
-desc "Update misc tables"
+desc 'Update misc tables'
 task :update do
-  Dir.glob("tools/update_*.rb").each do |path|
+  Dir.glob('tools/update_*.rb').each do |path|
     ruby path
   end
 end
 
 namespace :test do
-  desc "Preparation of external modules"
+  desc 'Preparation of external modules'
   task :prepare do
     external_repos = [
-      "jpmobile-ipaddresses",
-      "jpmobile-terminfo"
+      'jpmobile-ipaddresses',
+      'jpmobile-terminfo',
     ]
-    github_prefix = "git://github.com/jpmobile"
-    vendor_path = Pathname.new(Dir.pwd).join("vendor")
+    github_prefix = 'git://github.com/jpmobile'
+    vendor_path = Pathname.new(Dir.pwd).join('vendor')
     FileUtils.mkdir_p(vendor_path)
 
     FileUtils.cd(vendor_path) do
       external_repos.each do |repos|
         unless File.directory?("#{repos}/.git")
-          Git.clone("#{github_prefix}/#{repos}.git", repos, {:path => vendor_path})
+          Git.clone("#{github_prefix}/#{repos}.git", repos, { :path => vendor_path })
         end
       end
     end

data/circle.yml

@@ -0,0 +1,14 @@
+machine:
+  timezone:
+    Asia/Tokyo
+  ruby:
+    version: 2.4.0
+
+database:
+  override:
+    - echo "Skip create database."
+
+test:
+  override:
+    - bundle exec rubocop
+    - bundle exec rake test

data/jpmobile.gemspec

@@ -1,24 +1,23 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'jpmobile/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "jpmobile"
+  gem.name          = 'jpmobile'
   gem.version       = Jpmobile::VERSION
-  gem.authors       = ["Shin-ichiro OGAWA", "Yoji Shidara"]
-  gem.email         = ["rust.stnard@gmail.com"]
-  gem.description   = %q{A Rails plugin for mobile devices in Japan}
-  gem.summary       = %q{A Rails plugin for mobile devices in Japan}
+  gem.authors       = ['Shin-ichiro OGAWA', 'Yoji Shidara']
+  gem.email         = ['rust.stnard@gmail.com']
+  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.files         = `git ls-files`.split($/)
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
   gem.add_development_dependency 'rails', '~> 5.0.0'
-  gem.add_development_dependency 'rspec', '3.5.0.beta4'
-  gem.add_development_dependency 'rspec-rails', '3.5.0.beta4'
+  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec-rails'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'capybara-webkit'
   gem.add_development_dependency 'geokit'

data/lib/jpmobile.rb

@@ -1,7 +1,6 @@
-# -*- coding: utf-8 -*-
-$:.unshift(File.dirname(__FILE__)) unless $:.include?(File.dirname(__FILE__)) ||
-                                          $:.include?(File.expand_path(File.dirname(__FILE__)))
-require "jpmobile/version"
+$LOAD_PATH.unshift(File.dirname(__FILE__)) unless $LOAD_PATH.include?(File.dirname(__FILE__)) ||
+                                                  $LOAD_PATH.include?(File.expand_path(File.dirname(__FILE__)))
+require 'jpmobile/version'
 require 'singleton'
 require 'rack/utils'
 
@@ -41,7 +40,7 @@ module Jpmobile
     autoload :UnicodeEmoticon, 'jpmobile/mobile/unicode_emoticon'
     autoload :GoogleEmoticon, 'jpmobile/mobile/google_emoticon'
 
-    DEFAULT_CARRIERS = %w(Docomo Au Softbank Vodafone Emobile Willcom Ddipocket Ipad AndroidTablet Iphone Android WindowsPhone BlackBerry)
+    DEFAULT_CARRIERS = %w[Docomo Au Softbank Vodafone Emobile Willcom Ddipocket Ipad AndroidTablet Iphone Android WindowsPhone BlackBerry].freeze
 
     def self.carriers
       @carriers ||= DEFAULT_CARRIERS.dup
@@ -65,10 +64,12 @@ module Jpmobile
 
   autoload :FallbackViewSelector, 'jpmobile/fallback_view_selector'
 
+  autoload :ParamsOverCookie,    'jpmobile/trans_sid'
   autoload :TransSidRedirecting, 'jpmobile/trans_sid'
   autoload :TransSid,            'jpmobile/trans_sid'
 
   module_function
+
   def config
     ::Jpmobile::Configuration.instance
   end

data/lib/jpmobile/datum_conv.rb

@@ -5,68 +5,68 @@
 # 日本測量協会, 2002.
 
 module DatumConv
-  GRS80  = [    6378137, 298.257222101]
-  Bessel = [6377397.155, 299.152813]
-  Tokyo97toITRF94 = [-146.414, 507.337, 680.507]
-  ITRF94toTokyo97 = [ 146.414,-507.337,-680.507]
-  Deg2Rad = Math::PI/180
+  GRS80  = [6_378_137, 298.257222101].freeze
+  Bessel = [6_377_397.155, 299.152813].freeze
+  Tokyo97toITRF94 = [-146.414, 507.337, 680.507].freeze
+  ITRF94toTokyo97 = [146.414, -507.337, -680.507].freeze
+  Deg2Rad = Math::PI / 180
 
   # 緯度(度),経度(度),高度(m)を三次元直交座標(m)に変換する。
-  def self.blh2xyz(b_deg,l_deg,he,datum)
+  def self.blh2xyz(b_deg, l_deg, he, datum)
     a = datum[0].to_f
-    f = 1.0/datum[1]
+    f = 1.0 / datum[1]
     b = b_deg * Deg2Rad
     l = l_deg * Deg2Rad
 
     e2 = f * (2 - f)
-    n = a / Math.sqrt(1 - e2 * Math.sin(b)**2 )
+    n = a / Math.sqrt(1 - e2 * Math.sin(b)**2)
 
-    x = (n+he)*Math.cos(b)*Math.cos(l)
-    y = (n+he)*Math.cos(b)*Math.sin(l)
-    z = (n*(1-e2)+he)*Math.sin(b)
-    return x,y,z
+    x = (n + he) * Math.cos(b) * Math.cos(l)
+    y = (n + he) * Math.cos(b) * Math.sin(l)
+    z = (n * (1 - e2) + he) * Math.sin(b)
+    return x, y, z
   end
 
   # 三次元直交座標(m)を緯度(度),経度(度),高度(m)に変換する。
-  def self.xyz2blh(x,y,z,datum)
+  def self.xyz2blh(x, y, z, datum)
     a = datum[0].to_f
-    f = 1.0/datum[1]
+    f = 1.0 / datum[1]
     e2 = f * (2 - f)
-    l = Math.atan2(y,x)
+    l = Math.atan2(y, x)
 
-    p = Math.sqrt(x**2+y**2)
-    r = Math.sqrt(p**2+z**2)
-    u = Math.atan2(z*((1-f)+e2*a/r),p)
-    b = Math.atan2(z*(1-f)+e2*a*Math.sin(u)**3,(1-f)*(p-e2*a*Math.cos(u)**3))
+    p = Math.sqrt(x**2 + y**2)
+    r = Math.sqrt(p**2 + z**2)
+    u = Math.atan2(z * ((1 - f) + e2 * a / r), p)
+    b = Math.atan2(z * (1 - f) + e2 * a * Math.sin(u)**3, (1 - f) * (p - e2 * a * Math.cos(u)**3))
 
-    he = p*Math.cos(b) + z*Math.sin(b) - a*Math.sqrt(1-e2*Math.sin(b)**2)
+    he = p * Math.cos(b) + z * Math.sin(b) - a * Math.sqrt(1 - e2 * Math.sin(b)**2)
 
     b_deg = b / Deg2Rad
     l_deg = l / Deg2Rad
-    return b_deg,l_deg,he
+    return b_deg, l_deg, he
   end
 
   # 三次元直交座標でシフトする。
-  def self.xyz2xyz(x,y,z,d)
-    return x+d[0],y+d[1],z+d[2]
+  def self.xyz2xyz(x, y, z, d)
+    return x + d[0], y + d[1], z + d[2]
   end
 
   # 日本測地系から世界測地系に変換する。
-  def self.tky2jgd(b,l,he=0)
-    x,y,z = blh2xyz(b,l,he,Bessel)
-    x,y,z = xyz2xyz(x,y,z,Tokyo97toITRF94)
-    b,l,he = xyz2blh(x,y,z,GRS80)
-    return b,l,he
+  def self.tky2jgd(b, l, he = 0)
+    x, y, z = blh2xyz(b, l, he, Bessel)
+    x, y, z = xyz2xyz(x, y, z, Tokyo97toITRF94)
+    b, l, he = xyz2blh(x, y, z, GRS80)
+    return b, l, he
   end
 
   # 世界測地系から日本測地系に変換する。
-  def self.jgd2tky(b,l,he=0)
-    x,y,z = blh2xyz(b,l,he,GRS80)
-    x,y,z = xyz2xyz(x,y,z,ITRF94toTokyo97)
-    b,l,he = xyz2blh(x,y,z,Bessel)
-    return b,l,he
+  def self.jgd2tky(b, l, he = 0)
+    x, y, z = blh2xyz(b, l, he, GRS80)
+    x, y, z = xyz2xyz(x, y, z, ITRF94toTokyo97)
+    b, l, he = xyz2blh(x, y, z, Bessel)
+    return b, l, he
   end
 end
 
-#DatumConv.tky2jgd(b,l)
-#DatumConv.jgd2tky(b,l)
+# DatumConv.tky2jgd(b,l)
+# DatumConv.jgd2tky(b,l)

data/lib/jpmobile/docomo_guid.rb

@@ -1,27 +1,26 @@
-# -*- coding: utf-8 -*-
-#DoCoMoの時guid=onの付与
+# DoCoMoの時guid=onの付与
 class ActionController::Base #:nodoc:
   class_attribute :docomo_guid_mode
 
   class << self
-    def docomo_guid(mode=:docomo)
+    def docomo_guid(mode = :docomo)
       include Jpmobile::DocomoGuid
       self.docomo_guid_mode = mode
     end
   end
 end
 
-
 module Jpmobile::DocomoGuid #:nodoc:
   protected
+
   def default_url_options
     result = super || {}
     return result unless request # for test process
     return result unless apply_add_guid?
-    return result.merge({:guid => "ON"})
+    result.merge({ guid: 'ON' })
   end
 
-  #guid=ONを付与すべきか否かを返す
+  # guid=ONを付与すべきか否かを返す
   def apply_add_guid?
     return true if docomo_guid_mode == :always
     return false if docomo_guid_mode == :none
@@ -34,10 +33,10 @@ module Jpmobile::DocomoGuid #:nodoc:
       return false unless request.mobile.valid_ip?
     end
 
-    return true
+    true
   end
 
   def not_apply_guid_user_agent?
-    request.user_agent.match(/(?:Googlebot|Y!J-SRD\/1\.0|Y!J-MBS\/1\.0)/)
+    request.user_agent.match(%r{(?:Googlebot|Y!J-SRD/1\.0|Y!J-MBS/1\.0)})
   end
 end

data/lib/jpmobile/email.rb

@@ -1,13 +1,9 @@
-# -*- coding: utf-8 -*-
 # =メールアドレスモジュール
 #
 module Jpmobile
   # email関連の処理
   class Email
     class << self
-      @@japanese_mail_address_regexp = nil
-      @@converting_content_type = ['text/plain', 'text/html']
-
       # メールアドレスよりキャリア情報を取得する
       # _param1_:: email メールアドレス
       # return  :: Jpmobile::Mobileで定義されている携帯キャリアクラス
@@ -24,8 +20,8 @@ module Jpmobile
         Mobile.carriers.each do |const|
           c = Mobile.const_get(const)
           if c::MAIL_ADDRESS_REGEXP &&
-              header.match(/(\S+@[A-Za-z0-9\-\.\_]+)/) &&
-              $1.match(/^#{c::MAIL_ADDRESS_REGEXP}$/)
+             header.match(/(\S+@[A-Za-z0-9\-\.\_]+)/) &&
+             Regexp.last_match(1).match(/^#{c::MAIL_ADDRESS_REGEXP}$/)
             return c
           end
         end
@@ -37,17 +33,21 @@ module Jpmobile
         nil
       end
 
-      def japanese_mail_address_regexp=(regexp)
-        @@japanese_mail_address_regexp = regexp
-      end
+      attr_writer :japanese_mail_address_regexp
 
       def japanese_mail?(header)
-        @@japanese_mail_address_regexp and header.match(@@japanese_mail_address_regexp)
+        @japanese_mail_address_regexp and header.match(@japanese_mail_address_regexp)
+      end
+
+      attr_writer :converting_content_type
+
+      def converting_content_type
+        @converting_content_type ||= ['text/plain', 'text/html']
       end
 
       def convertable?(content_type)
-        if @@converting_content_type.respond_to?(:each)
-          @@converting_content_type.each do |c|
+        if converting_content_type.respond_to?(:each)
+          converting_content_type.each do |c|
             return true if content_type.match(c)
           end
         end

data/lib/jpmobile/emoticon.rb

@@ -1,27 +1,25 @@
-# -*- coding: utf-8 -*-
-
 require 'scanf'
 require 'nkf'
 
 module Jpmobile
   # 絵文字関連処理
   module Emoticon
-    %w( DOCOMO_SJIS_TO_UNICODE DOCOMO_UNICODE_TO_SJIS ).each do |const|
+    %w[DOCOMO_SJIS_TO_UNICODE DOCOMO_UNICODE_TO_SJIS].each do |const|
       autoload const, 'jpmobile/emoticon/docomo'
     end
-    %w( AU_SJIS_TO_UNICODE AU_UNICODE_TO_EMAILJIS AU_SJIS_TO_EMAIL_JIS AU_EMAILJIS_TO_UNICODE ).each do |const|
+    %w[AU_SJIS_TO_UNICODE AU_UNICODE_TO_EMAILJIS AU_SJIS_TO_EMAIL_JIS AU_EMAILJIS_TO_UNICODE].each do |const|
       autoload const, 'jpmobile/emoticon/au'
     end
-    %w(
+    %w[
       SOFTBANK_UNICODE_TO_WEBCODE SOFTBANK_WEBCODE_TO_UNICODE
       SOFTBANK_UNICODE_TO_SJIS SOFTBANK_SJIS_TO_UNICODE
-    ).each do |const|
+    ].each do |const|
       autoload const, 'jpmobile/emoticon/softbank'
     end
-    %w( CONVERSION_TABLE_TO_DOCOMO CONVERSION_TABLE_TO_AU CONVERSION_TABLE_TO_SOFTBANK ).each do |const|
+    %w[CONVERSION_TABLE_TO_DOCOMO CONVERSION_TABLE_TO_AU CONVERSION_TABLE_TO_SOFTBANK].each do |const|
       autoload const, 'jpmobile/emoticon/conversion_table'
     end
-    %w(
+    %w[
       SJIS_TO_UNICODE UNICODE_TO_SJIS
       SJIS_REGEXP SOFTBANK_WEBCODE_REGEXP DOCOMO_SJIS_REGEXP AU_SJIS_REGEXP SOFTBANK_UNICODE_REGEXP
       EMOTICON_UNICODES UTF8_REGEXP
@@ -30,13 +28,13 @@ module Jpmobile
       GOOGLE_EMOTICONS GOOGLE_EMOTICON_REGEXP GOOGLE_EMOTICON_TO_CARRIER_EMOTICON
       CONVERSION_TABLE_TO_UNICODE_EMOTICON CONVERSION_TABLE_TO_GOOGLE_EMOTICON
       GETA_CODE GETA
-    ).each do |const|
+    ].each do |const|
       autoload const, 'jpmobile/emoticon/z_combine'
     end
-    %w( GOOGLE_TO_DOCOMO_UNICODE GOOGLE_TO_AU_UNICODE GOOGLE_TO_SOFTBANK_UNICODE ).each do |const|
+    %w[GOOGLE_TO_DOCOMO_UNICODE GOOGLE_TO_AU_UNICODE GOOGLE_TO_SOFTBANK_UNICODE].each do |const|
       autoload const, 'jpmobile/emoticon/google'
     end
-    %w( UNICODE_TO_DOCOMO_UNICODE UNICODE_TO_AU_UNICODE UNICODE_TO_SOFTBANK_UNICODE ).each do |const|
+    %w[UNICODE_TO_DOCOMO_UNICODE UNICODE_TO_AU_UNICODE UNICODE_TO_SOFTBANK_UNICODE].each do |const|
       autoload const, 'jpmobile/emoticon/unicode'
     end
 
@@ -45,7 +43,7 @@ module Jpmobile
       str.gsub(DOCOMO_SJIS_REGEXP) do |match|
         sjis = match.unpack('n').first
         unicode = DOCOMO_SJIS_TO_UNICODE[sjis]
-        unicode ? ("&#x%04x;"%unicode) : match
+        unicode ? ('&#x%04x;' % unicode) : match
       end
     end
 
@@ -54,7 +52,7 @@ module Jpmobile
       str.gsub(AU_SJIS_REGEXP) do |match|
         sjis = match.unpack('n').first
         unicode = AU_SJIS_TO_UNICODE[sjis]
-        unicode ? ("&#x%04x;"%unicode) : match
+        unicode ? ('&#x%04x;' % unicode) : match
       end
     end
 
@@ -65,7 +63,7 @@ module Jpmobile
         jis_string.gsub(/[\x21-\x7e]{2}/) do |match|
           jis = match.unpack('n').first
           unicode = AU_EMAILJIS_TO_UNICODE[jis]
-          unicode ? Jpmobile::Util.ascii_8bit("\x1b\x28\x42&#x%04x;\x1b\x24\x42"%unicode) : match
+          unicode ? Jpmobile::Util.ascii_8bit("\x1b\x28\x42&#x%04x;\x1b\x24\x42" % unicode) : match
         end
       end
     end
@@ -75,17 +73,19 @@ module Jpmobile
       # SoftBank Unicode
       str.gsub(SOFTBANK_UNICODE_REGEXP) do |match|
         unicode = match.unpack('U').first
-        "&#x%04x;" % (unicode+0x1000)
+        '&#x%04x;' % (unicode + 0x1000)
       end
     end
+
     def self.external_to_unicodecr_softbank_sjis(str)
       # SoftBank Shift_JIS
       str.gsub(SOFTBANK_SJIS_REGEXP) do |match|
         sjis = match.unpack('n').first
         unicode = SOFTBANK_SJIS_TO_UNICODE[sjis]
-        "&#x%04x;" % (unicode+0x1000)
+        '&#x%04x;' % (unicode + 0x1000)
       end
     end
+
     def self.external_to_unicodecr_vodafone(str)
       external_to_unicodecr_softbank(str)
     end
@@ -103,7 +103,7 @@ module Jpmobile
           when GETA_CODE
             GETA
           when Integer
-            "&#x%04x;" % emoticon
+            '&#x%04x;' % emoticon
           when String
             emoticon
           end
@@ -120,15 +120,14 @@ module Jpmobile
         unicodes = match.unpack('U*')
         unicodes = unicodes.first if unicodes.size == 1
 
-        if emoticon = GOOGLE_EMOTICON_TO_CARRIER_EMOTICON[unicodes]
-          case emoticon
-          when GETA_CODE
-            GETA
-          when Integer
-            "&#x%04x;" % emoticon
-          when String
-            emoticon
-          end
+        emoticon = GOOGLE_EMOTICON_TO_CARRIER_EMOTICON[unicodes]
+        case emoticon
+        when GETA_CODE
+          GETA
+        when Integer
+          '&#x%04x;' % emoticon
+        when String
+          emoticon
         else
           # 変換できなければ〓に
           GETA
@@ -143,32 +142,33 @@ module Jpmobile
     #
     # 携帯側エンコーディングがShift_JIS場合は +to_sjis+ に +true+ を指定する。
     # +true+ を指定すると変換テーブルに文字列が指定されている場合にShift_JISで出力される。
-    def self.unicodecr_to_external(str, conversion_table=nil, to_sjis=true)
+    def self.unicodecr_to_external(str, conversion_table = nil, to_sjis = true)
       str.gsub(/&#x([0-9a-f]{4});/i) do |match|
-        unicode = $1.scanf("%x").first
+        unicode = Regexp.last_match(1).scanf('%x').first
 
-        if conversion_table
-          converted = conversion_table[unicode] # キャリア間変換
-        else
-          converted = unicode # 変換しない
-        end
+        converted = if conversion_table
+                      conversion_table[unicode] # キャリア間変換
+                    else
+                      unicode # 変換しない
+                    end
 
         # 携帯側エンコーディングに変換する
         case converted
         when Integer
           # 変換先がUnicodeで指定されている。つまり対応する絵文字がある。
-          if sjis = UNICODE_TO_SJIS[converted]
+          sjis = UNICODE_TO_SJIS[converted]
+          if sjis
             if to_sjis
               Jpmobile::Util.sjis([sjis].pack('n'))
             else
-              [converted].pack("U")
+              [converted].pack('U')
             end
-          elsif SOFTBANK_UNICODE_TO_WEBCODE[converted-0x1000]
-            [converted-0x1000].pack('U')
+          elsif SOFTBANK_UNICODE_TO_WEBCODE[converted - 0x1000]
+            [converted - 0x1000].pack('U')
           elsif converted == GETA_CODE
             # PCで〓を表示する場合
             GETA
-          elsif UNICODE_EMOTICONS.include?(converted) or GOOGLE_EMOTICONS.include?(converted)
+          elsif UNICODE_EMOTICONS.include?(converted) || GOOGLE_EMOTICONS.include?(converted)
             if unicode == GETA_CODE
               GETA
             else
@@ -181,7 +181,7 @@ module Jpmobile
           end
         when String
           # 変換先が数値参照だと、再変換する
-          if converted.match(/&#x([0-9a-f]{4});/i)
+          if converted =~ /&#x([0-9a-f]{4});/i
             self.unicodecr_to_external(converted, conversion_table, to_sjis)
           else
             # 変換先が文字列で指定されている。
@@ -193,21 +193,23 @@ module Jpmobile
         end
       end
     end
+
     # +str+ のなかでUnicode数値文字参照で表記された絵文字をUTF-8に置換する。
     def self.unicodecr_to_utf8(str)
       str.gsub(/&#x([0-9a-f]{4});/i) do |match|
-        unicode = $1.scanf("%x").first
-        if UNICODE_TO_SJIS[unicode] || SOFTBANK_UNICODE_TO_WEBCODE[unicode-0x1000]
+        unicode = Regexp.last_match(1).scanf('%x').first
+        if UNICODE_TO_SJIS[unicode] || SOFTBANK_UNICODE_TO_WEBCODE[unicode - 0x1000]
           [unicode].pack('U')
         else
           match
         end
       end
     end
+
     # +str+ のなかでUTF-8で表記された絵文字をUnicode数値文字参照に置換する。
     def self.utf8_to_unicodecr(str)
       str.gsub(UTF8_REGEXP) do |match|
-        "&#x%04x;" % match.unpack('U').first
+        '&#x%04x;' % match.unpack('U').first
       end
     end
 
@@ -215,17 +217,19 @@ module Jpmobile
     # au 専用
     def self.unicodecr_to_au_email(in_str)
       str = Jpmobile::Util.ascii_8bit(in_str)
-      regexp = Regexp.compile(Jpmobile::Util.ascii_8bit("&#x([0-9a-f]{4});"), Regexp::IGNORECASE)
+      regexp = Regexp.compile(Jpmobile::Util.ascii_8bit('&#x([0-9a-f]{4});'), Regexp::IGNORECASE)
       str = str.gsub(regexp) do |match|
-        unicode = $1.scanf("%x").first
+        unicode = Regexp.last_match(1).scanf('%x').first
         converted = CONVERSION_TABLE_TO_AU[unicode]
 
         # メール用エンコーディングに変換する
         case converted
         when Integer
-          if sjis = UNICODE_TO_SJIS[converted]
-            if email_jis = SJIS_TO_EMAIL_JIS[sjis]
-              Jpmobile::Util.ascii_8bit("\x1b\x24\x42#{[email_jis].pack('n')}\x1b\x28\x42")
+          sjis = UNICODE_TO_SJIS[converted]
+          if sjis
+            email_jis = SJIS_TO_EMAIL_JIS[sjis]
+            if email_jis
+              Jpmobile::Util.ascii_8bit("\x1b\x24\x42#{[email_jis].pack("n")}\x1b\x28\x42")
             else
               Jpmobile::Util.ascii_8bit([sjis].pack('n'))
             end
@@ -247,13 +251,14 @@ module Jpmobile
     # softbank 専用
     def self.unicodecr_to_softbank_email(str)
       str.gsub(/&#x([0-9a-f]{4});/i) do |match|
-        unicode = $1.scanf("%x").first
+        unicode = Regexp.last_match(1).scanf('%x').first
         converted = CONVERSION_TABLE_TO_SOFTBANK[unicode]
 
         # メール用エンコーディングに変換する
         case converted
         when Integer
-          if sjis = SOFTBANK_UNICODE_TO_SJIS[converted-0x1000]
+          sjis = SOFTBANK_UNICODE_TO_SJIS[converted - 0x1000]
+          if sjis
             Jpmobile::Util.sjis([sjis].pack('n'))
           else
             match
@@ -267,53 +272,57 @@ module Jpmobile
       end
     end
 
-    @@pc_emoticon_image_path = nil
-    @@pc_emoticon_yaml       = nil
-    @@pc_emoticon_hash       = nil
-
     def self.pc_emoticon_image_path
-      @@pc_emoticon_image_path
+      @pc_emoticon_image_path
     end
+
     def self.pc_emoticon_image_path=(path)
-      @@pc_emoticon_image_path=(path)
+      @pc_emoticon_image_path = path
     end
 
     def self.pc_emoticon_yaml=(file)
-      @@pc_emoticon_yaml = file
+      @pc_emoticon_yaml = file
     end
+
     def self.pc_emoticon_yaml
-      @@pc_emoticon_yaml
+      @pc_emoticon_yaml
     end
 
     def self.pc_emoticon?
-      if @@pc_emoticon_yaml and File.exist?(@@pc_emoticon_yaml) and @@pc_emoticon_image_path
+      if @pc_emoticon_yaml && File.exist?(@pc_emoticon_yaml) && @pc_emoticon_image_path
+        return true if @pc_emoticon_hash
 
-        unless @@pc_emoticon_hash
-          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.match(/\/$/)
+        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{/$}
 
-            return true
-          rescue
-          end
-        else
           return true
+        rescue
         end
       end
 
-      return false
+      false
     end
 
     def self.emoticons_to_image(str)
-      if @@pc_emoticon_hash
-        utf8_to_unicodecr(str).gsub(/&#x([0-9a-f]{4});/i) do |match|
-          img = @@pc_emoticon_hash[$1.upcase] || (@@pc_emoticon_hash[("%x" % ($1.scanf("%x").first - 0x1000)).upcase] rescue nil)
-          if img
-            "<img src=\"#{@@pc_emoticon_image_path}/#{img}.gif\" alt=\"#{img}\" />"
-          else
-            ""
-          end
+      return str unless @pc_emoticon_hash
+
+      utf8_to_unicodecr(str).gsub(/&#x([0-9a-f]{4});/i) do
+        img = @pc_emoticon_hash[Regexp.last_match(1).upcase]
+        unless img
+          img =
+            begin
+              @pc_emoticon_hash[('%x' % (Regexp.last_match(1).scanf('%x').first - 0x1000)).upcase]
+            rescue
+              nil
+            end
+        end
+
+        if img
+          "<img src=\"#{@pc_emoticon_image_path}/#{img}.gif\" alt=\"#{img}\" />"
+        else
+          ''
         end
       end
     end