ffaker 2.10.0 → 2.23.0

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'rubygems'
 require 'rake'
 require 'date'
@@ -21,6 +23,10 @@ module Test
   end
 end
 
+require 'rubocop/rake_task'
+
+RuboCop::RakeTask.new
+
 #############################################################################
 #
 # Helper functions
@@ -32,7 +38,7 @@ def name
 end
 
 def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
+  line = File.read("lib/#{name}/version.rb")[/^\s*VERSION\s*=\s*.*/]
   line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
 end
 
@@ -40,10 +46,6 @@ def date
   Date.today.to_s
 end
 
-def rubyforge_project
-  name
-end
-
 def gemspec_file
   "#{name}.gemspec"
 end
@@ -52,10 +54,6 @@ def gem_file
   "#{name}-#{version}.gem"
 end
 
-def replace_header(head, header_name)
-  head.sub!(/(\.#{header_name}\s*= ').*'/) { "#{Regexp.last_match(1)}#{send(header_name)}'" }
-end
-
 #############################################################################
 #
 # Standard tasks
@@ -86,71 +84,38 @@ rescue LoadError
   end
 end
 
-#############################################################################
-#
-# Packaging tasks
-#
-#############################################################################
-
+desc 'Packaging tasks'
 task release: :build do
-  unless `git branch` =~ /^\* master$/
-    puts 'You must be on the master branch to release!'
+  unless `git branch`.match?(/^\* main$/)
+    puts 'You must be on the main branch to release!'
     exit!
   end
   sh "git commit --allow-empty -a -m 'Release #{version}'"
   sh "git tag v#{version}"
-  sh 'git push origin master'
+  sh 'git push origin main'
   sh 'git push --tags'
   sh "gem push pkg/#{name}-#{version}.gem"
 end
 
-task build: %i[gemspec reference] do
+task build: %i[validate reference] do
   sh 'mkdir -p pkg'
-  sh "gem build #{gemspec_file}"
-  sh "mv #{gem_file} pkg"
-end
-
-task gemspec: :validate do
-  # read spec file and split out manifest section
-  spec = File.read(gemspec_file)
-  head, manifest, tail = spec.split("  # = MANIFEST =\n")
-
-  # replace name version and date
-  replace_header(head, :name)
-  replace_header(head, :version)
-  replace_header(head, :date)
-  # comment this out if your rubyforge_project has a different name
-  replace_header(head, :rubyforge_project)
-
-  # determine file list from git ls-files
-  files = `git ls-files`
-          .split("\n")
-          .sort
-          .reject { |file| file =~ /^\./ }
-          .reject { |file| file =~ /^(rdoc|pkg)/ }
-          .map { |file| "    #{file}" }
-          .join("\n")
-
-  # piece file back together and write
-  manifest = "  s.files = %w[\n#{files}\n  ]\n"
-  spec = [head, manifest, tail].join("  # = MANIFEST =\n")
-  File.open(gemspec_file, 'w') { |io| io.write(spec) }
-  puts "Updated #{gemspec_file}"
+  sh "gem build #{gemspec_file} --output=pkg/#{gem_file}"
 end
 
+desc 'Validate library files'
 task :validate do
   libfiles = Dir['lib/*'] - ["lib/#{name}.rb", "lib/#{name}"]
   unless libfiles.empty?
-    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir."
-    exit!
-  end
-  unless Dir['VERSION*'].empty?
-    puts 'A `VERSION` file at root level violates Gem best practices.'
+    puts "Directory `lib` should only contain a `#{name}.rb` file and `#{name}` dir. Found:"
+    libfiles.each do |libfile|
+      puts "- #{libfile}"
+    end
+
     exit!
   end
 end
 
 desc 'Creates REFERENCE.md'
 task :reference do
-  system 'ruby ./scripts/reference.rb > REFERENCE.md'
+  system 'ruby -Ilib ./scripts/reference.rb > REFERENCE.md'
 end

data/bin/console

@@ -0,0 +1,9 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require 'bundler/setup'
+require 'irb'
+
+require_relative '../lib/ffaker'
+
+IRB.start

data/ffaker.gemspec

@@ -1,13 +1,13 @@
+# frozen_string_literal: true
+
+require_relative 'lib/ffaker/version'
+
 Gem::Specification.new do |s|
-  s.specification_version = 2 if s.respond_to? :specification_version=
   s.required_rubygems_version = Gem::Requirement.new('>= 0') if s.respond_to? :required_rubygems_version=
-  s.rubygems_version = '1.3.5'
 
   s.name              = 'ffaker'
-  s.version           = '2.10.0'
-  s.date              = '2018-01-04'
-  s.rubyforge_project = 'ffaker'
-  s.required_ruby_version = '>= 2.0'
+  s.version           = FFaker::VERSION
+  s.required_ruby_version = '>= 3.0'
 
   s.license = 'MIT'
 
@@ -26,21 +26,15 @@ Gem::Specification.new do |s|
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = %w[README.md LICENSE Changelog.md]
 
-  # = MANIFEST =
-  s.files = %w[
-    Changelog.md
-    Gemfile
-    LICENSE
-    RANDOM.md
-    README.md
-    REFERENCE.md
-    Rakefile
-    ffaker.gemspec
-  ] + Dir['lib/**/*', 'scripts/*']
-  # = MANIFEST =
-
-  s.test_files = Dir['test/**/*']
-
-  s.add_development_dependency 'rake', '~> 10.1.1'
-  s.add_development_dependency 'test-unit'
+  s.files = `git ls-files`
+            .split("\n")
+            .sort
+            .grep_v(/^\./)
+            .grep_v(/^(rdoc|pkg)/)
+
+  s.metadata = {
+    'changelog_uri' => 'https://github.com/ffaker/ffaker/blob/main/Changelog.md',
+    'documentation_uri' => 'https://github.com/ffaker/ffaker/blob/main/REFERENCE.md',
+    'rubygems_mfa_required' => 'true'
+  }
 end

data/lib/ffaker/address.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module FFaker
   module Address
@@ -36,10 +36,10 @@ module FFaker
 
     def city
       case rand(0..3)
-      when 0 then format('%s %s%s', city_prefix, Name.first_name, city_suffix)
-      when 1 then format('%s %s', city_prefix, Name.first_name)
-      when 2 then format('%s%s', Name.first_name, city_suffix)
-      when 3 then format('%s%s', Name.last_name, city_suffix)
+      when 0 then "#{city_prefix} #{Name.first_name}#{city_suffix}"
+      when 1 then "#{city_prefix} #{Name.first_name}"
+      when 2 then "#{Name.first_name}#{city_suffix}"
+      when 3 then "#{Name.last_name}#{city_suffix}"
       end
     end
 
@@ -48,7 +48,7 @@ module FFaker
     end
 
     def building_number
-      FFaker.numerify(('#' * rand(0..2)) << '###')
+      FFaker.numerify(('#' * rand(3..5)))
     end
 
     def street_name
@@ -59,7 +59,7 @@ module FFaker
     end
 
     def street_address(include_secondary = false)
-      str = "#{building_number} #{street_name}"
+      str = +"#{building_number} #{street_name}"
       str << " #{secondary_address}" if include_secondary
       str
     end

data/lib/ffaker/address_au.rb

@@ -1,16 +1,16 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'ffaker/address'
+require_relative 'address'
 
 module FFaker
-  # Author wiseleyb<wiseleyb@gmail.com>
   module AddressAU
     include FFaker::Address
 
     extend ModuleUtils
     extend self
 
-    # based on areas labeled state (+act) here: http://en.wikipedia.org/wiki/States_and_territories_of_Australia
+    # based on areas labeled state (+act) here:
+    # http://en.wikipedia.org/wiki/States_and_territories_of_Australia
     STATE = [
       'Australian Capital Territory', 'New South Wales', 'Queensland',
       'South Australia', 'Tasmania', 'Victoria', 'Western Australia'
@@ -102,7 +102,7 @@ module FFaker
 
     def suburb(st_abbr = nil, p_code = nil)
       st_abbr ||= state_abbr
-      p_code  ||= postcode(st_abbr)
+      p_code ||= postcode(st_abbr)
       SUBURB[st_abbr][p_code]
     end
 
@@ -112,11 +112,9 @@ module FFaker
     end
 
     def time_zone(st_abbr = nil)
-      if st_abbr
-        TIME_ZONE[st_abbr]
-      else
-        TIME_ZONE.values.sample
-      end
+      return TIME_ZONE[st_abbr] if st_abbr
+
+      TIME_ZONE.values.sample
     end
   end
 end

data/lib/ffaker/address_br.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'ffaker/address'
+require_relative 'address'
 
 module FFaker
   module AddressBR
@@ -38,8 +38,20 @@ module FFaker
       end
     end
 
-    def full_address
-      "#{street}, #{building_number}, #{city}, #{state}, Brazil"
+    def complement
+      FFaker.numerify(fetch_sample(COMPLEMENT))
+    end
+
+    def neighborhood
+      prefix = fetch_sample(NEIGHBORHOOD_PREFIXES)
+      "#{prefix} #{NameBR.first_name}"
+    end
+
+    def full_address(with_complement: false)
+      base_address_order = [street, building_number, neighborhood, city, state, 'Brazil']
+      return base_address_order.join(', ') unless with_complement
+
+      base_address_order.insert(2, complement).join(', ')
     end
   end
 end

data/lib/ffaker/address_ca.rb

@@ -1,6 +1,6 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
-require 'ffaker/address'
+require_relative 'address'
 
 module FFaker
   module AddressCA
@@ -9,7 +9,7 @@ module FFaker
     extend ModuleUtils
     extend self
 
-    POSTAL_CODE_FORMAT = '?#? #?#'.freeze
+    POSTAL_CODE_FORMAT = '?#? #?#'
     POSTAL_CODE_CHARS = %w[A B C E G H J K L M N P R S T V X Y].freeze
     PROVINCE_ABBRS = %w[NL NS PE NB QC ON MB SK AB BC YT NT NU].freeze
 

data/lib/ffaker/address_ch.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address'
+# frozen_string_literal: true
 
 module FFaker
   module AddressCH

data/lib/ffaker/address_ch_de.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address_ch'
+# frozen_string_literal: true
 
 module FFaker
   module AddressCHDE

data/lib/ffaker/address_ch_fr.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address_ch'
+# frozen_string_literal: true
 
 module FFaker
   module AddressCHFR

data/lib/ffaker/address_ch_it.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address_ch'
+# frozen_string_literal: true
 
 module FFaker
   module AddressCHIT

data/lib/ffaker/address_da.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address'
+# frozen_string_literal: true
 
 module FFaker
   module AddressDA

data/lib/ffaker/address_de.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address'
+# frozen_string_literal: true
 
 module FFaker
   module AddressDE

data/lib/ffaker/address_fi.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address'
+# frozen_string_literal: true
 
 module FFaker
   # List of countries is from Freebase:

data/lib/ffaker/address_fr.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address'
+# frozen_string_literal: true
 
 module FFaker
   module AddressFR
@@ -13,14 +11,12 @@ module FFaker
     MOD = [' B', ' T', ' Q', ' BIS', ' TER', ' QUATER', '', '', '', ''].freeze
     SEP = [', ', ' '].freeze
     TYPE = %w[rue avenue av boulevard bd impasse].freeze
-    POSTAL_CODE_FORMATS = ['####', '#####', '97####', '2A###', '2B###'].freeze
+    POSTAL_CODE_FORMATS = ['#####', '97###', '2A###', '2B###'].freeze
 
     def street_address
-      FFaker.numerify(fetch_sample(NUM)) +
-        fetch_sample(MOD) +
-        fetch_sample(SEP) +
-        fetch_sample(TYPE) + ' ' +
-        FFaker::NameFR.name
+      <<~TEXT.chomp
+        #{FFaker.numerify(fetch_sample(NUM))}#{fetch_sample(MOD)}#{fetch_sample(SEP)}#{fetch_sample(TYPE)} #{FFaker::NameFR.name}
+      TEXT
     end
 
     def postal_code
@@ -34,5 +30,9 @@ module FFaker
     def full_address
       %(#{street_address}#{fetch_sample(SEP)}#{postal_code} #{fetch_sample(CITY)})
     end
+
+    def region
+      fetch_sample(REGION)
+    end
   end
 end

data/lib/ffaker/address_gr.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address'
+# frozen_string_literal: true
 
 module FFaker
   module AddressGR

data/lib/ffaker/address_id.rb

@@ -1,7 +1,4 @@
 # frozen_string_literal: true
-# encoding: utf-8
-
-require 'ffaker/address'
 
 module FFaker
   module AddressID

data/lib/ffaker/address_in.rb

@@ -1,6 +1,4 @@
-# encoding: utf-8
-
-require 'ffaker/address'
+# frozen_string_literal: true
 
 module FFaker
   module AddressIN
@@ -15,6 +13,10 @@ module FFaker
 
     alias pincode zip_code
 
+    def city
+      fetch_sample(CITY)
+    end
+
     def state
       fetch_sample(STATE)
     end

data/lib/ffaker/address_it.rb

@@ -0,0 +1,33 @@
+# frozen_string_literal: true
+
+module FFaker
+  module AddressIT
+    extend ModuleUtils
+    extend self
+
+    NUM = ['#', '##', '##', '###', '####', '#-##'].freeze
+    SEP = [', ', ' '].freeze
+    TYPE = %w[via viale piazza piazzale].freeze
+    POSTAL_CODE_FORMATS = ['#####'].freeze
+
+    def street_address
+      "#{FFaker.numerify(fetch_sample(NUM))}#{fetch_sample(SEP)}#{fetch_sample(TYPE)} #{FFaker::NameIT.name}"
+    end
+
+    def postal_code
+      FFaker.numerify(fetch_sample(POSTAL_CODE_FORMATS))
+    end
+
+    def city
+      fetch_sample(CITY)
+    end
+
+    def full_address
+      %(#{street_address}#{fetch_sample(SEP)}#{postal_code} #{fetch_sample(CITY)})
+    end
+
+    def region
+      fetch_sample(REGION)
+    end
+  end
+end

data/lib/ffaker/address_ja.rb

@@ -1,8 +1,5 @@
-# encoding: utf-8
 # frozen_string_literal: true
 
-require 'ffaker/address'
-
 module FFaker
   module AddressJA
     include FFaker::Address

data/lib/ffaker/address_kr.rb

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