gimei 1.0.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8b901f4ad99a870c4fccfe3c2b45d091efb1419db562b59b8a21ee28b789110d
-  data.tar.gz: 37857e0546c84936dab79d8731c0cf2dd5462819138a8bc038107632c11b76dc
+  metadata.gz: 216d95783e46b3cdc2064cd313f95b132c27bac29226303edc8b803fde526331
+  data.tar.gz: 3d2e0e555591948b532d86d53bd7256bc963e33b5eb3e8b9cd4acaa7ba67deb2
 SHA512:
-  metadata.gz: bf30c05cf967c15a0eba2713428baa490e0ffe2b0034286db8079f9a39a669685e74a6449b7d65bfe9c52418abfa6dfe85f242d3e69ec5c784b9ce47e6a198b4
-  data.tar.gz: fdbace6cac90a3cbab0d93edb084fbff7babfa729efcb2b2e31da9eba3663b0d611d79abdc3861c98b3200c620a95ba50e91ed5e5ab9e8d4927173f3df601722
+  metadata.gz: 9e38714869d50eb7103cec576217cf034f56a353546e6424d8d7e8a0b7db9364d55cd0da3e6ec35c3ea6cc4b77be88773522706c46064232918468597916b646
+  data.tar.gz: 41035cbcb85d036bc177a7b01a494cab298d82c579402c0e560c474cef28d972860aafd1b84bc7e0562471db54810f554f541a1f25fe6e8e13b376b7c9ffad19

data/.github/dependabot.yml

@@ -0,0 +1,6 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "weekly"

data/.github/workflows/test.yml

@@ -29,16 +29,17 @@ jobs:
           - ruby:2.7
           - ruby:3.0
           - ruby:3.1
-          - rubylang/ruby:master-nightly-bionic
+          - ruby:3.2
+          - rubylang/ruby:master-jammy
         include:
-          - ruby: rubylang/ruby:master-nightly-bionic
+          - ruby: rubylang/ruby:master-jammy
             allow_failures: "true"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Cache vendor/bundle
-        uses: actions/cache@v1
+        uses: actions/cache@v3
         id: cache_gem
         with:
           path: vendor/bundle
@@ -59,3 +60,6 @@ jobs:
           set -xe
           bundle exec rake
         continue-on-error: ${{ matrix.allow_failures == 'true' }}
