jpmobile 5.2.3 → 6.1.0

data/.ruby-version

@@ -1 +1 @@
-2.5.1
+2.7.2

data/Gemfile

@@ -3,5 +3,5 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in jpmobile.gemspec
 gemspec
 
-gem 'onkcop', require: false
-gem 'rubocop', require: false
+gem 'rubocop', '0.79.0', require: false
+gem 'rubocop-performance', '1.5.2', require: false

data/Gemfile.lock

@@ -1,193 +1,218 @@
 PATH
   remote: .
   specs:
-    jpmobile (5.2.2)
+    jpmobile (6.0.0)
       mail (~> 2.7.0)
+      rexml
+      scanf
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.2)
-      actionpack (= 5.2.2)
+    actioncable (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
+    actionmailbox (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      mail (>= 2.7.1)
+    actionmailer (6.1.0)
+      actionpack (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activesupport (= 6.1.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (5.2.2)
-      actionview (= 5.2.2)
-      activesupport (= 5.2.2)
-      rack (~> 2.0)
+    actionpack (6.1.0)
+      actionview (= 6.1.0)
+      activesupport (= 6.1.0)
+      rack (~> 2.0, >= 2.0.9)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.2)
-    actionview (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.0, >= 1.2.0)
+    actiontext (6.1.0)
+      actionpack (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      nokogiri (>= 1.8.5)
+    actionview (6.1.0)
+      activesupport (= 6.1.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
-      rails-html-sanitizer (~> 1.0, >= 1.0.3)
-    activejob (5.2.2)
-      activesupport (= 5.2.2)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activejob (6.1.0)
+      activesupport (= 6.1.0)
       globalid (>= 0.3.6)
-    activemodel (5.2.2)
-      activesupport (= 5.2.2)
-    activerecord (5.2.2)
-      activemodel (= 5.2.2)
-      activesupport (= 5.2.2)
-      arel (>= 9.0)
-    activestorage (5.2.2)
-      actionpack (= 5.2.2)
-      activerecord (= 5.2.2)
+    activemodel (6.1.0)
+      activesupport (= 6.1.0)
+    activerecord (6.1.0)
+      activemodel (= 6.1.0)
+      activesupport (= 6.1.0)
+    activestorage (6.1.0)
+      actionpack (= 6.1.0)
+      activejob (= 6.1.0)
+      activerecord (= 6.1.0)
+      activesupport (= 6.1.0)
       marcel (~> 0.3.1)
-    activesupport (5.2.2)
+      mimemagic (~> 0.3.2)
+    activesupport (6.1.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-    addressable (2.5.2)
-      public_suffix (>= 2.0.2, < 4.0)
-    arel (9.0.0)
-    ast (2.4.0)
-    builder (3.2.3)
-    capybara (3.0.1)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    addressable (2.7.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ast (2.4.1)
+    builder (3.2.4)
+    capybara (3.34.0)
       addressable
       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)
+      regexp_parser (~> 1.5)
+      xpath (~> 3.2)
+    capybara-webkit (1.15.1)
       capybara (>= 2.3, < 4.0)
       json
-    coderay (1.1.2)
-    concurrent-ruby (1.1.3)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.7.1)
-    geokit (1.11.0)
-    git (1.3.0)
-    globalid (0.4.1)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.7)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
+    geokit (1.13.1)
+    git (1.7.0)
+      rchardet (~> 1.8)
+    globalid (0.4.2)
       activesupport (>= 4.2.0)
     hpricot (0.8.6)
-    i18n (1.1.1)
+    i18n (1.8.5)
       concurrent-ruby (~> 1.0)
-    json (2.1.0)
-    loofah (2.2.3)
+    jaro_winkler (1.5.4)
+    json (2.3.1)
+    loofah (2.8.0)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
     mail (2.7.1)
       mini_mime (>= 0.1.1)
     marcel (0.3.3)
       mimemagic (~> 0.3.2)
-    method_source (0.9.2)
-    mimemagic (0.3.2)
-    mini_mime (1.0.1)
-    mini_portile2 (2.3.0)
-    minitest (5.11.3)
-    nio4r (2.3.1)
-    nokogiri (1.8.5)
-      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.11.3)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.0.2)
-    rack (2.0.6)
+    method_source (1.0.0)
+    mimemagic (0.3.5)
+    mini_mime (1.0.2)
+    mini_portile2 (2.4.0)
+    minitest (5.14.2)
+    nio4r (2.5.4)
+    nokogiri (1.10.10)
+      mini_portile2 (~> 2.4.0)
+    parallel (1.20.1)
+    parser (2.7.2.0)
+      ast (~> 2.4.1)
+    pry (0.13.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    public_suffix (4.0.6)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.2)
-      actioncable (= 5.2.2)
-      actionmailer (= 5.2.2)
-      actionpack (= 5.2.2)
-      actionview (= 5.2.2)
-      activejob (= 5.2.2)
-      activemodel (= 5.2.2)
-      activerecord (= 5.2.2)
-      activestorage (= 5.2.2)
-      activesupport (= 5.2.2)
-      bundler (>= 1.3.0)
-      railties (= 5.2.2)
+    rails (6.1.0)
+      actioncable (= 6.1.0)
+      actionmailbox (= 6.1.0)
+      actionmailer (= 6.1.0)
+      actionpack (= 6.1.0)
+      actiontext (= 6.1.0)
+      actionview (= 6.1.0)
+      activejob (= 6.1.0)
+      activemodel (= 6.1.0)
+      activerecord (= 6.1.0)
+      activestorage (= 6.1.0)
+      activesupport (= 6.1.0)
+      bundler (>= 1.15.0)
+      railties (= 6.1.0)
       sprockets-rails (>= 2.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (5.2.2)
-      actionpack (= 5.2.2)
-      activesupport (= 5.2.2)
+    rails-html-sanitizer (1.3.0)
+      loofah (~> 2.3)
+    railties (6.1.0)
+      actionpack (= 6.1.0)
+      activesupport (= 6.1.0)
       method_source
       rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
+      thor (~> 1.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)
+    rake (13.0.1)
+    rchardet (1.8.0)
+    regexp_parser (1.8.2)
+    rexml (3.2.4)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.0)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-its (1.2.0)
+      rspec-support (~> 3.10.0)
+    rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.7.0)
+    rspec-mocks (3.10.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.7.0)
-    rspec-rails (3.7.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 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)
+      rspec-support (~> 3.10.0)
+    rspec-rails (4.0.1)
+      actionpack (>= 4.2)
+      activesupport (>= 4.2)
+      railties (>= 4.2)
+      rspec-core (~> 3.9)
+      rspec-expectations (~> 3.9)
+      rspec-mocks (~> 3.9)
+      rspec-support (~> 3.9)
+    rspec-support (3.10.0)
+    rubocop (0.79.0)
+      jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
-      parser (>= 2.5)
-      powerpack (~> 0.1)
+      parser (>= 2.7.0.1)
       rainbow (>= 2.2.2, < 4.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.0, >= 1.0.1)
-    rubocop-rspec (1.25.0)
-      rubocop (>= 0.53.0)
-    ruby-progressbar (1.9.0)
-    sprockets (3.7.2)
+      unicode-display_width (>= 1.4.0, < 1.7)
+    rubocop-performance (1.5.2)
+      rubocop (>= 0.71.0)
+    ruby-progressbar (1.10.1)
+    scanf (1.0.0)
+    sprockets (4.0.2)
       concurrent-ruby (~> 1.0)
       rack (> 1, < 3)
-    sprockets-rails (3.2.1)
+    sprockets-rails (3.2.2)
       actionpack (>= 4.0)
       activesupport (>= 4.0)
       sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.2)
     sqlite3-ruby (1.3.3)
       sqlite3 (>= 1.3.3)
