ffaker 1.10.1 → 1.11.0

data/README.rdoc

@@ -76,8 +76,14 @@ $ cat scripts/benchmark.rb
 * kichiro (https://github.com/kichiro)
 * doctorbh (https://github.com/doctorbh)
 
+* See complete list: https://github.com/EmmanuelOga/ffaker/network
+
 == Changelog
 
+* 1.11.0
+
+  Extraction of AddressUK and AddressUS classes. (Thanks doctorbh).
+
 * 1.10.1
 
   Added Faker::AddressCA (Thanks doctorbh, https://github.com/EmmanuelOga/ffaker/pull/27)

data/ffaker.gemspec

@@ -5,8 +5,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'ffaker'
-  s.version           = '1.10.1'
-  s.date              = '2011-11-11'
+  s.version           = '1.11.0'
+  s.date              = '2012-01-03'
   s.rubyforge_project = 'ffaker'
 
   s.summary     = "Faster Faker, generates dummy data."
@@ -32,6 +32,8 @@ Gem::Specification.new do |s|
     lib/ffaker/address.rb
     lib/ffaker/address_ca.rb
     lib/ffaker/address_de.rb
+    lib/ffaker/address_uk.rb
+    lib/ffaker/address_us.rb
     lib/ffaker/company.rb
     lib/ffaker/education.rb
     lib/ffaker/geolocation.rb
@@ -58,6 +60,8 @@ Gem::Specification.new do |s|
     test/test_address.rb
     test/test_address_ca.rb
     test/test_address_de.rb
+    test/test_address_uk.rb
+    test/test_address_us.rb
     test/test_array_utils.rb
     test/test_company.rb
     test/test_faker.rb

data/lib/ffaker.rb

@@ -1,29 +1,34 @@
 module Faker
-  VERSION = "1.10.1"
+  VERSION = "1.11.0"
 
+  require 'ffaker/utils/array_utils'
   require 'ffaker/utils/module_utils'
 
   extend ModuleUtils
 
- LETTERS = k('a'..'z')
+  LETTERS = k('a'..'z')
 
-  def self.numerify(number_string)
-    number_string.gsub!(/#/) { rand(10).to_s }
-    number_string
+  def self.numerify(*masks)
+    mask = ArrayUtils.rand(masks.flatten)
+    mask.gsub!(/#/) { rand(10).to_s }
+    mask
   end
 
-  def self.letterify(letter_string)
-    letter_string.gsub!(/\?/) { LETTERS.rand }
-    letter_string
+  def self.letterify(*masks)
+    mask = ArrayUtils.rand(masks.flatten)
+    mask.gsub!(/\?/) { LETTERS.rand }
+    mask
   end
 
-  def self.bothify(string)
-    letterify(numerify(string))
+  def self.bothify(masks)
+    letterify(numerify(masks))
   end
 
   autoload :Address,       'ffaker/address'
+  autoload :AddressUS,     'ffaker/address_us'
   autoload :AddressDE,     'ffaker/address_de'
   autoload :AddressCA,     'ffaker/address_ca'
+  autoload :AddressUK,     'ffaker/address_uk'
   autoload :Company,       'ffaker/company'
   autoload :Education,     'ffaker/education'
   autoload :Geolocation,   'ffaker/geolocation'

data/lib/ffaker/address.rb

@@ -3,17 +3,22 @@ module Faker
     extend ModuleUtils
     extend self
 
+    # @deprecated US specific address info. Moved into {AddressUS}
     def zip_code
-      Faker.numerify ZIP_FORMATS.rand
+      warn '[zip_code] is deprecated. For US addresses please use the AddressUS module'
+      Faker::AddressUS.zip_code
     end
 
     def us_state
-      STATE.rand
+      warn '[us_state] is deprecated. For US addresses please use the AddressUS module'
+      Faker::AddressUS.state
     end
 
     def us_state_abbr
-      STATE_ABBR.rand
+      warn '[state_abbr] is deprecated. For US addresses please use the AddressUS module'
+      Faker::AddressUS.state_abbr
     end
+    # end US deprecation
 
     def city_prefix
       CITY_PREFIXES.rand
@@ -54,42 +59,31 @@ module Faker
       Faker.numerify(SEC_ADDR.rand)
     end
 
+    # @deprecated UK specific address info. Moved into {AddressUK}
     # UK Variants
     def uk_county
-      UK_COUNTY.rand
+      warn '[uk_county] is deprecated. For UK addresses please use the AddressUK module'
+      Faker::AddressUK.county
     end
 
     def uk_country
-      UK_COUNTRY.rand
+      warn '[uk_country] is deprecated. For UK addresses please use the AddressUK module'
+      Faker::AddressUK.country
     end
 
     def uk_postcode
-      Faker.bothify(UK_POSTCODE.rand).upcase
+      warn '[uk_postcode] is deprecated. For UK addresses please use the AddressUK module'
+      Faker::AddressUK.postcode
     end
-
+    # end UK deprecation
+    
     def neighborhood
       NEIGHBORHOOD.rand
     end
 
-    ZIP_FORMATS = k ['#####', '#####-####']
-
-    STATE = k ['Alabama', 'Alaska', 'Arizona', 'Arkansas',
-      'California', 'Colorado', 'Connecticut', 'Delaware', 'Florida',
-      'Georgia', 'Hawaii', 'Idaho', 'Illinois', 'Indiana', 'Iowa', 'Kansas',
-      'Kentucky', 'Louisiana', 'Maine', 'Maryland', 'Massachusetts',
-      'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 'Montana',
-      'Nebraska', 'Nevada', 'New Hampshire', 'New Jersey', 'New Mexico', 'New York',
-      'North Carolina', 'North Dakota', 'Ohio', 'Oklahoma', 'Oregon',
-      'Pennsylvania', 'Rhode Island', 'South Carolina', 'South Dakota',
-      'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
-      'West Virginia', 'Wisconsin', 'Wyoming']
-
-    STATE_ABBR = k %w(AL AK AS AZ AR CA CO CT DE DC FM FL GA GU HI ID IL IN IA
-                     KS KY LA ME MH MD MA MI MN MS MO MT NE NV NH NJ NM NY NC
-                     ND MP OH OK OR PW PA PR RI SC SD TN TX UT VT VI VA WA WV
-                     WI WY AE AA AP)
 
     COMPASS_DIRECTIONS = k %w(North East West South)
+
     CITY_PREFIXES = k(COMPASS_DIRECTIONS + %w(New Lake Port))
 
     CITY_SUFFIXES = k %w(town ton land ville berg burgh borough bury view port
@@ -119,26 +113,6 @@ module Faker
 
     SEC_ADDR = k ['Apt. ###', 'Suite ###']
 
-    UK_COUNTY = k ['Avon', 'Bedfordshire', 'Berkshire', 'Borders',
-      'Buckinghamshire', 'Cambridgeshire', 'Central', 'Cheshire', 'Cleveland',
-      'Clwyd', 'Cornwall', 'County Antrim', 'County Armagh', 'County Down',
-      'County Fermanagh', 'County Londonderry', 'County Tyrone', 'Cumbria',
-      'Derbyshire', 'Devon', 'Dorset', 'Dumfries and Galloway', 'Durham',
-      'Dyfed', 'East Sussex', 'Essex', 'Fife', 'Gloucestershire', 'Grampian',
-      'Greater Manchester', 'Gwent', 'Gwynedd County', 'Hampshire',
-      'Herefordshire', 'Hertfordshire', 'Highlands and Islands', 'Humberside',
-      'Isle of Wight', 'Kent', 'Lancashire', 'Leicestershire', 'Lincolnshire',
-      'Lothian', 'Merseyside', 'Mid Glamorgan', 'Norfolk', 'North Yorkshire',
-      'Northamptonshire', 'Northumberland', 'Nottinghamshire', 'Oxfordshire',
-      'Powys', 'Rutland', 'Shropshire', 'Somerset', 'South Glamorgan',
-      'South Yorkshire', 'Staffordshire', 'Strathclyde', 'Suffolk', 'Surrey',
-      'Tayside', 'Tyne and Wear', 'Warwickshire', 'West Glamorgan', 'West Midlands',
-      'West Sussex', 'West Yorkshire', 'Wiltshire', 'Worcestershire']
-
-    UK_COUNTRY = k ['England', 'Scotland', 'Wales', 'Northern Ireland']
-
-    UK_POSTCODE = k ['??# #??', '??## #??']
-
     NEIGHBORHOOD = k ['East of Telegraph Road', 'North Norridge', 'Northwest Midlothian/Midlothian Country Club',
       'Mott Haven/Port Morris', 'Kingsbridge Heights', 'Bronxdale', 'Pennypack', 'Bridesburg',
       'Allegheny West', 'Bushwick South', 'Dyker Heights', 'Ocean Parkway South', 'Summerlin North',

data/lib/ffaker/address_uk.rb

@@ -0,0 +1,39 @@
+module Faker
+  module AddressUK
+    include Faker::Address
+    extend ModuleUtils
+    extend self
+
+    def county
+      UK_COUNTY.rand
+    end
+
+    def country
+      UK_COUNTRY.rand
+    end
+
+    def postcode
+      Faker.bothify(UK_POSTCODE.rand).upcase
+    end
+
+    UK_COUNTY = k ['Avon', 'Bedfordshire', 'Berkshire', 'Borders',
+      'Buckinghamshire', 'Cambridgeshire', 'Central', 'Cheshire', 'Cleveland',
+      'Clwyd', 'Cornwall', 'County Antrim', 'County Armagh', 'County Down',
+      'County Fermanagh', 'County Londonderry', 'County Tyrone', 'Cumbria',
+      'Derbyshire', 'Devon', 'Dorset', 'Dumfries and Galloway', 'Durham',
+      'Dyfed', 'East Sussex', 'Essex', 'Fife', 'Gloucestershire', 'Grampian',
+      'Greater Manchester', 'Gwent', 'Gwynedd County', 'Hampshire',
+      'Herefordshire', 'Hertfordshire', 'Highlands and Islands', 'Humberside',
+      'Isle of Wight', 'Kent', 'Lancashire', 'Leicestershire', 'Lincolnshire',
+      'Lothian', 'Merseyside', 'Mid Glamorgan', 'Norfolk', 'North Yorkshire',
+      'Northamptonshire', 'Northumberland', 'Nottinghamshire', 'Oxfordshire',
+      'Powys', 'Rutland', 'Shropshire', 'Somerset', 'South Glamorgan',
+      'South Yorkshire', 'Staffordshire', 'Strathclyde', 'Suffolk', 'Surrey',
+      'Tayside', 'Tyne and Wear', 'Warwickshire', 'West Glamorgan', 'West Midlands',
+      'West Sussex', 'West Yorkshire', 'Wiltshire', 'Worcestershire']
+
+    UK_COUNTRY = k ['England', 'Scotland', 'Wales', 'Northern Ireland']
+
+    UK_POSTCODE = k ['??# #??', '??## #??']
+  end
+end

data/lib/ffaker/address_us.rb

@@ -0,0 +1,37 @@
+module Faker
+  module AddressUS
+    include Faker::Address
+    extend ModuleUtils
+    extend self
+
+    def zip_code
+      Faker.numerify ZIP_FORMATS.rand
+    end
+
+    def state
+      STATE.rand
+    end
+
+    def state_abbr
+      STATE_ABBR.rand
+    end
+
+    ZIP_FORMATS = k ['#####', '#####-####']
+
+    STATE = k ['Alabama', 'Alaska', 'Arizona', 'Arkansas',
+      'California', 'Colorado', 'Connecticut', 'Delaware', 'Florida',
+      'Georgia', 'Hawaii', 'Idaho', 'Illinois', 'Indiana', 'Iowa', 'Kansas',
+      'Kentucky', 'Louisiana', 'Maine', 'Maryland', 'Massachusetts',
+      'Michigan', 'Minnesota', 'Mississippi', 'Missouri', 'Montana',
+      'Nebraska', 'Nevada', 'New Hampshire', 'New Jersey', 'New Mexico', 'New York',
+      'North Carolina', 'North Dakota', 'Ohio', 'Oklahoma', 'Oregon',
+      'Pennsylvania', 'Rhode Island', 'South Carolina', 'South Dakota',
+      'Tennessee', 'Texas', 'Utah', 'Vermont', 'Virginia', 'Washington',
+      'West Virginia', 'Wisconsin', 'Wyoming']
+
+    STATE_ABBR = k %w(AL AK AS AZ AR CA CO CT DE DC FM FL GA GU HI ID IL IN IA
+                     KS KY LA ME MH MD MA MI MN MS MO MT NE NV NH NJ NM NY NC
+                     ND MP OH OK OR PW PA PR RI SC SD TN TX UT VT VI VA WA WV
+                     WI WY AE AA AP)
+  end
+end

data/test/test_address_de.rb

@@ -2,10 +2,14 @@ require 'helper'
 
 class TestAddressDE < Test::Unit::TestCase
   def test_city
-    assert_match /[ a-z]+/, Faker::Address.city
+    assert_match /[ a-z]+/, Faker::AddressDE.city
   end
 
   def test_state
-    assert_match /[ a-z]/, Faker::Address.us_state
+    assert_match /[ a-z]/, Faker::AddressDE.state
+  end
+
+  def test_zip_code
+    assert_match /^\d{5}$/, Faker::AddressDE.zip_code
   end
 end

data/test/test_address_uk.rb

@@ -0,0 +1,15 @@
+require 'helper'
+
+class TestAddressUK < Test::Unit::TestCase
+  def test_county
+    assert_match /[ a-z]/, Faker::AddressUK.county
+  end
+
+  def test_country
+    assert_match /[ a-z]/, Faker::AddressUK.country
+  end
+  
+  def test_postcode
+    assert_match /^[A-Z]{2}\d \d[A-Z]{2}|[A-Z]{2}\d\d \d[A-Z]{2}$/, Faker::AddressUK.postcode
+  end
+end

data/test/test_address_us.rb

@@ -0,0 +1,19 @@
+require 'helper'
+
+class TestAddressUSUS < Test::Unit::TestCase
+  def test_us_state
+    assert_match /[ a-z]/, Faker::AddressUS.state
+  end
+
+  def test_us_state_abbr
+    assert_match /[A-Z]/, Faker::AddressUS.state_abbr
+  end
+
+  def test_zip_code
+    assert_match /[0-9]/, Faker::AddressUS.zip_code
+  end
+
+  def test_zip_code_frozen
+    assert Faker::AddressUS.zip_code.frozen? == false
+  end
+end

data/test/test_faker.rb

@@ -4,12 +4,24 @@ class TestFaker < Test::Unit::TestCase
   def test_numerify
     assert Faker.numerify('###').match(/\d{3}/)
   end
+  
+  def test_numerify_with_array
+    assert Faker.numerify(['###', '###']).match(/\d{3}/)
+  end
 
   def test_letterify
     assert Faker.letterify('???').match(/[a-z]{3}/)
   end
 
+  def test_letterify_with_array
+    assert Faker.letterify(['???', '???']).match(/[a-z]{3}/)
+  end
+
   def test_bothify
     assert Faker.bothify('???###').match(/[a-z]{3}\d{3}/)
   end
+
+  def test_bothify
+    assert Faker.bothify(['???###', '???###']).match(/[a-z]{3}\d{3}/)
+  end
 end

metadata

@@ -1,33 +1,24 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: ffaker
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 10
-  - 1
-  version: 1.10.1
+version: !ruby/object:Gem::Version
+  version: 1.11.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Emmanuel Oga
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-11 00:00:00 -03:00
-default_executable: 
+date: 2012-01-03 00:00:00.000000000 Z
 dependencies: []
-
 description: Faster Faker, generates dummy data.
 email: EmmanuelOga@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
 - LICENSE
-files: 
+files:
 - History.txt
 - LICENSE
 - README.rdoc
@@ -37,6 +28,8 @@ files:
 - lib/ffaker/address.rb
 - lib/ffaker/address_ca.rb
 - lib/ffaker/address_de.rb
+- lib/ffaker/address_uk.rb
+- lib/ffaker/address_us.rb
 - lib/ffaker/company.rb
 - lib/ffaker/education.rb
 - lib/ffaker/geolocation.rb
@@ -63,6 +56,8 @@ files:
 - test/test_address.rb
 - test/test_address_ca.rb
 - test/test_address_de.rb
+- test/test_address_uk.rb
+- test/test_address_us.rb
 - test/test_array_utils.rb
 - test/test_company.rb
 - test/test_faker.rb
@@ -81,42 +76,37 @@ files:
 - test/test_module_utils.rb
 - test/test_phone_number.rb
 - test/test_phone_number_sn.rb
-has_rdoc: true
 homepage: http://github.com/emmanueloga/ffaker
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: ffaker
-rubygems_version: 1.3.7
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 2
 summary: Faster Faker, generates dummy data.
-test_files: 
+test_files:
 - test/test_address.rb
 - test/test_address_ca.rb
 - test/test_address_de.rb
+- test/test_address_uk.rb
+- test/test_address_us.rb
 - test/test_array_utils.rb
 - test/test_company.rb
 - test/test_faker.rb