From da3135772f4f1f1bd34fb8e066c47a63cad1a3a2 Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Sun, 18 Nov 2018 01:28:18 -0200 Subject: [PATCH 1/8] Deprecate ::HarryPotter --- doc/unreleased/movies/harry_potter.md | 17 ++++++++ lib/faker/default/harry_potter.rb | 31 -------------- lib/faker/deprecate/harry_potter.rb | 40 +++++++++++++++++++ lib/faker/movies/harry_potter.rb | 33 +++++++++++++++ test/deprecate/test_deprecate_harry_potter.rb | 33 +++++++++++++++ test/faker/movies/test_faker_harry_potter.rb | 33 +++++++++++++++ 6 files changed, 156 insertions(+), 31 deletions(-) create mode 100755 doc/unreleased/movies/harry_potter.md delete mode 100644 lib/faker/default/harry_potter.rb create mode 100644 lib/faker/deprecate/harry_potter.rb create mode 100644 lib/faker/movies/harry_potter.rb create mode 100644 test/deprecate/test_deprecate_harry_potter.rb create mode 100644 test/faker/movies/test_faker_harry_potter.rb diff --git a/doc/unreleased/movies/harry_potter.md b/doc/unreleased/movies/harry_potter.md new file mode 100755 index 0000000000..b38f1d825e --- /dev/null +++ b/doc/unreleased/movies/harry_potter.md @@ -0,0 +1,17 @@ +# Faker::Movies::HarryPotter + +Available since version 1.7.3. + +```ruby +Faker::Movies::HarryPotter.character #=> "Harry Potter" + +Faker::Movies::HarryPotter.location #=> "Hogwarts" + +Faker::Movies::HarryPotter.quote #=> "I solemnly swear that I am up to no good." + +Faker::Movies::HarryPotter.book #=> "Harry Potter and the Chamber of Secrets" + +Faker::Movies::HarryPotter.house #=> "Gryffindor" + +Faker::Movies::HarryPotter.spell #=> "Reparo" +``` diff --git a/lib/faker/default/harry_potter.rb b/lib/faker/default/harry_potter.rb deleted file mode 100644 index f72b3b96fe..0000000000 --- a/lib/faker/default/harry_potter.rb +++ /dev/null @@ -1,31 +0,0 @@ -# frozen_string_literal: true - -module Faker - class HarryPotter < Base - class << self - def character - fetch('harry_potter.characters') - end - - def location - fetch('harry_potter.locations') - end - - def quote - fetch('harry_potter.quotes') - end - - def book - fetch('harry_potter.books') - end - - def house - fetch('harry_potter.houses') - end - - def spell - fetch('harry_potter.spells') - end - end - end -end diff --git a/lib/faker/deprecate/harry_potter.rb b/lib/faker/deprecate/harry_potter.rb new file mode 100644 index 0000000000..51679b8241 --- /dev/null +++ b/lib/faker/deprecate/harry_potter.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +module Faker + class HarryPotter < Base + class << self + extend Gem::Deprecate + + def character + Faker::Movies::HarryPotter.character + end + + def location + Faker::Movies::HarryPotter.location + end + + def quote + Faker::Movies::HarryPotter.quote + end + + def book + Faker::Movies::HarryPotter.book + end + + def house + Faker::Movies::HarryPotter.house + end + + def spell + Faker::Movies::HarryPotter.spell + end + + deprecate :character, 'Faker::Movies::HarryPotter.character', 2018, 12 + deprecate :location, 'Faker::Movies::HarryPotter.location', 2018, 12 + deprecate :quote, 'Faker::Movies::HarryPotter.quote', 2018, 12 + deprecate :book, 'Faker::Movies::HarryPotter.book', 2018, 12 + deprecate :house, 'Faker::Movies::HarryPotter.house', 2018, 12 + deprecate :spell, 'Faker::Movies::HarryPotter.spell', 2018, 12 + end + end +end diff --git a/lib/faker/movies/harry_potter.rb b/lib/faker/movies/harry_potter.rb new file mode 100644 index 0000000000..9e483660a1 --- /dev/null +++ b/lib/faker/movies/harry_potter.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +module Faker + module Movies + class HarryPotter < Base + class << self + def character + fetch('harry_potter.characters') + end + + def location + fetch('harry_potter.locations') + end + + def quote + fetch('harry_potter.quotes') + end + + def book + fetch('harry_potter.books') + end + + def house + fetch('harry_potter.houses') + end + + def spell + fetch('harry_potter.spells') + end + end + end + end +end diff --git a/test/deprecate/test_deprecate_harry_potter.rb b/test/deprecate/test_deprecate_harry_potter.rb new file mode 100644 index 0000000000..cf208f2874 --- /dev/null +++ b/test/deprecate/test_deprecate_harry_potter.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require_relative '../test_helper' + +class TestDeprecateHarryPotter < Test::Unit::TestCase + def setup + @tester = Faker::HarryPotter + end + + def test_character + assert @tester.character.match(/\w+/) + end + + def test_location + assert @tester.location.match(/\w+/) + end + + def test_quote + assert @tester.quote.match(/\w+/) + end + + def test_book + assert @tester.book.match(/\w+/) + end + + def test_house + assert @tester.house.match(/\w+/) + end + + def test_spell + assert @tester.spell.match(/\w+/) + end +end diff --git a/test/faker/movies/test_faker_harry_potter.rb b/test/faker/movies/test_faker_harry_potter.rb new file mode 100644 index 0000000000..24df71bf82 --- /dev/null +++ b/test/faker/movies/test_faker_harry_potter.rb @@ -0,0 +1,33 @@ +# frozen_string_literal: true + +require_relative '../../test_helper' + +class TestFakerHarryPotter < Test::Unit::TestCase + def setup + @tester = Faker::Movies::HarryPotter + end + + def test_character + assert @tester.character.match(/\w+/) + end + + def test_location + assert @tester.location.match(/\w+/) + end + + def test_quote + assert @tester.quote.match(/\w+/) + end + + def test_book + assert @tester.book.match(/\w+/) + end + + def test_house + assert @tester.house.match(/\w+/) + end + + def test_spell + assert @tester.spell.match(/\w+/) + end +end From 064a93b54825de83616aa494921119c8abdfd841 Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Sun, 18 Nov 2018 01:29:20 -0200 Subject: [PATCH 2/8] Deprecate ::HitchhikersGuideToTheGalaxy --- .../movies/hitchhikers_guide_to_the_galaxy.md | 19 ++++++++++ .../hitchhikers_guide_to_the_galaxy.rb | 9 +++++ .../movies/hitchhikers_guide_to_the_galaxy.rb | 37 +++++++++++++++++++ ...precate_hitchhikers_guide_to_the_galaxy.rb | 37 +++++++++++++++++++ ...t_faker_hitchhikers_guide_to_the_galaxy.rb | 2 +- 5 files changed, 103 insertions(+), 1 deletion(-) create mode 100755 doc/unreleased/movies/hitchhikers_guide_to_the_galaxy.md rename lib/faker/{default => deprecate}/hitchhikers_guide_to_the_galaxy.rb (56%) create mode 100644 lib/faker/movies/hitchhikers_guide_to_the_galaxy.rb create mode 100644 test/deprecate/test_deprecate_hitchhikers_guide_to_the_galaxy.rb rename test/faker/{default => movies}/test_faker_hitchhikers_guide_to_the_galaxy.rb (91%) diff --git a/doc/unreleased/movies/hitchhikers_guide_to_the_galaxy.md b/doc/unreleased/movies/hitchhikers_guide_to_the_galaxy.md new file mode 100755 index 0000000000..30d2d866fd --- /dev/null +++ b/doc/unreleased/movies/hitchhikers_guide_to_the_galaxy.md @@ -0,0 +1,19 @@ +# Faker::Movies::HitchhikersGuideToTheGalaxy + +Available since version 1.8.0. + +```ruby +Faker::Movies::HitchhikersGuideToTheGalaxy.character #=> "Marvin" + +Faker::Movies::HitchhikersGuideToTheGalaxy.location #=> "Arthur Dent's house" + +Faker::Movies::HitchhikersGuideToTheGalaxy.marvin_quote #=> "Life? Don't talk to me about life." + +Faker::Movies::HitchhikersGuideToTheGalaxy.planet #=> "Magrathea" + +Faker::Movies::HitchhikersGuideToTheGalaxy.quote #=> "In the beginning, the Universe was created. This has made a lot of people very angry and been widely regarded as a bad move." + +Faker::Movies::HitchhikersGuideToTheGalaxy.specie #=> "Perfectly Normal Beast" + +Faker::Movies::HitchhikersGuideToTheGalaxy.starship #=> "Vogon Constructor Fleet" +``` diff --git a/lib/faker/default/hitchhikers_guide_to_the_galaxy.rb b/lib/faker/deprecate/hitchhikers_guide_to_the_galaxy.rb similarity index 56% rename from lib/faker/default/hitchhikers_guide_to_the_galaxy.rb rename to lib/faker/deprecate/hitchhikers_guide_to_the_galaxy.rb index f89f1f498f..90293678fc 100644 --- a/lib/faker/default/hitchhikers_guide_to_the_galaxy.rb +++ b/lib/faker/deprecate/hitchhikers_guide_to_the_galaxy.rb @@ -3,6 +3,8 @@ module Faker class HitchhikersGuideToTheGalaxy < Base class << self + extend Gem::Deprecate + def character fetch('hitchhikers_guide_to_the_galaxy.characters') end @@ -30,6 +32,13 @@ def specie def starship fetch('hitchhikers_guide_to_the_galaxy.starships') end + + deprecate :character, 'Faker::Movies::HitchhikersGuideToTheGalaxy.character', 2018, 12 + deprecate :location, 'Faker::Movies::HitchhikersGuideToTheGalaxy.location', 2018, 12 + deprecate :marvin_quote, 'Faker::Movies::HitchhikersGuideToTheGalaxy.marvin_quote', 2018, 12 + deprecate :planet, 'Faker::Movies::HitchhikersGuideToTheGalaxy.planet', 2018, 12 + deprecate :specie, 'Faker::Movies::HitchhikersGuideToTheGalaxy.specie', 2018, 12 + deprecate :starship, 'Faker::Movies::HitchhikersGuideToTheGalaxy.starship', 2018, 12 end end end diff --git a/lib/faker/movies/hitchhikers_guide_to_the_galaxy.rb b/lib/faker/movies/hitchhikers_guide_to_the_galaxy.rb new file mode 100644 index 0000000000..c2b1dfddb1 --- /dev/null +++ b/lib/faker/movies/hitchhikers_guide_to_the_galaxy.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +module Faker + module Movies + class HitchhikersGuideToTheGalaxy < Base + class << self + def character + fetch('hitchhikers_guide_to_the_galaxy.characters') + end + + def location + fetch('hitchhikers_guide_to_the_galaxy.locations') + end + + def marvin_quote + fetch('hitchhikers_guide_to_the_galaxy.marvin_quote') + end + + def planet + fetch('hitchhikers_guide_to_the_galaxy.planets') + end + + def quote + fetch('hitchhikers_guide_to_the_galaxy.quotes') + end + + def specie + fetch('hitchhikers_guide_to_the_galaxy.species') + end + + def starship + fetch('hitchhikers_guide_to_the_galaxy.starships') + end + end + end + end +end diff --git a/test/deprecate/test_deprecate_hitchhikers_guide_to_the_galaxy.rb b/test/deprecate/test_deprecate_hitchhikers_guide_to_the_galaxy.rb new file mode 100644 index 0000000000..a6a42605e8 --- /dev/null +++ b/test/deprecate/test_deprecate_hitchhikers_guide_to_the_galaxy.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +require_relative '../test_helper' + +class TestDeprecateHitchhikersGuideToTheGalaxy < Test::Unit::TestCase + def setup + @tester = Faker::HitchhikersGuideToTheGalaxy + end + + def test_character + assert @tester.character.match(/\w+/) + end + + def test_location + assert @tester.location.match(/\w+/) + end + + def test_marvin_quote + assert @tester.marvin_quote.match(/\w+/) + end + + def test_planet + assert @tester.planet.match(/\w+/) + end + + def test_quote + assert @tester.quote.match(/\w+/) + end + + def test_specie + assert @tester.specie.match(/\w+/) + end + + def test_starship + assert @tester.starship.match(/\w+/) + end +end diff --git a/test/faker/default/test_faker_hitchhikers_guide_to_the_galaxy.rb b/test/faker/movies/test_faker_hitchhikers_guide_to_the_galaxy.rb similarity index 91% rename from test/faker/default/test_faker_hitchhikers_guide_to_the_galaxy.rb rename to test/faker/movies/test_faker_hitchhikers_guide_to_the_galaxy.rb index 7ceeb59adf..3726aef6b1 100644 --- a/test/faker/default/test_faker_hitchhikers_guide_to_the_galaxy.rb +++ b/test/faker/movies/test_faker_hitchhikers_guide_to_the_galaxy.rb @@ -4,7 +4,7 @@ class TestFakerHitchhikersGuideToTheGalaxy < Test::Unit::TestCase def setup - @tester = Faker::HitchhikersGuideToTheGalaxy + @tester = Faker::Movies::HitchhikersGuideToTheGalaxy end def test_character From 2cbe5642ef32402a06063d62735b103f17a34d32 Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Sun, 18 Nov 2018 01:30:42 -0200 Subject: [PATCH 3/8] Deprecate ::MichaelScott --- doc/unreleased/tv_shows/michael_scott.md | 7 ++++ lib/faker/default/michael_scott.rb | 11 ------- lib/faker/deprecate/michael_scott.rb | 15 +++++++++ lib/faker/tv_shows/michael_scott.rb | 13 ++++++++ .../deprecate/test_deprecate_michael_scott.rb | 13 ++++++++ test/faker/default/test_faker_harry_potter.rb | 33 ------------------- .../test_michael_scott.rb} | 0 7 files changed, 48 insertions(+), 44 deletions(-) create mode 100755 doc/unreleased/tv_shows/michael_scott.md delete mode 100644 lib/faker/default/michael_scott.rb create mode 100644 lib/faker/deprecate/michael_scott.rb create mode 100644 lib/faker/tv_shows/michael_scott.rb create mode 100644 test/deprecate/test_deprecate_michael_scott.rb delete mode 100644 test/faker/default/test_faker_harry_potter.rb rename test/faker/{default/test_faker_michael_scott.rb => tv_shows/test_michael_scott.rb} (100%) diff --git a/doc/unreleased/tv_shows/michael_scott.md b/doc/unreleased/tv_shows/michael_scott.md new file mode 100755 index 0000000000..d1592a9c91 --- /dev/null +++ b/doc/unreleased/tv_shows/michael_scott.md @@ -0,0 +1,7 @@ +# Faker::TvShows::MichaelScott + +Available since version 1.9.0. + +```ruby +Faker::TvShows::MichaelScott.quote #=> "I am Beyoncé, always." +``` diff --git a/lib/faker/default/michael_scott.rb b/lib/faker/default/michael_scott.rb deleted file mode 100644 index 4fdee57169..0000000000 --- a/lib/faker/default/michael_scott.rb +++ /dev/null @@ -1,11 +0,0 @@ -# frozen_string_literal: true - -module Faker - class MichaelScott < Base - class << self - def quote - fetch('michael_scott.quotes') - end - end - end -end diff --git a/lib/faker/deprecate/michael_scott.rb b/lib/faker/deprecate/michael_scott.rb new file mode 100644 index 0000000000..4d725d8696 --- /dev/null +++ b/lib/faker/deprecate/michael_scott.rb @@ -0,0 +1,15 @@ +# frozen_string_literal: true + +module Faker + class MichaelScott < Base + class << self + extend Gem::Deprecate + + def quote + Faker::TvShows::MichaelScott.quote + end + + deprecate :quote, 'Faker::TvShows::MichaelScott.quote', 2018, 12 + end + end +end diff --git a/lib/faker/tv_shows/michael_scott.rb b/lib/faker/tv_shows/michael_scott.rb new file mode 100644 index 0000000000..01d7d5d993 --- /dev/null +++ b/lib/faker/tv_shows/michael_scott.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Faker + module TvShows + class MichaelScott < Base + class << self + def quote + fetch('michael_scott.quotes') + end + end + end + end +end diff --git a/test/deprecate/test_deprecate_michael_scott.rb b/test/deprecate/test_deprecate_michael_scott.rb new file mode 100644 index 0000000000..40ee0b287b --- /dev/null +++ b/test/deprecate/test_deprecate_michael_scott.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +require_relative '../test_helper' + +class TestDeprecateMichaelScott < Test::Unit::TestCase + def setup + @tester = Faker::TvShows::MichaelScott + end + + def test_quote + assert @tester.quote.match(/\w+/) + end +end diff --git a/test/faker/default/test_faker_harry_potter.rb b/test/faker/default/test_faker_harry_potter.rb deleted file mode 100644 index 4a914345c5..0000000000 --- a/test/faker/default/test_faker_harry_potter.rb +++ /dev/null @@ -1,33 +0,0 @@ -# frozen_string_literal: true - -require_relative '../../test_helper' - -class TestFakerHarryPotter < Test::Unit::TestCase - def setup - @tester = Faker::HarryPotter - end - - def test_character - assert @tester.character.match(/\w+/) - end - - def test_location - assert @tester.location.match(/\w+/) - end - - def test_quote - assert @tester.quote.match(/\w+/) - end - - def test_book - assert @tester.book.match(/\w+/) - end - - def test_house - assert @tester.house.match(/\w+/) - end - - def test_spell - assert @tester.spell.match(/\w+/) - end -end diff --git a/test/faker/default/test_faker_michael_scott.rb b/test/faker/tv_shows/test_michael_scott.rb similarity index 100% rename from test/faker/default/test_faker_michael_scott.rb rename to test/faker/tv_shows/test_michael_scott.rb From f0612c939b0bc21fc7045ed846d470d1cb856f2b Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Sun, 18 Nov 2018 01:31:37 -0200 Subject: [PATCH 4/8] Deprecate ::RockBand --- doc/unreleased/music/rock_band.md | 5 +++++ lib/faker/{default => deprecate}/rock_band.rb | 6 +++++- lib/faker/music/rock_band.rb | 13 +++++++++++++ test/deprecate/test_deprecate_rock_band.rb | 13 +++++++++++++ .../{default => music}/test_faker_rock_band.rb | 2 +- 5 files changed, 37 insertions(+), 2 deletions(-) create mode 100755 doc/unreleased/music/rock_band.md rename lib/faker/{default => deprecate}/rock_band.rb (50%) create mode 100644 lib/faker/music/rock_band.rb create mode 100644 test/deprecate/test_deprecate_rock_band.rb rename test/faker/{default => music}/test_faker_rock_band.rb (84%) diff --git a/doc/unreleased/music/rock_band.md b/doc/unreleased/music/rock_band.md new file mode 100755 index 0000000000..cb3a5b018f --- /dev/null +++ b/doc/unreleased/music/rock_band.md @@ -0,0 +1,5 @@ +# Faker::Music::RockBand + +```ruby +Faker::Music::RockBand.name #=> "Led Zeppelin" +``` diff --git a/lib/faker/default/rock_band.rb b/lib/faker/deprecate/rock_band.rb similarity index 50% rename from lib/faker/default/rock_band.rb rename to lib/faker/deprecate/rock_band.rb index dc3fe6654a..b9c707b2a9 100644 --- a/lib/faker/default/rock_band.rb +++ b/lib/faker/deprecate/rock_band.rb @@ -3,9 +3,13 @@ module Faker class RockBand < Base class << self + extend Gem::Deprecate + def name - fetch('rock_band.name') + Faker::Music::RockBand.name end + + deprecate :name, 'Faker::Music::RockBand.name', 2018, 12 end end end diff --git a/lib/faker/music/rock_band.rb b/lib/faker/music/rock_band.rb new file mode 100644 index 0000000000..26205dbd8e --- /dev/null +++ b/lib/faker/music/rock_band.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +module Faker + class Music + class RockBand < Base + class << self + def name + fetch('rock_band.name') + end + end + end + end +end diff --git a/test/deprecate/test_deprecate_rock_band.rb b/test/deprecate/test_deprecate_rock_band.rb new file mode 100644 index 0000000000..82af2547a1 --- /dev/null +++ b/test/deprecate/test_deprecate_rock_band.rb @@ -0,0 +1,13 @@ +# frozen_string_literal: true + +require_relative '../test_helper' + +class TestDeprecateRockBand < Test::Unit::TestCase + def setup + @tester = Faker::RockBand + end + + def test_name + assert @tester.name.match(/\w+/) + end +end diff --git a/test/faker/default/test_faker_rock_band.rb b/test/faker/music/test_faker_rock_band.rb similarity index 84% rename from test/faker/default/test_faker_rock_band.rb rename to test/faker/music/test_faker_rock_band.rb index 7a5c7b326f..9ee1fc06f7 100644 --- a/test/faker/default/test_faker_rock_band.rb +++ b/test/faker/music/test_faker_rock_band.rb @@ -4,7 +4,7 @@ class TestFakerRockBand < Test::Unit::TestCase def setup - @tester = Faker::RockBand + @tester = Faker::Music::RockBand end def test_name From bcef716f7ac097557805f771528086c64cf50142 Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Sun, 18 Nov 2018 01:31:53 -0200 Subject: [PATCH 5/8] Deprecate ::RuPaul --- doc/unreleased/tv_shows/rupaul.md | 8 +++++++ lib/faker/default/rupaul.rb | 17 -------------- lib/faker/deprecate/ru_paul.rb | 22 +++++++++++++++++++ lib/faker/tv_shows/ru_paul.rb | 19 ++++++++++++++++ test/deprecate/test_deprecate_ru_paul.rb | 17 ++++++++++++++ .../test_ru_paul.rb} | 2 +- 6 files changed, 67 insertions(+), 18 deletions(-) create mode 100755 doc/unreleased/tv_shows/rupaul.md delete mode 100644 lib/faker/default/rupaul.rb create mode 100644 lib/faker/deprecate/ru_paul.rb create mode 100644 lib/faker/tv_shows/ru_paul.rb create mode 100644 test/deprecate/test_deprecate_ru_paul.rb rename test/faker/{default/test_faker_rupaul.rb => tv_shows/test_ru_paul.rb} (87%) diff --git a/doc/unreleased/tv_shows/rupaul.md b/doc/unreleased/tv_shows/rupaul.md new file mode 100755 index 0000000000..c68c86f864 --- /dev/null +++ b/doc/unreleased/tv_shows/rupaul.md @@ -0,0 +1,8 @@ +# Faker::TvShows::RuPaul + +Available since version 1.8.0. + +```ruby +Faker::TvShows::RuPaul.quote #=> "That's Funny, Tell Another One" +Faker::TvShows::RuPaul.queen #=> "Latrice Royale" +``` diff --git a/lib/faker/default/rupaul.rb b/lib/faker/default/rupaul.rb deleted file mode 100644 index 145ea32905..0000000000 --- a/lib/faker/default/rupaul.rb +++ /dev/null @@ -1,17 +0,0 @@ -# frozen_string_literal: true - -module Faker - class RuPaul < Base - flexible :rupaul - - class << self - def quote - fetch('rupaul.quotes') - end - - def queen - fetch('rupaul.queens') - end - end - end -end diff --git a/lib/faker/deprecate/ru_paul.rb b/lib/faker/deprecate/ru_paul.rb new file mode 100644 index 0000000000..d779a54015 --- /dev/null +++ b/lib/faker/deprecate/ru_paul.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +module Faker + class RuPaul < Base + flexible :rupaul + + class << self + extend Gem::Deprecate + + def quote + Faker::TvShows::RuPaul.quote + end + + def queen + Faker::TvShows::RuPaul.queen + end + + deprecate :quote, 'Faker::TvShows::RuPaul.quote', 2018, 12 + deprecate :queen, 'Faker::TvShows::RuPaul.queen', 2018, 12 + end + end +end diff --git a/lib/faker/tv_shows/ru_paul.rb b/lib/faker/tv_shows/ru_paul.rb new file mode 100644 index 0000000000..08e7634d81 --- /dev/null +++ b/lib/faker/tv_shows/ru_paul.rb @@ -0,0 +1,19 @@ +# frozen_string_literal: true + +module Faker + module TvShows + class RuPaul < Base + flexible :rupaul + + class << self + def quote + fetch('rupaul.quotes') + end + + def queen + fetch('rupaul.queens') + end + end + end + end +end diff --git a/test/deprecate/test_deprecate_ru_paul.rb b/test/deprecate/test_deprecate_ru_paul.rb new file mode 100644 index 0000000000..a9954f99cd --- /dev/null +++ b/test/deprecate/test_deprecate_ru_paul.rb @@ -0,0 +1,17 @@ +# frozen_string_literal: true + +require_relative '../test_helper' + +class TestDeprecateRuPaul < Test::Unit::TestCase + def setup + @tester = Faker::RuPaul + end + + def test_quote + assert @tester.quote.match(/\w+/i) + end + + def test_queen + assert @tester.queen.match(/\w+/i) + end +end diff --git a/test/faker/default/test_faker_rupaul.rb b/test/faker/tv_shows/test_ru_paul.rb similarity index 87% rename from test/faker/default/test_faker_rupaul.rb rename to test/faker/tv_shows/test_ru_paul.rb index 5d7b37acf3..4b56ebecf8 100644 --- a/test/faker/default/test_faker_rupaul.rb +++ b/test/faker/tv_shows/test_ru_paul.rb @@ -4,7 +4,7 @@ class TestFakerRuPaul < Test::Unit::TestCase def setup - @tester = Faker::RuPaul + @tester = Faker::TvShows::RuPaul end def test_quote From e173bfef451c9da1c8d1caacd3fd38471f790f86 Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Sun, 18 Nov 2018 01:32:01 -0200 Subject: [PATCH 6/8] Update unreleased_REAMDE.md --- unreleased_README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/unreleased_README.md b/unreleased_README.md index abf738b3bd..85a737fea7 100644 --- a/unreleased_README.md +++ b/unreleased_README.md @@ -160,10 +160,7 @@ gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master' - [Faker::Gender](doc/unreleased/default/gender.md) - [Faker::GreekPhilosophers](doc/unreleased/default/greek_philosophers.md) - [Faker::Hacker](doc/unreleased/default/hacker.md) - - [Faker::HarryPotter](doc/unreleased/default/harry_potter.md) - [Faker::Hipster](doc/unreleased/default/hipster.md) - - [Faker::HitchhikersGuideToTheGalaxy](doc/unreleased/default/hitchhikers_guide_to_the_galaxy.md) - - [Faker::Hobbit](doc/unreleased/default/hobbit.md) - [Faker::House](doc/unreleased/default/house.md) - [Faker::IDNumber](doc/unreleased/default/id_number.md) - [Faker::IndustrySegments](doc/unreleased/default/industry_segments.md) @@ -180,7 +177,6 @@ gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master' - [Faker::Marketing](doc/unreleased/default/marketing.md) - [Faker::Matz](doc/unreleased/default/matz.md) - [Faker::Measurement](doc/unreleased/default/measurement.md) - - [Faker::MichaelScott](doc/unreleased/default/michael_scott.md) - [Faker::Military](doc/unreleased/default/military.md) - [Faker::MostInterestingManInTheWorld](doc/unreleased/default/most_interesting_man_in_the_world.md) - [Faker::Name](doc/unreleased/default/name.md) @@ -195,8 +191,6 @@ gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master' - [Faker::Relationship](doc/unreleased/default/relationship.md) - [Faker::Restaurant](doc/unreleased/default/restaurant.md) - [Faker::Robin](doc/unreleased/default/robin.md) - - [Faker::RockBand](doc/unreleased/default/rock_band.md) - - [Faker::RuPaul](doc/unreleased/default/rupaul.md) - [Faker::Science](doc/unreleased/default/science.md) - [Faker::SingularSiegler](doc/unreleased/default/singular_siegler.md) - [Faker::SlackEmoji](doc/unreleased/default/slack_emoji.md) @@ -245,10 +239,13 @@ gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master' - [Faker::JapaneseMedia::SwordArtOnline](doc/unreleased/japanese_media/sword_art_online.md) ### Movies - - [Faker::Movie](doc/unreleased/default/movie.md) + - [Faker::Movie](doc/unreleased/movies/movie.md) - [Faker::Movies::BackToTheFuture](doc/unreleased/movies/back_to_the_future.md) - [Faker::Movies::Ghostbusters](doc/unreleased/movies/ghostbusters.md) - [Faker::Movies::GratefulDead](doc/unreleased/movies/grateful_dead.md) + - [Faker::Movies::HarryPotter](doc/unreleased/movies/harry_potter.md) + - [Faker::Movies::HitchhikersGuideToTheGalaxy](doc/unreleased/movies/hitchhikers_guide_to_the_galaxy.md) + - [Faker::Movies::Hobbit](doc/unreleased/movies/hobbit.md) - [Faker::Movies::Lebowski](doc/unreleased/movies/lebowski.md) - [Faker::Movies::LordOfTheRings](doc/unreleased/movies/lord_of_the_rings.md) - [Faker::Movies::PrincessBride](doc/unreleased/movies/princess_bride.md) @@ -258,6 +255,7 @@ gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master' ### Music - [Faker::Music](doc/unreleased/music/music.md) - [Faker::Music::Phish](doc/unreleased/music/phish.md) + - [Faker::Music::RockBand](doc/unreleased/music/rock_band.md) - [Faker::Music::UmphreysMcgee](doc/unreleased/music/umphreys_mcgee.md) ### Tv Shows @@ -273,9 +271,11 @@ gem 'faker', :git => 'https://github.com/stympy/faker.git', :branch => 'master' - [Faker::TvShows::GameOfThrones](doc/unreleased/tv_shows/game_of_thrones.md) - [Faker::TvShows::HeyArnold](doc/unreleased/tv_shows/hey_arnold.md) - [Faker::TvShows::HowIMetYourMother](doc/unreleased/tv_shows/how_i_met_your_mother.md) + - [Faker::TvShows::MichaelScott](doc/unreleased/tv_shows/michael_scott.md) - [Faker::TvShows::NewGirl](doc/unreleased/tv_shows/new_girl.md) - [Faker::TvShows::ParksAndRec](doc/unreleased/tv_shows/parks_and_rec.md) - [Faker::TvShows::RickAndMorty](doc/unreleased/tv_shows/rick_and_morty.md) + - [Faker::TvShows::RuPaul](doc/unreleased/tv_shows/rupaul.md) - [Faker::TvShows::Seinfeld](doc/unreleased/tv_shows/seinfeld.md) - [Faker::TvShows::SiliconValley](doc/unreleased/tv_shows/silicon_valley.md) - [Faker::TvShows::Simpsons](doc/unreleased/tv_shows/simpsons.md) From 87dad3235e02d948b507ebc13c259b6cb7143ad7 Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Sun, 18 Nov 2018 01:39:00 -0200 Subject: [PATCH 7/8] Minor changes --- .../deprecate/hitchhikers_guide_to_the_galaxy.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/faker/deprecate/hitchhikers_guide_to_the_galaxy.rb b/lib/faker/deprecate/hitchhikers_guide_to_the_galaxy.rb index 90293678fc..9b68a9d135 100644 --- a/lib/faker/deprecate/hitchhikers_guide_to_the_galaxy.rb +++ b/lib/faker/deprecate/hitchhikers_guide_to_the_galaxy.rb @@ -6,31 +6,31 @@ class << self extend Gem::Deprecate def character - fetch('hitchhikers_guide_to_the_galaxy.characters') + Faker::Movies::HitchhikersGuideToTheGalaxy.character end def location - fetch('hitchhikers_guide_to_the_galaxy.locations') + Faker::Movies::HitchhikersGuideToTheGalaxy.location end def marvin_quote - fetch('hitchhikers_guide_to_the_galaxy.marvin_quote') + Faker::Movies::HitchhikersGuideToTheGalaxy.marvin_quote end def planet - fetch('hitchhikers_guide_to_the_galaxy.planets') + Faker::Movies::HitchhikersGuideToTheGalaxy.planet end def quote - fetch('hitchhikers_guide_to_the_galaxy.quotes') + Faker::Movies::HitchhikersGuideToTheGalaxy.quote end def specie - fetch('hitchhikers_guide_to_the_galaxy.species') + Faker::Movies::HitchhikersGuideToTheGalaxy.specie end def starship - fetch('hitchhikers_guide_to_the_galaxy.starships') + Faker::Movies::HitchhikersGuideToTheGalaxy.starship end deprecate :character, 'Faker::Movies::HitchhikersGuideToTheGalaxy.character', 2018, 12 From d88a74d7de2e952f814079869f6eb62ad1321958 Mon Sep 17 00:00:00 2001 From: Vitor Oliveira Date: Mon, 19 Nov 2018 10:03:25 -0200 Subject: [PATCH 8/8] Minor change --- unreleased_README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/unreleased_README.md b/unreleased_README.md index c9de7c22ea..51adf5270c 100644 --- a/unreleased_README.md +++ b/unreleased_README.md @@ -21,8 +21,8 @@ development. - [Ensuring unique values](#ensuring-unique-values) - [Deterministic Random](#deterministic-random) - [Generators](#generators) - - [Blockchain](#blockchain) - [Default](#default) + - [Blockchain](#blockchain) - [Creature](#creature) - [Games](#games) - [Japanese Media](#japanese-media)