jpmobile 8.0.0 → 8.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (20) hide show
  1. checksums.yaml +4 -4
  2. data/.circleci/config.yml +3 -3
  3. data/.onkcop-config.yml +1 -1
  4. data/.rubocop.yml +1 -1
  5. data/.ruby-version +1 -1
  6. data/Gemfile +1 -2
  7. data/Gemfile.lock +155 -143
  8. data/jpmobile.gemspec +0 -1
  9. data/lib/jpmobile/docomo_guid.rb +1 -0
  10. data/lib/jpmobile/emoticon/z_combine.rb +1 -1
  11. data/lib/jpmobile/emoticon.rb +1 -1
  12. data/lib/jpmobile/mobile/abstract_mobile.rb +3 -3
  13. data/lib/jpmobile/mobile/au.rb +1 -1
  14. data/lib/jpmobile/mobile/softbank.rb +1 -1
  15. data/lib/jpmobile/position.rb +1 -0
  16. data/lib/jpmobile/version.rb +1 -1
  17. data/lib/jpmobile.rb +1 -1
  18. data/renovate.json +1 -1
  19. data/test/sinatra/guestbook.rb +1 -0
  20. metadata +3 -20
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 7734464f89c44e577fb2285001c50878a641db1fd6d2a2950fab678fbe3739eb
4
- data.tar.gz: 0cbc7800fa81bb2981e595c4ab57a8081a39653b2682b2948edda737321ea2bd
3
+ metadata.gz: eeb63b59e947babb76f23181a1d64a8a80c189ff8dfe688300f9f7ad732f823a
4
+ data.tar.gz: 11918a81e675d738cc128629eb1c8a4396f8745865cf9160484f40c6fc696e45
5
5
  SHA512:
6
- metadata.gz: 155f14390fe363425eb798aaafa8f686b30b9cc1fb9c8a4b358b45975199b490ac50bdb02742d4cc1a4773f7f76dcb997492803a43bb97afaf17bfc8f4298259
7
- data.tar.gz: 7bd15aa282c7e4a0e4ceba3794895f44898186f49866e4eb0d8b5390a39576953f7de0c5f856c76c7e3af676d28aa7284d15f591e511e63bed4cf4fde4e9ceec
6
+ metadata.gz: 7f2f0d4de017c2966312bc421a149d0b2d3e51de1d3301491f95717d9f4f0e9b898bdfc4a6799301c8c2c6c314a2882123ab05e0a55c283f6f510fda279c96e9
7
+ data.tar.gz: 7cfa7d6ae82291d8fac57b4899c6ff49b74639cd47ad871bec7050213d10d995fd00d7533fbf88bd19e5491f6ec620768c92f7b65160f0426346fbde8cc20a22
data/.circleci/config.yml CHANGED
@@ -1,18 +1,18 @@
1
1
  version: 2.1
2
2
  orbs:
3
- browser-tools: circleci/browser-tools@1.4.8
3
+ browser-tools: circleci/browser-tools@2.3.2
4
4
  jobs:
5
5
  test-job:
6
6
  working_directory: ~/jpmobile
7
7
  docker:
8
- - image: cimg/ruby:3.3-browsers
8
+ - image: cimg/ruby:3.4.7-browsers
9
9
  environment:
10
10
  BUNDLE_JOBS: 3
11
11
  BUNDLE_RETRY: 3
12
12
  BUNDLE_PATH: vendor/bundle
13
13
  RAILS_ENV: test
14
14
  steps:
15
- - browser-tools/install-browser-tools
15
+ - browser-tools/install_browser_tools
16
16
  - checkout
17
17
 
18
18
  # Install dependent packages
data/.onkcop-config.yml CHANGED
@@ -125,7 +125,7 @@ Metrics/BlockLength:
125
125
  #################### Naming ################################
126
126
 
127
127
  # has_ から始まるメソッドは許可する
128
- Naming/PredicateName:
128
+ Naming/PredicatePrefix:
129
129
  ForbiddenPrefixes:
130
130
  - "is_"
