phonenumber_jp 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97164fbe29ca374429029d19b550d2742a6e52c8013a1979ba07d537e7b9e47c
-  data.tar.gz: 2d7fdc5291da54c228e93363caf376bbb487ac1ea42334713d72ce1d63bc8db5
+  metadata.gz: a4ccec0967152f3ee0a741feeedcd85130a177c1906239d1938a53f1d045911e
+  data.tar.gz: ff57e1b129331c30199915963fae35b0336e28692092c6f93bed2375647fab00
 SHA512:
-  metadata.gz: daad0407ade0e69a924629f0ba02ba1379c2e8dc81c32db3e51f778a98a11744b59b4f05d171d412804d61df6759deacc0cc9a807ce58a9dfdf8b216cecde835
-  data.tar.gz: 0b8d8f20e060adc0c32793eee2b6457362d2270f1e8ef6601082c4343a2352c04ae3ef0197db198c1f9d6ea5cb8119932a90a543220fb1eca4c93814b9fbc259
+  metadata.gz: 41f0aa077d9acc3ae52de9eaae18395c0c926aa607397b0a585af160c6b63c535143adb06f2b692df7bc4a68cc98ebbc8af6de34a527003509a01e4363c5b30e
+  data.tar.gz: b89e2c87c0fe170567026ae45b79b843360dc2902668dd8065ccaa3fafffa227ee5a597a539a81012407d759743a9b946ff5a4f56a842e70a1156c57a3b194d8

data/.rubocop.yml

@@ -2,6 +2,7 @@ AllCops:
   Exclude:
     - bin/*
     - node_modules/**/*
+  NewCops: enable
 
 Layout/CaseIndentation:
   EnforcedStyle: end
@@ -12,6 +13,9 @@ Layout/EndAlignment:
 Layout/EmptyLinesAroundAccessModifier:
   EnforcedStyle: only_before
 
+Layout/LineLength:
+  Enabled: false
+
 Layout/SpaceInLambdaLiteral:
   EnforcedStyle: require_space
 
@@ -33,9 +37,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Enabled: false
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -51,7 +52,7 @@ Naming/HeredocDelimiterNaming:
 Naming/PredicateName:
   Enabled: false
 
-Naming/UncommunicativeMethodParamName:
+Naming/MethodParameterName:
   Enabled: false
 
 Style/Alias:
@@ -104,6 +105,9 @@ Style/PercentLiteralDelimiters:
 Style/SpecialGlobalVars:
   Enabled: false
 
+Style/StringConcatenation:
+  Enabled: false
+
 Style/StringLiterals:
   EnforcedStyle: double_quotes
 

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# v0.1.3 (2021-10-29)
+
+* update special number formats (e.g. 14 digits data transfer number).
+
 # v0.1.2 (2015-07-24)
 
 * copy entire codes from [labocho/phonenumber](https://github.com/labocho/phonenumber).

data/Gemfile

@@ -4,3 +4,11 @@ git_source(:github) {|repo_name| "https://github.com/#{repo_name}" }
 
 # Specify your gem's dependencies in phonenumber.gemspec
 gemspec
+
+group :development do
+  gem "bundler", ">= 1.16"
+  gem "rake", ">= 10.0"
+  gem "rspec", ">= 3.7"
+  gem "rubocop", ">= 0.76"
+  gem "steep", ">= 0.41.0"
+end

data/Gemfile.lock

@@ -1,41 +1,79 @@
 PATH
   remote: .
   specs:
-    phonenumber_jp (0.1.2)
+    phonenumber_jp (0.1.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
-    diff-lcs (1.3)
-    jaro_winkler (1.5.4)
-    parallel (1.19.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
+    diff-lcs (1.4.4)
+    ffi (1.15.4)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    language_server-protocol (3.16.0.3)
+    listen (3.7.0)
+      rb-fsevent (~> 0.10, >= 0.10.3)
+      rb-inotify (~> 0.9, >= 0.9.10)
+    minitest (5.14.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
     rainbow (3.0.0)
-    rake (13.0.1)
-    rspec (3.9.0)
-      rspec-core (~> 3.9.0)
-      rspec-expectations (~> 3.9.0)
-      rspec-mocks (~> 3.9.0)
-    rspec-core (3.9.0)
-      rspec-support (~> 3.9.0)
-    rspec-expectations (3.9.0)
+    rake (13.0.6)
+    rb-fsevent (0.11.0)
+    rb-inotify (0.10.1)
+      ffi (~> 1.0)
+    rbs (1.6.2)
+    regexp_parser (2.1.1)
+    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.9.0)
-    rspec-mocks (3.9.0)
+      rspec-support (~> 3.10.0)
+    rspec-mocks (3.10.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.9.0)
-    rspec-support (3.9.0)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
+      rspec-support (~> 3.10.0)
+    rspec-support (3.10.2)
+    rubocop (1.22.3)
       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)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.12.0)
+      parser (>= 3.0.1.1)
+    ruby-progressbar (1.11.0)
+    steep (0.46.0)
+      activesupport (>= 5.1)
+      language_server-protocol (>= 3.15, < 4.0)
+      listen (~> 3.0)
+      parallel (>= 1.0.0)
+      parser (>= 3.0)
+      rainbow (>= 2.2.2, < 4.0)
+      rbs (>= 1.2.0)
+      terminal-table (>= 2, < 4)
+    terminal-table (3.0.2)
+      unicode-display_width (>= 1.1.1, < 3)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.1.0)
+    zeitwerk (2.5.1)
 
 PLATFORMS
   ruby
