japanese_address_parser 4.0.0 → 4.0.1

data/sig/fetcher.rbs

@@ -1,5 +1,3 @@
-# Interim signature for the v4.0.0 config & data-access layer (M3).
-# The full RBS overhaul happens in M9.
 
 module JapaneseAddressParser
   module Fetcher
@@ -14,11 +12,12 @@ module JapaneseAddressParser
       def text: () -> String
     end
 
+    HOMEPAGE_URL: String
     USER_AGENT: String
 
-    def self.fetch: (String input, ?offset: Integer?, ?length: Integer?) -> Response
-    def self.http_request: (String url, Integer? offset, Integer? length) -> Response
-    def self.read_file: (String path, Integer? offset, Integer? length) -> Response
-    def self.strip_query: (String path) -> String
+    def self?.fetch: (String input, ?offset: Integer?, ?length: Integer?) -> Response
+    def self?.http_request: (String url, Integer? offset, Integer? length) -> Response
+    def self?.read_file: (String path, Integer? offset, Integer? length) -> Response
+    def self?.strip_query: (String path) -> String
   end
 end

data/sig/japanese_address_parser.rbs

@@ -1,9 +1,12 @@
-# 公開エントリの型。Address 等の VO は sig/**（旧 sig/v4/**）で定義する。
+# 公開エントリの型。Address 等の VO は sig/** で定義する。
 
 module JapaneseAddressParser
   VERSION: String
   DEFAULT_LEVEL: Integer
 
-  def self.call: (String address, ?level: Integer) -> Address?
-  def self.call!: (String address, ?level: Integer) -> Address
+  class NormalizeError < ::StandardError
+  end
+
+  def self?.call: (String address, ?level: Integer) -> Address?
+  def self?.call!: (String address, ?level: Integer) -> Address
 end

data/sig/japanese_numeral.rbs

@@ -1,8 +1,5 @@
-# Interim signature for the v4.0.0 utility layer (M2).
-# The full RBS overhaul happens in M9; this keeps `steep check` green in the meantime.
-#
 # `untyped` is used where the upstream JS relies on Number()/undefined coercion that can
-# produce NaN — modelling that union precisely is deferred to M9.
+# produce NaN — that union is intentionally left untyped.
 
 module JapaneseAddressParser
   module JapaneseNumeral
@@ -13,17 +10,17 @@ module JapaneseAddressParser
     LARGE_NUMBERS: Hash[String, Integer]
     SMALL_NUMBERS: Hash[String, Integer]
 
-    def self.kanji2number: (String japanese) -> Integer
-    def self.number2kanji: (untyped num) -> String
-    def self.find_kanji_numbers: (String text) -> Array[String]
+    def self?.kanji2number: (String japanese) -> Integer
+    def self?.number2kanji: (untyped num) -> String
+    def self?.find_kanji_numbers: (String text) -> Array[String]
 
-    def self.ecmascript_global_match: (String text, String pattern) -> Array[String]
-    def self.normalize: (String japanese) -> String
-    def self.split_large_number: (String japanese) -> Hash[String, untyped]
-    def self.kan2n: (String japanese) -> untyped
-    def self.n2kan: (Integer num) -> String
-    def self.zen2han: (String str) -> String
-    def self.js_number: (String str) -> untyped
-    def self.js_truthy?: (untyped value) -> bool
+    def self?.ecmascript_global_match: (String text, String pattern) -> Array[String]
+    def self?.normalize: (String japanese) -> String
+    def self?.split_large_number: (String japanese) -> Hash[String, untyped]
+    def self?.kan2n: (String japanese) -> untyped
+    def self?.n2kan: (Integer num) -> String
+    def self?.zen2han: (String str) -> String
+    def self?.js_number: (String str) -> untyped
+    def self?.js_truthy?: (untyped value) -> bool
   end
 end

data/sig/kan2num.rbs

@@ -1,8 +1,6 @@
-# Interim signature for the v4.0.0 utility layer (M2).
-# The full RBS overhaul happens in M9.
 
 module JapaneseAddressParser
   module Kan2num
-    def self.call: (String string) -> String
+    def self?.call: (String string) -> String
   end
 end

data/sig/lru_redux.rbs

@@ -0,0 +1,9 @@
+# lru_redux gem には RBS が同梱されておらず gem_rbs_collection にも無いため、
+# 本 gem が使う範囲だけを untyped で最小宣言する。
+module LruRedux
+  class Cache
+    def initialize: (untyped size) -> void
+    def []: (untyped key) -> untyped
+    def []=: (untyped key, untyped value) -> untyped
+  end
+end

data/sig/normalize.rbs

@@ -1,6 +1,3 @@
-# Interim signature for the v4.0.0 normalize layer (M5).
-# The full RBS overhaul happens in M9.
-#
 # town は SingleMachiAza か TownAlias の混在なので untyped で受ける。
 
 module JapaneseAddressParser
@@ -9,9 +6,9 @@ module JapaneseAddressParser
     NUM: String
     DASHES: String
 
-    def self.call: (String address, ?level: Integer) -> NormalizeResult
-    def self.normalize_town_name: (String input, Data::SinglePrefecture pref, Data::SingleCity city, Integer api_version) -> { town: untyped, other: String }?
-    def self.normalize_addr: (String other) -> String
-    def self.normalize_addr_part: (String addr, untyped pref, untyped city, untyped town, Integer api_version) -> Hash[Symbol, untyped]
+    def self?.call: (String address, ?level: Integer) -> NormalizeResult
+    def self?.normalize_town_name: (String input, Data::SinglePrefecture pref, Data::SingleCity city, Integer api_version) -> { town: untyped, other: String }?
+    def self?.normalize_addr: (String other) -> String
+    def self?.normalize_addr_part: (String addr, untyped pref, untyped city, untyped town, Integer api_version) -> Hash[Symbol, untyped]
   end
 end

