jpmobile 7.1.0 → 8.1.0

data/spec/unit/is_carrier_spec.rb

@@ -59,7 +59,7 @@ describe 'Jpmobile::Mobile' do
     [%w[Ddipocket ddipocket], true],
   ].each do |carrier, expected|
     it "#{carrier.first}##{carrier.last}? should be return #{expected}" do
-      expect(Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__("#{carrier.last}?")).to eq(expected)
+      expect(Jpmobile::Mobile.const_get(carrier.first).new({}, {}).__send__(:"#{carrier.last}?")).to eq(expected)
     end
   end
 end

data/spec/unit/receive_mail_spec.rb

@@ -7,7 +7,7 @@ describe 'Jpmobile::Mail#receive' do
 
   before(:each) do
     @to = 'info@jpmobile-rails.org'
-    Jpmobile::Email.japanese_mail_address_regexp = Regexp.new(/\.jp[^a-zA-Z.-]/)
+    Jpmobile::Email.japanese_mail_address_regexp = /\.jp[^a-zA-Z.-]/
   end
 
   describe 'PC mail' do

data/spec/unit/util_spec.rb

@@ -1,6 +1,5 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'spec_helper'))
 require 'stringio'
-require 'nkf'
 
 describe Jpmobile::Util do
   include Jpmobile::Util

data/test/rails/overrides/Gemfile.jpmobile

@@ -4,7 +4,7 @@ gem 'jpmobile',             path: './vendor/jpmobile'
 gem 'jpmobile-terminfo',    path: './vendor/jpmobile-terminfo'
 gem 'jpmobile-ipaddresses', path: './vendor/jpmobile-ipaddresses'
 
-gem 'activerecord-session_store', git: 'https://github.com/rails/activerecord-session_store.git', ref: 'f188efbc49a522123cc8acc805143824176d01c1'
+gem 'activerecord-session_store'
 
 gem 'pry'
 gem 'pry-byebug'

data/test/rails/overrides/spec/controllers/hankaku_filter_controller_spec.rb

@@ -6,7 +6,7 @@ describe HankakuFilterController, type: :controller do
 
     it 'should be successful' do
       request.user_agent = 'DoCoMo/2.0 P05C(c500;TB;W24H16)'
-      get 'index', params: params
+      get('index', params:)
       expect(response).to be_successful
       expect(request.mobile?).to be_truthy
     end

data/test/rails/overrides/spec/controllers/helpers_spec.rb

@@ -9,7 +9,7 @@ describe LinksController, type: :controller do
   def get_href_and_texts(str)
     results = []
     (Nokogiri::HTML.parse(str) / 'a').each do |link|
-      path, query = link['href'].split(/\?/, 2)
+      path, query = link['href'].split('?', 2)
       params = query.nil? ? nil : Rack::Utils.parse_query(query)
       results << [link.inner_html, link.attributes, path, params]
     end

data/test/rails/overrides/spec/rails_helper.rb

@@ -28,7 +28,9 @@ ActiveRecord::Migration.maintain_test_schema!
 
 RSpec.configure do |config|
   # Remove this line if you're not using ActiveRecord or ActiveRecord fixtures
-  config.fixture_path = "#{Rails.root}/spec/fixtures"
+  config.fixture_paths = [
+    "#{Rails.root}/spec/fixtures",
+  ]
 
   # If you're not using ActiveRecord, or you'd prefer not to run each of your
   # examples within a transaction, remove the following line or assign false

data/test/rails/overrides/spec/requests/method_less_action_support_spec.rb

@@ -2,7 +2,7 @@ require 'rails_helper'
 
 describe 'Method-less mobile template only action', type: :request do
   subject do
-    get '/method_less_action_support', headers: headers
+    get '/method_less_action_support', headers:
   end
 
   let(:headers) do

data/test/rails/overrides/spec/system/filter_spec.rb

@@ -40,7 +40,7 @@ describe 'jpmobile integration spec', type: :feature do
   shared_examples_for '文字コードフィルタが動作しているとき' do
     it 'response.bodyが空のときは文字コードを変更しないこと' do
       visit "/#{controller}/empty"
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
   end
 