@@ -46,6 +84,7 @@ DEPENDENCIES
   rake (>= 10.0)
   rspec (>= 3.7)
   rubocop (>= 0.76)
+  steep (>= 0.41.0)
 
 BUNDLED WITH
-   2.0.2
+   2.2.3

data/Rakefile

@@ -10,7 +10,7 @@ file "tmp/xls2csv.jar" do
   warn "Download xls2csv.jar"
   File.write(
     "tmp/xls2csv.jar",
-    open("https://github.com/labocho/xls2csv/releases/download/v0.1.1/xls2csv.jar", &:read),
+    URI.open("https://github.com/labocho/xls2csv/releases/download/v0.1.1/xls2csv.jar", &:read),
   )
 end
 
@@ -35,3 +35,9 @@ namespace "area_codes" do
     ruby "scripts/update_area_codes_list.rb"
   end
 end
+
+namespace "steep" do
+  task "check" do
+    sh "steep check"
+  end
+end

data/Steepfile

@@ -0,0 +1,25 @@
+target :lib do
+  signature "sig"
+  check "lib"
+end
+
+# target :lib do
+#   signature "sig"
+#
+#   check "lib"                       # Directory name
+#   check "Gemfile"                   # File name
+#   check "app/models/**/*.rb"        # Glob
+#   # ignore "lib/templates/*.rb"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   # library "strong_json"           # Gems
+# end
+
+# target :spec do
+#   signature "sig", "sig-private"
+#
+#   check "spec"
+#
+#   # library "pathname", "set"       # Standard libraries
+#   # library "rspec"
+# end

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "phonenumber"
+require "phonenumber_jp"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/lib/phonenumber_jp/version.rb

@@ -1,3 +1,3 @@
 module PhonenumberJp
-  VERSION = "0.1.2".freeze
+  VERSION = "0.1.3".freeze
 end

data/lib/phonenumber_jp.rb

@@ -25,23 +25,25 @@ module PhonenumberJp
     def split(phonenumber)
       return [] if phonenumber.nil?
 
-      phonenumber = phonenumber.gsub(/[^0-9\+]/, "")
+      phonenumber = phonenumber.gsub(/[^0-9+]/, "")
       return [] if phonenumber.length == 0
 
       case phonenumber
       when /^\+81/
-        local = split("0" + phonenumber[3..-1])
+        local = split("0" + phonenumber[3..-1].to_s) # steep does not know that `phonenumber[3..-1]` will be return String always. Call `to_s` to tell it is String.
         return [phonenumber] if local.length < 2
 
-        local[0] = local[0][1..-1]
+        local[0] = local[0][1..-1].to_s # steep does not know that `local[0][1..-1]` will be return String always. Call `to_s` to tell it is String.
         ["+81"] + local
-      when /^(050)(\d\d\d\d)(\d\d\d\d)$/, # IP 電話
-          /^(0800)(\d\d\d)(\d\d\d\d)$/, # フリーダイヤル
-          /^(0[789]0)(\d\d\d\d)(\d\d\d\d)$/, # 携帯電話・PHS
-          /^(020)(\d\d\d\d)(\d\d\d\d)$/, # ポケベル
-          /^(0120)(\d\d\d)(\d\d\d)$/, # フリーダイヤル
+      when /^(0120)(\d\d\d)(\d\d\d)$/, # 着信課金機能 (フリーダイヤル)
+          /^(0800)(\d\d\d)(\d\d\d\d)$/, # 着信課金機能(フリーダイヤル)
+          /^(0180)(\d\d\d)(\d\d\d)$/, # 大量呼受付機能
           /^(0570)(\d\d\d)(\d\d\d)$/, # ナビダイヤル