131
131
  - "have_"
data/.rubocop.yml CHANGED
@@ -1,4 +1,4 @@
1
- require:
1
+ plugins:
2
2
  - rubocop-performance
3
3
 
4
4
  inherit_from: './.onkcop-config.yml'
data/.ruby-version CHANGED
@@ -1 +1 @@
1
- 3.3.6
1
+ 3.4.7
data/Gemfile CHANGED
@@ -6,10 +6,9 @@ gemspec
6
6
  gem 'geokit'
7
7
  gem 'git'
8
8
  gem 'pry'
9
- gem 'rails', '~> 8.0.0'
9
+ gem 'rails', '~> 8.1.0'
10
10
  gem 'rspec'
11
11
  gem 'rspec-its'
12
12
  gem 'rspec-rails'
13
13
  gem 'rubocop', require: false
14
14
  gem 'rubocop-performance', require: false
15
- gem 'sqlite3-ruby'
data/Gemfile.lock CHANGED
@@ -1,37 +1,38 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- jpmobile (7.2.0)
4
+ jpmobile (8.0.0)
5
5
  mail (~> 2.8.0)
6
- rexml
7
6
  scanf
8
7
 
9
8
  GEM
10
9
  remote: https://rubygems.org/
11
10
  specs:
12
- actioncable (8.0.0)
13
- actionpack (= 8.0.0)
14
- activesupport (= 8.0.0)
11
+ action_text-trix (2.1.15)
12
+ railties
13
+ actioncable (8.1.1)
14
+ actionpack (= 8.1.1)
15
+ activesupport (= 8.1.1)
15
16
  nio4r (~> 2.0)
16
17
  websocket-driver (>= 0.6.1)
17
18
  zeitwerk (~> 2.6)
18
- actionmailbox (8.0.0)
19
- actionpack (= 8.0.0)
20
- activejob (= 8.0.0)
21
- activerecord (= 8.0.0)
22
- activestorage (= 8.0.0)
23
- activesupport (= 8.0.0)
19
+ actionmailbox (8.1.1)
20
+ actionpack (= 8.1.1)
21
+ activejob (= 8.1.1)
22
+ activerecord (= 8.1.1)
23
+ activestorage (= 8.1.1)
24
+ activesupport (= 8.1.1)
24
25
  mail (>= 2.8.0)
25
- actionmailer (8.0.0)
26
- actionpack (= 8.0.0)
27
- actionview (= 8.0.0)
28
- activejob (= 8.0.0)
29
- activesupport (= 8.0.0)
26
+ actionmailer (8.1.1)
27
+ actionpack (= 8.1.1)
28
+ actionview (= 8.1.1)
29
+ activejob (= 8.1.1)
30
+ activesupport (= 8.1.1)
30
31
  mail (>= 2.8.0)
31
32
  rails-dom-testing (~> 2.2)
32
- actionpack (8.0.0)
33
- actionview (= 8.0.0)
34
- activesupport (= 8.0.0)
33
+ actionpack (8.1.1)
34
+ actionview (= 8.1.1)
35
+ activesupport (= 8.1.1)
35
36
  nokogiri (>= 1.8.5)
36
37
  rack (>= 2.2.4)
37
38
  rack-session (>= 1.0.1)
@@ -39,42 +40,43 @@ GEM
39
40
  rails-dom-testing (~> 2.2)
40
41
  rails-html-sanitizer (~> 1.6)
41
42
  useragent (~> 0.16)
42
- actiontext (8.0.0)
43
- actionpack (= 8.0.0)
44
- activerecord (= 8.0.0)
45
- activestorage (= 8.0.0)
46
- activesupport (= 8.0.0)
43
+ actiontext (8.1.1)
44
+ action_text-trix (~> 2.1.15)
45
+ actionpack (= 8.1.1)
46
+ activerecord (= 8.1.1)
47
+ activestorage (= 8.1.1)
48
+ activesupport (= 8.1.1)
47
49
  globalid (>= 0.6.0)
