japanese_address_parser 3.1.1 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 53a31a273123299a2e48aea1fa82e3bd4d0d33d7e8f1a694ef39a1926004576a
-  data.tar.gz: 21198c935bf0dc0892f5ff395403ef4aaa08d03f60d576e7cfbeaa556ae9ebed
+  metadata.gz: bfa568e2017ad20c3226026019e10c0d3b0c7d02c5dc249f986e37691939c4c8
+  data.tar.gz: ecce6dcfcdbe8013c485ee20c677b1fce17105a3cf205009c4d64fcd5fb9b925
 SHA512:
-  metadata.gz: 742a64618c177ef65bf6dcb0677993ba531f734efda24b81dc2a5f0839aef47ae42c57e829b5c9a3e9b984dbb4b1960303a1b05c8d88dcfc516b473948f8219e
-  data.tar.gz: dab2e5dedbeda742af992a5b9574697523f9816c9765741c8f6b9eec6b06723c98247f9248d20a61aeebdcaf541d09d734c2a30a12ca22a47b5b2f1ab2da5694
+  metadata.gz: 35bb2397beb4b209c570c6e999eb7c12dde3d7d1750f7c6f84a071d3f6d89edda36ff37858842e18f684b16962462ae9b718f5da367bda070e1cb94e068a9135
+  data.tar.gz: d07ddcec5a9ee546f731e13de357c3e4669e40648b9282084a253aa6ae550108ba47244d13724df6458b7594449b7b01598928da8f1334acd0c7df3d4b55bb2a

data/.rubocop.yml

@@ -17,6 +17,12 @@ Metrics/BlockLength:
 RSpec/ContextWording:
   Enabled: false
 
+RSpec/ExampleLength:
+  Enabled: false
+
+RSpec/MultipleExpectations:
+  Enabled: false
+
 # MITなのでファイルの著作権は記載しない。
 Style/Copyright:
   Enabled: false

data/CHANGELOG.md

