ffaker 2.7.0 → 2.21.0

data/lib/ffaker/sem_ver.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+module FFaker
+  module SemVer
+    extend ModuleUtils
+    extend self
+
+    UPDATE = %w[major minor patch].freeze
+
+    def next(previous_version = '0.0.0')
+      major, minor, patch = previous_version.split('.').map(&:to_i)
+      case fetch_sample(UPDATE)
+      when 'major' then "#{major + 1}.0.0"
+      when 'minor' then "#{major}.#{minor + 1}.0"
+      when 'patch' then "#{major}.#{minor}.#{patch + 1}"
+      end
+    end
+  end
+end

data/lib/ffaker/skill.rb

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

data/lib/ffaker/sport.rb

@@ -1,9 +1,13 @@
+# frozen_string_literal: true
+
 module FFaker
   module Sport
     extend ModuleUtils
     extend self
 
+    # @deprecated US sports name. Moved into {SportUS}
     def name
+      warn '[name] is deprecated. For US sports please use the SportUS module'
       fetch_sample(NAMES)
     end
   end

data/lib/ffaker/sport_pl.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module FFaker
+  # Inspirations:
+  # https://pl.wikipedia.org/wiki/Kategoria:Dyscypliny_sportowe
+  # https://pl.wikipedia.org/wiki/Igrzyska_olimpijskie
+  module SportPL
+    extend ModuleUtils
+    extend self
+
+    ALL = SUMMER + WINTER
+
+    def name
+      fetch_sample(ALL)
+    end
+
+    def summer
+      fetch_sample(SUMMER)
+    end
+
+    def winter
+      fetch_sample(WINTER)
+    end
+  end
+end

data/lib/ffaker/sport_ru.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module FFaker
+  # Inspirations:
+  # https://olympic.ru/team/sport/
+  # http://ru.sport-wiki.org/vidy-sporta/
+  module SportRU
+    extend ModuleUtils
+    extend self
+
+    ALL = SUMMER + WINTER
+
+    def name
+      fetch_sample(ALL)
+    end
+
+    def summer
+      fetch_sample(SUMMER)
+    end
+
+    def winter
+      fetch_sample(WINTER)
+    end
+  end
+end

data/lib/ffaker/sport_us.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+module FFaker
+  module SportUS
+    extend ModuleUtils
+    extend self
+
+    def name
+      fetch_sample(NAMES)
+    end
+  end
+end

data/lib/ffaker/ssn.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
   module SSN
@@ -11,7 +11,12 @@ module FFaker
     # http://en.wikipedia.org/wiki/Social_Security_number
     #
     def ssn
-      FFaker.numerify('###-##-####')
+      first_group  = fetch_sample([*1..665, *667..899])
+      second_group = rand(1..99)
+      third_group  = rand(1..9999)
+
+      group_numbers = [first_group, second_group, third_group]
+      format('%.3d-%.2d-%.4d', *group_numbers)
     end
   end
 end

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,52 +57,24 @@ 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
 
     def three_character_string(number)
       format('%03d', number)
     end