48
50
  nokogiri (>= 1.8.5)
49
- actionview (8.0.0)
50
- activesupport (= 8.0.0)
51
+ actionview (8.1.1)
52
+ activesupport (= 8.1.1)
51
53
  builder (~> 3.1)
52
54
  erubi (~> 1.11)
53
55
  rails-dom-testing (~> 2.2)
54
56
  rails-html-sanitizer (~> 1.6)
55
- activejob (8.0.0)
56
- activesupport (= 8.0.0)
57
+ activejob (8.1.1)
58
+ activesupport (= 8.1.1)
57
59
  globalid (>= 0.3.6)
58
- activemodel (8.0.0)
59
- activesupport (= 8.0.0)
60
- activerecord (8.0.0)
61
- activemodel (= 8.0.0)
62
- activesupport (= 8.0.0)
60
+ activemodel (8.1.1)
61
+ activesupport (= 8.1.1)
62
+ activerecord (8.1.1)
63
+ activemodel (= 8.1.1)
64
+ activesupport (= 8.1.1)
63
65
  timeout (>= 0.4.0)
64
- activestorage (8.0.0)
65
- actionpack (= 8.0.0)
66
- activejob (= 8.0.0)
67
- activerecord (= 8.0.0)
68
- activesupport (= 8.0.0)
66
+ activestorage (8.1.1)
67
+ actionpack (= 8.1.1)
68
+ activejob (= 8.1.1)
69
+ activerecord (= 8.1.1)
70
+ activesupport (= 8.1.1)
69
71
  marcel (~> 1.0)
70
- activesupport (8.0.0)
72
+ activesupport (8.1.1)
71
73
  base64
72
- benchmark (>= 0.3)
73
74
  bigdecimal
74
75
  concurrent-ruby (~> 1.0, >= 1.3.1)
75
76
  connection_pool (>= 2.2.5)
76
77
  drb
77
78
  i18n (>= 1.6, < 2)
79
+ json
78
80
  logger (>= 1.4.2)
79
81
  minitest (>= 5.1)
80
82
  securerandom (>= 0.3)
@@ -82,37 +84,39 @@ GEM
82
84
  uri (>= 0.13.1)
83
85
  addressable (2.8.7)
84
86
  public_suffix (>= 2.0.2, < 7.0)
85
- ast (2.4.2)
86
- base64 (0.2.0)
87
- benchmark (0.3.0)
88
- bigdecimal (3.1.8)
87
+ ast (2.4.3)
88
+ base64 (0.3.0)
89
+ bigdecimal (3.3.1)
89
90
  builder (3.3.0)
90
91
  coderay (1.1.3)
91
- concurrent-ruby (1.3.4)
92
- connection_pool (2.4.1)
92
+ concurrent-ruby (1.3.5)
93
+ connection_pool (2.5.4)
93
94
  crass (1.0.6)
94
- date (3.3.4)
95
- diff-lcs (1.5.1)
96
- drb (2.2.1)
97
- erubi (1.13.0)
95
+ date (3.4.1)
96
+ diff-lcs (1.6.2)
97
+ drb (2.2.3)
98
+ erb (5.1.3)
99
+ erubi (1.13.1)
98
100
  geokit (1.14.0)
99
- git (2.3.1)
101
+ git (4.0.5)
100
102
  activesupport (>= 5.0)
101
103
  addressable (~> 2.8)
102
- process_executer (~> 1.1)
103
- rchardet (~> 1.8)
104
- globalid (1.2.1)
104
+ process_executer (~> 4.0)
105
+ rchardet (~> 1.9)
106
+ globalid (1.3.0)
105
107
  activesupport (>= 6.1)
106
- i18n (1.14.6)
108
+ i18n (1.14.7)
107
109
  concurrent-ruby (~> 1.0)
108
- io-console (0.7.2)
109
- irb (1.14.1)
110
+ io-console (0.8.1)
111
+ irb (1.15.2)
112
+ pp (>= 0.6.0)
110
113
  rdoc (>= 4.0.0)
