ffaker 2.11.0 → 2.12.0

data/lib/ffaker/ssn_mx.rb

@@ -1,7 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
-  # Author Guapolo <github.com/guapolo>
   module SSNMX
     extend ModuleUtils
     extend self

data/lib/ffaker/ssn_se.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'date'
 
@@ -26,8 +26,8 @@ module FFaker
     GENDERS = %w[female male].freeze
 
     def ssn(opts = {})
-      from   = opts[:from]   || ::Time.local(1940, 1, 1)
-      to     = opts[:to]     || ::Time.now
+      from   = opts[:from] || ::Time.local(1940, 1, 1)
+      to     = opts[:to] || ::Time.now
       gender = (opts[:gender] || fetch_sample(GENDERS)).to_s
 
       raise_error_on_bad_arguments(from, to, gender)
@@ -39,11 +39,11 @@ module FFaker
 
     def generate_ssn(from, to, gender)
       birth_date = random_birth_time_between(from, to)
-      birth_date_str = birth_date.strftime('%Y%m%d')      # "19800228"
-      region = get_random_region_for(gender)              # "413"
-      ssn_without_check_digit = birth_date_str + region   # "19800228413"
-      check_digit = luhn_check(ssn_without_check_digit)   # "9"
-      ssn_without_check_digit + check_digit               # "198002284139"
+      birth_date_str = birth_date.strftime('%Y%m%d') # "19800228"
+      region = random_region_for(gender) # "413"
+      ssn_without_check_digit = birth_date_str + region # "19800228413"
+      check_digit = luhn_check(ssn_without_check_digit) # "9"
+      ssn_without_check_digit + check_digit # "198002284139"
     end
 
     def raise_error_on_bad_arguments(from, to, gender)
@@ -57,19 +57,19 @@ module FFaker
       ::Time.at(from + rand * (to.to_f - from.to_f))
     end
 
-    def get_random_region_for(gender)
+    def random_region_for(gender)
       region_number = case gender
-                      when 'female' then get_random_region_even
-                      when 'male' then get_random_region_odd
-      end
+                      when 'female' then random_region_even
+                      when 'male' then random_region_odd
+                      end
       three_character_string(region_number)
     end
 
-    def get_random_region_even
+    def random_region_even
       rand(0..498) * 2
     end
 
-    def get_random_region_odd
+    def random_region_odd
       rand(0..498) * 2 + 1
     end
 
