Merge branch 'main' into add-en-GB-id-numbers

Author: stefannibrasil

.github/workflows/push_gem.yml

@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: ruby/setup-ruby@v1
         with:
-          ruby-version: '3.0'
+          ruby-version: '3.4'
 
       - name: Install dependencies
         run: bundle install
@@ -42,6 +42,7 @@ jobs:
           - '3.1'
           - '3.2'
           - '3.3'
+          - '3.4'
           - 'head'
           - truffleruby-head
     continue-on-error: ${{ endsWith(matrix.ruby, 'head') }}

.github/workflows/ruby.yml

@@ -1,4 +1,4 @@
-require:
+plugins:
   - rubocop-minitest
   - rubocop-rake
 
@@ -78,9 +78,6 @@ Style/FormatStringToken:
 
 Style/FrozenStringLiteralComment:
   Description: Add the frozen_string_literal comment to the top of files to help transition from Ruby 2.3.0 to Ruby 3.0.
-  Exclude:
-    - 'lib/faker/default/json.rb'
-    - 'test/faker/default/test_faker_json.rb'
 
 Style/For:
   Description: Checks use of for or each in multiline loops.
@@ -113,3 +110,7 @@ Security/Eval:
 Style/IfUnlessModifier:
   Description: Checks for `if` and `unless` statements that would fit on one line if written as modifier `if`/`unless`. The cop also checks for modifier `if`/`unless` lines that exceed the maximum line length.
   Enabled: false
+
+Style/MultipleComparison:
+  Description: Avoid comparing a variable with multiple items in a conditional, use Array#include? instead.
+  Enabled: false

.rubocop.yml

@@ -1,5 +1,62 @@
 # Changelog
 
+## [v3.5.2](https://github.com/faker-ruby/faker/tree/v3.5.2) (2025-07-01)
+
+Happy Canada Day! 🍁
+
+This version adds and improves some locales and fixes some bugs.
+
+Thanks to all contributors!
+
+### Improvements & Bug fixes
+* Correct `Faker::Address.city` and `Faker::Address.street_address` for `:fr` locale by @brupla6126 in https://github.com/faker-ruby/faker/pull/3018
+* fix condominium_fiscal_code generator length from 9 to 11 characters by @FiloSpaTeam in https://github.com/faker-ruby/faker/pull/3037
+* Add Cell Phone, Default Time Zone and State Abbreviation translation for en-PAK locale by @wonderer007 in https://github.com/faker-ruby/faker/pull/3024
+* Fix usage docs header indentation by @jaredsmithse in https://github.com/faker-ruby/faker/pull/3049
+* Fix nl phone format by @klaaspieter in https://github.com/faker-ruby/faker/pull/3050
+* Fix typo in `ja/book` locale by @thdaraujo in https://github.com/faker-ruby/faker/pull/3062
+* fix a typo by @jethrodaniel in https://github.com/faker-ruby/faker/pull/3060
+* Fix typo in `restaurant.yml` by @daniel-nerdgeschoss in https://github.com/faker-ruby/faker/pull/3067
+* Fix city address with number in `locales/fr/address.yml` by @brupla6126 in https://github.com/faker-ruby/faker/pull/3071
+* Fix unclosed quote in `locales/en/cosmere.yml` by @bensheldon in https://github.com/faker-ruby/faker/pull/3075
+* Remove inappropriate word from ja lorem by @se4weed in https://github.com/faker-ruby/faker/pull/3095
+* Add mountains to de-CH locale by @codez in https://github.com/faker-ruby/faker/pull/3066
+* Bump i18n from 1.14.6 to 1.14.7 by @dependabot in https://github.com/faker-ruby/faker/pull/3042
+
+### Chore
+* ci: run against Ruby 3.4 by @thdaraujo in https://github.com/faker-ruby/faker/pull/3079
+* Fix Broken CI by @wonderer007 in https://github.com/faker-ruby/faker/pull/3073
+
+### Update local dependencies
+* Bump rubocop from 1.67.0 to 1.68.0 by @dependabot in https://github.com/faker-ruby/faker/pull/3020
+* Bump rubocop from 1.68.0 to 1.69.2 by @dependabot in https://github.com/faker-ruby/faker/pull/3035
+* Bump rubocop version + offenses fixes by @stefannibrasil in https://github.com/faker-ruby/faker/pull/3053
+* deps: update dev dependencies by @thdaraujo in https://github.com/faker-ruby/faker/pull/3078
+* Bump rubocop-minitest and fix rubocop's offense by @stefannibrasil in https://github.com/faker-ruby/faker/pull/3052
+* Bump rubocop-minitest from 0.38.0 to 0.38.1 by @dependabot in https://github.com/faker-ruby/faker/pull/3088
+* Bump rubocop-rake from 0.6.0 to 0.7.1 by @dependabot in https://github.com/faker-ruby/faker/pull/3059
+* deps: bump `rubocop-minitest` from `0.37.1` to `0.38.0`. by @thdaraujo in https://github.com/faker-ruby/faker/pull/3080
+* Bump minitest from 5.25.1 to 5.25.4 by @dependabot in https://github.com/faker-ruby/faker/pull/3031
+* Bump test-unit from 3.6.2 to 3.6.7 by @dependabot in https://github.com/faker-ruby/faker/pull/3038
+* Bump benchmark from 0.3.0 to 0.4.0 by @dependabot in https://github.com/faker-ruby/faker/pull/3021
+* Bump benchmark from 0.4.0 to 0.4.1 by @dependabot in https://github.com/faker-ruby/faker/pull/3087
+* Bump pry from 0.14.2 to 0.15.2 by @dependabot in https://github.com/faker-ruby/faker/pull/3039
+* Bump rake from 13.2.1 to 13.3.0 by @dependabot in https://github.com/faker-ruby/faker/pull/3086
+* Bump test-unit from 3.6.8 to 3.6.9 by @dependabot in https://github.com/faker-ruby/faker/pull/3096
+
+### New Contributors
+* @brupla6126 made their first contribution in https://github.com/faker-ruby/faker/pull/3018
+* @jaredsmithse made their first contribution in https://github.com/faker-ruby/faker/pull/3049
+* @klaaspieter made their first contribution in https://github.com/faker-ruby/faker/pull/3050
+* @jethrodaniel made their first contribution in https://github.com/faker-ruby/faker/pull/3060
+* @daniel-nerdgeschoss made their first contribution in https://github.com/faker-ruby/faker/pull/3067
+* @bensheldon made their first contribution in https://github.com/faker-ruby/faker/pull/3075
+* @se4weed made their first contribution in https://github.com/faker-ruby/faker/pull/3095
+
+**Full Changelog**: https://github.com/faker-ruby/faker/compare/v3.5.1...v3.5.2
+
+---------------------------------
+
 ## [v3.5.1](https://github.com/faker-ruby/faker/tree/v3.5.1) (2024-10-18)
 
 Happy October! 🎃
