jpmobile 6.0.0 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f2ac72dc53112eb5d8babd6b44194602d93c7f8f6b5940d4e5c15f950e27f611
-  data.tar.gz: 835cccb90c737865a0db753be8f0b1883ba4c420aafe2d2a75ad27e139817692
+  metadata.gz: 23fd23b1c3355357f297fbfbcd1ccd9bd673a7cd32ac0de550ed5222b9cbe2d1
+  data.tar.gz: f2432b9a47332debe6dde7bb42b5dc175a6ffa7c0ac70f80ca40ab3a4613a1f8
 SHA512:
-  metadata.gz: 2bf6ee36acf3766c0ffb1c709e8de2a51921a686c5ddbf9ba0041551637284551f72eb7983f79ece9f5837ec21c92d22b2c0e0605a29f8800cd080c9237f84e2
-  data.tar.gz: beb1c38b73a123652ca6a2f41091efd108f824844824cfe6eaae187f213b79627f4c5ddff77fc0f0ea4c0232c5bd7d2488c60868ca50d42bd324a145b6e32623
+  metadata.gz: 57bf348d59ec1f6b520d363a1b5e8b798a033c10a75d88ca88c8b8539530b436a9711a9882571f21371e1c547654c92c16db1ac50fae9164f4cd0a818b19d262
+  data.tar.gz: 86b3585c886a0e4ba2a5a94f736b45d3adc8c4c2924572acc477986d8cecb8edf34eed5e06c3fbb2a4f071f2c7f431b9f7e3d5cb1f4f29cb680b5a42d2be2c8b

data/.circleci/config.yml

@@ -1,21 +1,26 @@
-version: 2
+version: 2.1
+orbs:
+  browser-tools: circleci/browser-tools@1.1
 jobs:
   test-job:
     working_directory: ~/jpmobile
     docker:
-      - image: circleci/ruby:2.6-node-browsers
+      - image: cimg/ruby:3.0-browsers
         environment:
           BUNDLE_JOBS: 3
           BUNDLE_RETRY: 3
           BUNDLE_PATH: vendor/bundle
           RAILS_ENV: test
     steps:
+      - browser-tools/install-browser-tools
       - checkout
 
       # Install dependent packages
       - run:
           name: Install dependent packages
-          command: sudo apt-get install -y cmake qt5-default libqt5webkit5-dev gstreamer1.0-plugins-base gstreamer1.0-tools gstreamer1.0-x
+          command: |
+            sudo apt update
+            sudo apt install -y cmake libsqlite3-dev
 
       # Which version of bundler?
       - run:

data/.onkcop-config.yml

@@ -29,12 +29,12 @@ Layout/ExtraSpacing:
 # special_inside_parentheses (default) と比べて
 # * 横に長くなりづらい
 # * メソッド名の長さが変わったときに diff が少ない
-Layout/IndentFirstArrayElement:
+Layout/FirstArrayElementIndentation:
   EnforcedStyle: consistent
 
 # ({ と hash を開始した場合に ( の位置にインデントさせる
 # そもそも {} が必要ない可能性が高いが Style/BracesAroundHashParameters はチェックしないことにしたので
-Layout/IndentFirstHashElement:
+Layout/FirstHashElementIndentation:
   EnforcedStyle: consistent
 
 # private/protected は一段深くインデントする
@@ -122,34 +122,11 @@ Metrics/BlockLength:
     - "config/routes/**/*.rb"
     - "*.gemspec"
 
-# 6 は強すぎるので緩める
-Metrics/CyclomaticComplexity:
-  Max: 10
-
-# * 警告 120文字
-# * 禁止 160文字
-# のイメージ
-Metrics/LineLength:
-  Max: 160
-  Exclude:
-    - "db/migrate/*.rb"
-
-# 20 行超えるのは migration ファイル以外滅多に無い
-Metrics/MethodLength:
-  Max: 20
-  Exclude:
-    - "db/migrate/*.rb"
-
-# 分岐の数。ガード句を多用しているとデフォルト 7 だと厳しい
-Metrics/PerceivedComplexity:
-  Max: 8
-
-
 #################### Naming ################################
 
 # has_ から始まるメソッドは許可する
 Naming/PredicateName:
-  NamePrefixBlacklist:
+  ForbiddenPrefixes:
     - "is_"
     - "have_"
   NamePrefix:
