faker 2.15.1 → 3.4.2

data/lib/faker/default/barcode.rb

@@ -3,8 +3,9 @@
 module Faker
   class Barcode < Base
     class << self
-      ## Returns a EAN 8 or 13 digit format barcode number with check digit
-      #  @returns [String]
+      ##
+      # Returns a EAN 8 or 13 digit format barcode number with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.ean      => "85657526"
@@ -16,8 +17,9 @@ module Faker
         generate_barcode("barcode.ean_#{Integer(length)}")
       end
 
-      ## Returns a EAN 8 or 13 digit format barcode number with composite string attached with check digit
-      #  @returns [String]
+      ##
+      # Returns a EAN 8 or 13 digit format barcode number with composite string attached with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.ean_with_composite_sumbology      => "41007624|JHOC6649"
@@ -29,8 +31,9 @@ module Faker
         "#{ean(length)}|#{bothify(parse('barcode.composite_symbol'))}"
       end
 
-      ## Returns a UPC_A format barcode number with check digit
-      #  @returns [String]
+      ##
+      # Returns a UPC_A format barcode number with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.upc_a      => "766807541831"
@@ -40,8 +43,9 @@ module Faker
         generate_barcode('barcode.upc_a')
       end
 
-      ## Returns a UPC_E format barcode number with check digit
-      #  @returns [String]
+      ##
+      # Returns a UPC_E format barcode number with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.upc_e      => "03746820"
@@ -51,8 +55,9 @@ module Faker
         generate_barcode('barcode.upc_e')
       end
 
-      ## Returns a UPC_A format barcode number with composite string attached with check digit
-      #  @returns [String]
+      ##
+      # Returns a UPC_A format barcode number with composite string attached with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.upc_a_with_composite_symbology      => "790670155765|JOVG6208"
@@ -62,8 +67,9 @@ module Faker
         "#{upc_a}|#{bothify(parse('barcode.composite_symbol'))}"
       end
 
-      ## Returns a UPC_E format barcode number with composite string attached with check digit
-      #  @returns [String]
+      ##
+      # Returns a UPC_E format barcode number with composite string attached with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.upc_e_with_composite_symbology      => "05149247|BKZX9722"
@@ -73,8 +79,9 @@ module Faker
         "#{upc_e}|#{bothify(parse('barcode.composite_symbol'))}"
       end
 
-      ## Returns a ISBN format barcode number with check digit
-      #  @returns [String]
+      ##
+      # Returns a ISBN format barcode number with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.isbn      => "9798363807732"
@@ -84,8 +91,9 @@ module Faker
         generate_barcode('barcode.isbn')
       end
 
-      ## Returns a ISMN format barcode number with check digit
-      #  @returns [String]
+      ##
+      # Returns a ISMN format barcode number with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.ismn      => "9790527672897"
@@ -95,8 +103,9 @@ module Faker
         generate_barcode('barcode.ismn')
       end
 
-      ## Returns a ISSN format barcode number with check digit
-      #  @returns [String]
+      ##
+      # Returns a ISSN format barcode number with check digit
+      #  @return [String]
       #
       #  @example
       #     Faker::Barcode.issn      => "9775541703338"
@@ -114,9 +123,10 @@ module Faker
         "#{barcode}#{check_digit}"
       end
 
-      ## Returns the sum of even and odd numbers from value passed
+      ##
+      # Returns the sum of even and odd numbers from value passed
       #
-      # @returns [Array]
+      # @return [Array]
       #
       # @example
       #   Faker::Barcode.send(:sum_even_odd, 12345)   => [9, 5]
@@ -137,9 +147,10 @@ module Faker
         [sum_odd, sum_even]
       end
 
-      ## Generates the check digits from sum passed
+      ##
+      # Generates the check digits from sum passed
       #
-      # @returns [Integer]
+      # @return [Integer]
       #
       # @example
       #   Faker::Barcode.send(:generate_check_digit, 12, 4)   => 0

data/lib/faker/default/boolean.rb

@@ -15,10 +15,7 @@ module Faker
       #   Faker::Boolean.boolean(true_ratio: 0.2) #=> false
       #
       # @faker.version 1.6.2
-      def boolean(legacy_true_ratio = NOT_GIVEN, true_ratio: 0.5)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :true_ratio if legacy_true_ratio != NOT_GIVEN
-        end
+      def boolean(true_ratio: 0.5)
         (rand < true_ratio)
       end
     end

data/lib/faker/default/cannabis.rb

@@ -2,6 +2,7 @@
 
 module Faker
   class Cannabis < Base