@@ -82,11 +82,7 @@ module FFaker
       multiplications = []
 
       number.split(//).each_with_index do |digit, i|
-        multiplications << if i.even?
-                             digit.to_i * 2
-                           else
-                             digit.to_i
-        end
+        multiplications << i.even? ? digit.to_i * 2 : digit.to_i
       end
 
       sum = 0
@@ -96,12 +92,7 @@ module FFaker
         end
       end
 
-      control_digit = if sum % 10 == 0
-                        0
-                      else
-                        (sum / 10 + 1) * 10 - sum
-      end
-
+      control_digit = (sum % 10).zero? ? 0 : (sum / 10 + 1) * 10 - sum
       control_digit.to_s
     end
   end

data/lib/ffaker/string.rb

@@ -1,12 +1,12 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
   module String
     extend ModuleUtils
     extend self
 
-    BACKSLASH = '\\'.freeze
-    DASH      = '-'.freeze
+    BACKSLASH = '\\'
+    DASH      = '-'
 
     LOWERS     = [*'a'..'z'].freeze
     UPPERS     = [*'A'..'Z'].freeze
@@ -17,7 +17,7 @@ module FFaker
     ESCAPEABLE_CHARS = ['\\', '/', '.', '(', ')', '[', ']', '{', '}'].freeze
 
     def from_regexp(exp)
-      result = ''
+      result = +''
       @last_token = nil
 
       # Drop surrounding /'s and split into characters
@@ -59,9 +59,10 @@ module FFaker
       when '*' then
         tokens.unshift(token) if rand(0..1) == 1 # Leave the `*` on to run again
         return '' if rand(0..1) == 1 # Or maybe do nothing
+
         process_token(@last_token) # Else run the last one again
       when '{' then
-        number = ''
+        number = +''
         while (ch = tokens.shift) != '}'
           number << ch
         end

data/lib/ffaker/time.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'date'
 
@@ -7,7 +7,9 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    MONTHS = %w[January February March April May June July August September October November December].freeze
+    MONTHS = %w[
+      January February March April May June July August September October November December
+    ].freeze
     DAYS_OF_WEEK = %w[Monday Tuesday Wednesday Thursday Friday Saturday Sunday].freeze
 
     def month
@@ -27,13 +29,12 @@ module FFaker
       hours = params[:hours] || rand(0..23)
       minutes = params[:minutes] || rand(0..59)
       series = [date = ::DateTime.new(year, month, day, hours, minutes)]
-      if params[:series]
-        params[:series].each do |some_time_after|
-          series << series.last + (rand * some_time_after).ceil
-        end
-        return series
+      return date unless params[:series]
+
+      params[:series].each do |some_time_after|
+        series << series.last + (rand * some_time_after).ceil
       end
-      date
+      series
     end
 
     def date(params = {})

data/lib/ffaker/tweet.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
   module Tweet
@@ -12,14 +12,14 @@ module FFaker
     # body_length:    Target length (rand(20..140)) (will be <= target)
     def tweet(args = {})
       options = {
-        num_hashtags: [0, rand(1..10) - 6].max,
-        num_mentions: [0, rand(1..10) - 8].max,
+        num_hashtags: [0, rand(-5..4)].max,
+        num_mentions: [0, rand(-7..2)].max,
         reply: (rand(1..10) == 1),
         body_length: rand(20..140)
       }.merge(args)
 
       my_reply = options[:reply] ? "#{mention} " : ''
-      my_mentions = options[:num_mentions] > 0 ? "#{mentions(options[:num_mentions])} " : ''
+      my_mentions = (options[:num_mentions]).positive? ? "#{mentions(options[:num_mentions])} " : ''
       my_tags = tags(options[:num_hashtags])
 
       remaining = [

data/lib/ffaker/unit.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'ostruct'
 

data/lib/ffaker/unit_english.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'ffaker/unit'
 require 'ostruct'

data/lib/ffaker/unit_metric.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'ffaker/unit'
 require 'ostruct'

data/lib/ffaker/utils/array_utils.rb

@@ -1,4 +1,7 @@
+# frozen_string_literal: true
+
 require 'ffaker/utils/random_utils'
+
 module FFaker
   module ArrayUtils
     extend RandomUtils
@@ -9,9 +12,9 @@ module FFaker
       freeze_all(array)
     end
 
-    def self.random_pick(array, n)
+    def self.random_pick(array, num)
       warn '[ArrayUtils.random_pick] is deprecated. Please use the ModuleUtils#fetch_sample method'
-      fetch_sample(array, count: n)
+      fetch_sample(array, count: num)
     end
 
     def self.rand(array)
@@ -29,9 +32,9 @@ module FFaker
       array.sort_by { FFaker::Random.rand }
     end
 
-    def random_pick(n)
+    def random_pick(num)
       warn '[ArrayUtils#random_pick] is deprecated. Please use the ModuleUtils#fetch_sample method'
-      ArrayUtils.random_pick(self, n)
+      ArrayUtils.random_pick(self, num)
     end
 
     def rand

data/lib/ffaker/utils/module_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ffaker/utils/array_utils'
 require 'ffaker/utils/random_utils'
 require 'ffaker/utils/unique_utils'

data/lib/ffaker/utils/random_utils.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module FFaker
   # Methods for returning repeatably-random data using the internal
   # Random Number Generator. You should not need to use this directly, it is

data/lib/ffaker/vehicle.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
   module Vehicle
@@ -8,8 +8,9 @@ module FFaker
     DRIVETRAINS = %w[4WD 4X4 AWD FWD RWD].freeze
     YEARS = [*'1900'..(Date.today.year + 1).to_s].freeze
     COLOR_PREFIXES = k(%w[
-                         beautiful bright calm dangerous dark dull fast magnetic magnificent majestic melodic metallic
-                         mundane mute mysterious new pleasant pretty resonant royal slate soft tranquil vibrant weak
+                         beautiful bright calm dangerous dark dull fast magnetic magnificent
+                         majestic melodic metallic mundane mute mysterious new pleasant pretty
+                         resonant royal slate soft tranquil vibrant weak
                        ])
     TRANSMISSIONS_ABBR = %w[AT MT AM CVT].freeze
     CYLINDERS = %w[2 5 6 8].freeze
@@ -26,9 +27,9 @@ module FFaker
       fetch_sample(MAKES_LIST)
     end
 
-    def manufacturer_color(n = 2)
+    def manufacturer_color(count = 2)
       # Take two prefixes because it's more fun than one
-      (fetch_sample(COLOR_PREFIXES, count: n) + [base_color]).join(' ')
+      (fetch_sample(COLOR_PREFIXES, count: count) + [base_color]).join(' ')
     end
     alias mfg_color manufacturer_color
 

data/lib/ffaker/venue.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
   module Venue

data/lib/ffaker/youtube.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
   module Youtube

data/scripts/benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'benchmark'
 

data/scripts/profiling.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require File.dirname(__FILE__) + '/../lib/faker'
 
 N = 1_000_000

data/scripts/reference.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << File.dirname(__FILE__) + '/../lib'
 require 'ffaker'
 
@@ -15,6 +17,7 @@ def faker_modules
     next if mod == FFaker::ModuleUtils
     next if mod == FFaker::RandomUtils
     next if mod == FFaker::Random
+
     mod
   end.compact
 end
@@ -59,7 +62,7 @@ sections = faker_modules.map do |mod|
     left = "`#{meth}`"
     right = ''
 
-    if arity > 0
+    if arity.positive?
       left = "`#{meth}`(#{Array.new(arity) { '...' }.join(', ')})"
     else
       begin
@@ -71,7 +74,7 @@ sections = faker_modules.map do |mod|
                 else
                   (escape examples.join(', ')).to_s
                 end
-      rescue => e
+      rescue StandardError => e
         right = "#{ICONS[:error]} #{e.class}: #{e.message}"
       end
     end

data/test/helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'test/unit'
 require 'ffaker'
 

data/test/test_address.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_au.rb

@@ -1,8 +1,7 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 
-# Author: wiseleyb<wiseleyb@gmail.com>
 class TestAddressAU < Test::Unit::TestCase
   include DeterministicHelper
 
@@ -12,9 +11,9 @@ class TestAddressAU < Test::Unit::TestCase
   )
 
   def test_au_state_abbr_insertion
-    arr = FFaker::AddressAU::STATE_ABBR.sort
-    assert arr = FFaker::AddressAU::SUBURB.keys.sort
-    assert arr = FFaker::AddressAU::POSTCODE.keys.sort
+    FFaker::AddressAU::STATE_ABBR.sort
+    assert FFaker::AddressAU::SUBURB.keys.sort
+    assert FFaker::AddressAU::POSTCODE.keys.sort
   end
 
   def test_au_state

data/test/test_address_br.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_ca.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_ch.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_ch_de.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_ch_fr.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_ch_it.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_da.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_de.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 

data/test/test_address_fi.rb

@@ -1,13 +1,12 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'helper'
 
-# Test features related to Finnish addresses
 class TestAddressFI < Test::Unit::TestCase
   include DeterministicHelper
 
-  ALPHA = /\A[\p{Alpha}]+/
-  DIGIT = /\d{1}/
+  ALPHA = /\A[\p{Alpha}]+/.freeze
+  DIGIT = /\d{1}/.freeze
 
   assert_methods_are_deterministic(
     FFaker::AddressFI,