111
114
  reline (>= 0.4.2)
112
- json (2.7.6)
113
- language_server-protocol (3.17.0.3)
114
- logger (1.6.1)
115
- loofah (2.22.0)
115
+ json (2.15.2)
116
+ language_server-protocol (3.17.0.5)
117
+ lint_roller (1.1.0)
118
+ logger (1.7.0)
119
+ loofah (2.24.1)
116
120
  crass (~> 1.0.2)
117
121
  nokogiri (>= 1.12.0)
118
122
  mail (2.8.1)
@@ -120,149 +124,158 @@ GEM
120
124
  net-imap
121
125
  net-pop
122
126
  net-smtp
123
- marcel (1.0.4)
124
- method_source (1.0.0)
127
+ marcel (1.1.0)
128
+ method_source (1.1.0)
125
129
  mini_mime (1.1.5)
126
- mini_portile2 (2.8.7)
127
- minitest (5.25.1)
128
- net-imap (0.4.17)
130
+ minitest (5.26.0)
131
+ net-imap (0.5.12)
129
132
  date
130
133
  net-protocol
131
134
  net-pop (0.1.2)
132
135
  net-protocol
133
136
  net-protocol (0.2.2)
134
137
  timeout
135
- net-smtp (0.4.0.1)
138
+ net-smtp (0.5.1)
136
139
  net-protocol
137
140
  nio4r (2.7.4)
138
- nokogiri (1.16.7-arm64-darwin)
141
+ nokogiri (1.18.10-arm64-darwin)
139
142
  racc (~> 1.4)
140
- nokogiri (1.16.7-x86_64-linux)
143
+ nokogiri (1.18.10-x86_64-linux-gnu)
141
144
  racc (~> 1.4)
142
- parallel (1.26.3)
143
- parser (3.3.5.1)
145
+ parallel (1.27.0)
146
+ parser (3.3.10.0)
144
147
  ast (~> 2.4.1)
145
148
  racc
146
- process_executer (1.1.2)
147
- pry (0.14.2)
149
+ pp (0.6.3)
150
+ prettyprint
151
+ prettyprint (0.2.0)
152
+ prism (1.6.0)
153
+ process_executer (4.0.0)
154
+ track_open_instances (~> 0.1)
155
+ pry (0.15.2)
148
156
  coderay (~> 1.1)
149
157
  method_source (~> 1.0)
150
- psych (5.1.2)
158
+ psych (5.2.6)
159
+ date
151
160
  stringio
152
- public_suffix (5.1.1)
161
+ public_suffix (6.0.2)
153
162
  racc (1.8.1)
154
- rack (3.1.8)
155
- rack-session (2.0.0)
163
+ rack (3.2.3)
164
+ rack-session (2.1.1)
165
+ base64 (>= 0.1.0)
156
166
  rack (>= 3.0.0)
157
- rack-test (2.1.0)
167
+ rack-test (2.2.0)
158
168
  rack (>= 1.3)
159
- rackup (2.1.0)
169
+ rackup (2.2.1)
160
170
  rack (>= 3)
161
- webrick (~> 1.8)
162
- rails (8.0.0)
163
- actioncable (= 8.0.0)
164
- actionmailbox (= 8.0.0)
165
- actionmailer (= 8.0.0)
166
- actionpack (= 8.0.0)
167
- actiontext (= 8.0.0)
168
- actionview (= 8.0.0)
169
- activejob (= 8.0.0)
170
- activemodel (= 8.0.0)
171
- activerecord (= 8.0.0)
172
- activestorage (= 8.0.0)
173
- activesupport (= 8.0.0)
171
+ rails (8.1.1)
172
+ actioncable (= 8.1.1)
173
+ actionmailbox (= 8.1.1)
174
+ actionmailer (= 8.1.1)
175
+ actionpack (= 8.1.1)
176
+ actiontext (= 8.1.1)
177
+ actionview (= 8.1.1)
178
+ activejob (= 8.1.1)
179
+ activemodel (= 8.1.1)
180
+ activerecord (= 8.1.1)
181
+ activestorage (= 8.1.1)
182
+ activesupport (= 8.1.1)
174
183
  bundler (>= 1.15.0)