+    ##
     # Produces a random strain.
     #
     # @return [String]
@@ -14,6 +15,7 @@ module Faker
       fetch('cannabis.strains')
     end
 
+    ##
     # Produces a random abbreviation.
     #
     # @return [String]
@@ -26,6 +28,7 @@ module Faker
       fetch('cannabis.cannabinoid_abbreviations')
     end
 
+    ##
     # Produces a random cannabinoid type.
     #
     # @return [String]
@@ -38,6 +41,7 @@ module Faker
       fetch('cannabis.cannabinoids')
     end
 
+    ##
     # Produces a random terpene type.
     #
     # @return [String]
@@ -50,6 +54,7 @@ module Faker
       fetch('cannabis.terpenes')
     end
 
+    ##
     # Produces a random kind of medical use.
     #
     # @return [String]
@@ -62,6 +67,7 @@ module Faker
       fetch('cannabis.medical_uses')
     end
 
+    ##
     # Produces a random health benefit.
     #
     # @return [String]
@@ -74,6 +80,7 @@ module Faker
       fetch('cannabis.health_benefits')
     end
 
+    ##
     # Produces a random category.
     #
     # @return [String]
@@ -86,6 +93,7 @@ module Faker
       fetch('cannabis.categories')
     end
 
+    ##
     # Produces a random type.
     #
     # @return [String]
@@ -98,6 +106,7 @@ module Faker
       fetch('cannabis.types')
     end
 
+    ##
     # Produces a random buzzword.
     #
     # @return [String]
@@ -110,6 +119,7 @@ module Faker
       fetch('cannabis.buzzwords')
     end
 
+    ##
     # Produces a random brand.
     #
     # @return [String]

data/lib/faker/default/chile_rut.rb

@@ -8,23 +8,19 @@ module Faker
       ##
       # Produces a random Chilean RUT (Rol Unico Tributario, ID with 8 digits).
       #
-      # @param min_rut [Integer] Specifies the minimum value of the rut.
-      # @param fixed [Boolean] Determines if the rut is fixed (returns the min_rut value).
+      # @param min_rut [Integer] Specifies the minimum value of the RUT.
+      # @param max_rut [Integer] Specifies the maximum value of the RUT.
+      # @param fixed [Boolean] Determines if the RUT is fixed (returns the min_rut value).
       # @return [Number]
       #
       # @example
       #   Faker::ChileRut.rut #=> 11235813
-      #   Faker::ChileRut.rut(min_rut: 20890156) #=> 31853211
-      #   Faker::ChileRut.rut(min_rut: 20890156, fixed: true) #=> 20890156
+      #   Faker::ChileRut.rut(min_rut: 10_000_000, max_rut: 30_000_000) #=> 21853211
+      #   Faker::ChileRut.rut(min_rut: 20_890_156, fixed: true) #=> 20890156
       #