@@ -160,7 +137,7 @@ Naming/PredicateName:
 # n(umber) といった 1 文字変数は頻出するし、前置詞(by, to, ...)や
 # よく知られた省略語 (op: operator とか pk: primary key とか) も妥当。
 # 変数 s にどんな文字列かを形容したい場合と、不要な場合とがある＝無効
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 #################### Performance ###########################
@@ -202,10 +179,6 @@ Style/BlockDelimiters:
   Exclude:
     - "spec/**/*_spec.rb"
 
-# option 等、明示的にハッシュにした方が分かりやすい場合もある
-Style/BracesAroundHashParameters:
-  Enabled: false
-
 # scope が違うとか親 module の存在確認が必要とかデメリットはあるが、
 # namespace 付きのクラスはかなり頻繁に作るので簡単に書きたい。
 Style/ClassAndModuleChildren:

data/.rubocop.yml

@@ -3,7 +3,7 @@ require: rubocop-performance
 inherit_from: './.onkcop-config.yml'
 
 AllCops:
-  TargetRubyVersion: 2.6
+  TargetRubyVersion: 3.0
   Exclude:
     - 'tmp/**/*'
     - 'bin/*'
@@ -64,16 +64,20 @@ Metrics/AbcSize:
     - 'lib/jpmobile/fallback_view_selector.rb'
     - 'lib/jpmobile/resolver.rb'
     - 'lib/jpmobile/rack/filter.rb'
+    - 'lib/jpmobile/trans_sid.rb'
 
 Metrics/CyclomaticComplexity:
+  Max: 10
   Exclude:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/helpers.rb'
     - 'lib/jpmobile/mail.rb'
     - 'lib/jpmobile/mobile/au.rb'
     - 'lib/jpmobile/mobile/docomo.rb'
+    - 'lib/jpmobile/mobile/abstract_mobile.rb'
 
 Metrics/PerceivedComplexity:
+  Max: 8
   Exclude:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/helpers.rb'
@@ -81,8 +85,12 @@ Metrics/PerceivedComplexity:
     - 'lib/jpmobile/mobile/au.rb'
     - 'lib/jpmobile/mobile/docomo.rb'
     - 'lib/jpmobile/trans_sid.rb'
+    - 'lib/jpmobile/filter.rb'
+    - 'lib/jpmobile/rack/filter.rb'
+    - 'lib/jpmobile/mobile/abstract_mobile.rb'
 
-Metrics/LineLength:
+Layout/LineLength:
+  Max: 160
   Exclude:
     - '**/*_spec.rb'
     - 'lib/jpmobile/emoticon/z_combine.rb'
@@ -115,13 +123,15 @@ Metrics/ClassLength:
     - 'lib/jpmobile/mobile/docomo.rb'
 
 Metrics/MethodLength:
+  Max: 20
   Exclude:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/helpers.rb'
     - 'lib/jpmobile/mail.rb'
     - 'lib/jpmobile/resolver.rb'
+    - 'test/rails/overrides/db/migrate/*'
 
-Lint/HandleExceptions:
+Lint/SuppressedException:
   Exclude:
     - 'lib/jpmobile/emoticon.rb'
     - 'lib/jpmobile/fallback_view_selector.rb'
@@ -130,3 +140,57 @@ Lint/HandleExceptions:
 Lint/Void:
   Exclude:
     - 'lib/jpmobile/filter.rb'
+
+Style/StringConcatenation:
+  Enabled: false
+
+Layout/SpaceBeforeBrackets: # (new in 1.7)
+  Enabled: true
+  Exclude:
+    - '**/*_controller.rb'
+    - '**/*_spec.rb'
+Lint/AmbiguousAssignment: # (new in 1.7)
+  Enabled: true
+Lint/DuplicateBranch: # (new in 1.3)
+  Enabled: true
+Lint/DuplicateRegexpCharacterClassElement: # (new in 1.1)
+  Enabled: true
+Lint/EmptyBlock: # (new in 1.1)
+  Enabled: true
+Lint/EmptyClass: # (new in 1.3)
+  Enabled: true
+Lint/NoReturnInBeginEndBlocks: # (new in 1.2)
+  Enabled: true
+Lint/ToEnumArguments: # (new in 1.1)
+  Enabled: true
+Lint/UnexpectedBlockArity: # (new in 1.5)
+  Enabled: true
+Lint/UnmodifiedReduceAccumulator: # (new in 1.1)
+  Enabled: true
+Style/ArgumentsForwarding: # (new in 1.1)
+  Enabled: true
+Style/CollectionCompact: # (new in 1.2)
+  Enabled: true
+Style/DocumentDynamicEvalDefinition: # (new in 1.1)
+  Enabled: true
+  Exclude:
+    - 'lib/jpmobile/path_set.rb'
+Style/HashExcept: # (new in 1.7)
+  Enabled: true
+Style/NegatedIfElseCondition: # (new in 1.2)
+  Enabled: true
+Style/NilLambda: # (new in 1.3)
+  Enabled: true
+Style/RedundantArgument: # (new in 1.4)
+  Enabled: true
+Style/SwapValues: # (new in 1.1)
+  Enabled: true
+
+Style/OptionalBooleanParameter:
+  Exclude:
+    - 'lib/jpmobile/emoticon.rb'
+    - 'lib/jpmobile/path_set.rb'
+
+Metrics/ParameterLists:
+  Exclude:
+    - 'lib/jpmobile/path_set.rb'

