Merge branch 'main' into de-ch-mountains

codez · web-flow · commit f971d483a7f9 · 2025-05-09T15:45:27.000+02:00
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.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') }}
diff --git a/.rubocop.yml b/.rubocop.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.
diff --git a/Gemfile b/Gemfile
@@ -6,13 +6,13 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'benchmark'
-gem 'minitest', '5.25.4'
+gem 'minitest', '5.25.5'
 gem 'pry', '0.15.2'
 gem 'rake', '13.2.1'
-gem 'rubocop', '1.73.0'
-gem 'rubocop-minitest', '0.37.0'
+gem 'rubocop', '1.75.4'
+gem 'rubocop-minitest', '0.38.0'
 gem 'rubocop-rake', '0.7.1'
 gem 'simplecov', '0.22.0'
-gem 'test-unit', '3.6.7'
+gem 'test-unit', '3.6.8'
 gem 'timecop', '0.9.10'
 gem 'yard', '0.9.37'
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -7,46 +7,48 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.2)
+    ast (2.4.3)
     benchmark (0.4.0)
     coderay (1.1.3)
     concurrent-ruby (1.3.5)
-    docile (1.4.0)
+    docile (1.4.1)
     i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    json (2.10.1)
+    json (2.11.3)
     language_server-protocol (3.17.0.4)
     lint_roller (1.1.0)
     method_source (1.1.0)
-    minitest (5.25.4)
-    parallel (1.26.3)
-    parser (3.3.7.1)
+    minitest (5.25.5)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
       racc
     power_assert (2.0.5)
+    prism (1.4.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.10.0)
-    rubocop (1.73.0)
+    rubocop (1.75.4)
       json (~> 2.3)
       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.9.3, < 3.0)