-    thor (0.20.3)
-    thread_safe (0.3.6)
-    tzinfo (1.2.5)
-      thread_safe (~> 0.1)
-    unicode-display_width (1.3.0)
-    websocket-driver (0.7.0)
+    thor (1.0.1)
+    tzinfo (2.0.3)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (1.6.1)
+    websocket-driver (0.7.3)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
-    xpath (3.0.0)
+    websocket-extensions (0.1.5)
+    xpath (3.2.0)
       nokogiri (~> 1.8)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
+  x86_64-darwin-19
 
 DEPENDENCIES
   capybara-webkit
@@ -195,14 +220,14 @@ DEPENDENCIES
   git
   hpricot
   jpmobile!
-  onkcop
   pry
-  rails (~> 5.2.0)
+  rails (~> 6.1.0)
   rspec
   rspec-its
   rspec-rails
-  rubocop
+  rubocop (= 0.79.0)
+  rubocop-performance (= 1.5.2)
   sqlite3-ruby
 
 BUNDLED WITH
-   1.16.4
+   2.2.2

data/README.md

@@ -316,7 +316,7 @@ end
 
 ```ruby
 <%= get_position_link_to("位置情報を取得する", :action=>:gps) %>
-```ruby
+```
 
 ### セッションIDの付与(Trans SID)
 #### Cookie非対応携帯だけに付与する
@@ -353,7 +353,7 @@ Rails.application.config.session_options = {:cookie_only => false}
 
 ```ruby
 link_to "hoge", "/controller/action/id"