@@ -10,7 +67,7 @@ Besides that, this version removes deprecated generators, fixes some bugs, and a
 
 Thanks to all contributors!
 
-## Breaking Changes
+### Breaking Changes
 * Drop support for Ruby 2.7 by @tatheerf02 in https://github.com/faker-ruby/faker/pull/3006
 * Removes deprecated generators by @stefannibrasil in https://github.com/faker-ruby/faker/pull/3014
 
@@ -46,7 +103,7 @@ The following deprecated generators are being removed. Please use the new genera
 * Bump yard from 0.9.36 to 0.9.37 by @dependabot in https://github.com/faker-ruby/faker/pull/3000
 * Bump rubocop from 1.65.1 to 1.66.1 by @dependabot in https://github.com/faker-ruby/faker/pull/3001
 
-## New Contributors
+### New Contributors
 * @murichristopher made their first contribution in https://github.com/faker-ruby/faker/pull/2960
 * @admtnnr made their first contribution in https://github.com/faker-ruby/faker/pull/2996
 * @dirschn made their first contribution in https://github.com/faker-ruby/faker/pull/3007
@@ -93,7 +150,7 @@ Breaking change was introduced in "Add test range param to NHS numbers" by @nean
 * Bump rubocop from 1.64.1 to 1.65.0 by @dependabot in https://github.com/faker-ruby/faker/pull/2979
 * Bump rubocop-minitest from 0.35.0 to 0.35.1 by @dependabot in https://github.com/faker-ruby/faker/pull/2980
 
-## New Contributors
+### New Contributors
 * @twk-mn made their first contribution in https://github.com/faker-ruby/faker/pull/2961
 * @neanias made their first contribution in https://github.com/faker-ruby/faker/pull/2947
 * @garrettgregor made their first contribution in https://github.com/faker-ruby/faker/pull/2963