data/sig/normalize_helpers.rbs

@@ -1,5 +1,3 @@
-# Interim signature for the v4.0.0 utility layer (M2).
-# The full RBS overhaul happens in M9.
 
 module JapaneseAddressParser
   module NormalizeHelpers
@@ -9,6 +7,6 @@ module JapaneseAddressParser
     BEFORE_KU_GUN: Regexp
     BEFORE_FIRST_NUMBER_DASH: Regexp
 
-    def self.prenormalize: (String input) -> String
+    def self?.prenormalize: (String input) -> String
   end
 end

data/sig/normalize_result.rbs

@@ -1,5 +1,3 @@
-# Interim signature for the v4.0.0 normalize layer (M5).
-# The full RBS overhaul happens in M9.
 
 module JapaneseAddressParser
   class NormalizeResultMetadata

data/sig/normalize_result_point.rbs

@@ -1,5 +1,3 @@
-# Interim signature for the v4.0.0 normalize layer (M5).
-# The full RBS overhaul happens in M9.
 
 module JapaneseAddressParser
   class NormalizeResultPoint
@@ -8,16 +6,18 @@ module JapaneseAddressParser
     attr_reader level: Integer
 
     def self.new: (lat: Float, lng: Float, level: Integer) -> instance
-    def self.from_lng_lat: ([Float, Float]? point, level: Integer) -> NormalizeResultPoint?
+    def self.from_lng_lat: ([Float, Float] point, level: Integer) -> NormalizeResultPoint
+                          | (nil point, level: Integer) -> nil
+                          | ([Float, Float]? point, level: Integer) -> NormalizeResultPoint?
     def self.normalize_result_point?: (untyped obj) -> bool
     def to_h: () -> Hash[Symbol, untyped]
   end
 
   module ResultPoint
-    def self.prefecture_to_result_point: (Data::SinglePrefecture pref) -> NormalizeResultPoint
-    def self.city_to_result_point: (Data::SingleCity city) -> NormalizeResultPoint
-    def self.machi_aza_to_result_point: (Data::SingleMachiAza machi_aza) -> NormalizeResultPoint?
-    def self.rsdt_or_chiban_to_result_point: (Data::SingleRsdt | Data::SingleChiban input) -> NormalizeResultPoint?
-    def self.upgrade_point: (NormalizeResultPoint? point_a, NormalizeResultPoint? point_b) -> NormalizeResultPoint?
+    def self?.prefecture_to_result_point: (Data::SinglePrefecture pref) -> NormalizeResultPoint
+    def self?.city_to_result_point: (Data::SingleCity city) -> NormalizeResultPoint
+    def self?.machi_aza_to_result_point: (Data::SingleMachiAza machi_aza) -> NormalizeResultPoint?
+    def self?.rsdt_or_chiban_to_result_point: (Data::SingleRsdt | Data::SingleChiban input) -> NormalizeResultPoint?
+    def self?.upgrade_point: (NormalizeResultPoint? point_a, NormalizeResultPoint? point_b) -> NormalizeResultPoint?
   end
 end

data/sig/patch_addr.rbs

@@ -1,10 +1,8 @@
-# Interim signature for the v4.0.0 utility layer (M2).
-# The full RBS overhaul happens in M9.
 
 module JapaneseAddressParser
   module PatchAddr
     ADDR_PATCHES: Array[Hash[Symbol, String]]
 
-    def self.call: (String pref_name, String city_name, String town_name, String addr) -> String
+    def self?.call: (String pref_name, String city_name, String town_name, String addr) -> String
   end
 end

data/sig/utils.rbs

@@ -1,9 +1,7 @@
-# Interim signature for the v4.0.0 utility layer (M2).
-# The full RBS overhaul happens in M9.
 
 module JapaneseAddressParser
   module Utils
-    def self.remove_cities_from_prefecture: (untyped pref) -> (Hash[Symbol, untyped] | nil)
-    def self.remove_extra_from_machi_aza: (untyped machi_aza) -> (Hash[Symbol, untyped] | nil)
+    def self?.remove_cities_from_prefecture: (untyped pref) -> (Hash[Symbol, untyped] | nil)
+    def self?.remove_extra_from_machi_aza: (untyped machi_aza) -> (Hash[Symbol, untyped] | nil)
   end
 end

data/sig/zen2han.rbs

@@ -1,8 +1,6 @@
-# Interim signature for the v4.0.0 utility layer (M2).
-# The full RBS overhaul happens in M9; this keeps `steep check` green in the meantime.
 
 module JapaneseAddressParser
   module Zen2han
-    def self.call: (String str) -> String
+    def self?.call: (String str) -> String
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: japanese_address_parser
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
 platform: ruby
 authors:
 - Yamaguchi Takuya
@@ -66,6 +66,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: benchmark
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: ostruct
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -255,6 +283,7 @@ files:
 - sig/japanese_address_parser.rbs
 - sig/japanese_numeral.rbs
 - sig/kan2num.rbs
+- sig/lru_redux.rbs
 - sig/normalize.rbs
 - sig/normalize_helpers.rbs
 - sig/normalize_result.rbs