ffaker 2.15.0 → 2.19.0

data/lib/ffaker/unit.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'ostruct'
-
 module FFaker
   module Unit
     extend ModuleUtils
@@ -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,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'ffaker/unit'
-require 'ostruct'
-
 module FFaker
   module UnitEnglish
     include FFaker::Unit
@@ -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,8 +1,5 @@
 # frozen_string_literal: true
 
-require 'ffaker/unit'
-require 'ostruct'
-
 module FFaker
   module UnitMetric
     include FFaker::Unit
@@ -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

data/lib/ffaker/utils/array_utils.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'ffaker/utils/random_utils'
+require_relative 'random_utils'
 
 module FFaker
   module ArrayUtils

data/lib/ffaker/utils/module_utils.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'ffaker/utils/array_utils'
-require 'ffaker/utils/random_utils'
-require 'ffaker/utils/unique_utils'
+require_relative 'array_utils'
+require_relative 'random_utils'
+require_relative 'unique_utils'
 
 module FFaker
   module ModuleUtils
@@ -35,5 +35,25 @@ module FFaker
     def unique(max_retries = 10_000)
       @unique_generator ||= FFaker::UniqueUtils.new(self, max_retries)
     end
+
+    # http://en.wikipedia.org/wiki/Luhn_algorithm
+    def luhn_check(number)
+      multiplications = []
+
+      number.split(//).each_with_index do |digit, i|
+        multiplications << i.even? ? digit.to_i * 2 : digit.to_i
+      end
+
+      sum = 0
+      multiplications.each do |num|
+        num.to_s.each_byte do |character|
+          sum += character.chr.to_i
+        end
+      end
+
+      control_digit = (sum % 10).zero? ? 0 : (sum / 10 + 1) * 10 - sum
+      control_digit.to_s
+    end
+
   end
 end

data/lib/ffaker/vehicle.rb

@@ -6,7 +6,7 @@ module FFaker
     extend self
 
     DRIVETRAINS = %w[4WD 4X4 AWD FWD RWD].freeze
-    YEARS = [*'1900'..(::Time.now.year + 1).to_s].freeze
+    YEARS = Array('1900'..(::Time.now.year + 1).to_s).freeze
     TRANSMISSIONS_ABBR = %w[AT MT AM CVT].freeze
     CYLINDERS = %w[2 5 6 8].freeze
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FFaker
-  VERSION = '2.15.0'
+  VERSION = '2.19.0'
 end

data/scripts/profiling.rb

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

data/scripts/reference.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-$LOAD_PATH << File.dirname(__FILE__) + '/../lib'
-require 'ffaker'
+require_relative '../lib/ffaker'
 
 ICONS = {
   error: '‼️',
@@ -25,7 +24,7 @@ end
 # Returns faker methods for a given module
 def faker_methods(mod)
   methods = mod.methods - Module.methods -
-            %i[k underscore fetch_sample rand shuffle unique]
+            %i[k underscore fetch_sample rand shuffle unique luhn_check]
 
   # For Company.name (et al), don't discard :name if it was reimplemented
   methods << :name if mod.send(:name) != mod.to_s

data/test/helper.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'test/unit'
-require 'ffaker'
+require_relative '../lib/ffaker'
 
 # Helpers for checking if a method is deterministic -- e.g., that the Random
 # results are repeatable given the same random seed.
@@ -45,9 +45,9 @@ module DeterministicHelper
     end
   end
 
-  def assert_between(got, from, to, exclude_end: false)
-    assert_greater_than_or_equal_to got, from
-    public_send "assert_less_than#{'_or_equal_to' unless exclude_end}", got, to
+  def assert_between(got, range)
+    assert_greater_than_or_equal_to got, range.begin
+    public_send "assert_less_than#{'_or_equal_to' unless range.exclude_end?}", got, range.end
   end
 
   def assert_random(original_block, *args)

data/test/test_address.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'helper'
+require_relative 'helper'
 
 class TestAddress < Test::Unit::TestCase
   include DeterministicHelper

data/test/test_address_au.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'helper'
+require_relative 'helper'
 
 class TestAddressAU < Test::Unit::TestCase
   include DeterministicHelper
@@ -33,7 +33,7 @@ class TestAddressAU < Test::Unit::TestCase
   end
 
   def test_full_address
-    assert_match(/[\, a-z]/, FFaker::AddressAU.full_address)
+    assert_match(/[, a-z]/, FFaker::AddressAU.full_address)
   end
 
   def test_au_suburb_with_states
@@ -60,7 +60,7 @@ class TestAddressAU < Test::Unit::TestCase
 
   def test_full_address_with_states
     FFaker::AddressAU::STATE_ABBR.each do |st_abbr|
-      assert_match(/[\, a-z]/, FFaker::AddressAU.full_address(st_abbr))
+      assert_match(/[, a-z]/, FFaker::AddressAU.full_address(st_abbr))
       assert_deterministic { FFaker::AddressAU.full_address(st_abbr) }
     end
   end

data/test/test_address_br.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'helper'
+require_relative 'helper'
 
 class TestAddressBR < Test::Unit::TestCase
   include DeterministicHelper
@@ -32,6 +32,6 @@ class TestAddressBR < Test::Unit::TestCase
 
   def test_street
     prefixes = FFaker::AddressBR::STREET_PREFIX
-    assert_match(/(#{prefixes.join('|')})( [\p{Alpha}]+){1,2}/, FFaker::AddressBR.street)
+    assert_match(/(#{prefixes.join('|')})( \p{Alpha}+){1,2}/, FFaker::AddressBR.street)
   end
 end

data/test/test_address_ca.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'helper'
+require_relative 'helper'
 
 class TestAddressCA < Test::Unit::TestCase
   include DeterministicHelper

data/test/test_address_ch.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'helper'
+require_relative 'helper'
 
 class TestAddressCHCH < Test::Unit::TestCase
   include DeterministicHelper

data/test/test_address_ch_de.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'helper'
+require_relative 'helper'
 
 class TestAddressCHDE < Test::Unit::TestCase
   include DeterministicHelper