-
-    # http://en.wikipedia.org/wiki/Luhn_algorithm
-    def luhn_check(number)
-      multiplications = []
-
-      number.split(//).each_with_index do |digit, i|
-        multiplications << if i.even?
-                             digit.to_i * 2
-                           else
-                             digit.to_i
-        end
-      end
-
-      sum = 0
-      multiplications.each do |num|
-        num.to_s.each_byte do |character|
-          sum += character.chr.to_i
-        end
-      end
-
-      control_digit = if sum % 10 == 0
-                        0
-                      else
-                        (sum / 10 + 1) * 10 - sum
-      end
-
-      control_digit.to_s
-    end
   end
 end

data/lib/ffaker/string.rb

@@ -1,23 +1,23 @@
-# 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
+    LOWERS     = Array('a'..'z').freeze
+    UPPERS     = Array('A'..'Z').freeze
     LETTERS    = LOWERS + UPPERS
-    NUMBERS    = [*'0'..'9'].freeze
+    NUMBERS    = Array('0'..'9').freeze
     WORD_CHARS = LETTERS + NUMBERS + ['_']
     SPACES     = [' ', "\t"].freeze
     ESCAPEABLE_CHARS = ['\\', '/', '.', '(', ')', '[', ']', '{', '}'].freeze
 
     def from_regexp(exp)
-      result = ''
+      result = +''
       @last_token = nil
 
       # Drop surrounding /'s and split into characters
@@ -34,7 +34,7 @@ module FFaker
       while tokens.any?
         token = tokens.shift
         if token == DASH && tokens.first && result.last
-          result += [*result.pop..tokens.shift]
+          result += Array(result.pop..tokens.shift)
         elsif token == BACKSLASH
           result << special(tokens.shift)
         else
@@ -50,18 +50,19 @@ module FFaker
       token = tokens.shift
 
       case token
-      when '?' then
+      when '?'
         # TODO: Let ? generate nothing
         '' # We already printed its target
-      when '+' then
+      when '+'
         tokens.unshift(token) if rand(0..1) == 1 # Leave the `+` on to run again
         process_token(@last_token) # Run the last one at least once
-      when '*' then
+      when '*'
         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 = ''
+      when '{'
+        number = +''
         while (ch = tokens.shift) != '}'
           number << ch
         end
@@ -75,14 +76,14 @@ module FFaker
 
     def generate_token(token, tokens)
       case token
-      when /\w/ then
+      when /\w/
         @last_token = [token]
         token
-      when BACKSLASH then
+      when BACKSLASH
         token = tokens.shift
         @last_token = ['\\', token]
         special(token)
-      when '[' then
+      when '['
         set = []
         while (ch = tokens.shift) != ']'
           set << ch

data/lib/ffaker/time.rb

@@ -1,11 +1,15 @@
-# encoding: utf-8
+# frozen_string_literal: true
+
+require 'date'
 
 module FFaker
   module Time
     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
@@ -16,32 +20,46 @@ module FFaker
       fetch_sample(DAYS_OF_WEEK)[0..(options[:long] ? 10 : 2)]
     end
 
-    def date(params = {})
+    def datetime(params = {})
       years_back = params[:year_range] || 5
-      latest_year = params [:year_latest] || 0
-      year = (rand * years_back).ceil + (::Time.now.year - latest_year - years_back)
-      month = (rand * 12).ceil
-      day = (rand * 31).ceil
-      hours = params[:hours] || 0
-      minutes = params[:minutes] || 0
-      series = [date = ::Time.local(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
+      latest_year = params[:year_latest] || 0
+      year = (rand * years_back).ceil + (::DateTime.now.year - latest_year - years_back)
+      month = rand(1..12)
+      day = rand(1..Date.new(year, month, -1).day)
+      hours = params[:hours] || rand(0..23)
+      minutes = params[:minutes] || rand(0..59)
+      series = [date = ::DateTime.new(year, month, day, hours, minutes)]
+      return date unless params[:series]
+
+      params[:series].each do |some_time_after|
+        series << series.last + (rand * some_time_after).ceil
       end
-      date.strftime '%Y-%m-%d %T %z'
+      series
     end
 
-    def datetime(params = {})
-      hours = params[:hours] || (rand * 12).ceil
-      minutes = params[:minutes] || (rand * 59).ceil
-      date(params.merge(hours: hours, minutes: minutes))
+    def date(params = {})
+      datetime(params).to_date
     end
 
     def between(from, to)
-      ::Time.at(from + rand * (to.to_f - from.to_f))
+      from_value = convert_to_time(from)
+      to_value = convert_to_time(to)
+      ::Time.at(from_value + rand * (to_value.to_f - from_value.to_f))
+    end
+
+    private
+
+    def convert_to_time(value)
+      case value.class.name
+      when 'String'
+        DateTime.parse(value).to_time
+      when 'Date', 'DateTime', 'ActiveSupport::TimeWithZone'
+        value.to_time
+      when 'Time'
+        value
+      else
+        raise "FFaker cannot convert #{value.class} '#{value}' to Time"
+      end
     end
   end
 end

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,6 +1,4 @@
-# encoding: utf-8
-
-require 'ostruct'
+# frozen_string_literal: true
 
 module FFaker
   module Unit
@@ -10,9 +8,10 @@ module FFaker
     TIME_UNITS = [
       { name: 'Years', abbreviation: 'yr' },
       { name: 'Days', abbreviation: 'd' },
-      { name: 'Hours', abbreviation: 'Minutes' },
+      { name: 'Hours', abbreviation: 'h' },
+      { name: 'Minutes', abbreviation: 'm' },
       { name: 'Seconds', abbreviation: 's' },
-      { name: 'Milliseconds', abbreviation: 'msec' }
+      { name: 'Milliseconds', abbreviation: 'ms' }
     ].freeze
     TEMPERATURE_UNITS = [
       { name: 'Kelvin', abbreviation: 'K' },
@@ -21,29 +20,29 @@ module FFaker
     ].freeze
 
     def time_name
-      time.name
+      time[:name]
     end
 
     def time_abbr
-      time.abbreviation
+      time[:abbreviation]
     end
 
     def temperature_name
-      temperature.name
+      temperature[:name]
     end
 
     def temperature_abbr
-      temperature.abbreviation
+      temperature[:abbreviation]
     end
 
     private
 
     def time
-      OpenStruct.new(fetch_sample(TIME_UNITS))
+      fetch_sample(TIME_UNITS)
     end
 
     def temperature
-      OpenStruct.new(fetch_sample(TEMPERATURE_UNITS))
+      fetch_sample(TEMPERATURE_UNITS)
     end
   end
 end

data/lib/ffaker/unit_english.rb

@@ -1,7 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/unit'
-require 'ostruct'
+# frozen_string_literal: true
 
 module FFaker
   module UnitEnglish
@@ -15,7 +12,7 @@ module FFaker
       { name: 'foot', abbreviation: 'ft' },
       { name: 'yard', abbreviation: 'yd' },
       { name: 'furlong', abbreviation: 'fur' },
-      { name: 'mile', abbreviation: 'm' }
+      { name: 'mile', abbreviation: 'mi' }
     ].freeze
     MASS_UNITS = [
       { name: 'grains', abbreviation: 'gr' },
@@ -36,75 +33,75 @@ module FFaker
       { name: 'cubic yard', abbreviation: 'CY' }
     ].freeze
     AREA_UNITS = [
-      { name: 'square inch', abbreviation: 'sq. in' },
+      { name: 'square inch', abbreviation: 'sq in' },
       { name: 'square foot', abbreviation: 'sq ft' },
       { name: 'square yard', abbreviation: 'sq yd' },
       { name: 'acre', abbreviation: 'ac' },
       { name: 'section', abbreviation: 's' },
       { name: 'square mile', abbreviation: 'sq mi' },
-      { name: 'township', abbreviation: 'Twp' }
+      { name: 'township', abbreviation: 'twp' }
     ].freeze
 
     def mass_name
-      mass.name
+      mass[:name]
     end
 
     def mass_abbr
-      mass.abbreviation
+      mass[:abbreviation]
     end
 
     def length_name
-      length.name
+      length[:name]
     end
 
     def length_abbr
-      length.abbreviation
+      length[:abbreviation]
     end
 
     def liquid_name
-      liquid.name
+      liquid[:name]
     end
 
     def liquid_abbr
-      liquid.abbreviation
+      liquid[:abbreviation]
     end
 
     def volume_name
-      volume.name
+      volume[:name]
     end
 
     def volume_abbr
-      volume.abbreviation
+      volume[:abbreviation]
     end
 
     def area_name
-      area.name
+      area[:name]
     end
 
     def area_abbr
-      area.abbreviation
+      area[:abbreviation]
     end
 
     private
 
     def length
-      OpenStruct.new(fetch_sample(LENGTH_UNITS))
+      fetch_sample(LENGTH_UNITS)
     end
 
     def mass
-      OpenStruct.new(fetch_sample(MASS_UNITS))
+      fetch_sample(MASS_UNITS)
     end
 
     def liquid
-      OpenStruct.new(fetch_sample(LIQUID_UNITS))
+      fetch_sample(LIQUID_UNITS)
     end
 
     def volume
-      OpenStruct.new(fetch_sample(VOLUME_UNITS))
+      fetch_sample(VOLUME_UNITS)
     end
 
     def area
-      OpenStruct.new(fetch_sample(AREA_UNITS))
+      fetch_sample(AREA_UNITS)
     end
   end
 end

data/lib/ffaker/unit_metric.rb

@@ -1,7 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/unit'
-require 'ostruct'
+# frozen_string_literal: true
 
 module FFaker
   module UnitMetric
@@ -37,65 +34,65 @@ module FFaker
     ].freeze
 
     def mass_name
-      mass.name
+      mass[:name]
     end
 
     def mass_abbr
-      mass.abbreviation
+      mass[:abbreviation]
     end
 
     def length_name
-      length.name
+      length[:name]
     end
 
     def length_abbr
-      length.abbreviation
+      length[:abbreviation]
     end
 
     def liquid_name
-      liquid.name
+      liquid[:name]
     end
 
     def liquid_abbr
-      liquid.abbreviation
+      liquid[:abbreviation]
     end
 
     def volume_name
-      volume.name
+      volume[:name]
     end
 
     def volume_abbr
-      volume.abbreviation
+      volume[:abbreviation]
     end
 
     def area_name
-      area.name
+      area[:name]
     end
 
     def area_abbr
-      area.abbreviation
+      area[:abbreviation]
     end
 
     private
 
     def length
-      OpenStruct.new(fetch_sample(LENGTH_UNITS))
+      fetch_sample(LENGTH_UNITS)
     end
 
     def mass
-      OpenStruct.new(fetch_sample(MASS_UNITS))
+      fetch_sample(MASS_UNITS)
     end
 
     def liquid
-      OpenStruct.new(fetch_sample(LIQUID_UNITS))
+      fetch_sample(LIQUID_UNITS)
     end
 
     def volume
-      OpenStruct.new(fetch_sample(VOLUME_UNITS))
+      fetch_sample(VOLUME_UNITS)
     end
 
     def area
-      OpenStruct.new(fetch_sample(AREA_UNITS))
+      fetch_sample(AREA_UNITS)
     end
   end
 end