ffaker 2.6.0 → 2.7.0

data/lib/ffaker/ssn_se.rb

@@ -23,7 +23,7 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    GENDERS = %w(female male).freeze
+    GENDERS = %w[female male].freeze
 
     def ssn(opts = {})
       from   = opts[:from]   || ::Time.local(1940, 1, 1)
@@ -66,15 +66,15 @@ module FFaker
     end
 
     def get_random_region_even
-      rand(499) * 2
+      rand(0..498) * 2
     end
 
     def get_random_region_odd
-      rand(499) * 2 + 1
+      rand(0..498) * 2 + 1
     end
 
     def three_character_string(number)
-      '%03d' % number
+      format('%03d', number)
     end
 
     # http://en.wikipedia.org/wiki/Luhn_algorithm

data/lib/ffaker/string.rb

@@ -54,11 +54,11 @@ module FFaker
         # TODO: Let ? generate nothing
         '' # We already printed its target
       when '+' then
-        tokens.unshift(token) if rand(2) == 1 # Leave the `+` on to run again
+        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
-        tokens.unshift(token) if rand(2) == 1 # Leave the `*` on to run again
-        return '' if rand(2) == 1 # Or maybe do nothing
+        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 = ''

data/lib/ffaker/time.rb

@@ -5,12 +5,17 @@ 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
       fetch_sample(MONTHS)
     end
 
+    def day_of_week(options = {})
+      fetch_sample(DAYS_OF_WEEK)[0..(options[:long] ? 10 : 2)]
+    end
+
     def date(params = {})
       years_back = params[:year_range] || 5
       latest_year = params [:year_latest] || 0

data/lib/ffaker/utils/module_utils.rb

@@ -1,5 +1,6 @@
 require 'ffaker/utils/array_utils'
 require 'ffaker/utils/random_utils'
+require 'ffaker/utils/unique_utils'
 
 module FFaker
   module ModuleUtils
@@ -28,5 +29,9 @@ module FFaker
             .tr('-', '_')
             .downcase
     end
+
+    def unique(max_retries = 10_000)
+      @unique_generator ||= FFaker::UniqueUtils.new(self, max_retries)
+    end
   end
 end

data/lib/ffaker/utils/unique_utils.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require 'set'
+
+module FFaker
+  class UniqueUtils
+    def initialize(generator, max_retries)
+      @generator = generator
+      @max_retries = max_retries
+      @previous_results = Hash.new { |hash, key| hash[key] = Set.new }
+    end
+
+    def method_missing(name, *arguments)
+      @generator.respond_to?(name) ? add_results_to_hash(name, *arguments) : super
+    end
+
+    def respond_to_missing?(method_name, include_private = false)
+      super
+    end
+
+    RetryLimitExceeded = Class.new(StandardError)
+
+    def clear
+      @previous_results.clear
+    end
+
+    def self.clear
+      ObjectSpace.each_object(self, &:clear)
+    end
+
+    private
+
+    def add_results_to_hash(name, *arguments)
+      @max_retries.times do
+        result = @generator.send(name, *arguments)
+
+        next if @previous_results[[name, arguments]].include?(result)
+
+        @previous_results[[name, arguments]] << result
+        return result
+      end
+      raise RetryLimitExceeded
+    end
+  end
+end

data/lib/ffaker/vehicle.rb

@@ -5,14 +5,14 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    DRIVETRAINS = %w(4WD 4X4 AWD FWD RWD).freeze
+    DRIVETRAINS = %w[4WD 4X4 AWD FWD RWD].freeze
     YEARS = [*'1900'..(Date.today.year + 1).to_s].freeze
-    COLOR_PREFIXES = k(%w(
+    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
-                       ))
-    TRANSMISSIONS_ABBR = %w(AT MT AM CVT).freeze
-    CYLINDERS = %w(2 5 6 8).freeze
+                       ])
+    TRANSMISSIONS_ABBR = %w[AT MT AM CVT].freeze
+    CYLINDERS = %w[2 5 6 8].freeze
 
     def base_color
       FFaker::Color.name

data/scripts/reference.rb

@@ -22,7 +22,7 @@ end
 # Returns faker methods for a given module
 def faker_methods(mod)
   methods = mod.methods - Module.methods -
-            [:k, :underscore, :fetch_sample, :rand, :shuffle]
+            %i[k underscore fetch_sample rand shuffle]
 
   # For Company.name (et al), don't discard :name if it was reimplemented
   methods << :name if mod.send(:name) != mod.to_s