-      # @faker.version 1.9.2
-      def rut(legacy_min_rut = NOT_GIVEN, legacy_fixed = NOT_GIVEN, min_rut: 1, fixed: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :min_rut if legacy_min_rut != NOT_GIVEN
-          keywords << :fixed if legacy_fixed != NOT_GIVEN
-        end
-
-        @last_rut = fixed ? min_rut : rand_in_range(min_rut, 99_999_999)
+      # @faker.version next
+      def rut(min_rut: 1, max_rut: 99_999_999, fixed: false)
+        @last_rut = fixed ? min_rut : rand_in_range(min_rut, max_rut)
       end
 
       ##
@@ -37,7 +33,7 @@ module Faker
       #
       # @faker.version 1.9.2
       def dv
-        split_reversed_rut = @last_rut.to_s.reverse.split('')
+        split_reversed_rut = @last_rut.to_s.reverse.chars
         seq = [2, 3, 4, 5, 6, 7]
         i = 0
         digit_sum = split_reversed_rut.reduce(0) do |sum, n|
@@ -73,26 +69,30 @@ module Faker
       ##
       # Produces a random Chilean RUT (Rol Unico Tributario, ID with 8 digits) with a dv (digito verificador, check-digit).
       #
-      # @param min_rut [Integer] Specifies the minimum value of the rut.
-      # @param fixed [Boolean] Determines if the rut is fixed (returns the min_rut value).
+      # @param min_rut [Integer] Specifies the minimum value of the RUT.
+      # @param max_rut [Integer] Specifies the maximum value of the RUT.
+      # @param fixed [Boolean] Determines if the RUT is fixed (returns the min_rut value).
       # @return [String]
       #
       # @example
       #   Faker::ChileRut.full_rut #=> "30686957-4"
-      #   Faker::ChileRut.full_rut(min_rut: 20890156) #=> "30686957-4"
-      #   Faker::ChileRut.full_rut(min_rut: 30686957, fixed: true) #=> "30686957-4"
+      #   Faker::ChileRut.full_rut(min_rut: 10_000_000, max_rut: 30_000_000) #=> "20686957-4"
+      #   Faker::ChileRut.full_rut(min_rut: 30_686_957, fixed: true) #=> "30686957-4"
       #
-      # @faker.version 1.9.2
-      def full_rut(legacy_min_rut = NOT_GIVEN, legacy_fixed = NOT_GIVEN, min_rut: 0, fixed: false)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :min_rut if legacy_min_rut != NOT_GIVEN
-          keywords << :fixed if legacy_fixed != NOT_GIVEN
-        end
-
-        "#{rut(min_rut: min_rut, fixed: fixed)}-#{dv}"
+      # @faker.version next
+      def full_rut(min_rut: 1, max_rut: 99_999_999, fixed: false, formatted: false)
+        this_rut = rut(min_rut: min_rut, max_rut: max_rut, fixed: fixed)
+        this_rut = format_rut(this_rut) if formatted
+        "#{this_rut}-#{dv}"
       end
 
       attr_reader :last_rut
+
+      private
+
+      def format_rut(rut)
+        rut.to_s.reverse.gsub(/(\d{3})(?=\d)/, '\\1.').reverse
+      end
     end
   end
 end

data/lib/faker/default/chuck_norris.rb

@@ -5,6 +5,7 @@ module Faker
     flexible :chuck_norris
 
     class << self
+      ##
       # Produces a Chuck Norris Fact.
       # Original list of facts:
       # https://github.com/jenkinsci/chucknorris-plugin/blob/master/src/main/java/hudson/plugins/chucknorris/FactGenerator.java

data/lib/faker/default/code.rb

@@ -5,7 +5,7 @@ module Faker
     flexible :code
     class << self
       ##
-      # Produces a random NPI (National Provider Identifer) code.
+      # Produces a random NPI (National Provider Identifier) code.
       #
       # @return [String]
       #
@@ -29,11 +29,7 @@ module Faker
       #   Faker::Code.isbn #=> "170366802-2"
       #
       # @faker.version 2.2.0
-      def isbn(legacy_base = NOT_GIVEN, base: 10)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :base if legacy_base != NOT_GIVEN
-        end
-
+      def isbn(base: 10)
         case base
         when 10 then generate_base10_isbn
         when 13 then generate_base13_isbn
@@ -53,15 +49,11 @@ module Faker
       #   Faker::Code.ean #=> "9941880131907"
       #
       # @faker.version 2.2.0
-      def ean(legacy_base = NOT_GIVEN, base: 13)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :base if legacy_base != NOT_GIVEN
-        end
-
+      def ean(base: 13)
         case base
         when 8 then generate_base8_ean
         when 13 then generate_base13_ean
-        else raise ArgumentError, 'base must be 3 or 13'
+        else raise ArgumentError, 'base must be 8 or 13'
         end
       end
 
@@ -80,11 +72,11 @@ module Faker
         value << "-#{vd}"
       end
 
+      ##
+      # Produces a random NRIC (National Registry Identity Card) code.
       # By default generates a Singaporean NRIC ID for someone
       # who is born between the age of 18 and 65.
       #
-      # Produces a random NRIC (National Registry Identity Card) code.
-      #
       # @param min_age [Integer] the min age of the person in years
       # @param max_age [Integer] the max age of the person in years
       # @return [String]
@@ -99,18 +91,25 @@ module Faker
       #   Faker::Code.nric #=> "S6372958B"
       #
       # @faker.version 2.2.0
-      def nric(legacy_min_age = NOT_GIVEN, legacy_max_age = NOT_GIVEN, min_age: 18, max_age: 65)
-        warn_for_deprecated_arguments do |keywords|
-          keywords << :min_age if legacy_min_age != NOT_GIVEN
-          keywords << :max_age if legacy_max_age != NOT_GIVEN
-        end
-
+      def nric(min_age: 18, max_age: 65)
         birthyear = Date.birthday(min_age: min_age, max_age: max_age).year
-        prefix = birthyear < 2000 ? 'S' : 'T'
-        values = birthyear.to_s[-2..-1]
-        values << regexify(/\d{5}/)
-        check_alpha = generate_nric_check_alphabet(values, prefix)
-        "#{prefix}#{values}#{check_alpha}"
+
+        generate(:string) do |g|
+          g.computed(name: :prefix) do
+            if birthyear < 2000
+              'S'
+            else
+              'T'
+            end
+          end
+          g.computed(name: :yy) do
+            birthyear.to_s[-2..]
+          end
+          g.int(name: :values, length: 5)
+          g.computed(name: :check, deps: %i[prefix yy values]) do |prefix, yy, values|
+            generate_nric_check_alphabet("#{yy}#{values}", prefix)
+          end
+        end
       end
 
       ##
@@ -206,50 +205,80 @@ module Faker
         str[len - 1] = (10 - (sum % 10)) % 10
 
         # Output the IMEI value.
-        str.join('')
+        str.join
       end
 
       def generate_base10_isbn
-        values = regexify(/\d{9}/)
-        remainder = sum(values) { |value, index| (index + 1) * value.to_i } % 11
-        values << "-#{remainder == 10 ? 'X' : remainder}"
+        generate(:string) do |g|
+          g.int(name: :values, length: 9)
+          g.lit('-')
+          g.computed(name: :checksum, deps: [:values]) do |values|
+            remainder = sum(values.to_s) { |value, offset| (offset + 1) * value.to_i } % 11
+            if remainder == 10
+              'X'
+            else
+              remainder.to_s
+            end
+          end
+        end
       end
 
       def generate_base13_isbn
-        values = regexify(/\d{12}/)
-        remainder = sum(values) { |value, index| index.even? ? value.to_i : value.to_i * 3 } % 10
-        values << "-#{(10 - remainder) % 10}"
+        generate(:string) do |g|
+          g.int(name: :values, length: 12)
+          g.lit('-')
+          g.computed(name: :checksum, deps: [:values]) do |values|
+            remainder = sum(values.to_s) { |value, offset| offset.even? ? value.to_i : value.to_i * 3 } % 10
+            (10 - remainder) % 10
+          end
+        end
       end
 
       def sum(values)
-        values.split(//).each_with_index.inject(0) do |sum, (value, index)|
+        values.chars.each_with_index.inject(0) do |sum, (value, index)|
           sum + yield(value, index)
         end
       end
 
       def generate_base8_ean
-        values = regexify(/\d{7}/)
-        check_digit = 10 - values.split(//).each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT8[i] } % 10
-        values << (check_digit == 10 ? 0 : check_digit).to_s
+        generate(:string) do |g|
+          g.int(name: :values, length: 7)
+          g.computed(name: :checksum, deps: [:values]) do |values|
+            check_digit = 10 - values.to_s.chars.each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT8[i] } % 10
+            if check_digit == 10
+              0
+            else
+              check_digit
+            end
+          end
+        end
       end
 
       def generate_base13_ean
-        values = regexify(/\d{12}/)
-        check_digit = 10 - values.split(//).each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT13[i] } % 10
-        values << (check_digit == 10 ? 0 : check_digit).to_s
+        generate(:string) do |g|
+          g.int(name: :values, length: 12)
+          g.computed(name: :checksum, deps: [:values]) do |values|
+            check_digit = 10 - values.to_s.chars.each_with_index.inject(0) { |s, (v, i)| s + v.to_i * EAN_CHECK_DIGIT13[i] } % 10
+            if check_digit == 10
+              0
+            else
+              check_digit
+            end
+          end
+        end
       end
 
       EAN_CHECK_DIGIT8 = [3, 1, 3, 1, 3, 1, 3].freeze
       EAN_CHECK_DIGIT13 = [1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3].freeze
 
       def rut_verificator_digit(rut)
-        total = rut.to_s.rjust(8, '0').split(//).zip(%w[3 2 7 6 5 4 3 2]).collect { |a, b| a.to_i * b.to_i }.inject(:+)
-        (11 - total % 11).to_s.gsub(/10/, 'k').gsub(/11/, '0')
+        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(:+)
+        (11 - total % 11).to_s.gsub('10', 'k').gsub('11', '0')
       end
 
       def generate_nric_check_alphabet(values, prefix)
         weight = %w[2 7 6 5 4 3 2]
-        total = values.split(//).zip(weight).collect { |a, b| a.to_i * b.to_i }.inject(:+)
+        total = values.chars.zip(weight).collect { |a, b| a.to_i * b.to_i }.inject(:+)
         total += 4 if prefix == 'T'
         %w[A B C D E F G H I Z J][10 - total % 11]
       end

data/lib/faker/default/color.rb

@@ -3,17 +3,34 @@
 module Faker
   class Color < Base
     class << self
+      LIGHTNESS_LOOKUP = {
+        light: 0.8,
+        dark: 0.2
+      }.freeze
       ##
       # Produces a hex color code.
+      # Clients are able to specify the hue, saturation, or lightness of the required color.
+      # Alternatively a client can simply specify that they need a light or dark color.
+      #
+      # @param args [Hash, Symbol] Allows the client to specify what color should be return
       #
       # @return [String]
       #
       # @example
       #   Faker::Color.hex_color #=> "#31a785"
+      # @example
+      #   Faker::Color.hex_color(hue: 118, saturation: 1, lightness: 0.53) #=> "#048700"
+      # @example
+      #   Faker::Color.hex_color(:light) #=> "#FFEE99"
+      # @example
+      #   Faker::Color.hex_color(:dark) #=> "#665500"
       #
-      # @faker.version 1.5.0
-      def hex_color
-        format('#%06x', (rand * 0xffffff))
+      # @faker.version next
+      def hex_color(args = nil)
+        hsl_hash = {}
+        hsl_hash = { lightness: LIGHTNESS_LOOKUP[args] } if %i[dark light].include?(args)
+        hsl_hash = args if args.is_a?(Hash)
+        hsl_to_hex(hsl_color(**hsl_hash))
       end
 
       ##
@@ -51,14 +68,28 @@ module Faker
       # Produces an array of floats representing an HSL color.
       # The array is in the form of `[hue, saturation, lightness]`.
       #
+      # @param hue [FLoat] Optional value to use for hue
+      # @param saturation [Float] Optional value to use for saturation
+      # @param lightness [Float] Optional value to use for lightness
       # @return [Array(Float, Float, Float)]
       #
       # @example
       #   Faker::Color.hsl_color #=> [69.87, 0.66, 0.3]
+      # @example
+      #   Faker::Color.hsl_color(hue: 70, saturation: 0.5, lightness: 0.8) #=> [70, 0.5, 0.8]
+      # @example
+      #   Faker::Color.hsl_color(hue: 70) #=> [70, 0.66, 0.6]
+      # @example
+      #   Faker::Color.hsl_color(saturation: 0.2) #=> [54, 0.2, 0.3]
+      # @example
+      #   Faker::Color.hsl_color(lightness: 0.6) #=> [69.87, 0.66, 0.6]
       #
-      # @faker.version 1.5.0
-      def hsl_color
-        [sample((0..360).to_a), rand.round(2), rand.round(2)]
+      # @faker.version next
+      def hsl_color(hue: nil, saturation: nil, lightness: nil)
+        valid_hue = hue || sample((0..360).to_a)
+        valid_saturation = saturation&.clamp(0, 1) || rand.round(2)
+        valid_lightness = lightness&.clamp(0, 1) || rand.round(2)
+        [valid_hue, valid_saturation, valid_lightness]
       end
 
       ##
@@ -74,6 +105,46 @@ module Faker
       def hsla_color
         hsl_color << rand.round(1)
       end
+
+      private
+
+      ##
+      # Produces a hex code representation of an HSL color
+      #
+      # @param a_hsl_color [Array(Float, Float, Float)] The array that represents the HSL color
+      #
+      # @return [String]
+      #
+      # @example
+      #   hsl_to_hex([50, 100,80]) #=> #FFEE99
+      #
+      # @see https://en.wikipedia.org/wiki/HSL_and_HSV#HSL_to_RGB
+      # @see https://github.com/jpmckinney/color-generator/blob/master/lib/color-generator.rb
+      #
+      def hsl_to_hex(a_hsl_color)
+        h, s, l = a_hsl_color
+        c = (1 - (2 * l - 1).abs) * s
+        h_prime = h / 60
+        x = c * (1 - (h_prime % 2 - 1).abs)
+        m = l - 0.5 * c
+
+        rgb = case h_prime.to_i
+              when 0 # 0 <= H' < 1
+                [c, x, 0]
+              when 1 # 1 <= H' < 2
+                [x, c, 0]
+              when 2 # 2 <= H' < 3
+                [0, c, x]
+              when 3 # 3 <= H' < 4
+                [0, x, c]
+              when 4 # 4 <= H' < 5
+                [x, 0, c]
+              else # 5 <= H' < 6
+                [c, 0, x]
+              end.map { |value| ((value + m) * 255).round }
+
+        format('#%02x%02x%02x', rgb[0], rgb[1], rgb[2])
+      end
     end
   end
 end