175
- railties (= 8.0.0)
176
- rails-dom-testing (2.2.0)
184
+ railties (= 8.1.1)
185
+ rails-dom-testing (2.3.0)
177
186
  activesupport (>= 5.0.0)
178
187
  minitest
179
188
  nokogiri (>= 1.6)
180
- rails-html-sanitizer (1.6.0)
189
+ rails-html-sanitizer (1.6.2)
181
190
  loofah (~> 2.21)
182
- nokogiri (~> 1.14)
183
- railties (8.0.0)
184
- actionpack (= 8.0.0)
185
- activesupport (= 8.0.0)
191
+ nokogiri (>= 1.15.7, != 1.16.7, != 1.16.6, != 1.16.5, != 1.16.4, != 1.16.3, != 1.16.2, != 1.16.1, != 1.16.0.rc1, != 1.16.0)
192
+ railties (8.1.1)
193
+ actionpack (= 8.1.1)
194
+ activesupport (= 8.1.1)
186
195
  irb (~> 1.13)
187
196
  rackup (>= 1.0.0)
188
197
  rake (>= 12.2)
189
198
  thor (~> 1.0, >= 1.2.2)
199
+ tsort (>= 0.2)
190
200
  zeitwerk (~> 2.6)
191
201
  rainbow (3.1.1)
192
- rake (13.2.1)
193
- rchardet (1.8.0)
194
- rdoc (6.7.0)
202
+ rake (13.3.0)
203
+ rchardet (1.9.0)
204
+ rdoc (6.15.0)
205
+ erb
195
206
  psych (>= 4.0.0)
196
- regexp_parser (2.9.2)
197
- reline (0.5.10)
207
+ tsort
208
+ regexp_parser (2.11.3)
209
+ reline (0.6.2)
198
210
  io-console (~> 0.5)
199
- rexml (3.3.6)
200
- strscan
201
- rspec (3.13.0)
211
+ rspec (3.13.2)
202
212
  rspec-core (~> 3.13.0)
203
213
  rspec-expectations (~> 3.13.0)
204
214
  rspec-mocks (~> 3.13.0)
205
- rspec-core (3.13.2)
215
+ rspec-core (3.13.6)
206
216
  rspec-support (~> 3.13.0)
207
- rspec-expectations (3.13.3)
217
+ rspec-expectations (3.13.5)
208
218
  diff-lcs (>= 1.2.0, < 2.0)
209
219
  rspec-support (~> 3.13.0)
210
220
  rspec-its (2.0.0)
211
221
  rspec-core (>= 3.13.0)
212
222
  rspec-expectations (>= 3.13.0)
213
- rspec-mocks (3.13.1)
223
+ rspec-mocks (3.13.6)
214
224
  diff-lcs (>= 1.2.0, < 2.0)
215
225
  rspec-support (~> 3.13.0)
216
- rspec-rails (7.0.1)
217
- actionpack (>= 7.0)
218
- activesupport (>= 7.0)
219
- railties (>= 7.0)
226
+ rspec-rails (8.0.2)
227
+ actionpack (>= 7.2)
228
+ activesupport (>= 7.2)
229
+ railties (>= 7.2)
220
230
  rspec-core (~> 3.13)
221
231
  rspec-expectations (~> 3.13)
222
232
  rspec-mocks (~> 3.13)
223
233
  rspec-support (~> 3.13)
224
- rspec-support (3.13.1)
225
- rubocop (1.68.0)
234
+ rspec-support (3.13.6)
235
+ rubocop (1.81.7)
226
236
  json (~> 2.3)
227
- language_server-protocol (>= 3.17.0)
237
+ language_server-protocol (~> 3.17.0.2)
238
+ lint_roller (~> 1.1.0)
228
239
  parallel (~> 1.10)
229
240
  parser (>= 3.3.0.2)
230
241
  rainbow (>= 2.2.2, < 4.0)