@@ -5,6 +5,7 @@ Change Log の形式は [Keep a Changelog](http://keepachangelog.com/) に従い
 またバージョンの付け方は [Semantic Versioning](https://semver.org/) に従います。
 
 ## [Unreleased]
+
 ### Added
 
 ### Changed
@@ -17,6 +18,28 @@ Change Log の形式は [Keep a Changelog](http://keepachangelog.com/) に従い
 
 ### Security
 
+## [3.2.0]
+
+### Changed
+
+- [#105](https://github.com/yamat47/japanese_address_parser/pull/105) Update CI settings.([@yamat47](https://github.com/yamat47))
+- [#103](https://github.com/yamat47/japanese_address_parser/pull/103) Bump @geolonia/normalize-japanese-addresses from 2.9.2 to 2.10.0 in /js([@yamat47](https://github.com/yamat47))
+- [#104](https://github.com/yamat47/japanese_address_parser/pull/104) Bump geolonia-japanese-addresses from a8df8fe to 406bb43([@yamat47](https://github.com/yamat47))
+
+### Fixed
+
+- [#102](https://github.com/yamat47/japanese_address_parser/pull/102) #full_addressが処理前の住所の一部のみを返すようになっていた不具合を解消した。([@yamat47](https://github.com/yamat47))
+
+## [3.1.2] - 2023-09-23
+
+### Changed
+
+- [#97](https://github.com/yamat47/japanese_address_parser/pull/97) parser gem のバージョンを最新の(3.2.2.3)にアップデートする([@takatea](https://github.com/takatea))
+
+### Fixed
+
+- [#99](https://github.com/yamat47/japanese_address_parser/pull/99) 最新のRuby（head）でCIを実行できるようにする
+
 ## [3.1.1] - 2023-09-07
 
 ### Changed

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    japanese_address_parser (3.1.1)
+    japanese_address_parser (3.2.0)
       schmooze
 
 GEM
@@ -27,8 +27,10 @@ GEM
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.19.0)
     parallel (1.22.1)
-    parser (3.1.2.1)
+    parser (3.2.2.3)
       ast (~> 2.4.1)
+      racc
+    racc (1.7.1)
     rainbow (3.1.1)
     rake (13.0.6)
     rb-fsevent (0.11.2)
@@ -89,6 +91,7 @@ PLATFORMS
   aarch64-linux-musl
   arm64-darwin-21
   arm64-darwin-22
+  arm64-darwin-23
   x86_64-darwin-21
   x86_64-linux
 

data/js/node_modules/.package-lock.json

@@ -9,9 +9,9 @@
       "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
     },
     "node_modules/@geolonia/normalize-japanese-addresses": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.9.2.tgz",
-      "integrity": "sha512-sbeV/seJ/ue6pn2sLo+Ccunl6eB3yNhrUIzNpT2IiR9Fw6fW5f1lLdApODqhTmz++xr1dyPwZOzTXCGEaXejDA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.10.0.tgz",
+      "integrity": "sha512-ubGDWbX5CeT4xgbFPOSEwo6Ir404CIX/6LE9exE+K9/+7rNhUvCk84sWwu9xZB1Fl5aH/9cIpPMIFlJrXdt3IQ==",
       "dependencies": {
         "@geolonia/japanese-numeral": "^0.1.16",
         "isomorphic-unfetch": "^3.1.0",

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/main-browser.js

@@ -378,21 +378,21 @@
             pref: '香川県',
             city: '仲多度郡まんのう町',
             town: '勝浦',
-            pattern: '^字?家6',
+            pattern: '^字?家[6六]',
             result: '家六',
         },
         {
             pref: '愛知県',
             city: 'あま市',
             town: '西今宿',
-            pattern: '^字?梶村1',
+            pattern: '^字?梶村[1一]',
             result: '梶村一',
         },
         {
             pref: '香川県',
             city: '丸亀市',
             town: '原田町',
-            pattern: '^字?東三分1',
+            pattern: '^字?東三分[1一]',
             result: '東三分一',
         },
     ];
@@ -1812,29 +1812,29 @@
                                     return dist.number2kanji(Number(num));
                                 });
                             })
-                                .replace(/(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
-                                .replace(/([0-9〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
-                                .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
-                                .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
-                                .replace(/([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
+                                .replace(/(([0-9]+|[〇一二三四五六七八九十百千]+)(番地?)([0-9]+|[〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
+                                .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9]+|[〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
+                                .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)番地?/, '$1')
+                                .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)の/g, '$1-')
+                                .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
                                 return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
                             })
-                                .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9〇一二三四五六七八九十百千]+)/g, function (match) {
+                                .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9]+|[〇一二三四五六七八九十百千]+)/g, function (match) {
                                 return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
                             })
-                                .replace(/([0-9〇一二三四五六七八九十百千]+)-/, function (s) {
+                                .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)-/, function (s) {
                                 // `1-` のようなケース
                                 return kan2num(s);
                             })
-                                .replace(/-([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                                .replace(/-([0-9]+|[〇一二三四五六七八九十百千]+)/, function (s) {
                                 // `-1` のようなケース
                                 return kan2num(s);
                             })
-                                .replace(/-[^0-9]([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                                .replace(/-[^0-9]([0-9]+|[〇一二三四五六七八九十百千]+)/, function (s) {
                                 // `-あ1` のようなケース
                                 return kan2num(zen2han(s));
                             })
-                                .replace(/([0-9〇一二三四五六七八九十百千]+)$/, function (s) {
+                                .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)$/, function (s) {
                                 // `串本町串本１２３４` のようなケース
                                 return kan2num(s);
                             })

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/main-es.js

@@ -372,21 +372,21 @@ var addrPatches = [
         pref: '香川県',
         city: '仲多度郡まんのう町',
         town: '勝浦',
-        pattern: '^字?家6',
+        pattern: '^字?家[6六]',
         result: '家六',
     },
     {
         pref: '愛知県',
         city: 'あま市',
         town: '西今宿',
-        pattern: '^字?梶村1',
+        pattern: '^字?梶村[1一]',
         result: '梶村一',
     },
     {
         pref: '香川県',
         city: '丸亀市',
         town: '原田町',
-        pattern: '^字?東三分1',
+        pattern: '^字?東三分[1一]',
         result: '東三分一',
     },
 ];
@@ -1806,29 +1806,29 @@ var normalize$1 = function (address, _option) {
                                 return dist.number2kanji(Number(num));
                             });
                         })
-                            .replace(/(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
+                            .replace(/(([0-9]+|[〇一二三四五六七八九十百千]+)(番地?)([0-9]+|[〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9]+|[〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)番地?/, '$1')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)の/g, '$1-')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
                             return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
                         })
-                            .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9〇一二三四五六七八九十百千]+)/g, function (match) {
+                            .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9]+|[〇一二三四五六七八九十百千]+)/g, function (match) {
                             return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
                         })
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)-/, function (s) {
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)-/, function (s) {
                             // `1-` のようなケース
                             return kan2num(s);
                         })