data/.ruby-version

@@ -1 +1 @@
-2.6.3
+3.0.3

data/Gemfile

@@ -5,3 +5,5 @@ gemspec
 
 gem 'rubocop', require: false
 gem 'rubocop-performance', require: false
+gem 'rubocop-rails', require: false
+gem 'rubocop-rspec', require: false

data/Gemfile.lock

@@ -1,223 +1,217 @@
 PATH
   remote: .
   specs:
-    jpmobile (6.0.0.beta)
+    jpmobile (6.1.2)
       mail (~> 2.7.0)
+      rexml
+      scanf
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (6.0.0)
-      actionpack (= 6.0.0)
+    actioncable (7.0.0)
+      actionpack (= 7.0.0)
+      activesupport (= 7.0.0)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailbox (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actionmailbox (7.0.0)
+      actionpack (= 7.0.0)
+      activejob (= 7.0.0)
+      activerecord (= 7.0.0)
+      activestorage (= 7.0.0)
+      activesupport (= 7.0.0)
       mail (>= 2.7.1)
-    actionmailer (6.0.0)
-      actionpack (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
+    actionmailer (7.0.0)
+      actionpack (= 7.0.0)
+      actionview (= 7.0.0)
+      activejob (= 7.0.0)
+      activesupport (= 7.0.0)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 2.0)
-    actionpack (6.0.0)
-      actionview (= 6.0.0)
-      activesupport (= 6.0.0)
-      rack (~> 2.0)
+    actionpack (7.0.0)
+      actionview (= 7.0.0)
+      activesupport (= 7.0.0)
+      rack (~> 2.0, >= 2.2.0)
       rack-test (>= 0.6.3)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.0, >= 1.2.0)
-    actiontext (6.0.0)
-      actionpack (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
+    actiontext (7.0.0)
+      actionpack (= 7.0.0)
+      activerecord (= 7.0.0)
+      activestorage (= 7.0.0)
+      activesupport (= 7.0.0)
+      globalid (>= 0.6.0)
       nokogiri (>= 1.8.5)
-    actionview (6.0.0)
-      activesupport (= 6.0.0)
+    actionview (7.0.0)
+      activesupport (= 7.0.0)
       builder (~> 3.1)
       erubi (~> 1.4)
       rails-dom-testing (~> 2.0)
       rails-html-sanitizer (~> 1.1, >= 1.2.0)
-    activejob (6.0.0)
-      activesupport (= 6.0.0)
+    activejob (7.0.0)
+      activesupport (= 7.0.0)
       globalid (>= 0.3.6)
-    activemodel (6.0.0)
-      activesupport (= 6.0.0)
-    activerecord (6.0.0)
-      activemodel (= 6.0.0)
-      activesupport (= 6.0.0)
-    activestorage (6.0.0)
-      actionpack (= 6.0.0)
-      activejob (= 6.0.0)
-      activerecord (= 6.0.0)
-      marcel (~> 0.3.1)
-    activesupport (6.0.0)
+    activemodel (7.0.0)
+      activesupport (= 7.0.0)
+    activerecord (7.0.0)
+      activemodel (= 7.0.0)
+      activesupport (= 7.0.0)
+    activestorage (7.0.0)
+      actionpack (= 7.0.0)
+      activejob (= 7.0.0)
+      activerecord (= 7.0.0)
+      activesupport (= 7.0.0)
+      marcel (~> 1.0)
+      mini_mime (>= 1.1.0)
+    activesupport (7.0.0)
       concurrent-ruby (~> 1.0, >= 1.0.2)
-      i18n (>= 0.7, < 2)
-      minitest (~> 5.1)
-      tzinfo (~> 1.1)
-      zeitwerk (~> 2.1, >= 2.1.8)
-    addressable (2.6.0)
-      public_suffix (>= 2.0.2, < 4.0)
-    ast (2.4.0)
-    builder (3.2.3)
-    capybara (3.28.0)
-      addressable
-      mini_mime (>= 0.1.3)
-      nokogiri (~> 1.8)
-      rack (>= 1.6.0)
-      rack-test (>= 0.6.3)
-      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.5)
-    crass (1.0.4)
-    diff-lcs (1.3)
-    erubi (1.8.0)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    ast (2.4.2)
+    builder (3.2.4)
+    coderay (1.1.3)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
+    diff-lcs (1.4.4)
+    erubi (1.10.0)
     geokit (1.13.1)