231
- regexp_parser (>= 2.4, < 3.0)
232
- rubocop-ast (>= 1.32.2, < 2.0)
242
+ regexp_parser (>= 2.9.3, < 3.0)
243
+ rubocop-ast (>= 1.47.1, < 2.0)
233
244
  ruby-progressbar (~> 1.7)
234
- unicode-display_width (>= 2.4.0, < 3.0)
235
- rubocop-ast (1.34.0)
236
- parser (>= 3.3.1.0)
237
- rubocop-performance (1.22.1)
238
- rubocop (>= 1.48.1, < 2.0)
239
- rubocop-ast (>= 1.31.1, < 2.0)
245
+ unicode-display_width (>= 2.4.0, < 4.0)
246
+ rubocop-ast (1.47.1)
247
+ parser (>= 3.3.7.2)
248
+ prism (~> 1.4)
249
+ rubocop-performance (1.26.1)
250
+ lint_roller (~> 1.1)
251
+ rubocop (>= 1.75.0, < 2.0)
252
+ rubocop-ast (>= 1.47.1, < 2.0)
240
253
  ruby-progressbar (1.13.0)
241
254
  scanf (1.0.0)
242
- securerandom (0.3.1)
243
- sqlite3 (1.6.1)
244
- mini_portile2 (~> 2.8.0)
245
- sqlite3-ruby (1.3.3)
246
- sqlite3 (>= 1.3.3)
247
- stringio (3.1.1)
248
- strscan (3.1.0)
249
- thor (1.3.2)
250
- timeout (0.4.1)
255
+ securerandom (0.4.1)
256
+ stringio (3.1.7)
257
+ thor (1.4.0)
258
+ timeout (0.4.3)
259
+ track_open_instances (0.1.15)
260
+ tsort (0.2.0)
251
261
  tzinfo (2.0.6)
252
262
  concurrent-ruby (~> 1.0)
253
- unicode-display_width (2.6.0)
254
- uri (0.13.1)
255
- useragent (0.16.10)
256
- webrick (1.8.2)
257
- websocket-driver (0.7.6)
263
+ unicode-display_width (3.2.0)
264
+ unicode-emoji (~> 4.1)
265
+ unicode-emoji (4.1.0)
266
+ uri (1.0.4)
267
+ useragent (0.16.11)
268
+ websocket-driver (0.8.0)
269
+ base64
258
270
  websocket-extensions (>= 0.1.0)
259
271
  websocket-extensions (0.1.5)
260
- zeitwerk (2.6.18)
272
+ zeitwerk (2.7.3)
261
273
 
262
274
  PLATFORMS
263
275
  arm64-darwin-20
264
276
  arm64-darwin-21
265
277
  arm64-darwin-23
278
+ arm64-darwin-24
266
279
  x86_64-linux
267
280
 
268
281
  DEPENDENCIES
@@ -270,13 +283,12 @@ DEPENDENCIES
270
283
  git
271
284
  jpmobile!
272
285
  pry
273
- rails (~> 8.0.0)
286
+ rails (~> 8.1.0)
274
287
  rspec
275
288
  rspec-its
276
289
  rspec-rails
277
290
  rubocop
278
291
  rubocop-performance
279
- sqlite3-ruby
280
292
 
281
293
  BUNDLED WITH
282
- 2.5.17
294
+ 2.6.2
data/jpmobile.gemspec CHANGED
@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
21
21
  gem.required_ruby_version = '>= 3.2.0'
22
22
 
23
23
  gem.add_dependency 'mail', '~> 2.8.0'
24
- gem.add_dependency 'rexml'
25
24
  gem.add_dependency 'scanf'
26
25
  gem.metadata['rubygems_mfa_required'] = 'true'
27
26
  end
data/lib/jpmobile/docomo_guid.rb CHANGED
@@ -5,6 +5,7 @@ class ActionController::Base # :nodoc:
5
5
  class << self
6
6
  def docomo_guid(mode = :docomo)
7
7
  include Jpmobile::DocomoGuid