-```ruby
+```
 
 のようにリンク先を直接指定するとセッションIDは付加されません。
 

data/jpmobile.gemspec

@@ -17,12 +17,14 @@ Gem::Specification.new do |gem|
   gem.require_paths = ['lib']
 
   gem.add_dependency 'mail', '~> 2.7.0'
+  gem.add_dependency 'scanf'
+  gem.add_dependency 'rexml'
   gem.add_development_dependency 'capybara-webkit'
   gem.add_development_dependency 'geokit'
   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 'rails', '~> 6.1.0'
   gem.add_development_dependency 'rspec'
   gem.add_development_dependency 'rspec-its'
   gem.add_development_dependency 'rspec-rails'

data/lib/jpmobile.rb

@@ -14,6 +14,7 @@ module Jpmobile
   autoload :Encoding,                 'jpmobile/encoding'
   autoload :Version,                  'jpmobile/version'
   autoload :DatumConv,                'jpmobile/datum_conv'
+  autoload :Helpers,                  'jpmobile/helpers'
 
   # autoload mobile classes
   module Mobile

data/lib/jpmobile/emoticon.rb

@@ -41,7 +41,7 @@ module Jpmobile
     # +str+ のなかでDoCoMo絵文字をUnicode数値文字参照に置換した文字列を返す。
     def self.external_to_unicodecr_docomo(str)
       str.gsub(DOCOMO_SJIS_REGEXP) do |match|
-        sjis = match.unpack('n').first
+        sjis = match.unpack1('n')
         unicode = DOCOMO_SJIS_TO_UNICODE[sjis]
         unicode ? ('&#x%04x;' % unicode) : match
       end
@@ -50,7 +50,7 @@ module Jpmobile
     # +str+ のなかでau絵文字をUnicode数値文字参照に置換した文字列を返す。
     def self.external_to_unicodecr_au(str)
       str.gsub(AU_SJIS_REGEXP) do |match|
-        sjis = match.unpack('n').first
+        sjis = match.unpack1('n')
         unicode = AU_SJIS_TO_UNICODE[sjis]
         unicode ? ('&#x%04x;' % unicode) : match
       end
@@ -61,7 +61,7 @@ module Jpmobile
       str = Jpmobile::Util.ascii_8bit(in_str)
       str.gsub(Jpmobile::Util.jis_string_regexp) do |jis_string|
         jis_string.gsub(/[\x21-\x7e]{2}/) do |match|
-          jis = match.unpack('n').first
+          jis = match.unpack1('n')
           unicode = AU_EMAILJIS_TO_UNICODE[jis]
           unicode ? Jpmobile::Util.ascii_8bit("\x1b\x28\x42&#x%04x;\x1b\x24\x42" % unicode) : match
         end
@@ -72,7 +72,7 @@ module Jpmobile
     def self.external_to_unicodecr_softbank(str)
       # SoftBank Unicode
       str.gsub(SOFTBANK_UNICODE_REGEXP) do |match|
-        unicode = match.unpack('U').first
+        unicode = match.unpack1('U')
         '&#x%04x;' % (unicode + 0x1000)
       end
     end
@@ -80,7 +80,7 @@ module Jpmobile
     def self.external_to_unicodecr_softbank_sjis(str)
       # SoftBank Shift_JIS
       str.gsub(SOFTBANK_SJIS_REGEXP) do |match|
-        sjis = match.unpack('n').first
+        sjis = match.unpack1('n')
         unicode = SOFTBANK_SJIS_TO_UNICODE[sjis]
         '&#x%04x;' % (unicode + 0x1000)
       end
@@ -209,7 +209,7 @@ module Jpmobile
     # +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.unpack1('U')
       end
     end