-    git (1.5.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
+    git (1.9.1)
+      rchardet (~> 1.8)
+    globalid (1.0.0)
+      activesupport (>= 5.0)
     hpricot (0.8.6)
-    i18n (1.6.0)
+    i18n (1.8.11)
       concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.3)
-    json (2.2.0)
-    loofah (2.2.3)
+    loofah (2.13.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.3)
-    mini_mime (1.0.2)
-    mini_portile2 (2.4.0)
-    minitest (5.11.3)
-    nio4r (2.4.0)
-    nokogiri (1.10.4)
-      mini_portile2 (~> 2.4.0)
-    parallel (1.17.0)
-    parser (2.6.3.0)
-      ast (~> 2.4.0)
-    pry (0.12.2)
-      coderay (~> 1.1.0)
-      method_source (~> 0.9.0)
-    public_suffix (3.1.1)
-    rack (2.0.7)
+    marcel (1.0.2)
+    method_source (1.0.0)
+    mini_mime (1.1.2)
+    minitest (5.15.0)
+    nio4r (2.5.8)
+    nokogiri (1.12.5-arm64-darwin)
+      racc (~> 1.4)
+    parallel (1.21.0)
+    parser (3.0.3.2)
+      ast (~> 2.4.1)
+    pry (0.14.1)
+      coderay (~> 1.1)
+      method_source (~> 1.0)
+    racc (1.6.0)
+    rack (2.2.3)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (6.0.0)
-      actioncable (= 6.0.0)
-      actionmailbox (= 6.0.0)
-      actionmailer (= 6.0.0)
-      actionpack (= 6.0.0)
-      actiontext (= 6.0.0)
-      actionview (= 6.0.0)
-      activejob (= 6.0.0)
-      activemodel (= 6.0.0)
-      activerecord (= 6.0.0)
-      activestorage (= 6.0.0)
-      activesupport (= 6.0.0)
-      bundler (>= 1.3.0)
-      railties (= 6.0.0)
-      sprockets-rails (>= 2.0.0)
+    rails (7.0.0)
+      actioncable (= 7.0.0)
+      actionmailbox (= 7.0.0)
+      actionmailer (= 7.0.0)
+      actionpack (= 7.0.0)
+      actiontext (= 7.0.0)
+      actionview (= 7.0.0)
+      activejob (= 7.0.0)
+      activemodel (= 7.0.0)
+      activerecord (= 7.0.0)
+      activestorage (= 7.0.0)
+      activesupport (= 7.0.0)
+      bundler (>= 1.15.0)
+      railties (= 7.0.0)
     rails-dom-testing (2.0.3)
       activesupport (>= 4.2.0)
       nokogiri (>= 1.6)
-    rails-html-sanitizer (1.2.0)
-      loofah (~> 2.2, >= 2.2.2)
-    railties (6.0.0)
-      actionpack (= 6.0.0)
-      activesupport (= 6.0.0)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    railties (7.0.0)
+      actionpack (= 7.0.0)
+      activesupport (= 7.0.0)
       method_source
-      rake (>= 0.8.7)
-      thor (>= 0.20.3, < 2.0)
+      rake (>= 12.2)
+      thor (~> 1.0)
+      zeitwerk (~> 2.5)
     rainbow (3.0.0)