data/test/test_address_gr.rb

@@ -16,23 +16,23 @@ class TestAddressGR < Test::Unit::TestCase
   end
 
   def test_city
-    assert_match /\p{Greek}/, @address_gr.city
+    assert_match(/\p{Greek}/, @address_gr.city)
   end
 
   def test_region
-    assert_match /\p{Greek}/, @address_gr.region
+    assert_match(/\p{Greek}/, @address_gr.region)
   end
 
   def test_zip_code
-    assert_match /\A\d{5}\z/, @address_gr.zip_code
+    assert_match(/\A\d{5}\z/, @address_gr.zip_code)
   end
 
   def test_street_name
-    assert_match /\p{Greek}/, @address_gr.street_name
+    assert_match(/\p{Greek}/, @address_gr.street_name)
   end
 
   def test_street_nbr
-    assert_match /\A\d{1,3}\z/, @address_gr.street_nbr
+    assert_match(/\A\d{1,3}\z/, @address_gr.street_nbr)
   end
 
   def test_street_address

data/test/test_address_ja.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
+
 require 'helper'
 
 class TestAddressJA < Test::Unit::TestCase
@@ -37,7 +38,7 @@ class TestAddressJA < Test::Unit::TestCase
   end
 
   def test_designated_city
-    assert_match(japanese_regex('市'), FFaker::AddressJA.city)
+    assert_match(japanese_regex('[市区]'), FFaker::AddressJA.city)
   end
 
   def test_city

data/test/test_address_kr.rb

@@ -1,5 +1,6 @@
 # encoding: utf-8
 # frozen_string_literal: true
+
 require 'helper'
 
 class TestAddressKR < Test::Unit::TestCase

data/test/test_array_utils.rb

@@ -54,20 +54,20 @@ class TestArrayUtils < Test::Unit::TestCase
 
   def test_self_random_pick_is_deterministic
     supress_warn_output do
-      array = Array.new(10) { rand(10) }
+      array = Array.new(10) { rand(0..9) }
       assert_deterministic { FFaker::ArrayUtils.random_pick(array, 3) }
     end
   end
 
   def test_self_rand_is_deterministic
     supress_warn_output do
-      array = Array.new(10) { rand(10) }
+      array = Array.new(10) { rand(0..9) }
       assert_deterministic { FFaker::ArrayUtils.rand(array) }
     end
   end
 
   def test_self_shuffle_is_deterministic
-    array = Array.new(10) { rand(10) }
+    array = Array.new(10) { rand(0..9) }
     assert_deterministic { FFaker::ArrayUtils.shuffle(array) }
   end
 

data/test/test_color.rb

@@ -21,7 +21,7 @@ class TestColor < Test::Unit::TestCase
   end
 
   def test_hex_code
-    assert_match /\A\h{6}\z/, FFaker::Color.hex_code
+    assert_match(/\A\h{6}\z/, FFaker::Color.hex_code)
   end
 
   def test_rgb_array

data/test/test_company_it.rb

@@ -7,7 +7,7 @@ class TestCompanyIT < Test::Unit::TestCase
 
   assert_methods_are_deterministic(
     FFaker::CompanyIT,
-    :name, :suffix, :prefix
+    :name, :suffix, :prefix, :partita_iva
   )
 
   def test_name
@@ -21,4 +21,8 @@ class TestCompanyIT < Test::Unit::TestCase
   def test_prefix
     assert_match(/[ a-z]+/i, FFaker::CompanyIT.prefix)
   end
+
+  def test_partita_iva
+    assert_match(/\d{11}/, FFaker::CompanyIT.partita_iva)
+  end
 end

data/test/test_identification_es_mx.rb

@@ -23,7 +23,7 @@ class TestIdentificationMX < Test::Unit::TestCase
 
   def test_curp
     or_curp_states_abbr = FFaker::IdentificationMX::ESTADOS_CURP.join('|')