-                            .replace(/-([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                            .replace(/-([0-9]+|[〇一二三四五六七八九十百千]+)/, function (s) {
                             // `-1` のようなケース
                             return kan2num(s);
                         })
-                            .replace(/-[^0-9]([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                            .replace(/-[^0-9]([0-9]+|[〇一二三四五六七八九十百千]+)/, function (s) {
                             // `-あ1` のようなケース
                             return kan2num(zen2han(s));
                         })
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)$/, function (s) {
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)$/, function (s) {
                             // `串本町串本１２３４` のようなケース
                             return kan2num(s);
                         })

data/js/node_modules/@geolonia/normalize-japanese-addresses/dist/main-node.js

@@ -108,21 +108,21 @@ var addrPatches = [
         pref: '香川県',
         city: '仲多度郡まんのう町',
         town: '勝浦',
-        pattern: '^字?家6',
+        pattern: '^字?家[6六]',
         result: '家六',
     },
     {
         pref: '愛知県',
         city: 'あま市',
         town: '西今宿',
-        pattern: '^字?梶村1',
+        pattern: '^字?梶村[1一]',
         result: '梶村一',
     },
     {
         pref: '香川県',
         city: '丸亀市',
         town: '原田町',
-        pattern: '^字?東三分1',
+        pattern: '^字?東三分[1一]',
         result: '東三分一',
     },
 ];
@@ -764,29 +764,29 @@ var normalize$1 = function (address, _option) {
                                 return japaneseNumeral.number2kanji(Number(num));
                             });
                         })
-                            .replace(/(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
+                            .replace(/(([0-9]+|[〇一二三四五六七八九十百千]+)(番地?)([0-9]+|[〇一二三四五六七八九十百千]+)号)\s*(.+)/, '$1 $5')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9]+|[〇一二三四五六七八九十百千]+)\s*号?/, '$1-$3')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)番地?/, '$1')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)の/g, '$1-')
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, function (match) {
                             return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
                         })
-                            .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9〇一二三四五六七八九十百千]+)/g, function (match) {
+                            .replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9]+|[〇一二三四五六七八九十百千]+)/g, function (match) {
                             return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-');
                         })
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)-/, function (s) {
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)-/, function (s) {
                             // `1-` のようなケース
                             return kan2num(s);
                         })