-    rake (12.3.3)
-    regexp_parser (1.6.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.2)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.4)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    regexp_parser (2.2.0)
+    rexml (3.2.5)
+    rspec (3.10.0)
+      rspec-core (~> 3.10.0)
+      rspec-expectations (~> 3.10.0)
+      rspec-mocks (~> 3.10.0)
+    rspec-core (3.10.1)
+      rspec-support (~> 3.10.0)
+    rspec-expectations (3.10.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
+      rspec-support (~> 3.10.0)
     rspec-its (1.3.0)
       rspec-core (>= 3.0.0)
       rspec-expectations (>= 3.0.0)
-    rspec-mocks (3.8.1)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.2)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.2)
-    rubocop (0.74.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-rails (5.0.2)
+      actionpack (>= 5.2)
+      activesupport (>= 5.2)
+      railties (>= 5.2)
+      rspec-core (~> 3.10)
+      rspec-expectations (~> 3.10)
+      rspec-mocks (~> 3.10)
+      rspec-support (~> 3.10)
+    rspec-support (3.10.3)
+    rubocop (1.23.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.12.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.4.1)
-      rubocop (>= 0.71.0)
-    ruby-progressbar (1.10.1)
-    sprockets (3.7.2)
-      concurrent-ruby (~> 1.0)
-      rack (> 1, < 3)
-    sprockets-rails (3.2.1)
-      actionpack (>= 4.0)
-      activesupport (>= 4.0)
-      sprockets (>= 3.0.0)
-    sqlite3 (1.4.1)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.15.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.12.0)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.12.4)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.7.0, < 2.0)
+    rubocop-rspec (2.6.0)
+      rubocop (~> 1.19)
+    ruby-progressbar (1.11.0)
+    scanf (1.0.0)
+    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.6.0)
-    websocket-driver (0.7.1)
+    thor (1.1.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    websocket-driver (0.7.5)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    xpath (3.2.0)
-      nokogiri (~> 1.8)
-    zeitwerk (2.1.9)
+    websocket-extensions (0.1.5)
+    zeitwerk (2.5.1)
 
 PLATFORMS
-  ruby
+  arm64-darwin-20
 
 DEPENDENCIES
-  capybara-webkit
   geokit
   git
   hpricot
   jpmobile!
   pry
-  rails (~> 6.0.0)
+  rails (~> 7.0.0.alpha2)
   rspec
   rspec-its
   rspec-rails
   rubocop
   rubocop-performance
+  rubocop-rails
+  rubocop-rspec
   sqlite3-ruby
 
 BUNDLED WITH
-   1.17.2
+   2.2.32

data/README.md

@@ -1,10 +1,10 @@
-[![CircleCI](https://circleci.com/gh/jpmobile/jpmobile/tree/master.svg?style=svg)](https://circleci.com/gh/jpmobile/jpmobile/tree/master)
+[![CircleCI](https://circleci.com/gh/jpmobile/jpmobile/tree/main.svg?style=svg)](https://circleci.com/gh/jpmobile/jpmobile/tree/main)
 [![Code Climate](https://codeclimate.com/github/jpmobile/jpmobile/badges/gpa.svg)](https://codeclimate.com/github/jpmobile/jpmobile)
 
 # jpmobile: A Rails plugin for Japanese mobile-phones
 
 ## jpmobileとは
-携帯電話特有の機能を Rails 5.0 や Rack middleware で利用するためのプラグイン。 以下の機能を備える。
+携帯電話特有の機能を Rails や Rack middleware で利用するためのプラグイン。 以下の機能を備える。
 
 * 携帯電話のキャリア判別
 * 端末位置情報の取得
@@ -38,21 +38,6 @@ Rails](https://github.com/jpmobile/jpmobile/wiki/Version-:-Jpmobile-vs-Rails)
 を参照。
 
 ## インストール
-### Rails pluginとしてインストールする場合
-```shell
-% rails plugin install git://github.com/jpmobile/jpmobile.git
-```
-
-#### IPアドレス検証が必要な場合
-```shell
-% rails plugin install git://github.com/jpmobile/jpmobile-ipaddresses.git
-```
-
-#### ディスプレイ情報を取得する必要がある場合
-```shell
-% rails plugin install git://github.com/jpmobile/jpmobile-terminfo.git
-```
-
 ### gemでインストールする場合
 ```shell
 % gem install jpmobile
@@ -316,7 +301,7 @@ end
 
 ```ruby
 <%= get_position_link_to("位置情報を取得する", :action=>:gps) %>
-```ruby
+```
 
 ### セッションIDの付与(Trans SID)
 #### Cookie非対応携帯だけに付与する
@@ -353,7 +338,7 @@ Rails.application.config.session_options = {:cookie_only => false}
 
 ```ruby
 link_to "hoge", "/controller/action/id"
-```ruby
+```
 
 のようにリンク先を直接指定するとセッションIDは付加されません。
 
@@ -396,7 +381,7 @@ end
 ## jpmobileの開発方法
 
 jpmobileの開発に関しては
-[こちら](https://github.com/jpmobile/jpmobile/blob/master/CONTRIBUTING.md) へ
+[こちら](https://github.com/jpmobile/jpmobile/blob/main/CONTRIBUTING.md) へ
 
 ## リンク