@@ -136,7 +193,7 @@ Breaking change was introduced in "Add test range param to NHS numbers" by @nean
 * Bump minitest from 5.22.3 to 5.23.1 by @dependabot in https://github.com/faker-ruby/faker/pull/2957
 * Bump rubocop from 1.63.4 to 1.64.0 by @dependabot in https://github.com/faker-ruby/faker/pull/2958
 
-## New Contributors
+### New Contributors
 
 * @connie-feng made their first contribution in https://github.com/faker-ruby/faker/pull/2930
 * @andrelaszlo made their first contribution in https://github.com/faker-ruby/faker/pull/2927
@@ -291,7 +348,7 @@ This version:
 * Bump rubocop from 1.57.1 to 1.57.2 by @dependabot in https://github.com/faker-ruby/faker/pull/2844
 * Bump timecop from 0.9.6 to 0.9.8 by @dependabot in https://github.com/faker-ruby/faker/pull/2811
 
-## New Contributors
+### New Contributors
 * @BelaBartok39 made their first contribution in https://github.com/faker-ruby/faker/pull/2812
 * @fernandomenolli made their first contribution in https://github.com/faker-ruby/faker/pull/2816
 * @hoshy made their first contribution in https://github.com/faker-ruby/faker/pull/2818
@@ -355,7 +412,7 @@ Other changes included in this version:
 * Update rubocop-minitest requirement from = 0.30.0 to = 0.31.0 by @dependabot in https://github.com/faker-ruby/faker/pull/2759
 * Bump minitest from 5.18.1 to 5.19.0 by @dependabot in https://github.com/faker-ruby/faker/pull/2804
 
-## New Contributors
+### New Contributors
 * @old-dead-account made their first contribution in https://github.com/faker-ruby/faker/pull/2742
 * @IvanReyesO7 made their first contribution in https://github.com/faker-ruby/faker/pull/2744
 * @DeepakRaj228 made their first contribution in https://github.com/faker-ruby/faker/pull/2741
@@ -422,7 +479,7 @@ Other changes included in this version:
 * Add Faker::Company.department generator by @acuppy in https://github.com/faker-ruby/faker/pull/2737
 * Update Pull Request template and guides by @stefannibrasil in https://github.com/faker-ruby/faker/pull/2749
 
-## New Contributors
+### New Contributors
 * @lexisvar made their first contribution in https://github.com/faker-ruby/faker/pull/2699
 * @danieldiekmeier made their first contribution in https://github.com/faker-ruby/faker/pull/2700
 * @AaronRustad made their first contribution in https://github.com/faker-ruby/faker/pull/2706

CHANGELOG.md

@@ -6,13 +6,13 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'benchmark'
-gem 'minitest', '5.25.1'
-gem 'pry', '0.14.2'
-gem 'rake', '13.2.1'
-gem 'rubocop', '1.68.0'
-gem 'rubocop-minitest', '0.36.0'
-gem 'rubocop-rake', '0.6.0'
+gem 'minitest', '5.25.5'
+gem 'pry', '0.15.2'
+gem 'rake', '13.3.1'
+gem 'rubocop', '1.81.7'
+gem 'rubocop-minitest', '0.38.2'
+gem 'rubocop-rake', '0.7.1'
 gem 'simplecov', '0.22.0'
-gem 'test-unit', '3.6.2'
+gem 'test-unit', '3.7.1'
 gem 'timecop', '0.9.10'
 gem 'yard', '0.9.37'

Gemfile

@@ -1,63 +1,71 @@
 PATH
   remote: .
   specs:
-    faker (3.5.1)
+    faker (3.5.2)
       i18n (>= 1.8.11, < 2)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
-    benchmark (0.3.0)
+    ast (2.4.3)
+    benchmark (0.5.0)
     coderay (1.1.3)
-    concurrent-ruby (1.3.4)
-    docile (1.4.0)
-    i18n (1.14.6)
+    concurrent-ruby (1.3.5)
+    docile (1.4.1)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.7.5)
-    language_server-protocol (3.17.0.3)
-    method_source (1.0.0)
-    minitest (5.25.1)
-    parallel (1.26.3)
-    parser (3.3.5.1)
+    json (2.16.0)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    method_source (1.1.0)
+    minitest (5.25.5)
+    parallel (1.27.0)
+    parser (3.3.10.0)
       ast (~> 2.4.1)
       racc