@@ -48,13 +48,13 @@ describe 'jpmobile integration spec', type: :feature do
     it 'はShift_JISで携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/Shift_JIS/i)
     end
     it 'はxhtmlでもShift_JISで携帯に送出されること' do
       visit "/#{controller}/abracadabra_xhtml_utf8"
 
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/Shift_JIS/i)
     end
     it 'はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape(utf8_to_sjis("アブラカダブラ"))}"
@@ -72,12 +72,12 @@ describe 'jpmobile integration spec', type: :feature do
     it 'はUTF-8で携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
     it 'はxhtmlでもUTF-8で携帯に送出されること' do
       visit "/#{controller}/abracadabra_xhtml_utf8"
       expect(page.body.encode('UTF-8')).to have_content('アブラカダブラ')
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
     it 'はparamsにUTF-8のまま格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape("アブラカダブラ")}"
@@ -94,7 +94,7 @@ describe 'jpmobile integration spec', type: :feature do
     it 'は半角に変換されShift_JISで携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ') # アブラカダブラ半角,SJIS
-      expect(page.response_headers['Content-Type']).to match(/Shift_JIS/)
+      expect(extract_response_header(page, 'Content-Type')).to match(/Shift_JIS/)
     end
     it 'はShift_JISで渡されたパラメタがparamsにUTF-8に変換されて格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape(utf8_to_sjis("アブラカダブラ"))}"
@@ -112,7 +112,7 @@ describe 'jpmobile integration spec', type: :feature do
     it 'はUTF-8半角で携帯に送出されること' do
       visit "/#{controller}/abracadabra_utf8"
       expect(page.body.encode('UTF-8')).to have_content('ｱﾌﾞﾗｶﾀﾞﾌﾞﾗ')
-      expect(page.response_headers['Content-Type']).to match(/utf-8/i)
+      expect(extract_response_header(page, 'Content-Type')).to match(/utf-8/i)
     end
     it 'はparamsにUTF-8のまま格納されること' do
       visit "/#{controller}/index_zenkaku?q=#{CGI.escape("アブラカダブラ")}"
@@ -223,7 +223,7 @@ describe 'jpmobile integration spec', type: :feature do
 
       it 'Content-Type が UTF-8 であること' do
         visit "/#{controller}/with_charset"
-        expect(page.response_headers['Content-Type']).to match(/UTF-8/i)
+        expect(extract_response_header(page, 'Content-Type')).to match(/UTF-8/i)
       end
     end
   end

data/test/rails/overrides/spec/system_helper.rb

@@ -1,3 +1,7 @@
 require 'rails_helper'
 
-Dir[File.join(__dir__, 'system/support/**/*.rb')].sort.each {|file| require file }
+Dir[File.join(__dir__, 'system/support/**/*.rb')].each {|file| require file }
+
+def extract_response_header(page, header)
+  page.response_headers[header] || page.response_headers[header.downcase]
+end

data/test/sinatra/guestbook.rb

@@ -8,6 +8,7 @@ require 'jpmobile/sinatra'
 
 class SinatraTestHelper
   include Singleton
+
   attr_accessor :last_app
 end
 
@@ -23,7 +24,7 @@ class Guestbook < Jpmobile::Sinatra::Base
   end
 
   def assigns(sym)
-    instance_variable_get("@#{sym}")
+    instance_variable_get(:"@#{sym}")
   end
 
   get '/' do

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jpmobile
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Shin-ichiro OGAWA
 - Yoji Shidara
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-06 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mail
@@ -17,28 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
+        version: 2.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.7.0
-- !ruby/object:Gem::Dependency
-  name: rexml
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: scanf
   requirement: !ruby/object:Gem::Requirement
@@ -332,10 +317,7 @@ files:
 - tools/e4u_conv.rb
 - tools/emoji/genregexp.rb
 - tools/emoji4unicode.xml
-- tools/generate_au_emoticon_table.rb
-- tools/generate_docomo_emoticon_table.rb
 - tools/generate_emoticon_conversion_table.rb
-- tools/generate_softbank_emoticon_table.rb
 - tools/list_gps_unsupported_au.rb
 homepage: https://jpmobile-rails.org
 licenses:
@@ -344,7 +326,6 @@ metadata:
   source_code_uri: https://github.com/jpmobile/jpmobile
   documentation_uri: https://github.com/jpmobile/jpmobile
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -352,15 +333,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.2.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Rails plugin for mobile devices in Japan
 test_files: []

data/tools/generate_au_emoticon_table.rb

