From c4ace83541d277445513174a6bda2bc7fd853928 Mon Sep 17 00:00:00 2001 From: Matt Kelly Date: Thu, 3 Oct 2019 17:18:42 -0400 Subject: [PATCH 1/3] Add planets and races to DragonBall --- doc/japanese_media/dragon_ball.md | 2 ++ lib/faker/japanese_media/dragon_ball.rb | 26 +++++++++++++++++++ lib/locales/en/dragon_ball.yml | 2 ++ .../japanese_media/test_faker_dragon_ball.rb | 8 ++++++ 4 files changed, 38 insertions(+) diff --git a/doc/japanese_media/dragon_ball.md b/doc/japanese_media/dragon_ball.md index 0480cb65cf..4edaa035ae 100644 --- a/doc/japanese_media/dragon_ball.md +++ b/doc/japanese_media/dragon_ball.md @@ -4,4 +4,6 @@ Available since version 1.8.0. ```ruby Faker::JapaneseMedia::DragonBall.character #=> "Goku" +Faker::JapaneseMedia::DragonBall.race #=> "Saiyan" +Faker::JapaneseMedia::DragonBall.planet #=> "Namek" ``` diff --git a/lib/faker/japanese_media/dragon_ball.rb b/lib/faker/japanese_media/dragon_ball.rb index 4f8bccecbe..e66dd2012d 100644 --- a/lib/faker/japanese_media/dragon_ball.rb +++ b/lib/faker/japanese_media/dragon_ball.rb @@ -16,6 +16,32 @@ class << self def character fetch('dragon_ball.characters') end + + ## + # Produces the name of a race from Dragon Ball. + # + # @return [String] + # + # @example + # Faker::Games::DragonBall.race #=> "Saiyan" + # + # @faker.version 1.8.0 + def race + fetch('dragon_ball.races') + end + + ## + # Produces the name of a planet from Dragon Ball. + # + # @return [String] + # + # @example + # Faker::Games::DragonBall.planet #=> "Namek" + # + # @faker.version 1.8.0 + def planet + fetch('dragon_ball.planets') + end end end end diff --git a/lib/locales/en/dragon_ball.yml b/lib/locales/en/dragon_ball.yml index b7285d248d..01c3dbee2e 100644 --- a/lib/locales/en/dragon_ball.yml +++ b/lib/locales/en/dragon_ball.yml @@ -2,3 +2,5 @@ en: faker: dragon_ball: characters: ["Goku", "Bulma", "Kami", "Yamcha", "Krillin", "Tien", "Piccolo", "Gohan", "Vegeta", "Kid Trunks", "Goten", "Future Trunks", "Pan", "Android 18", "Android 16", "Android 17", "Android 19", "Android 20", "Beerus", "Chaozu", "Chi-Chi", "Launch", "Mr. Satan", "Oolong", "Puar", "Videl", "Whis", "Yajirobe", "Demon King Piccolo", "Freeza", "Cell", "Majin Buu", "Goku Black", "Zamasu", "Baba", "Bra", "Bardock", "Champa", "Dende", "Dr. Gero", "Captain Ginyu", "Grandpa Gohan", "Jaco", "King Kai", "Supreme Kai", "Elder Kai", "Mr. Popo", "Nappa", "Uub", "Pilaf", "Raditz", "Shenron", "Vados", "Zarbon", "Broly", "Cooler", "King Cold", "Garlic Jr", "King Vegeta", "Nail", "Guru", "Hit", "Super Saiyan Goku", "Super Saiyan 2 Goku", "Super Saiyan 3 Goku", "Super Saiyan Vegeta", "Super Saiyan 2 Vegeta", "Majin Vegeta", "Super Saiyan Gohan", "Super Saiyan 2 Gohan", "Super Saiyan Goten", "Super Saiyan Trunks", "Vegito", "Gogeta", "Super Saiyan Blue Goku", "Super Saiyan Blue Vegeta", "Mystic Gohan", "Caulifla", "Baby", "Shenlong", "Ryan Shenlong", "Uh Shenlong", "Ryuu Shenlong", "Chi Shenlong", "Su Shenlong", "San Shenlong", "Li Shenlong"] + races: ["Android", "Angel", "Core Person", "Demon", "Dragon", "Earthling", "Majin", "Namekian", "Saiyan", "Tuffle", "Arlian", "Arcosian", "Bas", "Beenz", "Bio-Man", "Bio-Warrior", "Dinosaur", "Fairy", "Fishman", "Fish Snake", "Gelboian", "Ghost", "Giant Fish", "Giras", "Glass Tribe", "Imeckian", "Jiang Shi", "Jiggler", "Kabochan", "Kanassan", "Kashvar", "Kawa", "Konatsian", "Litt", "Machine Mutant", "Makyan", "Martian", "Meatian", "Mermaid", "Metalman", "Metamoran", "Neko Majin", "Niko", "Octo", "Ogre", "Plantian", "Saibaman", "Shamoian", "Shirt", "Skeleton", "Snackian", "Space Lemur", "Sprite", "Tech-Tech", "Three-Eyed People", "Toadmen", "Tritekian", "Vampa Beast", "Vampa Beetle", "Vampire", "Wolf Person", "Yardrat", "Zombie"] + planets: ["Alpha", "Arcose", "Arlia", "Babari", "Bas", "Big Gete Star", "Banna", "Beehay", "Beenz", "Chaos Area", "Cooler #6", "Cooler #98", "Cooler #256", "Core Area", "Cretaceous", "Daldon", "Dark Star", "Dorakiya", "Earth", "Eros", "Fake Namek", "Frieza #17", "Frieza #79", "Frieza #448", "Gaspa", "Gelbo", "Heaven", "Hera", "Ikonda", "Imecka", "Jung", "Jupiter", "Kaishin", "Kabocha", "Kanassa", "Konats", "Kuhn", "Litt", "Luud", "M-2", "Makyo Star", "Manu", "Mars", "Mayonnai", "Meat", "Metamor", "Mogina", "Monmaasu", "Monser", "Namchek", "Namchinno", "Name", "Namek", "Netfiss", "New Namek", "New Vegeta", "Nikochan", "Nutts", "Octo", "Outa", "Pital", "Polaris", "Popol", "DBS Potaufeu Screenshot 8", "Potaufeu", "Rudeeze", "Rygol 7", "Sacred World of the Kai", "Sadala", "Saute", "Shamo", "Shikk", "Slug", "Slum Area", "Snack", "Sweetz", "Synthesizer", "Tazba", "Tech-Tech", "Tigere", "Todokama", "Towale", "Tritek", "Vampa", "Vegeta", "Wagashi", "Watrin", "Yardrat", "Zoon", "Zorert"] diff --git a/test/faker/japanese_media/test_faker_dragon_ball.rb b/test/faker/japanese_media/test_faker_dragon_ball.rb index 1b006085aa..b59557441e 100644 --- a/test/faker/japanese_media/test_faker_dragon_ball.rb +++ b/test/faker/japanese_media/test_faker_dragon_ball.rb @@ -10,4 +10,12 @@ def setup def test_character assert @tester.character.match(/\w+/) end + + def test_race + assert @tester.race.match(/\w+/) + end + + def test_planet + assert @tester.planet.match(/\w+/) + end end From 336e905b45d6b36d334e88fe5cf556efc445ca85 Mon Sep 17 00:00:00 2001 From: Matt Kelly Date: Mon, 28 Sep 2020 12:31:27 -0400 Subject: [PATCH 2/3] Use version next in generators --- lib/faker/japanese_media/dragon_ball.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/faker/japanese_media/dragon_ball.rb b/lib/faker/japanese_media/dragon_ball.rb index e66dd2012d..3b18c5bc06 100644 --- a/lib/faker/japanese_media/dragon_ball.rb +++ b/lib/faker/japanese_media/dragon_ball.rb @@ -25,7 +25,7 @@ def character # @example # Faker::Games::DragonBall.race #=> "Saiyan" # - # @faker.version 1.8.0 + # @faker.version next def race fetch('dragon_ball.races') end @@ -38,7 +38,7 @@ def race # @example # Faker::Games::DragonBall.planet #=> "Namek" # - # @faker.version 1.8.0 + # @faker.version next def planet fetch('dragon_ball.planets') end From 64554cdd667a089d12c3963ace5f3890edc604f4 Mon Sep 17 00:00:00 2001 From: Matt Kelly Date: Mon, 28 Sep 2020 12:33:41 -0400 Subject: [PATCH 3/3] Use hypenated yaml array lists --- lib/locales/en/dragon_ball.yml | 246 ++++++++++++++++++++++++++++++++- 1 file changed, 243 insertions(+), 3 deletions(-) diff --git a/lib/locales/en/dragon_ball.yml b/lib/locales/en/dragon_ball.yml index 01c3dbee2e..6a7256f2cb 100644 --- a/lib/locales/en/dragon_ball.yml +++ b/lib/locales/en/dragon_ball.yml @@ -1,6 +1,246 @@ en: faker: dragon_ball: - characters: ["Goku", "Bulma", "Kami", "Yamcha", "Krillin", "Tien", "Piccolo", "Gohan", "Vegeta", "Kid Trunks", "Goten", "Future Trunks", "Pan", "Android 18", "Android 16", "Android 17", "Android 19", "Android 20", "Beerus", "Chaozu", "Chi-Chi", "Launch", "Mr. Satan", "Oolong", "Puar", "Videl", "Whis", "Yajirobe", "Demon King Piccolo", "Freeza", "Cell", "Majin Buu", "Goku Black", "Zamasu", "Baba", "Bra", "Bardock", "Champa", "Dende", "Dr. Gero", "Captain Ginyu", "Grandpa Gohan", "Jaco", "King Kai", "Supreme Kai", "Elder Kai", "Mr. Popo", "Nappa", "Uub", "Pilaf", "Raditz", "Shenron", "Vados", "Zarbon", "Broly", "Cooler", "King Cold", "Garlic Jr", "King Vegeta", "Nail", "Guru", "Hit", "Super Saiyan Goku", "Super Saiyan 2 Goku", "Super Saiyan 3 Goku", "Super Saiyan Vegeta", "Super Saiyan 2 Vegeta", "Majin Vegeta", "Super Saiyan Gohan", "Super Saiyan 2 Gohan", "Super Saiyan Goten", "Super Saiyan Trunks", "Vegito", "Gogeta", "Super Saiyan Blue Goku", "Super Saiyan Blue Vegeta", "Mystic Gohan", "Caulifla", "Baby", "Shenlong", "Ryan Shenlong", "Uh Shenlong", "Ryuu Shenlong", "Chi Shenlong", "Su Shenlong", "San Shenlong", "Li Shenlong"] - races: ["Android", "Angel", "Core Person", "Demon", "Dragon", "Earthling", "Majin", "Namekian", "Saiyan", "Tuffle", "Arlian", "Arcosian", "Bas", "Beenz", "Bio-Man", "Bio-Warrior", "Dinosaur", "Fairy", "Fishman", "Fish Snake", "Gelboian", "Ghost", "Giant Fish", "Giras", "Glass Tribe", "Imeckian", "Jiang Shi", "Jiggler", "Kabochan", "Kanassan", "Kashvar", "Kawa", "Konatsian", "Litt", "Machine Mutant", "Makyan", "Martian", "Meatian", "Mermaid", "Metalman", "Metamoran", "Neko Majin", "Niko", "Octo", "Ogre", "Plantian", "Saibaman", "Shamoian", "Shirt", "Skeleton", "Snackian", "Space Lemur", "Sprite", "Tech-Tech", "Three-Eyed People", "Toadmen", "Tritekian", "Vampa Beast", "Vampa Beetle", "Vampire", "Wolf Person", "Yardrat", "Zombie"] - planets: ["Alpha", "Arcose", "Arlia", "Babari", "Bas", "Big Gete Star", "Banna", "Beehay", "Beenz", "Chaos Area", "Cooler #6", "Cooler #98", "Cooler #256", "Core Area", "Cretaceous", "Daldon", "Dark Star", "Dorakiya", "Earth", "Eros", "Fake Namek", "Frieza #17", "Frieza #79", "Frieza #448", "Gaspa", "Gelbo", "Heaven", "Hera", "Ikonda", "Imecka", "Jung", "Jupiter", "Kaishin", "Kabocha", "Kanassa", "Konats", "Kuhn", "Litt", "Luud", "M-2", "Makyo Star", "Manu", "Mars", "Mayonnai", "Meat", "Metamor", "Mogina", "Monmaasu", "Monser", "Namchek", "Namchinno", "Name", "Namek", "Netfiss", "New Namek", "New Vegeta", "Nikochan", "Nutts", "Octo", "Outa", "Pital", "Polaris", "Popol", "DBS Potaufeu Screenshot 8", "Potaufeu", "Rudeeze", "Rygol 7", "Sacred World of the Kai", "Sadala", "Saute", "Shamo", "Shikk", "Slug", "Slum Area", "Snack", "Sweetz", "Synthesizer", "Tazba", "Tech-Tech", "Tigere", "Todokama", "Towale", "Tritek", "Vampa", "Vegeta", "Wagashi", "Watrin", "Yardrat", "Zoon", "Zorert"] + characters: + - Goku + - Bulma + - Kami + - Yamcha + - Krillin + - Tien + - Piccolo + - Gohan + - Vegeta + - Kid Trunks + - Goten + - Future Trunks + - Pan + - Android 18 + - Android 16 + - Android 17 + - Android 19 + - Android 20 + - Beerus + - Chaozu + - Chi-Chi + - Launch + - Mr. Satan + - Oolong + - Puar + - Videl + - Whis + - Yajirobe + - Demon King Piccolo + - Freeza + - Cell + - Majin Buu + - Goku Black + - Zamasu + - Baba + - Bra + - Bardock + - Champa + - Dende + - Dr. Gero + - Captain Ginyu + - Grandpa Gohan + - Jaco + - King Kai + - Supreme Kai + - Elder Kai + - Mr. Popo + - Nappa + - Uub + - Pilaf + - Raditz + - Shenron + - Vados + - Zarbon + - Broly + - Cooler + - King Cold + - Garlic Jr + - King Vegeta + - Nail + - Guru + - Hit + - Super Saiyan Goku + - Super Saiyan 2 Goku + - Super Saiyan 3 Goku + - Super Saiyan Vegeta + - Super Saiyan 2 Vegeta + - Majin Vegeta + - Super Saiyan Gohan + - Super Saiyan 2 Gohan + - Super Saiyan Goten + - Super Saiyan Trunks + - Vegito + - Gogeta + - Super Saiyan Blue Goku + - Super Saiyan Blue Vegeta + - Mystic Gohan + - Caulifla + - Baby + - Shenlong + - Ryan Shenlong + - Uh Shenlong + - Ryuu Shenlong + - Chi Shenlong + - Su Shenlong + - San Shenlong + - Li Shenlong + races: + - Android + - Angel + - Core Person + - Demon + - Dragon + - Earthling + - Majin + - Namekian + - Saiyan + - Tuffle + - Arlian + - Arcosian + - Bas + - Beenz + - Bio-Man + - Bio-Warrior + - Dinosaur + - Fairy + - Fishman + - Fish Snake + - Gelboian + - Ghost + - Giant Fish + - Giras + - Glass Tribe + - Imeckian + - Jiang Shi + - Jiggler + - Kabochan + - Kanassan + - Kashvar + - Kawa + - Konatsian + - Litt + - Machine Mutant + - Makyan + - Martian + - Meatian + - Mermaid + - Metalman + - Metamoran + - Neko Majin + - Niko + - Octo + - Ogre + - Plantian + - Saibaman + - Shamoian + - Shirt + - Skeleton + - Snackian + - Space Lemur + - Sprite + - Tech-Tech + - Three-Eyed People + - Toadmen + - Tritekian + - Vampa Beast + - Vampa Beetle + - Vampire + - Wolf Person + - Yardrat + - Zombie + planets: + - Alpha + - Arcose + - Arlia + - Babari + - Bas + - Big Gete Star + - Banna + - Beehay + - Beenz + - Chaos Area + - 'Cooler #6' + - 'Cooler #98' + - 'Cooler #256' + - Core Area + - Cretaceous + - Daldon + - Dark Star + - Dorakiya + - Earth + - Eros + - Fake Namek + - 'Frieza #17' + - 'Frieza #79' + - 'Frieza #448' + - Gaspa + - Gelbo + - Heaven + - Hera + - Ikonda + - Imecka + - Jung + - Jupiter + - Kaishin + - Kabocha + - Kanassa + - Konats + - Kuhn + - Litt + - Luud + - M-2 + - Makyo Star + - Manu + - Mars + - Mayonnai + - Meat + - Metamor + - Mogina + - Monmaasu + - Monser + - Namchek + - Namchinno + - Name + - Namek + - Netfiss + - New Namek + - New Vegeta + - Nikochan + - Nutts + - Octo + - Outa + - Pital + - Polaris + - Popol + - DBS Potaufeu Screenshot 8 + - Potaufeu + - Rudeeze + - Rygol 7 + - Sacred World of the Kai + - Sadala + - Saute + - Shamo + - Shikk + - Slug + - Slum Area + - Snack + - Sweetz + - Synthesizer + - Tazba + - Tech-Tech + - Tigere + - Todokama + - Towale + - Tritek + - Vampa + - Vegeta + - Wagashi + - Watrin + - Yardrat + - Zoon + - Zorert