-      rubocop-ast (>= 1.38.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 2.4.0, < 4.0)
-    rubocop-ast (1.38.1)
-      parser (>= 3.3.1.0)
-    rubocop-minitest (0.37.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-minitest (0.38.0)
       lint_roller (~> 1.1)
-      rubocop (>= 1.61, < 2.0)
+      rubocop (>= 1.75.0, < 2.0)
       rubocop-ast (>= 1.38.0, < 2.0)
     rubocop-rake (0.7.1)
       lint_roller (~> 1.1)
@@ -56,9 +58,9 @@ GEM
       docile (~> 1.1)
       simplecov-html (~> 0.11)
       simplecov_json_formatter (~> 0.1)
-    simplecov-html (0.12.3)
+    simplecov-html (0.13.1)
     simplecov_json_formatter (0.1.4)
-    test-unit (3.6.7)
+    test-unit (3.6.8)
       power_assert
     timecop (0.9.10)
     unicode-display_width (3.1.4)
@@ -73,14 +75,14 @@ PLATFORMS
 DEPENDENCIES
   benchmark
   faker!
-  minitest (= 5.25.4)
+  minitest (= 5.25.5)
   pry (= 0.15.2)
   rake (= 13.2.1)
-  rubocop (= 1.73.0)
-  rubocop-minitest (= 0.37.0)
+  rubocop (= 1.75.4)
+  rubocop-minitest (= 0.38.0)
   rubocop-rake (= 0.7.1)
   simplecov (= 0.22.0)
-  test-unit (= 3.6.7)
+  test-unit (= 3.6.8)
   timecop (= 0.9.10)
   yard (= 0.9.37)
 
diff --git a/lib/faker/default/code.rb b/lib/faker/default/code.rb
@@ -168,6 +168,7 @@ def sin
 
       # Reporting body identifier
       RBI = %w[01 10 30 33 35 44 45 49 50 51 52 53 54 86 91 98 99].freeze
+      private_constant :RBI
 
       def generate_imei
         str = Array.new(15, 0)
@@ -269,7 +270,10 @@ def generate_base13_ean
       end
 
       EAN_CHECK_DIGIT8 = [3, 1, 3, 1, 3, 1, 3].freeze
+      private_constant :EAN_CHECK_DIGIT8
+
       EAN_CHECK_DIGIT13 = [1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3].freeze
+      private_constant :EAN_CHECK_DIGIT13
 
       def rut_verificator_digit(rut)
         total = rut.to_s.rjust(8, '0').chars.zip(%w[3 2 7 6 5 4 3 2]).collect { |a, b| a.to_i * b.to_i }.inject(:+)
diff --git a/lib/faker/default/driving_licence.rb b/lib/faker/default/driving_licence.rb
@@ -104,7 +104,7 @@ def gb_licence_year(dob, gender)
           end
           g.computed do
             gender_marker = gender == :female ? 50 : 0
-            format('%02d', (dob.month + gender_marker))
+            format('%02d', dob.month + gender_marker)
           end
           g.computed do
             format('%02d', dob.day)
diff --git a/lib/faker/default/internet.rb b/lib/faker/default/internet.rb
@@ -267,7 +267,7 @@ def domain_suffix(safe: nil)
       #   Faker::Internet.mac_address(prefix: 'aa:44')  #=> "aa:44:30:88:6e:95"
       def mac_address(prefix: '')
         prefix_digits = prefix.split(':').map { |d| d.to_i(16) }
-        address_digits = Array.new((6 - prefix_digits.size)) { rand(256) }
+        address_digits = Array.new(6 - prefix_digits.size) { rand(256) }
         (prefix_digits + address_digits).map { |d| format('%02x', d) }.join(':')
       end
 
diff --git a/lib/faker/default/json.rb b/lib/faker/default/json.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Json < Base
     require 'json'
@@ -104,17 +106,20 @@ def add_hash_to_bottom(hash, key_array, width, options)
       end
 
       def add_hash(key_array, hash, width, options)
-        string_to_eval = 'hash'
+        string_to_eval = 'hash'.dup
+
         key_array.length.times do |index|
           string_to_eval << "['#{key_array[index]}']"
         end
         string_to_eval << " = #{build_shallow_hash(width, options)}"
         eval(string_to_eval)
+
         hash
       end
 
       def build_keys_from_array(key_array)
-        key_string = ''
+        key_string = ''.dup
+
         key_array.each do |value|
           key_string << "['#{value}']"
         end
diff --git a/lib/faker/default/placeholdit.rb b/lib/faker/default/placeholdit.rb
@@ -45,7 +45,7 @@ def image(size: '300x300', format: 'png', background_color: nil, text_color: nil
       private
 
       def generate_color
-        format('%06x', (rand * 0xffffff))
+        format('%06x', rand * 0xffffff)
       end
     end
   end
diff --git a/lib/locales/en/cosmere.yml b/lib/locales/en/cosmere.yml
@@ -26,7 +26,7 @@ en:
       'Skybreaker', 'Stoneward', 'Truthwatcher', 'Willshaper', 'Windrunner'
       ]
       metals: [
-      'Steel', 'Iron', 'Pewter', 'Tin', 'Zinc', 'Brass', 'Copper', Bronze',
+      'Steel', 'Iron', 'Pewter', 'Tin', 'Zinc', 'Brass', 'Copper', 'Bronze',
       'Duralumin', 'Aluminum', 'Nicrosil', 'Chromium', 'Gold', 'Electrum',
       'Cadmium', 'Bendalloy', 'Atium', 'Lerasium', 'Ettmetal', 'Malatium'
       ]
diff --git a/lib/locales/en/restaurant.yml b/lib/locales/en/restaurant.yml
@@ -125,5 +125,5 @@ en:
         - "Ambience was good, service was no nonsense but friendly."
         - "Id have to say that each piece was fresh and had their own slight unique flavor twist to it, pushing the line between traditional edomae and fusion. The Hokkaido uni and the ocean trout topped with cook seaweed was the highlights of the meal. But each piece served was really something special."
         - "Staff was very accommodating but the chef were no nonsense. The ambiance is clean and tranquil which is perfect if youre looking to have a conversation with a date or a friend."
-        - "My only critique would be that the rice could of used more vingaer and for them to use real wasabi. Also the variety of fish in stock wasnt a lot but hopefully that can change over time. The cost justify the quality youre getting. A solid 4 stars."
+        - "My only critique would be that the rice could of used more vinegar and for them to use real wasabi. Also the variety of fish in stock wasnt a lot but hopefully that can change over time. The cost justify the quality youre getting. A solid 4 stars."
         - "In terms of omakase, they had a few options but the one we chose was the 87 dollar version which include sashimi and sushi."
diff --git a/lib/locales/fr/address.yml b/lib/locales/fr/address.yml
@@ -268,7 +268,7 @@ fr:
         - Nogent-sur-Marne
         - Noisy-le-Grand
         - Noisy-le-Sec
-        - Nouméa11
+        - Nouméa
         - Orléans
         - Palaiseau
         - Pantin
diff --git a/test/faker/books/test_lovecraft.rb b/test/faker/books/test_lovecraft.rb
@@ -48,9 +48,9 @@ def test_range_count_param
     ss = @tester.sentences(number: 2..5)
     ps = @tester.paragraphs(number: 2..5)
 
-    assert(ws.length >= 2 && ws.length <= 5)
-    assert(ss.length >= 2 && ss.length <= 5)
-    assert(ps.length >= 2 && ps.length <= 5)
+    assert(ws.length.between?(2, 5))
+    assert(ss.length.between?(2, 5))
+    assert(ps.length.between?(2, 5))
   end
 
   def test_array_count_param
@@ -69,7 +69,7 @@ def test_words_with_large_count_params
     array = @tester.words(number: [250, 500])
 
     assert_equal(500, exact.length)
-    assert(range.length >= 250 && range.length <= 500)
+    assert(range.length.between?(250, 500))
     assert(array.length == 250 || array.length == 500)
   end
 
diff --git a/test/faker/default/test_array_sample_method_compat.rb b/test/faker/default/test_array_sample_method_compat.rb
@@ -39,20 +39,20 @@ def test_returns_an_array_with_integer_param
 
     assert_kind_of Array, result
     assert_equal(2, result.length)
-    assert_empty((result - source))
+    assert_empty(result - source)
   end
 
   def test_returns_source_array_with_integer_param_equal_or_bigger_than_source_length
     source = %w[foo bar]
     result = source.sample(2)
 
     assert_kind_of Array, result
-    assert_predicate((source.sort <=> result.sort), :zero?)
+    assert_predicate(source.sort <=> result.sort, :zero?)
 
     result = source.sample(3)
 
     assert_kind_of Array, result
-    assert_predicate((source.sort <=> result.sort), :zero?)
+    assert_predicate(source.sort <=> result.sort, :zero?)
   end
 
   def test_raises_argument_error_with_negative_param
diff --git a/test/faker/default/test_faker_company.rb b/test/faker/default/test_faker_company.rb
@@ -77,7 +77,7 @@ def test_australian_business_number
     checksum = abn_checksum(abn)
 
     assert_match(/\d{11}/, abn)
-    assert_predicate((checksum % 89), :zero?)
+    assert_predicate(checksum % 89, :zero?)
   end
 
   def test_profession
@@ -167,8 +167,8 @@ def test_luhn_algorithm
 
     even_control = "#{even_base}#{even_luhn_complement}"
 
-    assert_predicate((luhn_checksum(odd_control) % 10), :zero?)
-    assert_predicate((luhn_checksum(even_control) % 10), :zero?)
+    assert_predicate(luhn_checksum(odd_control) % 10, :zero?)
+    assert_predicate(luhn_checksum(even_control) % 10, :zero?)
   end
 
   def test_brazilian_company_number
@@ -218,7 +218,7 @@ def test_russian_tax_number_checksum
     number = base_number[0..-2]
     checksum = base_number.chars.last.to_i
 
-    assert_predicate((inn_checksum(number) - checksum), :zero?)
+    assert_predicate(inn_checksum(number) - checksum, :zero?)
   end
 
   def test_sic_code
diff --git a/test/faker/default/test_faker_hipster.rb b/test/faker/default/test_faker_hipster.rb
@@ -62,9 +62,9 @@ def test_range_count_param
     ss = @tester.sentences(number: 2..5)
     ps = @tester.paragraphs(number: 2..5)
 
-    assert(ws.length >= 2 && ws.length <= 5)
-    assert(ss.length >= 2 && ss.length <= 5)
-    assert(ps.length >= 2 && ps.length <= 5)
+    assert(ws.length.between?(2, 5))
+    assert(ss.length.between?(2, 5))
+    assert(ps.length.between?(2, 5))
   end
 
   def test_array_count_param
@@ -83,7 +83,7 @@ def test_words_with_large_count_params
     array = @tester.words(number: [250, 500])
 
     assert_equal(500, exact.length)
-    assert(range.length >= 250 && range.length <= 500)
+    assert(range.length.between?(250, 500))
     assert(array.length == 250 || array.length == 500)
   end
 
diff --git a/test/faker/default/test_faker_internet.rb b/test/faker/default/test_faker_internet.rb
@@ -183,7 +183,7 @@ def test_password_with_no_arguments
     assert_match(/[a-z]/, password)
     assert_match(/[A-Z]/, password)
     assert_match(/[0-9]/, password)
-    assert_includes((default_min_length..default_max_length), password.length, 'Generated password length is incorrect')
+    assert_includes(default_min_length..default_max_length, password.length, 'Generated password length is incorrect')
   end
 
   def test_password_with_integer_arg
diff --git a/test/faker/default/test_faker_json.rb b/test/faker/default/test_faker_json.rb
@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative '../../test_helper'
 
 class TestFakerJson < Test::Unit::TestCase
diff --git a/test/faker/default/test_faker_lorem.rb b/test/faker/default/test_faker_lorem.rb
@@ -92,10 +92,10 @@ def test_range_count_param
     ss = @tester.sentences(number: 2..5)
     ps = @tester.paragraphs(number: 2..5)
 
-    assert(cs.length >= 2 && cs.length <= 5)
-    assert(ws.length >= 2 && ws.length <= 5)
-    assert(ss.length >= 2 && ss.length <= 5)
-    assert(ps.length >= 2 && ps.length <= 5)
+    assert(cs.length.between?(2, 5))
+    assert(ws.length.between?(2, 5))
+    assert(ss.length.between?(2, 5))
+    assert(ps.length.between?(2, 5))
   end
 
   def test_exclusive_range_count_param
@@ -128,7 +128,7 @@ def test_words_with_large_count_params
     array = @tester.words(number: [250, 500])
 
     assert_equal(500, exact.length)
-    assert(range.length >= 250 && range.length <= 500)
+    assert(range.length.between?(250, 500))
     assert(array.length == 250 || array.length == 500)
   end
 
diff --git a/test/faker/default/test_faker_vehicle.rb b/test/faker/default/test_faker_vehicle.rb
@@ -63,7 +63,7 @@ def test_engine
   def test_mileage
     mileage = @tester.mileage(min: 5, max: 10)
 
-    assert mileage >= 5 && mileage <= 10
+    assert mileage.between?(5, 10)
   end
 
   def test_license_plate
diff --git a/test/test_i18n_reload.rb b/test/test_i18n_reload.rb
@@ -12,7 +12,7 @@ def test_faker_i18n
 
       gemfile do
         source 'https://rubygems.org'
-        gem 'minitest'
+        gem 'minitest', '5.25.5'
         gem 'i18n'
       end
 
diff --git a/test/test_pt_br_locale.rb b/test/test_pt_br_locale.rb

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ en:`
`26`	`26`	`'Skybreaker', 'Stoneward', 'Truthwatcher', 'Willshaper', 'Windrunner'`
`27`	`27`	`]`
`28`	`28`	`metals: [`
`29`		`- 'Steel', 'Iron', 'Pewter', 'Tin', 'Zinc', 'Brass', 'Copper', Bronze',`
	`29`	`+ 'Steel', 'Iron', 'Pewter', 'Tin', 'Zinc', 'Brass', 'Copper', 'Bronze',`
`30`	`30`	`'Duralumin', 'Aluminum', 'Nicrosil', 'Chromium', 'Gold', 'Electrum',`
`31`	`31`	`'Cadmium', 'Bendalloy', 'Atium', 'Lerasium', 'Ettmetal', 'Malatium'`
`32`	`32`	`]`