@@ -1,34 +0,0 @@
-#!/usr/bin/ruby
-
-# http://www.au.kddi.com/ezfactory/tec/spec/pdf/typeD.pdf から生成
-# - OSXのpreviewで開き、すべてを選択してコピーし、テキストファイルに落とす
-# - http://moriq.tdiary.net/20070212.html#p01
-# などの手段によって生成する。
-
-table = []
-open("au.txt") do |f|
-  f.each do |l|
-    l.chomp!
-    l.scan( /(([0-9A-F] )+)/ ) do |s|
-      s = s[0].gsub!(/ /, "")
-      next if s.size < 16
-      out = s[s.size-16,16]
-      table << a = [0,4,8,12].map{|i| out[i,4]}
-    end
-  end
-end
-
-open(File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/au.rb","w") do |f|
-  f.puts "Jpmobile::Emoticon::AU_SJIS_TO_UNICODE = {"
-  table.each do |a|
-    f.puts "  0x%s=>0x%s," % [a[0],a[1]]
-  end
-  f.puts "}.freeze"
-  f.puts "Jpmobile::Emoticon::AU_UNICODE_TO_SJIS = Jpmobile::Emoticon::AU_SJIS_TO_UNICODE.invert.freeze"
-  # EmailJIS -> UNICODE
-  f.puts "Jpmobile::Emoticon::AU_EMAILJIS_TO_UNICODE = {"
-  table.each do |a|
-    f.puts "  0x%s=>0x%s," % [a[2],a[1]]
-  end
-  f.puts "}.freeze"
-end

data/tools/generate_docomo_emoticon_table.rb

@@ -1,33 +0,0 @@
-require 'rubygems'
-require 'hpricot'
-require 'open-uri'
-require 'cgi'
-
-$KCODE="u"
-
-def parse(html)
-  results = []
-  (Hpricot(html)/"//table//tr").each do |tr|
-    tds = (tr/:td/:span)
-    if tds && tds.size > 0
-      results << tds.map {|td| CGI.unescapeHTML(td.inner_html)}
-    end
-  end
-  results
-end
-
-table = []
-%w(basic extention).each do |x|
-  uri = "http://www.nttdocomo.co.jp/service/imode/make/content/pictograph/#{x}/index.html"
-  table += parse(URI(uri).read.toutf8)
-end
-
-
-open(File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/docomo.rb","w") do |f|
-  f.puts "Jpmobile::Emoticon::DOCOMO_SJIS_TO_UNICODE = {"
-  table.each do |row|
-    f.puts "  0x%s=>0x%s, "%[row[1], row[3]]
-  end
-  f.puts "}.freeze"
-  f.puts "Jpmobile::Emoticon::DOCOMO_UNICODE_TO_SJIS = Jpmobile::Emoticon::DOCOMO_SJIS_TO_UNICODE.invert.freeze"
-end

data/tools/generate_softbank_emoticon_table.rb

@@ -1,31 +0,0 @@
-require 'rubygems'
-require 'hpricot'
-require 'cgi'
-require 'open-uri'
-
-# 'http://developers.softbankmobile.co.jp/dp/tool_dl/web/picword_01.php'
-
-table = []
-for i in 1..6
-  uri = "http://developers.softbankmobile.co.jp/dp/tool_dl/web/picword_%02d.php" % i
-  h = Hpricot(URI(uri).read.toutf8)
-  (h/"//table[@width='100%']//tr").each do |tr|
-    if tr
-      a = (tr/"td/font[@class='j10']").map { |td| td.inner_html }
-      unless a.empty?
-        s = CGI.unescapeHTML(a.last)
-        raise Exception, "something is wrong" if s[0,2] != "\x1b\x24" || s[4] != 0x0f
-        table << [a.first, s[2,2]]
-      end
-    end
-  end
-end
-
-open(File.dirname(__FILE__)+"/../lib/jpmobile/emoticon/softbank.rb","w") do |f|
-  f.puts "Jpmobile::Emoticon::SOFTBANK_UNICODE_TO_WEBCODE = {"
-  table.each do |a|
-    f.puts %{  0x%s => %p,} % a
-  end
-  f.puts "}"
-  f.puts "Jpmobile::Emoticon::SOFTBANK_WEBCODE_TO_UNICODE = Jpmobile::Emoticon::SOFTBANK_UNICODE_TO_WEBCODE.invert"
-end