8
+
8
9
  self.docomo_guid_mode = mode
9
10
  end
10
11
  end
data/lib/jpmobile/emoticon/z_combine.rb CHANGED
@@ -20,7 +20,7 @@ module Jpmobile
20
20
  UTF8_REGEXP = Regexp.union(*EMOTICON_UNICODES.map {|x| [x].pack('U') }).freeze
21
21
 
22
22
  # for PC conversion "GETA"
23
- 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]
23
+ 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!]
24
24
 
25
25
  SOFTBANK_SJIS_REGEXP = Regexp.union(*SOFTBANK_SJIS_TO_UNICODE.keys.map {|s| Jpmobile::Util.sjis_regexp(s) }).freeze
26
26
  AU_EMAILJIS_REGEXP = Regexp.union(*AU_EMAILJIS_TO_UNICODE.keys.map {|s| Jpmobile::Util.jis_regexp(s) })
data/lib/jpmobile/emoticon.rb CHANGED
@@ -286,7 +286,7 @@ module Jpmobile
286
286
 
287
287
  begin
288
288
  yaml_hash = YAML.load_file(@pc_emoticon_yaml)
289
- @pc_emoticon_hash = Hash[*(yaml_hash.values.inject([]) {|r, v| r += v.to_a.flatten; r })]
289
+ @pc_emoticon_hash = Hash[*yaml_hash.values.inject([]) {|r, v| r += v.to_a.flatten; r }]
290
290
  @pc_emoticon_image_path.chop! if @pc_emoticon_image_path.match?(%r{/$})
291
291
 
292
292
  return true
data/lib/jpmobile/mobile/abstract_mobile.rb CHANGED
@@ -94,7 +94,7 @@ module Jpmobile::Mobile
94
94
  def variants
95
95
  return @_variants if @_variants
96
96
 
97
- @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/ && c.to_s !~ /Emoticon/ }.map do |klass|
97
+ @_variants = self.class.ancestors.select {|c| c.to_s =~ /^Jpmobile/ && c.to_s !~ /Emoticon/ }.map! do |klass|
98
98
  klass = klass.to_s.
99
99
  gsub('Jpmobile::', '').
100
100
  gsub('AbstractMobile::', '').
@@ -108,9 +108,9 @@ module Jpmobile::Mobile
108
108
  end
109
109
 
110
110
  if @_variants.include?('tablet')
111
- @_variants = @_variants.reject {|v| v == 'mobile' }.map {|v| v.gsub('mobile_', 'tablet_') }
111
+ @_variants = @_variants.reject {|v| v == 'mobile' }.map! {|v| v.gsub('mobile_', 'tablet_') }
112
112
  elsif @_variants.include?('smart_phone')
113
- @_variants = @_variants.reject {|v| v == 'mobile' }.map {|v| v.gsub('mobile_', 'smart_phone_') }
113
+ @_variants = @_variants.reject {|v| v == 'mobile' }.map! {|v| v.gsub('mobile_', 'smart_phone_') }
114
114
  end
115
115
 
116
116
  @_variants || []
data/lib/jpmobile/mobile/au.rb CHANGED
@@ -29,7 +29,7 @@ module Jpmobile::Mobile
29
29
  return @__posotion = nil if params['lat'].nil? || params['lat'] == '' || params['lon'].nil? || params['lon'] == ''
30
30
 
31
31
  l = Jpmobile::Position.new
32
- l.options = params.select {|x, _| TARGET_PARAMS.include?(x) }
32
+ l.options = params.slice(*TARGET_PARAMS)
33
33
  case params['unit']
34
34
  when '1'
35
35
  l.lat = params['lat'].to_f
data/lib/jpmobile/mobile/softbank.rb CHANGED
@@ -38,7 +38,7 @@ module Jpmobile::Mobile
38
38
  l = Jpmobile::Position.new
39
39
  l.lat = ((Regexp.last_match(1) == 'N') ? 1 : -1) * Jpmobile::Position.dms2deg(Regexp.last_match(2), Regexp.last_match(3), Regexp.last_match(4))