-    re = /\A[a-z][aeioux][a-z]{2}[0-9]{2}[0-1][0-9][0-3][0-9][hm]#{or_curp_states_abbr}[bcdfghjklmnñpqrstvwxyz]{3}[0-9a-z][0-9]\z/i
+    re = /\A[a-z][aeioux][a-z]{2}\d{2}[0-1]\d[0-3]\d[hm](?:#{or_curp_states_abbr})[bcdfghjklmnñpqrstvwxyz]{3}[0-9a-z]\d\z/ui
     assert_match(re, FFaker::IdentificationMX.curp)
   end
 end

data/test/test_module_utils.rb

@@ -6,7 +6,7 @@ class TestModuleUtils < Test::Unit::TestCase
   def test_provides_a_k_method_for_generating_constant_arrays
     obj = Object.new
     obj.extend FFaker::ModuleUtils
-    result = obj.k %w(1 2 3)
+    result = obj.k %w[1 2 3]
 
     assert result.frozen?
     result.each { |e| assert e.frozen? }

data/test/test_name_ar.rb

@@ -29,14 +29,12 @@ class TestFakerNameAR < Test::Unit::TestCase
   end
 
   def test_name_male
-    first_name, last_name = @tester.name_male.split(/\s+/, 2)
-    assert_include(@tester::FIRST_NAMES_MALE, first_name)
-    assert_include(@tester::LAST_NAMES, last_name)
+    expected = @tester::FIRST_NAMES_MALE.product(@tester::LAST_NAMES).map { |set| set.join(' ') }
+    assert_include(expected, @tester.name_male)
   end
 
   def test_name_female
-    first_name, last_name = @tester.name_female.split(/\s+/, 2)
-    assert_include(@tester::FIRST_NAMES_FEMALE, first_name)
-    assert_include(@tester::LAST_NAMES, last_name)
+    expected = @tester::FIRST_NAMES_FEMALE.product(@tester::LAST_NAMES).map { |set| set.join(' ') }
+    assert_include(expected, @tester.name_female)
   end
 end

data/test/test_name_cs.rb

@@ -63,10 +63,10 @@ class TestFakerNameCS < Test::Unit::TestCase
 
   # checks if every name is of the same sex
   def same_sex?(words, sex = :any)
-    (sex == :any ? [:male, :female] : [sex]).any? do |sex|
+    (sex == :any ? %i[male female] : [sex]).any? do |s|
       words.all? do |word|
         [@tester::LAST_NAMES, @tester::FIRST_NAMES].any? do |names|
-          names[sex].include?(word)
+          names[s].include?(word)
         end
       end
     end

data/test/test_name_ja.rb

@@ -5,8 +5,8 @@ require 'helper'
 class TestFakerNameJA < Test::Unit::TestCase
   class << self
     def startup
-      FFaker::NameJA.const_set(:FIRST_NAMES, %w(あきら フミ 三郎))
-      FFaker::NameJA.const_set(:LAST_NAMES, %w(佐藤 高橋 佐々木))
+      FFaker::NameJA.const_set(:FIRST_NAMES, %w[あきら フミ 三郎])
+      FFaker::NameJA.const_set(:LAST_NAMES, %w[佐藤 高橋 佐々木])
     end
 
     def shutdown

data/test/test_name_ru.rb

@@ -75,10 +75,10 @@ class TestFakerNameRU < Test::Unit::TestCase
 
   # checks if every name is of the same sex
   def same_sex?(words, sex = :any)
-    (sex == :any ? [:male, :female] : [sex]).any? do |sex|
+    (sex == :any ? %i[male female] : [sex]).any? do |s|
       words.all? do |word|
         [@tester::LAST_NAMES, @tester::FIRST_NAMES, @tester::PATRONYMICS].any? do |names|
-          names[sex].include?(word)
+          names[s].include?(word)
         end
       end
     end

data/test/test_phone_number.rb

@@ -38,8 +38,8 @@ class TestPhoneNumer < Test::Unit::TestCase
   end
 
   def test_imei_with_sn
-    sn = rand(1_000_000)
-    assert_match(/\A\d{8}#{sprintf('%06d', sn)}\d{1}\z/,
+    sn = rand(0...1_000_000)
+    assert_match(/\A\d{8}#{format('%06d', sn)}\d{1}\z/,
                  FFaker::PhoneNumber.imei(sn))
     assert_deterministic { FFaker::PhoneNumber.imei(sn) }
   end

data/test/test_string.rb

@@ -48,7 +48,7 @@ class TestString < Test::Unit::TestCase
   end
 
   def test_atom_sets
-    assert_include %w(a b c), FS.from_regexp(/[abc]/)
+    assert_include %w[a b c], FS.from_regexp(/[abc]/)
     assert_deterministic { FS.from_regexp(/[abc]/) }
   end
 

data/test/test_time.rb

@@ -5,7 +5,7 @@ require 'helper'
 class TestFakerTime < Test::Unit::TestCase
   include DeterministicHelper
 
-  assert_methods_are_deterministic(FFaker::Time, :date, :datetime, :month)
+  assert_methods_are_deterministic(FFaker::Time, :date, :datetime, :month, :day_of_week)
 
   def setup
     @tester = FFaker::Time
@@ -16,6 +16,14 @@ class TestFakerTime < Test::Unit::TestCase
     assert_match(date_regex, @tester.date)
   end
 
+  def test_day_of_week
+    day_of_week_short_regex = /\A(?:Mon|Tue|Wed|Thu|Fri|Sat|Sun)\z/
+    day_of_week_long_regex = /\A(?:Monday|Tuesday|Wednesday|Thursday|Friday|Saturday|Sunday)\z/
+    assert_match(day_of_week_short_regex, @tester.day_of_week)
+    assert_match(day_of_week_long_regex, @tester.day_of_week(long: true))
+    assert_deterministic { @tester.day_of_week }
+  end
+
   def test_date_hours_and_minutes
     assert_match('04:20:00', @tester.date(hours: 4, minutes: 20))
     assert_deterministic { @tester.date(hours: 4, minutes: 20) }

data/test/test_unique_utils.rb

@@ -0,0 +1,54 @@
+# encoding: utf-8
+
+require 'helper'
+
+class TestUniqueUtils < Test::Unit::TestCase
+  def test_generates_unique_values
+    unique_object = FFaker::UniqueUtils.new(FFaker::Name, 10_000)
+
+    result = [unique_object.name, unique_object.name]
+    assert_operator(result[0], :!=, result[1])
+  end
+
+  def test_returns_error_when_retries_exceeded
+    stubbed_generator = Object.new
+    def stubbed_generator.test
+      1
+    end
+
+    unique_object = FFaker::UniqueUtils.new(stubbed_generator, 3)
+
+    unique_object.test
+
+    assert_raises FFaker::UniqueUtils::RetryLimitExceeded do
+      unique_object.test
+    end
+  end
+
+  def test_clears_unique_values
+    stubbed_generator = Object.new
+    def stubbed_generator.test
+      1
+    end
+
+    unique_object = FFaker::UniqueUtils.new(stubbed_generator, 3)
+
+    assert_equal(1, unique_object.test)
+
+    assert_raises FFaker::UniqueUtils::RetryLimitExceeded do
+      unique_object.test
+    end
+
+    FFaker::UniqueUtils.clear
+
+    assert_equal(1, unique_object.test)
+
+    assert_raises FFaker::UniqueUtils::RetryLimitExceeded do
+      unique_object.test
+    end
+
+    unique_object.clear
+
+    assert_equal(1, unique_object.test)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ffaker
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.7.0
 platform: ruby
 authors:
 - https://github.com/ffaker/ffaker/graphs/contributors
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-20 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -200,6 +200,7 @@ files:
 - lib/ffaker/data/company/catch_pos
 - lib/ffaker/data/company/catch_pre
 - lib/ffaker/data/company/position_areas
+- lib/ffaker/data/company_it/piva_office_codes
 - lib/ffaker/data/conference/conference_list
 - lib/ffaker/data/currency/currency_code
 - lib/ffaker/data/currency/currency_name
@@ -450,6 +451,7 @@ files:
 - lib/ffaker/utils/array_utils.rb
 - lib/ffaker/utils/module_utils.rb
 - lib/ffaker/utils/random_utils.rb
+- lib/ffaker/utils/unique_utils.rb
 - lib/ffaker/vehicle.rb
 - lib/ffaker/venue.rb
 - lib/ffaker/youtube.rb
@@ -596,6 +598,7 @@ files:
 - test/test_string.rb
 - test/test_time.rb
 - test/test_tweet.rb
+- test/test_unique_utils.rb
 - test/test_units.rb
 - test/test_units_english.rb
 - test/test_units_metric.rb
@@ -767,6 +770,7 @@ test_files:
 - test/test_string.rb
 - test/test_time.rb
 - test/test_tweet.rb
+- test/test_unique_utils.rb
 - test/test_units.rb
 - test/test_units_english.rb
 - test/test_units_metric.rb