diff --git a/gimei.gemspec b/gimei.gemspec index 37a9d8c..ee093be 100644 --- a/gimei.gemspec +++ b/gimei.gemspec @@ -19,7 +19,6 @@ Gem::Specification.new do |gem| gem.require_paths = ["lib"] gem.add_dependency('romaji') gem.add_development_dependency('rake') - gem.add_development_dependency('moji') gem.add_development_dependency('minitest') gem.add_development_dependency('coveralls') end diff --git a/spec/address_spec.rb b/spec/address_spec.rb index 4c9d087..80c75e2 100644 --- a/spec/address_spec.rb +++ b/spec/address_spec.rb @@ -4,21 +4,21 @@ describe Gimei do describe '#kanji and #to_s' do it '全角文字が返ること' do - _(Gimei.address.kanji).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.address.to_s).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.address.prefecture.kanji).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.address.prefecture.to_s).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.address.city.kanji).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.address.city.to_s).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.address.town.kanji).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.address.town.to_s).must_match(/\A[#{Moji.zen}]+\z/) + _(Gimei.address.kanji).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.address.to_s).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.address.prefecture.kanji).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.address.prefecture.to_s).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.address.city.kanji).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.address.city.to_s).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.address.town.kanji).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.address.town.to_s).must_match(/\A#{zenkaku_regexp}+\z/) - _(Gimei.prefecture.kanji).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.prefecture.to_s).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.city.kanji).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.city.to_s).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.town.kanji).must_match(/\A[#{Moji.zen}]+\z/) - _(Gimei.town.to_s).must_match(/\A[#{Moji.zen}]+\z/) + _(Gimei.prefecture.kanji).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.prefecture.to_s).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.city.kanji).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.city.to_s).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.town.kanji).must_match(/\A#{zenkaku_regexp}+\z/) + _(Gimei.town.to_s).must_match(/\A#{zenkaku_regexp}+\z/) end end diff --git a/spec/gimei_spec.rb b/spec/gimei_spec.rb index 7a21f08..21a41c0 100644 --- a/spec/gimei_spec.rb +++ b/spec/gimei_spec.rb @@ -43,19 +43,19 @@ describe '#kanji' do it '全角文字とスペースが返ること' do - _(Gimei.new.kanji).must_match(/\A[#{Moji.zen}\s]+\z/) + _(Gimei.new.kanji).must_match(/\A#{zenkaku_or_space_regexp}+\z/) end end describe '#to_s' do it '全角文字とスペースが返ること' do - _(Gimei.new.to_s).must_match(/\A[#{Moji.zen}\s]+\z/) + _(Gimei.new.to_s).must_match(/\A#{zenkaku_or_space_regexp}+\z/) end end describe '.kanji' do it '全角文字とスペースが返ること' do - _(Gimei.kanji).must_match(/\A[#{Moji.zen}\s]+\z/) + _(Gimei.kanji).must_match(/\A#{zenkaku_or_space_regexp}+\z/) end end diff --git a/spec/name_spec.rb b/spec/name_spec.rb index 81df1c7..6bd2fb0 100644 --- a/spec/name_spec.rb +++ b/spec/name_spec.rb @@ -36,7 +36,7 @@ describe '.kanji' do it '全角文字とスペースが返ること' do - _(Gimei::Name.kanji).must_match(/\A[#{Moji.zen}\s]+\z/) + _(Gimei::Name.kanji).must_match(/\A#{zenkaku_or_space_regexp}+\z/) end end @@ -67,7 +67,7 @@ describe '#kanji' do it '全角文字とスペースが返ること' do - _(Gimei::Name.new.kanji).must_match(/\A[#{Moji.zen}\s]+\z/) + _(Gimei::Name.new.kanji).must_match(/\A#{zenkaku_or_space_regexp}+\z/) end end @@ -129,7 +129,7 @@ describe '#kanji' do it '全角文字が返ること' do - _(Gimei::Name::First.new.kanji).must_match(/\A#{Moji.zen}+\z/) + _(Gimei::Name::First.new.kanji).must_match(/\A#{zenkaku_regexp}+\z/) end end @@ -147,7 +147,7 @@ describe '#to_s' do it '全角文字が返ること' do - _(Gimei::Name::First.new.to_s).must_match(/\A#{Moji.zen}+\z/) + _(Gimei::Name::First.new.to_s).must_match(/\A#{zenkaku_regexp}+\z/) end end @@ -163,7 +163,7 @@ describe '#kanji' do it '全角文字が返ること' do - _(@name.kanji).must_match(/\A#{Moji.zen}+\z/) + _(@name.kanji).must_match(/\A#{zenkaku_regexp}+\z/) end end @@ -181,7 +181,7 @@ describe '#to_s' do it '全角文字が返ること' do - _(@name.to_s).must_match(/\A#{Moji.zen}+\z/) + _(@name.to_s).must_match(/\A#{zenkaku_regexp}+\z/) end end diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f8db985..9ef3649 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -8,4 +8,12 @@ require 'gimei' require 'minitest/autorun' -require 'moji' + +def zenkaku_regexp + /\p{Hiragana}|\p{Katakana}|[一-龠々]/ +end + +def zenkaku_or_space_regexp + /\p{Hiragana}|\p{Katakana}|[一-龠々]|\s/ +end +