+
+      - name: Coveralls
+        uses: coverallsapp/github-action@v2

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.1.0
+
+- Gimei::Name#family, #given を追加 [@nard-tech](https://github.com/nard-tech) (https://github.com/willnet/gimei/pull/50)
+- テストケースの修正 [@nard-tech](https://github.com/nard-tech) https://github.com/willnet/gimei/pull/49
+
 ## 1.0.1
 
 - Ruby 3.1のサポート[@willnet](https://github.com/willnet) (https://github.com/willnet/gimei/pull/48)

data/Gemfile

@@ -2,3 +2,4 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in gimei.gemspec
 gemspec
+gem 'simplecov', require: false

data/README.md

@@ -1,6 +1,5 @@
 # Gimei
 
-[![Travis](https://img.shields.io/travis/willnet/gimei.svg)](https://travis-ci.org/willnet/gimei)
 [![Coveralls](https://coveralls.io/repos/willnet/gimei/badge.svg)](https://coveralls.io/r/willnet/gimei)
 [![Code Climate](https://codeclimate.com/github/willnet/gimei/badges/gpa.svg)](https://codeclimate.com/github/willnet/gimei)
 [![Gem](https://img.shields.io/gem/v/gimei.svg)](https://rubygems.org/gems/gimei)
@@ -33,6 +32,20 @@ gimei.first.katakana #=> "ハルナ"
 gimei.first.romaji   #=> "Haruna"
 ```
 
+`gimei.last`, `gimei.first` の代わりに、`gimei.family`, `gimei.given` を用いることもできます。
+
+```ruby
+gimei.family.kanji     #=> "斎藤"
+gimei.family.hiragana  #=> "さいとう"
+gimei.family.katakana  #=> "サイトウ"
+gimei.family.romaji    #=> "Saitou"
+
+gimei.given.kanji    #=> "陽菜"
+gimei.given.hiragana #=> "はるな"
+gimei.given.katakana #=> "ハルナ"
+gimei.given.romaji   #=> "Haruna"
+```
+
 下記のように男性／女性の名前を返すことを明示的に指定できます。`Gimei.name` の場合は男女の名前を等確率で返します。
 
 ```ruby
@@ -64,6 +77,16 @@ Gimei.first.kanji    #=> "結菜"
 Gimei.first.hiragana #=> "ここあ"
 Gimei.first.katakana #=> "ヤマト"
 Gimei.first.romaji   #=> "Noriyuki"
+
+Gimei.family.kanji     #=> "黒沢"
+Gimei.family.hiragana  #=> "いずみ"
+Gimei.family.katakana  #=> "エノモト"
+Gimei.family.romaji    #=> "Okada"
+
+Gimei.given.kanji    #=> "航"
+Gimei.given.hiragana #=> "まさみつ"
+Gimei.given.katakana #=> "ユカ"
+Gimei.given.romaji   #=> "Haruto"
 ```
 
 同じ名前を二度取得したくない場合には、以下のように`unique`を挟みます。次のようにすると、利用した名前をGimei内で保持することで必ず一意な名前を返すようにできます。
@@ -110,6 +133,9 @@ Gimei.unique.clear(:first) # Gimei.unique.first の結果を消去
 - `Gimei.unique.female`
 - `Gimei.unique.kanji`
 
+`Gimei.unique.family` で生成された名前は `Gimei.unique.clear(:last)` で消去します。
+また、`Gimei.unique.given` で生成された名前は `Gimei.unique.clear(:first)` で消去します。
+
 出力される名前の候補となるデータは `lib/data/names.yml` にあるので、必要であればファイルを修正してください。
 
 ### 住所をランダムで返す
@@ -220,6 +246,7 @@ Gimei.address.kanji #=> "熊本県日進市東場内"
 - 2.7.x
 - 3.0.x
 - 3.1.x
+- 3.2.x
 
 ## 他言語による実装
 

data/gimei.gemspec

@@ -20,5 +20,4 @@ Gem::Specification.new do |gem|
   gem.add_dependency('romaji')
   gem.add_development_dependency('rake')
   gem.add_development_dependency('minitest')
-  gem.add_development_dependency('coveralls')
 end

data/lib/gimei/config.rb

@@ -2,7 +2,7 @@ class Gimei
   class Config
     attr_accessor :rng
 
-    def initialize(rng: Random.new)
+    def initialize(rng: Random)
       @rng = rng
     end
   end

data/lib/gimei/name.rb

@@ -14,7 +14,7 @@ class Gimei::Name
       new(:female)
     end
 
-    %i[kanji hiragana katakana romaji first last].each do |method_name|
+    %i[kanji hiragana katakana romaji first last family given].each do |method_name|
       define_method(method_name) do |gender = nil|
         new(gender).public_send(method_name)
       end
@@ -53,6 +53,9 @@ class Gimei::Name
 
   alias_method :to_s, :kanji
 
+  alias_method :family, :last
+  alias_method :given, :first
+
   class First
     class << self
       def male

data/lib/gimei/version.rb

@@ -1,3 +1,3 @@
 class Gimei
-  VERSION = "1.0.1"
+  VERSION = "1.2.0"
 end

data/lib/gimei.rb

@@ -11,7 +11,11 @@ class Gimei
 
   GENDERS = [:male, :female].freeze
 
-  def_delegators :@name, :gender, :kanji, :hiragana, :katakana, :first, :last, :male?, :female?, :romaji
+  def_delegators :@name,
+                 :first, :last, :gender,
+                 :kanji, :hiragana, :katakana, :romaji,
+                 :male?, :female?,
+                 :family, :given
   def_delegators :@address, :prefecture, :city, :town
   alias_method :to_s, :kanji
 
@@ -35,7 +39,7 @@ class Gimei
       @addresses ||= YAML.load_file(File.expand_path(File.join('..', 'data', 'addresses.yml'), __FILE__))
     end
 
-    %i[kanji hiragana katakana romaji first last].each do |method_name|
+    %i[kanji hiragana katakana romaji first last family given].each do |method_name|
       define_method(method_name) do |gender = nil|
         name(gender).public_send(method_name)
       end
@@ -54,6 +58,9 @@ class Gimei
         @unique.define_unique_method(method_name)
       end
 
+      @unique.define_unique_method(:family, :last)
+      @unique.define_unique_method(:given, :first)
+
       %i[male female kanji].each do |method_name|
         @unique.define_unique_method(method_name, :name)
       end

data/spec/gimei_spec.rb

@@ -108,17 +108,41 @@ describe Gimei do
   end
 
   describe '.last' do
-    it 'Gimei::Name::First オブジェクトが返ること' do
+    it 'Gimei::Name::Last オブジェクトが返ること' do
       _(Gimei.last).must_be_instance_of Gimei::Name::Last
     end
   end
 
   describe '#last' do
-    it 'Gimei::Name::First オブジェクトが返ること' do
+    it 'Gimei::Name::Last オブジェクトが返ること' do
       _(Gimei.new.last).must_be_instance_of Gimei::Name::Last
     end
   end
 
+  describe '.family' do
+    it 'Gimei::Name::Last オブジェクトが返ること' do
+      _(Gimei.family).must_be_instance_of Gimei::Name::Last
+    end
+  end
+
+  describe '#family' do
+    it 'Gimei::Name::Last オブジェクトが返ること' do
+      _(Gimei.new.family).must_be_instance_of Gimei::Name::Last
+    end
+  end
+
+  describe '.given' do
+    it 'Gimei::Name::First オブジェクトが返ること' do
+      _(Gimei.given).must_be_instance_of Gimei::Name::First
+    end
+  end
+
+  describe '#given' do
+    it 'Gimei::Name::First オブジェクトが返ること' do
+      _(Gimei.new.given).must_be_instance_of Gimei::Name::First
+    end
+  end
+
   describe '.romaji' do
     it 'ローマ字とスペースが返ること' do
       _(Gimei.romaji).must_match(/\A[a-zA-Z\s]+\z/)

data/spec/name_spec.rb

@@ -58,6 +58,30 @@ describe Gimei::Name do
     end
   end
 
+  describe '.first' do
+    it 'Gimei::Name::First オブジェクトが返ること' do
+      _(Gimei::Name.first).must_be_instance_of Gimei::Name::First
+    end
+  end
+
+  describe '.last' do
+    it 'Gimei::Name::Last オブジェクトが返ること' do
+      _(Gimei::Name.last).must_be_instance_of Gimei::Name::Last
+    end
+  end
+
+  describe '.family' do
+    it 'Gimei::Name::Last オブジェクトが返ること' do
+      _(Gimei::Name.family).must_be_instance_of Gimei::Name::Last
+    end
+  end
+
+  describe '.given' do
+    it 'Gimei::Name::First オブジェクトが返ること' do
+      _(Gimei::Name.given).must_be_instance_of Gimei::Name::First
+    end
+  end
+
   describe '#gender' do
     it ':male または :female が返ること' do
       _(Gimei::Name.new.gender).must_be_instance_of(Symbol)
@@ -83,6 +107,12 @@ describe Gimei::Name do
     end
   end
 
+  describe '#romaji' do
+    it 'ローマ字とスペースが返ること' do
+      _(Gimei::Name.new.romaji).must_match(/\A[a-zA-Z\s]+\z/)
+    end
+  end
+
   describe '#first' do
     it 'Gimei::Name::First オブジェクトが返ること' do
       _(Gimei::Name.new.first).must_be_instance_of Gimei::Name::First
@@ -95,9 +125,15 @@ describe Gimei::Name do
     end
   end
 
-  describe '.romaji' do
-    it 'ローマ字とスペースが返ること' do
-      _(Gimei::Name.new.romaji).must_match(/\A[a-zA-Z\s]+\z/)
+  describe '#family' do
+    it 'Gimei::Name::Last オブジェクトが返ること' do
+      _(Gimei::Name.new.family).must_be_instance_of Gimei::Name::Last
+    end
+  end
+
+  describe '#given' do
+    it 'Gimei::Name::First オブジェクトが返ること' do
+      _(Gimei::Name.new.given).must_be_instance_of Gimei::Name::First
     end
   end
 end

data/spec/spec_helper.rb

@@ -2,10 +2,8 @@ lib = File.expand_path('../../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 require 'bundler/setup'
-
-require 'coveralls'
-Coveralls.wear!
-
+require 'simplecov'
+SimpleCov.start
 require 'gimei'
 require 'minitest/autorun'
 

data/spec/unique_spec.rb

@@ -157,6 +157,60 @@ describe 'Gimei.unique' do
     end
   end
 
+  describe '#family' do
+    describe '姓が枯渇していないとき' do
+      it '一意な姓(漢字単位)が返ること' do
+        Gimei.stub(:names, {
+          'first_name' => { 'male' => [], 'female' => [] },
+          'last_name' => [%w[前島 まえしま マエシマ], %w[神谷 かみや カミヤ]]
+        }) do
+          _([Gimei.unique.family.kanji, Gimei.unique.family.kanji].sort).must_equal %w[前島 神谷]
+        end
+      end
+    end
+
+    describe '姓が枯渇したとき' do
+      it 'Gimei::RetryLimitExceeded例外が発生すること' do
+        Gimei.stub(:names, {
+          'first_name' => { 'male' => [], 'female' => [] },
+          'last_name' => [%w[前島 まえしま マエシマ]]
+        }) do
+          assert_raises Gimei::RetryLimitExceeded do
+            Gimei.unique.family
+            Gimei.unique.family
+          end
+        end
+      end
+    end
+  end
+
+  describe '#given' do
+    describe '名が枯渇していないとき' do
+      it '一意な名(漢字単位)が返ること' do
+        Gimei.stub(:names, {
+          'first_name' => { 'male' => [%w[真一 しんいち シンイチ], %w[真二 しんじ シンジ]] },
+          'last_name' => %w[]
+        }) do
+          _([Gimei.unique.given(:male).kanji, Gimei.unique.given(:male).kanji].sort).must_equal %w[真一 真二]
+        end
+      end
+    end
+
+    describe '名が枯渇したとき' do
+      it 'Gimei::RetryLimitExceeded例外が発生すること' do
+        Gimei.stub(:names, {
+          'first_name' => { 'male' => [%w[真一 しんいち シンイチ]] },
+          'last_name' => []
+        }) do
+          assert_raises Gimei::RetryLimitExceeded do
+            Gimei.unique.given(:male)
+            Gimei.unique.given(:male)
+          end
+        end
+      end
+    end
+  end
+
   describe '#kanji' do
     describe '名前が枯渇していないとき' do
       it '一意な名前(フルネームの漢字単位)が返ること' do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gimei
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.2.0
 platform: ruby
 authors:
 - willnet
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-07 00:00:00.000000000 Z
+date: 2023-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: romaji
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  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'
 description: random Japanese name and address generator
 email:
 - netwillnet@gmail.com
@@ -73,7 +59,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".coveralls.yml"
+- ".github/dependabot.yml"
 - ".github/workflows/test.yml"
 - ".gitignore"
 - CHANGELOG.md
@@ -115,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.4.12
 signing_key:
 specification_version: 4
 summary: random Japanese name and address generator. support kanji, hiragana, and

data/.coveralls.yml

@@ -1 +0,0 @@
-service_name: travis-ci