-    power_assert (2.0.3)
-    pry (0.14.2)
+    power_assert (3.0.1)
+    prism (1.6.0)
+    pry (0.15.2)
       coderay (~> 1.1)
       method_source (~> 1.0)
     racc (1.8.1)
     rainbow (3.1.1)
-    rake (13.2.1)
-    regexp_parser (2.9.2)
-    rubocop (1.68.0)
+    rake (13.3.1)
+    regexp_parser (2.11.3)
+    rubocop (1.81.7)
       json (~> 2.3)
-      language_server-protocol (>= 3.17.0)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
       parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 2.4, < 3.0)
-      rubocop-ast (>= 1.32.2, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.47.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.33.0)
-      parser (>= 3.3.1.0)
-    rubocop-minitest (0.36.0)
-      rubocop (>= 1.61, < 2.0)
-      rubocop-ast (>= 1.31.1, < 2.0)
-    rubocop-rake (0.6.0)
-      rubocop (~> 1.0)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.48.0)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-minitest (0.38.2)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rake (0.7.1)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.72.1)
     ruby-progressbar (1.13.0)
     simplecov (0.22.0)
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.2)
     simplecov_json_formatter (0.1.4)
-    test-unit (3.6.2)
+    test-unit (3.7.1)
       power_assert
     timecop (0.9.10)
-    unicode-display_width (2.6.0)
+    unicode-display_width (3.2.0)
+      unicode-emoji (~> 4.1)
+    unicode-emoji (4.1.0)
     yard (0.9.37)
 
 PLATFORMS
@@ -67,14 +75,14 @@ PLATFORMS
 DEPENDENCIES
   benchmark
   faker!
-  minitest (= 5.25.1)
-  pry (= 0.14.2)
-  rake (= 13.2.1)
-  rubocop (= 1.68.0)
-  rubocop-minitest (= 0.36.0)
-  rubocop-rake (= 0.6.0)
+  minitest (= 5.25.5)
+  pry (= 0.15.2)
+  rake (= 13.3.1)
+  rubocop (= 1.81.7)
+  rubocop-minitest (= 0.38.2)
+  rubocop-rake (= 0.7.1)
   simplecov (= 0.22.0)
-  test-unit (= 3.6.2)
+  test-unit (= 3.7.1)
   timecop (= 0.9.10)
   yard (= 0.9.37)
 

Gemfile.lock

@@ -38,7 +38,7 @@ and it was the original impetus for the creation of this gem.
     - [Notes](#notes)
   - [Getting Started](#getting-started)
   - [Usage](#usage)
-      - [A note about the Generators versions](#a-note-about-the-generators-versions)
+    - [A note about the Generators versions](#a-note-about-the-generators-versions)
     - [Ensuring unique values](#ensuring-unique-values)
     - [Deterministic Random](#deterministic-random)
     - [Customization](#customization)
@@ -89,7 +89,7 @@ Faker::ProgrammingLanguage.name #=> "Ruby"
 
 For a complete list of the generators, see [Generators](#generators).
 
-#### A note about the Generators versions
+### A note about the Generators versions
 
 If you get a `uninitialized constant Faker::[some_class]` error, your version of
 the gem is behind main.
@@ -214,7 +214,6 @@ gem 'faker', :git => 'https://github.com/faker-ruby/faker.git', :branch => 'main
   - [Faker::Beer](doc/default/beer.md)
   - [Faker::Blood](doc/default/blood.md)
   - [Faker::Boolean](doc/default/boolean.md)
-  - [Faker::BossaNova](doc/default/bossa_nova.md)
   - [Faker::Business](doc/default/business.md)
   - [Faker::Camera](doc/default/camera.md)
   - [Faker::Cannabis](doc/default/cannabis.md)
@@ -420,6 +419,7 @@ gem 'faker', :git => 'https://github.com/faker-ruby/faker.git', :branch => 'main
   - [Faker::Music::Rush](doc/music/rush.md)
   - [Faker::Music::SmashingPumpkins](doc/music/smashing_pumpkins.md)
   - [Faker::Music::UmphreysMcgee](doc/music/umphreys_mcgee.md)
+  - [Faker::Music::BossaNova](doc/music/bossa_nova.md)
 </details>
 
 <details>

README.md

@@ -0,0 +1,7 @@
+# Faker::Music::BossaNova
+
+```ruby
+Faker::Music::BossaNova.artist #=> "Tom Jobim"
+
+Faker::Music::BossaNova.song #=> "Chega de Saudade"
+```