40
40
  l.lon = ((Regexp.last_match(5) == 'E') ? 1 : -1) * Jpmobile::Position.dms2deg(Regexp.last_match(6), Regexp.last_match(7), Regexp.last_match(8))
41
- l.options = params.select {|x, _| TARGET_PARAMS.include?(x) }
41
+ l.options = params.slice(*TARGET_PARAMS)
42
42
 
43
43
  @__position = l
44
44
  end
data/lib/jpmobile/position.rb CHANGED
@@ -13,6 +13,7 @@ module Jpmobile
13
13
  if Object.const_defined?(:GeoKit)
14
14
  # GeoKitが読み込まれている場合はMappableにする
15
15
  include ::GeoKit::Mappable
16
+
16
17
  def self.acts_as_mappable
17
18
  end
18
19
 
data/lib/jpmobile/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Jpmobile
2
- VERSION = '8.0.0'.freeze
2
+ VERSION = '8.1.0'.freeze
3
3
  end
data/lib/jpmobile.rb CHANGED
@@ -58,7 +58,7 @@ module Jpmobile
58
58
 
59
59
  @all_variants = carriers.map {|carrier|
60
60
  Jpmobile::Mobile.const_get(carrier).new({}, {}).variants
61
- }.flatten.uniq
61
+ }.flatten!.uniq
62
62
  end
63
63
 
64
64
  require 'jpmobile/mobile/abstract_mobile'
data/renovate.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
3
3
  "extends": [
4
- "config:base"
4
+ "config:recommended"
5
5
  ]
6
6
  }
data/test/sinatra/guestbook.rb CHANGED
@@ -8,6 +8,7 @@ require 'jpmobile/sinatra'
8
8
 
9
9
  class SinatraTestHelper
10
10
  include Singleton
11
+
11
12
  attr_accessor :last_app
12
13
  end
13
14
 
metadata CHANGED
@@ -1,15 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: jpmobile
3
3
  version: !ruby/object:Gem::Version
4
- version: 8.0.0
4
+ version: 8.1.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Shin-ichiro OGAWA
8
8
  - Yoji Shidara
9
- autorequire:
10
9
  bindir: bin
11
10
  cert_chain: []
12
- date: 2024-11-08 00:00:00.000000000 Z
11
+ date: 1980-01-02 00:00:00.000000000 Z
13
12
  dependencies:
14
13
  - !ruby/object:Gem::Dependency
15
14
  name: mail
@@ -25,20 +24,6 @@ dependencies:
25
24
  - - "~>"
26
25
  - !ruby/object:Gem::Version
27
26
  version: 2.8.0
28
- - !ruby/object:Gem::Dependency
29
- name: rexml
30
- requirement: !ruby/object:Gem::Requirement
31
- requirements:
32
- - - ">="
33
- - !ruby/object:Gem::Version
34
- version: '0'
35
- type: :runtime
36
- prerelease: false
37
- version_requirements: !ruby/object:Gem::Requirement
38
- requirements:
39
- - - ">="
40
- - !ruby/object:Gem::Version
41
- version: '0'
42
27
  - !ruby/object:Gem::Dependency
43
28
  name: scanf
44
29
  requirement: !ruby/object:Gem::Requirement
@@ -341,7 +326,6 @@ metadata:
341
326
  source_code_uri: https://github.com/jpmobile/jpmobile
342
327
  documentation_uri: https://github.com/jpmobile/jpmobile
343
328
  rubygems_mfa_required: 'true'
344
- post_install_message:
345
329
  rdoc_options: []
346
330
  require_paths:
347
331
  - lib
@@ -356,8 +340,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
356
340
  - !ruby/object:Gem::Version
357
341
  version: '0'
358
342
  requirements: []
359
- rubygems_version: 3.5.22
360
- signing_key:
343
+ rubygems_version: 3.6.9
361
344
  specification_version: 4
362
345
  summary: Rails plugin for mobile devices in Japan
363
346
  test_files: []