Skip to content

Commit 1ed70c9

Browse files
authored
Merge pull request #71 from willnet/fix-wrong-type
型エラーを修正した
2 parents 3216a26 + 47687a0 commit 1ed70c9

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

lib/gimei/address.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ def romaji
4343
end
4444

4545
def initialize
46-
@prefectures = Gimei.addresses['addresses']['prefecture'].sample(random: Gimei.config.rng) #: [String, String, String, String]
46+
@prefectures = Gimei.addresses['addresses']['prefecture'].sample(random: Gimei.config.rng)
4747
end
4848

4949
alias_method :to_s, :kanji
@@ -67,7 +67,7 @@ def romaji
6767
end
6868

6969
def initialize
70-
@cities = Gimei.addresses['addresses']['city'].sample(random: Gimei.config.rng) #: [String, String, String, String]
70+
@cities = Gimei.addresses['addresses']['city'].sample(random: Gimei.config.rng)
7171
end
7272

7373
alias_method :to_s, :kanji
@@ -91,7 +91,7 @@ def romaji
9191
end
9292

9393
def initialize
94-
@towns = Gimei.addresses['addresses']['town'].sample(random: Gimei.config.rng) #: [String, String, String, String]
94+
@towns = Gimei.addresses['addresses']['town'].sample(random: Gimei.config.rng)
9595
end
9696

9797
alias_method :to_s, :kanji

lib/gimei/name.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class Last
8989
def_delegators :@name, :kanji, :hiragana, :katakana, :to_s, :romaji
9090

9191
def initialize
92-
name = Gimei.names['last_name'].sample(random: Gimei.config.rng) #: [String, String, String, String]
92+
name = Gimei.names['last_name'].sample(random: Gimei.config.rng)
9393
@name = NameWord.new(name)
9494
end
9595
end

sig/gimei.rbs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ class Gimei
33

44
GENDERS: [:male, :female]
55
extend Forwardable
6-
self.@names: untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String]]]] | Hash['last_name', Array[[String, String, String]]])
7-
self.@addresses: Hash['addresses', Hash[('prefecture' | 'city' | 'town'), [String, String, String]]]
6+
self.@names: untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String, String]]]] | Hash['last_name', Array[[String, String, String, String]]])
7+
self.@addresses: Hash['addresses', Hash[('prefecture' | 'city' | 'town'), [String, String, String, String]]]
88
self.@unique: UniqueGenerator
99
self.@config: Config
1010

@@ -13,8 +13,8 @@ class Gimei
1313
def self.male: -> Name
1414
def self.female: -> Name
1515
def self.name: (?gender_type? gender) -> Name
16-
def self.names: -> untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String]]]] | Hash['last_name', Array[[String, String, String]]])
17-
def self.addresses: -> Hash['addresses', Hash[('prefecture' | 'city' | 'town'), Array[[String, String, String]]]]
16+
def self.names: -> untyped # (Hash['first_name', Hash[('male' | 'female'), Array[[String, String, String, String]]]] | Hash['last_name', Array[[String, String, String, String]]])
17+
def self.addresses: -> Hash['addresses', Hash[('prefecture' | 'city' | 'town'), Array[[String, String, String, String]]]]
1818
def self.kanji: (?gender_type? gender) -> String
1919
def self.hiragana: (?gender_type? gender) -> String
2020
def self.katakana: (?gender_type? gender) -> String

sig/gimei/address.rbs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ class Gimei
1010
def romaji: -> String
1111

1212
class Prefecture
13-
@prefectures: [String, String, String]
13+
@prefectures: [String, String, String, String]
1414

1515
def kanji: -> String
1616
def hiragana: -> String
@@ -20,7 +20,7 @@ class Gimei
2020
end
2121

2222
class City
23-
@cities: [String, String, String]
23+
@cities: [String, String, String, String]
2424

2525
def kanji: -> String
2626
def hiragana: -> String
@@ -30,7 +30,7 @@ class Gimei
3030
end
3131

3232
class Town
33-
@towns: [String, String, String]
33+
@towns: [String, String, String, String]
3434

3535
def kanji: -> String
3636
def hiragana: -> String

sig/gimei/name.rbs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ class Gimei
5454
end
5555

5656
class NameWord
57-
@name: [String, String, String]
57+
@name: [String, String, String, String]
5858

59-
def initialize: ([String, String, String] name) -> void
59+
def initialize: ([String, String, String, String] name) -> void
6060
def kanji: -> String
6161
def hiragana: -> String
6262
def katakana: -> String

0 commit comments

Comments
 (0)