-          /^(0990)(\d\d\d)(\d\d\d)$/ # ダイヤル Q2
+          /^(0990)(\d\d\d)(\d\d\d)$/, # ダイヤル Q2
+          /^(020)(\d\d\d)(\d\d\d\d\d)$/, # データ伝送携帯電話番号, 無線呼出番号
+          /^(0200)(\d\d\d\d\d)(\d\d\d\d\d)$/, # データ伝送携帯電話番号
+          /^(0[789]0)(\d\d\d\d)(\d\d\d\d)$/, # 携帯電話・PHS
+          /^(050)(\d\d\d\d)(\d\d\d\d)$/ # IP 電話
         $~.captures
       when /^0(\d{9})$/ # 固定電話
         return [phonenumber] unless (area_code = find_area_code(phonenumber))

data/phonenumber_jp.gemspec

@@ -13,24 +13,19 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/labocho/phonenumber_jp"
   spec.license       = "MIT"
 
-  if spec.respond_to?(:metadata)
-    spec.metadata["homepage_uri"] = spec.homepage
-    spec.metadata["source_code_uri"] = spec.homepage
-    spec.metadata["changelog_uri"] = "https://github.com/labocho/phonenumber_jp/blob/master/CHANGELOG.md"
-  else
-    raise "RubyGems 2.0 or newer is required to protect against " \
-      "public gem pushes."
-  end
+  raise "RubyGems 2.0 or newer is required to protect against public gem pushes." unless spec.respond_to?(:metadata)
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = spec.homepage
+  spec.metadata["changelog_uri"] = "https://github.com/labocho/phonenumber_jp/blob/master/CHANGELOG.md"
 
   spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
+
+  spec.required_ruby_version = ">= 2.5"
+
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r(^exe/)) {|f| File.basename(f) }
   spec.require_paths = ["lib"]
-
-  spec.add_development_dependency "bundler", ">= 1.16"
-  spec.add_development_dependency "rake", ">= 10.0"
-  spec.add_development_dependency "rspec", ">= 3.7"
-  spec.add_development_dependency "rubocop", ">= 0.76"
 end

data/scripts/xls_downloader.rb

@@ -3,9 +3,10 @@ require "open-uri"
 require "uri"
 require "nokogiri"
 
-URL = URI("http://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/number_shitei.html")
+URL = URI("https://www.soumu.go.jp/main_sosiki/joho_tsusin/top/tel_number/number_shitei.html")
+
+html = URI.open(URL.to_s, &:read).force_encoding("cp932")
 
-html = open(URL.to_s, &:read)
 doc = Nokogiri.parse(html)
 xls_urls = []
 
@@ -19,6 +20,6 @@ xls_urls.each do |url|
   basename = url.gsub(%r(.*/), "")
   dest = "#{__dir__}/../tmp/xls/#{basename}"
   warn "Download #{url} to #{dest}"
-  File.write(dest, open(url, &:read))
+  File.write(dest, URI.open(url, &:read))
 end
 # rubocop: enable Security/Open

data/sig/phonenumber_jp.rbs

@@ -0,0 +1,11 @@
+module PhonenumberJp
+  AREA_CODES: Array[String]
+  VERSION: String
+
+  def self.hyphenate: (String | nil) -> (String | nil)
+  def self.valid?: (String | nil) -> bool
+
+  private
+  def self.split: (String | nil) -> Array[String]
+  def self.find_area_code: (String) -> (String | nil)
+end

metadata

@@ -1,71 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: phonenumber_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - labocho
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '3.7'
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.76'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.76'
+date: 2021-10-29 00:00:00.000000000 Z
+dependencies: []
 description: Hyphenate Japanese phone number
 email:
 - labocho@penguinlab.jp
@@ -82,6 +26,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Steepfile
 - bin/bundle
 - bin/console
 - bin/rake
@@ -95,6 +40,7 @@ files:
 - scripts/convert_xls_to_csv.rb
 - scripts/update_area_codes_list.rb
 - scripts/xls_downloader.rb
+- sig/phonenumber_jp.rbs
 homepage: https://github.com/labocho/phonenumber_jp
 licenses:
 - MIT
@@ -102,7 +48,7 @@ metadata:
   homepage_uri: https://github.com/labocho/phonenumber_jp
   source_code_uri: https://github.com/labocho/phonenumber_jp
   changelog_uri: https://github.com/labocho/phonenumber_jp/blob/master/CHANGELOG.md
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -110,15 +56,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.1.2
+signing_key:
 specification_version: 4
 summary: Hyphenate Japanese phone number
 test_files: []