-                            .replace(/-([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                            .replace(/-([0-9]+|[〇一二三四五六七八九十百千]+)/, function (s) {
                             // `-1` のようなケース
                             return kan2num(s);
                         })
-                            .replace(/-[^0-9]([0-9〇一二三四五六七八九十百千]+)/, function (s) {
+                            .replace(/-[^0-9]([0-9]+|[〇一二三四五六七八九十百千]+)/, function (s) {
                             // `-あ1` のようなケース
                             return kan2num(zen2han(s));
                         })
-                            .replace(/([0-9〇一二三四五六七八九十百千]+)$/, function (s) {
+                            .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)$/, function (s) {
                             // `串本町串本１２３４` のようなケース
                             return kan2num(s);
                         })

data/js/node_modules/@geolonia/normalize-japanese-addresses/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@geolonia/normalize-japanese-addresses",
-  "version": "2.9.2",
+  "version": "2.10.0",
   "description": "",
   "browser": "./dist/main-browser.js",
   "main": "./dist/main-node.js",

data/js/node_modules/@geolonia/normalize-japanese-addresses/src/lib/patchAddr.ts

@@ -3,21 +3,21 @@ const addrPatches = [
     pref: '香川県',
     city: '仲多度郡まんのう町',
     town: '勝浦',
-    pattern: '^字?家6',
+    pattern: '^字?家[6六]',
     result: '家六',
   },
   {
     pref: '愛知県',
     city: 'あま市',
     town: '西今宿',
-    pattern: '^字?梶村1',
+    pattern: '^字?梶村[1一]',
     result: '梶村一',
   },
   {
     pref: '香川県',
     city: '丸亀市',
     town: '原田町',
-    pattern: '^字?東三分1',
+    pattern: '^字?東三分[1一]',
     result: '東三分一',
   },
 ]

data/js/node_modules/@geolonia/normalize-japanese-addresses/src/normalize.ts

@@ -435,40 +435,40 @@ export const normalize: Normalizer = async (
           })
         })
         .replace(
-          /(([0-9〇一二三四五六七八九十百千]+)(番地?)([0-9〇一二三四五六七八九十百千]+)号)\s*(.+)/,
+          /(([0-9]+|[〇一二三四五六七八九十百千]+)(番地?)([0-9]+|[〇一二三四五六七八九十百千]+)号)\s*(.+)/,
           '$1 $5',
         )
         .replace(
-          /([0-9〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9〇一二三四五六七八九十百千]+)\s*号?/,
+          /([0-9]+|[〇一二三四五六七八九十百千]+)\s*(番地?)\s*([0-9]+|[〇一二三四五六七八九十百千]+)\s*号?/,
           '$1-$3',
         )
-        .replace(/([0-9〇一二三四五六七八九十百千]+)番地?/, '$1')
-        .replace(/([0-9〇一二三四五六七八九十百千]+)の/g, '$1-')
+        .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)番地?/, '$1')
+        .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)の/g, '$1-')
         .replace(
-          /([0-9〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g,
+          /([0-9]+|[〇一二三四五六七八九十百千]+)[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g,
           (match) => {
             return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-')
           },
         )
         .replace(
-          /[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9〇一二三四五六七八九十百千]+)/g,
+          /[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]([0-9]+|[〇一二三四五六七八九十百千]+)/g,
           (match) => {
             return kan2num(match).replace(/[-－﹣−‐⁃‑‒–—﹘―⎯⏤ーｰ─━]/g, '-')
           },
         )
-        .replace(/([0-9〇一二三四五六七八九十百千]+)-/, (s) => {
+        .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)-/, (s) => {
           // `1-` のようなケース
           return kan2num(s)
         })
-        .replace(/-([0-9〇一二三四五六七八九十百千]+)/, (s) => {
+        .replace(/-([0-9]+|[〇一二三四五六七八九十百千]+)/, (s) => {
           // `-1` のようなケース
           return kan2num(s)
         })
-        .replace(/-[^0-9]([0-9〇一二三四五六七八九十百千]+)/, (s) => {
+        .replace(/-[^0-9]([0-9]+|[〇一二三四五六七八九十百千]+)/, (s) => {
           // `-あ1` のようなケース
           return kan2num(zen2han(s))
         })
-        .replace(/([0-9〇一二三四五六七八九十百千]+)$/, (s) => {
+        .replace(/([0-9]+|[〇一二三四五六七八九十百千]+)$/, (s) => {
           // `串本町串本１２３４` のようなケース
           return kan2num(s)
         })

data/js/package-lock.json

@@ -6,7 +6,7 @@
     "": {
       "name": "japanese_address_parser",
       "dependencies": {
-        "@geolonia/normalize-japanese-addresses": "^2.9.2"
+        "@geolonia/normalize-japanese-addresses": "^2.10.0"
       },
       "devDependencies": {}
     },
@@ -16,9 +16,9 @@
       "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
     },
     "node_modules/@geolonia/normalize-japanese-addresses": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.9.2.tgz",
-      "integrity": "sha512-sbeV/seJ/ue6pn2sLo+Ccunl6eB3yNhrUIzNpT2IiR9Fw6fW5f1lLdApODqhTmz++xr1dyPwZOzTXCGEaXejDA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.10.0.tgz",
+      "integrity": "sha512-ubGDWbX5CeT4xgbFPOSEwo6Ir404CIX/6LE9exE+K9/+7rNhUvCk84sWwu9xZB1Fl5aH/9cIpPMIFlJrXdt3IQ==",
       "dependencies": {
         "@geolonia/japanese-numeral": "^0.1.16",
         "isomorphic-unfetch": "^3.1.0",
@@ -101,9 +101,9 @@
       "integrity": "sha512-xzSsIHhyyjqNpW8qSh5bFMu3FJvyJGBbNZ/t8clPHkigjUdZ7Ck8wkzCkcwlVd00RkoHwGDLnvXx5W0WiGK0TQ=="
     },
     "@geolonia/normalize-japanese-addresses": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.9.2.tgz",
-      "integrity": "sha512-sbeV/seJ/ue6pn2sLo+Ccunl6eB3yNhrUIzNpT2IiR9Fw6fW5f1lLdApODqhTmz++xr1dyPwZOzTXCGEaXejDA==",
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/@geolonia/normalize-japanese-addresses/-/normalize-japanese-addresses-2.10.0.tgz",
+      "integrity": "sha512-ubGDWbX5CeT4xgbFPOSEwo6Ir404CIX/6LE9exE+K9/+7rNhUvCk84sWwu9xZB1Fl5aH/9cIpPMIFlJrXdt3IQ==",
       "requires": {
         "@geolonia/japanese-numeral": "^0.1.16",
         "isomorphic-unfetch": "^3.1.0",

data/js/package.json

@@ -3,7 +3,7 @@
   "private": true,
   "description": "JapaneseAddressParserは日本の住所をパースすることができるRuby gemです。",
   "dependencies": {
-    "@geolonia/normalize-japanese-addresses": "^2.9.2"
+    "@geolonia/normalize-japanese-addresses": "^2.10.0"
   },
   "devDependencies": {}
 }

data/lib/japanese_address_parser/address_parser.rb

@@ -5,12 +5,12 @@ require_relative './models/prefecture'
 
 module JapaneseAddressParser
   module AddressParser
-    def call(full_address)
-      prefecture = ::JapaneseAddressParser::Models::Prefecture.all.find { |candidate| full_address.start_with?(candidate.name) }
+    def call(normalized:, full_address:)
+      prefecture = ::JapaneseAddressParser::Models::Prefecture.all.find { |candidate| normalized.start_with?(candidate.name) }
 
       return _build_address(full_address: full_address) if prefecture.nil?
 
-      city_and_after = full_address.delete_prefix(prefecture.name)
+      city_and_after = normalized.delete_prefix(prefecture.name)
       city = prefecture.cities.find { |candidate| city_and_after.start_with?(candidate.name) }
 
       return _build_address(full_address: full_address, prefecture: prefecture) if city.nil?

data/lib/japanese_address_parser/version.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 module JapaneseAddressParser
-  VERSION = '3.1.1'
+  VERSION = '3.2.0'
   public_constant :VERSION
 end

data/lib/japanese_address_parser.rb

@@ -20,7 +20,7 @@ module JapaneseAddressParser
 
     # このライブラリで探索するのは町域まで。
     # それ以降のデータを使って探索するとデータと名前が一致しないことがあるので、町域までのデータを使う。
-    ::JapaneseAddressParser::AddressParser.call("#{normalized['pref']}#{normalized['city']}#{normalized['town']}")
+    ::JapaneseAddressParser::AddressParser.call(normalized: "#{normalized['pref']}#{normalized['city']}#{normalized['town']}", full_address: full_address)
   end
 
   module_function :call, :call!, :_call

data/sig/japanese_address_parser.rbs

@@ -20,7 +20,7 @@ module JapaneseAddressParser
   end
 
   module AddressParser
-    def self.call: (String full_address) -> Models::Address
+    def self.call: (normalized: String, full_address: String) -> Models::Address
   end
 
   module Models

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: japanese_address_parser
 version: !ruby/object:Gem::Version
-  version: 3.1.1
+  version: 3.2.0
 platform: ruby
 authors:
 - Yamaguchi Takuya
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-09-07 00:00:00.000000000 Z
+date: 2023-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: schmooze
@@ -4160,7 +4160,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.18
+rubygems_version: 3.5.0.dev
 signing_key:
 specification_version: 4
 summary: Japanese address parser written in Ruby.