faker 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21f18c21bf5f25337091e950534111e7c9c02d55
-  data.tar.gz: 5d00fceede0cb6fc670f6864791f1c27d333e773
+  metadata.gz: 9d9ae16e743b75883bfa74a32a7bf9e8d61003bb
+  data.tar.gz: 14f3e9cf81df8486916540f7e87f4adb7c4510d1
 SHA512:
-  metadata.gz: e13c2231dfc562013daef8ffa82d10988ab2a9f88ba22dad44bf39a83c6381466ebb82bc9af5a03f361c0d6881ecd0c900b21ce929ffe250d39df033ebaad8b6
-  data.tar.gz: f9d554b682f4b9d61470c8aeb86549552468ffc61d56bb6aa9cb9b708e19f850e8cdda7373f864411b2c46ae05bce61555e1746ad15b4dce72101f220b832523
+  metadata.gz: c2c98f8d6edc8c068b9671cdb1426b51e194e8e1f9648e4c0c1a62ece721457e0d53fefc449fa5006a8dc52985e6ae42c0f0318811190b0e1e5d1719d64d3fc2
+  data.tar.gz: c8fd7c213d18954544d406d733c3c4304cbce9d9998dfe34f09d987e46b42682259ef20da2284f015fd53bfa54d9e18591240793b32ccdbc685776250b2e8aed

data/History.txt

@@ -1,3 +1,10 @@
+== 1.4.3 2014-08-15
+* Updated Russian locale
+* Added EIN generator
+* Fixed Swedish locale
+* Added birthday to Faker::Date
+* Added Faker::App
+
 == 1.4.2 2014-07-15
 * Added Swedish locale
 * README update

data/README.md

@@ -103,7 +103,10 @@ Faker::Code.ean #=> "4600051000057"
 
 Faker::Commerce.color #=> "lavender"
 
+# Optional arguments max=3, fixed_amount=false
 Faker::Commerce.department #=> "Grocery, Health & Beauty"
+Faker::Commerce.department(5) #=> "Grocery, Books, Health & Beauty"
+Faker::Commerce.department(2, true) #=> "Books & Tools"
 
 Faker::Commerce.product_name #=> "Practical Granite Shirt"
 
@@ -126,6 +129,8 @@ Faker::Company.catch_phrase #=> "Business-focused coherent parallelism"
 # When a straight answer won't do, BS to the rescue!
 Faker::Company.bs #=> "empower one-to-one web-readiness"
 
+Faker::Company.ein #=> "34-8488813"
+
 Faker::Company.duns_number #=> "08-341-3736"
 
 # Get a random company logo url in GIF format.
@@ -294,7 +299,7 @@ Faker::PhoneNumber.cell_phone #=> "(186)285-7925"
 
 # NOTE NOTE NOTE NOTE
 # For the 'US only' methods below, first you must do the following:
-Faker::Config.locale = 'en-us'
+Faker::Config.locale = 'en-US'
 
 # US only
 Faker::PhoneNumber.area_code #=> "201"
@@ -336,8 +341,18 @@ Faker::Hacker.verb  #=> "bypass"
 Faker::Hacker.ingverb #=> "synthesizing"
 ```
 
+###Faker::App
+-----------------
+
+```ruby
 
+Faker::App.name #=> "Treeflex"
 
+Faker::App.version #=> "0.7.9"
+
+Faker::App.author #=> "Daphne Swift"
+
+```
 
 Customization
 ------------
@@ -349,6 +364,23 @@ allowing you to get different formats by switching locales.  Just set
 Faker::Config.locale to the locale you want, and Faker will take care of the
 rest.
 
+If your locale doesn't already exist, create it in the \lib\locales\ directory
+and you can then override or add elements to suit
+
+```yaml
+
+en-au-ocker:
+  faker:
+    name:
+      # Exiting faker field, new data
+      first_name: [Charlotte, Ava, Chloe, Emily]
+
+      # New faker fields
+      ocker_first_name: [Bazza, Bluey, Davo, Johno, Shano, Shazza]
+      region: [South East Queensland, Wide Bay Burnett, Margaret River, Port Pirie, Gippsland, Elizabeth, Barossa]
+
+```
+
 Contributing
 ------------
 See [CONTRIBUTING.md](https://github.com/stympy/faker/blob/master/CONTRIBUTING.md).

data/lib/faker.rb

@@ -7,7 +7,11 @@ rescue LoadError
 end
 
 require 'i18n'
-I18n.enforce_available_locales = true
+require 'set' # Fixes a bug in i18n 0.6.11
+
+if I18n.respond_to?(:enforce_available_locales=)
+  I18n.enforce_available_locales = true
+end
 I18n.load_path += Dir[File.join(mydir, 'locales', '*.yml')]
 
 
@@ -172,6 +176,7 @@ require 'faker/date'
 require 'faker/time'
 require 'faker/number'
 require 'faker/hacker'
+require 'faker/app'
 
 require 'extensions/array'
 require 'extensions/symbol'

data/lib/faker/address.rb

@@ -23,8 +23,12 @@ module Faker
         bothify(fetch('address.building_number'))
       end
 
-      def zip_code
-        bothify(fetch('address.postcode'))
+      def zip_code(state_abbreviation = '')
+        return bothify(fetch('address.postcode')) if state_abbreviation === ''
+
+        # provide a zip code that is valid for the state provided
+        # see http://www.fincen.gov/forms/files/us_state_territory_zip_codes.pdf
+        bothify(fetch('address.postcode_by_state.' + state_abbreviation))
       end
 
       def time_zone

data/lib/faker/app.rb

@@ -0,0 +1,22 @@
+module Faker
+  class App < Base
+    class << self
+
+      def name
+        fetch('app.name')
+      end
+
+      def version
+        if parse('app.version') == ""
+          numerify(fetch('app.version'))
+        else
+          parse('app.version')
+        end
+      end
+
+      def author
+        parse('app.author')
+      end
+    end
+  end
+end

data/lib/faker/avatar.rb

@@ -1,9 +1,13 @@
 module Faker
   class Avatar < Base
     class << self
-      def image(slug=nil)
+      SUPPORTED_FORMATS = %w(png jpg bmp)
+
+      def image(slug = nil, size = '300x300', format = 'png')
+        raise ArgumentError, "Size should be specified in format 300x300" unless size.match(/^[0-9]+x[0-9]+$/)
+        raise ArgumentError, "Supported formats are #{SUPPORTED_FORMATS.join(', ')}" unless SUPPORTED_FORMATS.include?(format)
         slug ||= Faker::Lorem.words.join
-        "http://robohash.org/#{slug}"
+        "http://robohash.org/#{slug}.#{format}?size=#{size}"
       end
     end
   end

data/lib/faker/bitcoin.rb

@@ -1,11 +1,12 @@
 require 'digest'
+require 'securerandom'
 
 module Faker
   class Bitcoin < Base
     class << self
 
       def address
-        hash = rand(2**160).to_s(16)
+        hash = SecureRandom.hex(20)
         version = 0
         packed = version.chr + [hash].pack("H*")
         checksum = Digest::SHA2.digest(Digest::SHA2.digest(packed))[0..3]

data/lib/faker/commerce.rb

@@ -6,8 +6,17 @@ module Faker
         fetch('commerce.color')
       end
 
-      def department
-        fetch('commerce.department')
+      def department(max = 3, fixed_amount = false)
+        num = max if fixed_amount
+        num ||= 1 + rand(max)
+
+        categories = categories(num)
+
+        if num > 1
+          merge_categories(categories)
+        else
+          categories[0]
+        end
       end
 
       def product_name
@@ -18,6 +27,25 @@ module Faker
         random = Random.new
         (random.rand(0..100.0) * 100).floor/100.0
       end    
+
+      private
+
+      def categories(num)
+        categories = []
+        while categories.length < num do
+          category = fetch('commerce.department')
+          categories << category unless categories.include?(category)
+        end
+
+        categories
+      end
+
+      def merge_categories(categories)
+        separator = fetch('separator')
+        comma_separated = categories.slice!(0...-1).join(', ')
+
+        [comma_separated, categories[0]].join(separator)
+      end
     end
   end
 end

data/lib/faker/company.rb

@@ -21,6 +21,10 @@ module Faker
         translate('faker.company.bs').collect {|list| list.sample }.join(' ')
       end
 
+      def ein
+        ('%09d' % rand(10 ** 9)).gsub(/(\d\d)(\d\d\d\d\d\d\d)/, '\\1-\\2')
+      end
+
       def duns_number
         ('%09d' % rand(10 ** 9)).gsub(/(\d\d)(\d\d\d)(\d\d\d\d)/, '\\1-\\2-\\3')
       end

data/lib/faker/date.rb

@@ -22,6 +22,14 @@ module Faker
         between(from, to).to_date
       end
 
+      def birthday(min_age = 18, max_age = 65)
+        t = ::Date.today
+        from =  ::Date.new(t.year - min_age, t.month, t.day)
+        to   =  ::Date.new(t.year - max_age, t.month, t.day)
+
+        between(from, to).to_date
+      end
+
       private
 
       def get_date_object(date)

data/lib/faker/lorem.rb

@@ -16,6 +16,10 @@ module Faker
         word_list.shuffle[0, resolved_num]
       end
 
+      def character
+        characters(1)
+      end
+
       def characters(char_count = 255)
         return '' if char_count.respond_to?(:to_i) && char_count.to_i < 1
         char_count = resolve(char_count)

data/lib/faker/version.rb

@@ -1,3 +1,3 @@
 module Faker #:nodoc:
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/locales/en-US.yml

@@ -4,6 +4,59 @@ en-US:
       domain_suffix: [com, us, biz, info, name, net, org]
     address:
       default_country: [United States, United States of America, USA]
+      postcode_by_state:
+        AL: '350##'
+        AK: '995##'
+        AS: '967##'
+        AZ: '850##'
+        AR: '717##'
+        CA: '900##'
+        CO: '800##'
+        CT: '061##'
+        DC: '204##'
+        DE: '198##'
+        FL: '322##'
+        GA: '301##'
+        HI: '967##'
+        ID: '832##'
+        IL: '600##'
+        IN: '463##'
+        IA: '510##'
+        KS: '666##'
+        KY: '404##'
+        LA: '701##'
+        ME: '042##'
+        MD: '210##'
+        MA: '026##'
+        MI: '480##'
+        MN: '555##'
+        MS: '387##'
+        MO: '650##'
+        MT: '590##'
+        NE: '688##'
+        NV: '898##'
+        NH: '036##'
+        NJ: '076##'
+        NM: '880##'
+        NY: '122##'
+        NC: '288##'
+        ND: '586##'
+        OH: '444##'
+        OK: '730##'
+        OR: '979##'
+        PA: '186##'
+        RI: '029##'
+        SC: '299##'
+        SD: '577##'
+        TN: '383##'
+        TX: '798##'
+        UT: '847##'
+        VT: '050##'
+        VA: '222##'
+        WA: '990##'
+        WV: '247##'
+        WI: '549##'
+        WY: '831##'
     phone_number:
       area_code: ["201", "202", "203", "205", "206", "207", "208", "209", "210", "212", "213", "214", "215", "216", "217", "218", "219", "224", "225", "227", "228", "229", "231", "234", "239", "240", "248", "251", "252", "253", "254", "256", "260", "262", "267", "269", "270", "276", "281", "283", "301", "302", "303", "304", "305", "307", "308", "309", "310", "312", "313", "314", "315", "316", "317", "318", "319", "320", "321", "323", "330", "331", "334", "336", "337", "339", "347", "351", "352", "360", "361", "386", "401", "402", "404", "405", "406", "407", "408", "409", "410", "412", "413", "414", "415", "417", "419", "423", "424", "425", "434", "435", "440", "443", "445", "464", "469", "470", "475", "478", "479", "480", "484", "501", "502", "503", "504", "505", "507", "508", "509", "510", "512", "513", "515", "516", "517", "518", "520", "530", "540", "541", "551", "557", "559", "561", "562", "563", "564", "567", "570", "571", "573", "574", "580", "585", "586", "601", "602", "603", "605", "606", "607", "608", "609", "610", "612", "614", "615", "616", "617", "618", "619", "620", "623", "626", "630", "631", "636", "641", "646", "650", "651", "660", "661", "662", "667", "678", "682", "701", "702", "703", "704", "706", "707", "708", "712", "713", "714", "715", "716", "717", "718", "719", "720", "724", "727", "731", "732", "734", "737", "740", "754", "757", "760", "763", "765", "770", "772", "773", "774", "775", "781", "785", "786", "801", "802", "803", "804", "805", "806", "808", "810", "812", "813", "814", "815", "816", "817", "818", "828", "830", "831", "832", "835", "843", "845", "847", "848", "850", "856", "857", "858", "859", "860", "862", "863", "864", "865", "870", "872", "878", "901", "903", "904", "906", "907", "908", "909", "910", "912", "913", "914", "915", "916", "917", "918", "919", "920", "925", "928", "931", "936", "937", "940", "941", "947", "949", "952", "954", "956", "959", "970", "971", "972", "973", "975", "978", "979", "980", "984", "985", "989"]
       exchange_code: ["201", "202", "203", "205", "206", "207", "208", "209", "210", "212", "213", "214", "215", "216", "217", "218", "219", "224", "225", "227", "228", "229", "231", "234", "239", "240", "248", "251", "252", "253", "254", "256", "260", "262", "267", "269", "270", "276", "281", "283", "301", "302", "303", "304", "305", "307", "308", "309", "310", "312", "313", "314", "315", "316", "317", "318", "319", "320", "321", "323", "330", "331", "334", "336", "337", "339", "347", "351", "352", "360", "361", "386", "401", "402", "404", "405", "406", "407", "408", "409", "410", "412", "413", "414", "415", "417", "419", "423", "424", "425", "434", "435", "440", "443", "445", "464", "469", "470", "475", "478", "479", "480", "484", "501", "502", "503", "504", "505", "507", "508", "509", "510", "512", "513", "515", "516", "517", "518", "520", "530", "540", "541", "551", "557", "559", "561", "562", "563", "564", "567", "570", "571", "573", "574", "580", "585", "586", "601", "602", "603", "605", "606", "607", "608", "609", "610", "612", "614", "615", "616", "617", "618", "619", "620", "623", "626", "630", "631", "636", "641", "646", "650", "651", "660", "661", "662", "667", "678", "682", "701", "702", "703", "704", "706", "707", "708", "712", "713", "714", "715", "716", "717", "718", "719", "720", "724", "727", "731", "732", "734", "737", "740", "754", "757", "760", "763", "765", "770", "772", "773", "774", "775", "781", "785", "786", "801", "802", "803", "804", "805", "806", "808", "810", "812", "813", "814", "815", "816", "817", "818", "828", "830", "831", "832", "835", "843", "845", "847", "848", "850", "856", "857", "858", "859", "860", "862", "863", "864", "865", "870", "872", "878", "901", "903", "904", "906", "907", "908", "909", "910", "912", "913", "914", "915", "916", "917", "918", "919", "920", "925", "928", "931", "936", "937", "940", "941", "947", "949", "952", "954", "956", "959", "970", "971", "972", "973", "975", "978", "979", "980", "984", "985", "989"]

data/lib/locales/en-au-ocker.yml

@@ -0,0 +1,31 @@
+# Australian Slang, and ocker names for a bit of fun, as well as
+# Aussie specific terms and references
+# Took the lead of previous contributors of en-au as a baseline
+# regular names are top 50 names from 2013
+
+en-au-ocker:
+  faker:
+    name:
+      first_name: [Charlotte, Ava, Chloe, Emily, Olivia, Zoe, Lily, Sophie, Amelia, Sofia, Ella, Isabella, Ruby, Sienna, Mia+3, Grace, Emma, Ivy, Layla, Abigail, Isla, Hannah, Zara, Lucy, Evie, Annabelle, Madison, Alice, Georgia, Maya, Madeline, Audrey, Scarlett, Isabelle, Chelsea, Mila, Holly, Indiana, Poppy, Harper, Sarah, Alyssa, Jasmine, Imogen, Hayley, Pheobe, Eva, Evelyn, Mackenzie, Ayla, Oliver, Jack, Jackson, William, Ethan, Charlie, Lucas, Cooper, Lachlan, Noah, Liam, Alexander, Max, Isaac, Thomas, Xavier, Oscar, Benjamin, Aiden, Mason, Samuel, James, Levi, Riley, Harrison, Ryan, Henry, Jacob, Joshua, Leo, Zach, Harry, Hunter, Flynn, Archie, Tyler, Elijah, Hayden, Jayden, Blake, Archer, Ashton, Sebastian, Zachery, Lincoln, Mitchell, Luca, Nathan, Kai, Connor, Tom, Nigel, Matt, Sean]
+      last_name: [Smith, Jones, Williams, Brown, Wilson, Taylor, Morton, White, Martin, Anderson, Thompson, Nguyen, Thomas, Walker, Harris, Lee, Ryan, Robinson, Kelly, King, Rausch, Ridge, Connolly, LeQuesne]
+      ocker_first_name: [Bazza, Bluey, Davo, Johno, Shano, Shazza]
+    company:
+      suffix: [Pty Ltd, and Sons, Corp, Group, Brothers, Partners]
+    internet:
+      domain_suffix: [com.au, com, net.au, net, org.au, org]
+    address:
+      street_root: [Ramsay Street, Bonnie Doon, Cavill Avenue, Queen Street]
+      street_name:
+        - "#{street_root}"
+      city_prefix: [Bondi, Burleigh Heads, Carlton, Fitzroy, Fremantle, Glenelg, Manly, Noosa, Stones Corner, St Kilda, Surry Hills, Yarra Valley]
+      city:
+        - "#{city_prefix}"
+      state_abbr: [NSW, QLD, NT, SA, WA, TAS, ACT, VIC]
+      region: [South East Queensland, Wide Bay Burnett, Margaret River, Port Pirie, Gippsland, Elizabeth, Barossa]
+      state: [New South Wales, Queensland, Northern Territory, South Australia, Western Australia, Tasmania, Australian Capital Territory, Victoria]
+      postcode: ['0###', '2###', '3###', '4###', '5###', '6###', '7###']
+      building_number: ['####', '###', '##']
+      street_suffix: [Avenue, Boulevard, Circle, Circuit, Court, Crescent, Crest, Drive, Estate Dr, Grove, Hill, Island, Junction, Knoll, Lane, Loop, Mall, Manor, Meadow, Mews, Parade, Parkway, Pass, Place, Plaza, Ridge, Road, Run, Square, Station St, Street, Summit, Terrace, Track, Trail, View Rd, Way]
+      default_country: [Australia]
+    phone_number:
+      formats: ['0# #### ####', '+61 # #### ####', '04## ### ###', '+61 4## ### ###'] #iOS AUS phone formats

data/lib/locales/en.yml

@@ -1,15 +1,17 @@
 en:
   faker:
+    separator: ' & '
     address:
       city_prefix: [North, East, West, South, New, Lake, Port]
       city_suffix: [town, ton, land, ville, berg, burgh, borough, bury, view, port, mouth, stad, furt, chester, mouth, fort, haven, side, shire]
       country: [Afghanistan, Albania, Algeria, American Samoa, Andorra, Angola, Anguilla, Antarctica (the territory South of 60 deg S), Antigua and Barbuda, Argentina, Armenia, Aruba, Australia, Austria, Azerbaijan, Bahamas, Bahrain, Bangladesh, Barbados, Belarus, Belgium, Belize, Benin, Bermuda, Bhutan, Bolivia, Bosnia and Herzegovina, Botswana, Bouvet Island (Bouvetoya), Brazil, British Indian Ocean Territory (Chagos Archipelago), Brunei Darussalam, Bulgaria, Burkina Faso, Burundi, Cambodia, Cameroon, Canada, Cape Verde, Cayman Islands, Central African Republic, Chad, Chile, China, Christmas Island, Cocos (Keeling) Islands, Colombia, Comoros, Congo, Congo, Cook Islands, Costa Rica, Cote d'Ivoire, Croatia, Cuba, Cyprus, Czech Republic, Denmark, Djibouti, Dominica, Dominican Republic, Ecuador, Egypt, El Salvador, Equatorial Guinea, Eritrea, Estonia, Ethiopia, Faroe Islands, Falkland Islands (Malvinas), Fiji, Finland, France, French Guiana, French Polynesia, French Southern Territories, Gabon, Gambia, Georgia, Germany, Ghana, Gibraltar, Greece, Greenland, Grenada, Guadeloupe, Guam, Guatemala, Guernsey, Guinea, Guinea-Bissau, Guyana, Haiti, Heard Island and McDonald Islands, Holy See (Vatican City State), Honduras, Hong Kong, Hungary, Iceland, India, Indonesia, Iran, Iraq, Ireland, Isle of Man, Israel, Italy, Jamaica, Japan, Jersey, Jordan, Kazakhstan, Kenya, Kiribati, Democratic People's Republic of Korea, Republic of Korea, Kuwait, Kyrgyz Republic, Lao People's Democratic Republic, Latvia, Lebanon, Lesotho, Liberia, Libyan Arab Jamahiriya, Liechtenstein, Lithuania, Luxembourg, Macao, Macedonia, Madagascar, Malawi, Malaysia, Maldives, Mali, Malta, Marshall Islands, Martinique, Mauritania, Mauritius, Mayotte, Mexico, Micronesia, Moldova, Monaco, Mongolia, Montenegro, Montserrat, Morocco, Mozambique, Myanmar, Namibia, Nauru, Nepal, Netherlands Antilles, Netherlands, New Caledonia, New Zealand, Nicaragua, Niger, Nigeria, Niue, Norfolk Island, Northern Mariana Islands, Norway, Oman, Pakistan, Palau, Palestinian Territory, Panama, Papua New Guinea, Paraguay, Peru, Philippines, Pitcairn Islands, Poland, Portugal, Puerto Rico, Qatar, Reunion, Romania, Russian Federation, Rwanda, Saint Barthelemy, Saint Helena, Saint Kitts and Nevis, Saint Lucia, Saint Martin, Saint Pierre and Miquelon, Saint Vincent and the Grenadines, Samoa, San Marino, Sao Tome and Principe, Saudi Arabia, Senegal, Serbia, Seychelles, Sierra Leone, Singapore, Slovakia (Slovak Republic), Slovenia, Solomon Islands, Somalia, South Africa, South Georgia and the South Sandwich Islands, Spain, Sri Lanka, Sudan, Suriname, Svalbard & Jan Mayen Islands, Swaziland, Sweden, Switzerland, Syrian Arab Republic, Taiwan, Tajikistan, Tanzania, Thailand, Timor-Leste, Togo, Tokelau, Tonga, Trinidad and Tobago, Tunisia, Turkey, Turkmenistan, Turks and Caicos Islands, Tuvalu, Uganda, Ukraine, United Arab Emirates, United Kingdom, United States of America, United States Minor Outlying Islands, Uruguay, Uzbekistan, Vanuatu, Venezuela, Vietnam, 'Virgin Islands, British', 'Virgin Islands, U.S.', Wallis and Futuna, Western Sahara, Yemen, Zambia, Zimbabwe]
-      country_code: [AD, AE, AF, AG, AI, AL, AM, AO, AQ, AR, AS, AT, AU, AW, AX, AZ, BA, BB, BD, BE, BF, BG, BH, BI, BJ, BL, BM, BN, BO, BQ, BQ, BR, BS, BT, BV, BW, BY, BZ, CA, CC, CD, CF, CG, CH, CI, CK, CL, CM, CN, CO, CR, CU, CV, CW, CX, CY, CZ, DE, DJ, DK, DM, DO, DZ, EC, EE, EG, EH, ER, ES, ET, FI, FJ, FK, FM, FO, FR, GA, GB, GD, GE, GF, GG, GH, GI, GL, GM, GN, GP, GQ, GR, GS, GT, GU, GW, GY, HK, HM, HN, HR, HT, HU, ID, IE, IL, IM, IN, IO, IQ, IR, IS, IT, JE, JM, JO, JP, KE, KG, KH, KI, KM, KN, KP, KR, KW, KY, KZ, LA, LB, LC, LI, LK, LR, LS, LT, LU, LV, LY, MA, MC, MD, ME, MF, MG, MH, MK, ML, MM, MN, MO, MP, MQ, MR, MS, MT, MU, MV, MW, MX, MY, MZ, NA, NC, NE, NF, NG, NI, NL, NO, NP, NR, NU, NZ, OM, PA, PE, PF, PG, PH, PK, PL, PM, PN, PR, PS, PT, PW, PY, QA, RE, RO, RS, RU, RW, SA, SB, SC, SD, SE, SG, SH, SI, SJ, SK, SL, SM, SN, SO, SR, SS, ST, SV, SX, SY, SZ, TC, TD, TF, TG, TH, TJ, TK, TL, TM, TN, TO, TR, TT, TV, TW, TZ, UA, UG, UM, US, UY, UZ, VA, VC, VE, VG, VI, VN, VU, WF, WS, YE, YT, ZA, ZM, ZW]
+      country_code: ["AD", "AE", "AF", "AG", "AI", "AL", "AM", "AO", "AQ", "AR", "AS", "AT", "AU", "AW", "AX", "AZ", "BA", "BB", "BD", "BE", "BF", "BG", "BH", "BI", "BJ", "BL", "BM", "BN", "BO", "BQ", "BQ", "BR", "BS", "BT", "BV", "BW", "BY", "BZ", "CA", "CC", "CD", "CF", "CG", "CH", "CI", "CK", "CL", "CM", "CN", "CO", "CR", "CU", "CV", "CW", "CX", "CY", "CZ", "DE", "DJ", "DK", "DM", "DO", "DZ", "EC", "EE", "EG", "EH", "ER", "ES", "ET", "FI", "FJ", "FK", "FM", "FO", "FR", "GA", "GB", "GD", "GE", "GF", "GG", "GH", "GI", "GL", "GM", "GN", "GP", "GQ", "GR", "GS", "GT", "GU", "GW", "GY", "HK", "HM", "HN", "HR", "HT", "HU", "ID", "IE", "IL", "IM", "IN", "IO", "IQ", "IR", "IS", "IT", "JE", "JM", "JO", "JP", "KE", "KG", "KH", "KI", "KM", "KN", "KP", "KR", "KW", "KY", "KZ", "LA", "LB", "LC", "LI", "LK", "LR", "LS", "LT", "LU", "LV", "LY", "MA", "MC", "MD", "ME", "MF", "MG", "MH", "MK", "ML", "MM", "MN", "MO", "MP", "MQ", "MR", "MS", "MT", "MU", "MV", "MW", "MX", "MY", "MZ", "NA", "NC", "NE", "NF", "NG", "NI", "NL", "NO", "NP", "NR", "NU", "NZ", "OM", "PA", "PE", "PF", "PG", "PH", "PK", "PL", "PM", "PN", "PR", "PS", "PT", "PW", "PY", "QA", "RE", "RO", "RS", "RU", "RW", "SA", "SB", "SC", "SD", "SE", "SG", "SH", "SI", "SJ", "SK", "SL", "SM", "SN", "SO", "SR", "SS", "ST", "SV", "SX", "SY", "SZ", "TC", "TD", "TF", "TG", "TH", "TJ", "TK", "TL", "TM", "TN", "TO", "TR", "TT", "TV", "TW", "TZ", "UA", "UG", "UM", "US", "UY", "UZ", "VA", "VC", "VE", "VG", "VI", "VN", "VU", "WF", "WS", "YE", "YT", "ZA", "ZM", "ZW"]
       building_number: ['#####', '####', '###']
       street_suffix: [Alley, Avenue, Branch, Bridge, Brook, Brooks, Burg, Burgs, Bypass, Camp, Canyon, Cape, Causeway, Center, Centers, Circle, Circles, Cliff, Cliffs, Club, Common, Corner, Corners, Course, Court, Courts, Cove, Coves, Creek, Crescent, Crest, Crossing, Crossroad, Curve, Dale, Dam, Divide, Drive, Drive, Drives, Estate, Estates, Expressway, Extension, Extensions, Fall, Falls, Ferry, Field, Fields, Flat, Flats, Ford, Fords, Forest, Forge, Forges, Fork, Forks, Fort, Freeway, Garden, Gardens, Gateway, Glen, Glens, Green, Greens, Grove, Groves, Harbor, Harbors, Haven, Heights, Highway, Hill, Hills, Hollow, Inlet, Inlet, Island, Island, Islands, Islands, Isle, Isle, Junction, Junctions, Key, Keys, Knoll, Knolls, Lake, Lakes, Land, Landing, Lane, Light, Lights, Loaf, Lock, Locks, Locks, Lodge, Lodge, Loop, Mall, Manor, Manors, Meadow, Meadows, Mews, Mill, Mills, Mission, Mission, Motorway, Mount, Mountain, Mountain, Mountains, Mountains, Neck, Orchard, Oval, Overpass, Park, Parks, Parkway, Parkways, Pass, Passage, Path, Pike, Pine, Pines, Place, Plain, Plains, Plains, Plaza, Plaza, Point, Points, Port, Port, Ports, Ports, Prairie, Prairie, Radial, Ramp, Ranch, Rapid, Rapids, Rest, Ridge, Ridges, River, Road, Road, Roads, Roads, Route, Row, Rue, Run, Shoal, Shoals, Shore, Shores, Skyway, Spring, Springs, Springs, Spur, Spurs, Square, Square, Squares, Squares, Station, Station, Stravenue, Stravenue, Stream, Stream, Street, Street, Streets, Summit, Summit, Terrace, Throughway, Trace, Track, Trafficway, Trail, Trail, Tunnel, Tunnel, Turnpike, Turnpike, Underpass, Union, Unions, Valley, Valleys, Via, Viaduct, View, Views, Village, Village, Villages, Ville, Vista, Vista, Walk, Walks, Wall, Way, Ways, Well, Wells]
       secondary_address: ['Apt. ###', 'Suite ###']
       # Though these are US-specific, they are here (in the default locale) for backwards compatibility
       postcode: ['#####', '#####-####']
+      postcode_by_state: ['#####', '#####-####']
       state: [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: [AL, AK, AZ, AR, CA, CO, CT, DE, FL, GA, HI, ID, IL, IN, IA, KS, KY, LA, ME, MD, MA, MI, MN, MS, MO, MT, NE, NV, NH, NJ, NM, NY, NC, ND, OH, OK, OR, PA, RI, SC, SD, TN, TX, UT, VT, VA, WA, WV, WI, WY]
       time_zone: [Pacific/Midway, Pacific/Pago_Pago, Pacific/Honolulu, America/Juneau, America/Los_Angeles, America/Tijuana, America/Denver, America/Phoenix, America/Chihuahua, America/Mazatlan, America/Chicago, America/Regina, America/Mexico_City, America/Mexico_City, America/Monterrey, America/Guatemala, America/New_York, America/Indiana/Indianapolis, America/Bogota, America/Lima, America/Lima, America/Halifax, America/Caracas, America/La_Paz, America/Santiago, America/St_Johns, America/Sao_Paulo, America/Argentina/Buenos_Aires, America/Guyana, America/Godthab, Atlantic/South_Georgia, Atlantic/Azores, Atlantic/Cape_Verde, Europe/Dublin, Europe/London, Europe/Lisbon, Europe/London, Africa/Casablanca, Africa/Monrovia, Etc/UTC, Europe/Belgrade, Europe/Bratislava, Europe/Budapest, Europe/Ljubljana, Europe/Prague, Europe/Sarajevo, Europe/Skopje, Europe/Warsaw, Europe/Zagreb, Europe/Brussels, Europe/Copenhagen, Europe/Madrid, Europe/Paris, Europe/Amsterdam, Europe/Berlin, Europe/Berlin, Europe/Rome, Europe/Stockholm, Europe/Vienna, Africa/Algiers, Europe/Bucharest, Africa/Cairo, Europe/Helsinki, Europe/Kiev, Europe/Riga, Europe/Sofia, Europe/Tallinn, Europe/Vilnius, Europe/Athens, Europe/Istanbul, Europe/Minsk, Asia/Jerusalem, Africa/Harare, Africa/Johannesburg, Europe/Moscow, Europe/Moscow, Europe/Moscow, Asia/Kuwait, Asia/Riyadh, Africa/Nairobi, Asia/Baghdad, Asia/Tehran, Asia/Muscat, Asia/Muscat, Asia/Baku, Asia/Tbilisi, Asia/Yerevan, Asia/Kabul, Asia/Yekaterinburg, Asia/Karachi, Asia/Karachi, Asia/Tashkent, Asia/Kolkata, Asia/Kolkata, Asia/Kolkata, Asia/Kolkata, Asia/Kathmandu, Asia/Dhaka, Asia/Dhaka, Asia/Colombo, Asia/Almaty, Asia/Novosibirsk, Asia/Rangoon, Asia/Bangkok, Asia/Bangkok, Asia/Jakarta, Asia/Krasnoyarsk, Asia/Shanghai, Asia/Chongqing, Asia/Hong_Kong, Asia/Urumqi, Asia/Kuala_Lumpur, Asia/Singapore, Asia/Taipei, Australia/Perth, Asia/Irkutsk, Asia/Ulaanbaatar, Asia/Seoul, Asia/Tokyo, Asia/Tokyo, Asia/Tokyo, Asia/Yakutsk, Australia/Darwin, Australia/Adelaide, Australia/Melbourne, Australia/Melbourne, Australia/Sydney, Australia/Brisbane, Australia/Hobart, Asia/Vladivostok, Pacific/Guam, Pacific/Port_Moresby, Asia/Magadan, Asia/Magadan, Pacific/Noumea, Pacific/Fiji, Asia/Kamchatka, Pacific/Majuro, Pacific/Auckland, Pacific/Auckland, Pacific/Tongatapu, Pacific/Fakaofo, Pacific/Apia]
@@ -89,7 +91,7 @@ en:
         - "#{Name.last_name} #{suffix}"
         - "#{Name.last_name}-#{Name.last_name}"
         - "#{Name.last_name}, #{Name.last_name} and #{Name.last_name}"
-          
+
     internet:
       free_email: [gmail.com, yahoo.com, hotmail.com]
       domain_suffix: [com, biz, info, name, net, org]
@@ -127,10 +129,10 @@ en:
 
     commerce:
       color: [red, green, blue, yellow, purple, mint green, teal, white, black, orange, pink, grey, maroon, violet, turquoise, tan, sky blue, salmon, plum, orchid, olive, magenta, lime, ivory, indigo, gold, fuchsia, cyan, azure, lavender, silver]
-      department: ["Books", "Movies, Music & Games", "Electronics & Computers", "Home, Garden & Tools", "Grocery, Health & Beauty", "Toys, Kids & Baby", "Clothing, Shoes & Jewelery", "Sports & Outdoors", "Automotive & Industrial"] 
+      department: ["Books", "Movies", "Music", "Games", "Electronics", "Computers", "Home", "Garden", "Tools", "Grocery", "Health", "Beauty", "Toys", "Kids", "Baby", "Clothing", "Shoes", "Jewelery", "Sports", "Outdoors", "Automotive", "Industrial"]
       product_name:
         adjective: [Small, Ergonomic, Rustic, Intelligent, Gorgeous, Incredible, Fantastic, Practical, Sleek, Awesome]
-        material: [Steel, Wooden, Concrete, Plastic, Cotton, Granite, Rubber] 
+        material: [Steel, Wooden, Concrete, Plastic, Cotton, Granite, Rubber]
         product: [Chair, Car, Computer, Gloves, Pants, Shirt, Table, Shoes, Hat]
 
     team:
@@ -139,8 +141,15 @@ en:
         - "#{Address.state} #{creature}"
 
     hacker:
-      abbreviation: [TCP,HTTP,SDD,RAM,GB,CSS,SSL,AGP,SQL,FTP,PCI,AI,ADP,RSS,XML,EXE,COM,HDD,THX,SMTP,SMS,USB, PNG]
+      abbreviation: [TCP,HTTP,SDD,RAM,GB,CSS,SSL,AGP,SQL,FTP,PCI,AI,ADP,RSS,XML,EXE,COM,HDD,THX,SMTP,SMS,USB,PNG,SAS,IB,SCSI,JSON,XSS,JBOD]
       adjective: [auxiliary,primary,back-end,digital,open-source,virtual,cross-platform,redundant,online,haptic,multi-byte,bluetooth,wireless,1080p,neural, optical,solid state,mobile]
       noun: [driver,protocol,bandwidth,panel,microchip,program,port,card,array, interface,system,sensor,firewall,hard drive,pixel,alarm,feed,monitor,application,transmitter,bus,circuit,capacitor,matrix]
       verb: [back up,bypass,hack,override,compress,copy,navigate,index,connect,generate,quantify,calculate,synthesize,input,transmit,program,reboot,parse]
       ingverb: [backing up,bypassing,hacking,overriding,compressing,copying, navigating,indexing,connecting,generating,quantifying,calculating, synthesizing,transmitting,programming,parsing]
+
+    app:
+      name: ['Redhold', 'Treeflex', 'Trippledex', 'Kanlam', 'Bigtax', 'Daltfresh', 'Toughjoyfax', 'Mat Lam Tam', 'Otcom', 'Tres-Zap', 'Y-Solowarm', 'Tresom', 'Voltsillam', 'Biodex', 'Greenlam', 'Viva', 'Matsoft', 'Temp', 'Zoolab', 'Subin', 'Rank', 'Job', 'Stringtough', 'Tin', 'It', 'Home Ing', 'Zamit', 'Sonsing', 'Konklab', 'Alpha', 'Latlux', 'Voyatouch', 'Alphazap', 'Holdlamis', 'Zaam-Dox', 'Sub-Ex', 'Quo Lux', 'Bamity', 'Ventosanzap', 'Lotstring', 'Hatity', 'Tempsoft', 'Overhold', 'Fixflex', 'Konklux', 'Zontrax', 'Tampflex', 'Span', 'Namfix', 'Transcof', 'Stim', 'Fix San', 'Sonair', 'Stronghold', 'Fintone', 'Y-find', 'Opela', 'Lotlux', 'Ronstring', 'Zathin', 'Duobam', 'Keylex']
+      version: ['0.#.#', '0.##', '#.##', '#.#', '#.#.#']
+      author:
+        - "#{Name.name}"
+        - "#{Company.name}"

data/lib/locales/ru.yml

@@ -1,5 +1,6 @@
 ru:
   faker:
+    separator: " и "
     address:
       country: [Австралия, Австрия, Азербайджан, Албания, Алжир, Американское Самоа (не признана), Ангилья, Ангола, Андорра, Антарктика (не признана), Антигуа и Барбуда, Антильские Острова (не признана), Аомынь (не признана), Аргентина, Армения, Афганистан, Багамские Острова, Бангладеш, Барбадос, Бахрейн, Беларусь, Белиз, Бельгия, Бенин, Болгария, Боливия, Босния и Герцеговина, Ботсвана, Бразилия, Бруней, Буркина-Фасо, Бурунди, Бутан, Вануату, Ватикан, Великобритания, Венгрия, Венесуэла, Восточный Тимор, Вьетнам, Габон, Гаити, Гайана, Гамбия, Гана, Гваделупа (не признана), Гватемала, Гвиана (не признана), Гвинея, Гвинея-Бисау, Германия, Гондурас, Гренада, Греция, Грузия, Дания, Джибути, Доминика, Доминиканская Республика, Египет, Замбия, Зимбабве, Израиль, Индия, Индонезия, Иордания, Ирак, Иран, Ирландия, Исландия, Испания, Италия, Йемен, Кабо-Верде, Казахстан, Камбоджа, Камерун, Канада, Катар, Кения, Кипр, Кирибати, Китай, Колумбия, Коморские Острова, Конго, Демократическая Республика, Корея (Северная), Корея (Южная), Косово, Коста-Рика, Кот-д'Ивуар, Куба, Кувейт, Кука острова, Кыргызстан, Лаос, Латвия, Лесото, Либерия, Ливан, Ливия, Литва, Лихтенштейн, Люксембург, Маврикий, Мавритания, Мадагаскар, Македония, Малави, Малайзия, Мали, Мальдивы, Мальта, Маршалловы Острова, Мексика, Микронезия, Мозамбик, Молдова, Монако, Монголия, Марокко, Мьянма, Намибия, Науру, Непал, Нигер, Нигерия, Нидерланды, Никарагуа, Новая Зеландия, Норвегия, Объединенные Арабские Эмираты, Оман, Пакистан, Палау, Панама, Папуа — Новая Гвинея, Парагвай, Перу, Польша, Португалия, Республика Конго, Россия, Руанда, Румыния, Сальвадор, Самоа, Сан-Марино, Сан-Томе и Принсипи, Саудовская Аравия, Свазиленд, Сейшельские острова, Сенегал, Сент-Винсент и Гренадины, Сент-Киттс и Невис, Сент-Люсия, Сербия, Сингапур, Сирия, Словакия, Словения, Соединенные Штаты Америки, Соломоновы Острова, Сомали, Судан, Суринам, Сьерра-Леоне, Таджикистан, Таиланд, Тайвань (не признана), Тамил-Илам (не признана), Танзания, Тёркс и Кайкос (не признана), Того, Токелау (не признана), Тонга, Тринидад и Тобаго, Тувалу, Тунис, Турецкая Республика Северного Кипра (не признана), Туркменистан, Турция, Уганда, Узбекистан, Украина, Уругвай, Фарерские Острова (не признана), Фиджи, Филиппины, Финляндия, Франция, Французская Полинезия (не признана), Хорватия, Центральноафриканская Республика, Чад, Черногория, Чехия, Чили, Швейцария, Швеция, Шри-Ланка, Эквадор, Экваториальная Гвинея, Эритрея, Эстония, Эфиопия, Южно-Африканская Республика, Ямайка, Япония]
       building_number: ['###']
@@ -44,9 +45,21 @@ ru:
 
     commerce:
       color: [красный, зеленый, синий, желтый, багровый, мятный, зеленовато-голубой, белый, черный, оранжевый, розовый, серый, красно-коричневый, фиолетовый, бирюзовый, желто-коричневый, небесно голубой, оранжево-розовый, темно-фиолетовый, орхидный, оливковый, пурпурный, лимонный, кремовый, сине-фиолетовый, золотой, красно-пурпурный, голубой, лазурный, лиловый, серебряный]
-      department: ["Книги", "Фильмы, музыка и игры", "Электроника и компьютеры", "Дом, сад и инструмент", "Бакалея, здоровье и красота", "Игрушки, детское и для малышей", "Одежда, обувь и украшения", "Спорт и туризм", "Автомобильное и промышленное"]
+      department: ["Книги", "Фильмы", "музыка", "игры", "Электроника", "компьютеры", "Дом", "садинструмент", "Бакалея", "здоровье", "красота", "Игрушки", "детское", "для малышей", "Одежда", "обувь", "украшения", "Спорт", "туризм", "Автомобильное", "промышленное"]
       product_name:
         adjective: [Маленький, Эргономичный, Грубый, Интеллектуальный, Великолепный, Невероятный, Фантастический, Практчиный, Лоснящийся, Потрясающий]
         material: [Стальной, Деревянный, Бетонный, Пластиковый, Хлопковый, Гранитный, Резиновый]
         product: [Стул, Автомобиль, Компьютер, Берет, Кулон, Стол, Свитер, Ремень, Ботинок]
 
+    company:
+      prefix: [ИП, ООО, ЗАО, ОАО, НКО, ТСЖ, ОП]
+      suffix: [Снаб, Торг, Пром, Трейд, Сбыт]
+      name:
+        - "#{prefix} #{Name.female_first_name}"
+        - "#{prefix} #{Name.male_first_name}"
+        - "#{prefix} #{Name.male_last_name}"
+        - "#{prefix} #{suffix}#{suffix}"
+        - "#{prefix} #{suffix}#{suffix}#{suffix}"
+        - "#{prefix} #{Address.city_name}#{suffix}"
+        - "#{prefix} #{Address.city_name}#{suffix}#{suffix}"
+        - "#{prefix} #{Address.city_name}#{suffix}#{suffix}#{suffix}"

data/lib/locales/sv.yml

@@ -31,14 +31,14 @@ sv:
       name:
         - "#{Name.last_name} #{suffix}"
         - "#{Name.last_name}-#{Name.last_name}"
-        - "#{Name.last_name}, #{Name.last_name} #{suffix}"   
+        - "#{Name.last_name}, #{Name.last_name} #{suffix}"
 
     internet:
       domain_suffix: [se, nu, info, com, org]
 
     name:
       first_name_women: [Maria, Anna, Margareta, Elisabeth, Eva, Birgitta, Kristina, Karin, Elisabet, Marie]
-      fiest_name_men: [Erik, Lars, Karl, Anders, Per, Johan, Nils, Lennart, Emil, Hans ]
+      first_name_men: [Erik, Lars, Karl, Anders, Per, Johan, Nils, Lennart, Emil, Hans ]
       last_name: [Johansson, Andersson, Karlsson, Nilsson, Eriksson, Larsson, Olsson, Persson, Svensson, Gustafsson]
       prefix: [Dr., Prof., PhD.]
 
@@ -64,10 +64,10 @@ sv:
 
     commerce:
       color: [vit, silver, grå, svart, röd, grön, blå, gul, lila, indigo, guld, brun, rosa, purpur, korall]
-      department: ["Böcker", "Filmer, Musik & Spel", "Elektronik & Datorer", "Hem, Trädgård & Verktyg", "Livsmedel", "Hälsa & Skönhet", "Leksaker", "Klädsel, Skor & Smycken", "Sport"] 
+      department: ["Böcker", "Filmer", "Musik", "Spel", "Elektronik", "Datorer", "Hem", "Trädgård", "Verktyg", "Livsmedel", "Hälsa", "Skönhet", "Leksaker", "Klädsel", "Skor", "Smycken", "Sport"]
       product_name:
         adjective: [Liten, Ergonomisk, Robust, Intelligent, Söt, Otrolig, Fatastisk, Praktisk, Slimmad, Grym]
-        material: [Stål, Metall, Trä, Betong, Plast, Bomul, Grnit, Gummi, Latex] 
+        material: [Stål, Metall, Trä, Betong, Plast, Bomul, Grnit, Gummi, Latex]
         product: [Stol, Bil, Dator, Handskar, Pants, Shirt, Table, Shoes, Hat]
 
     team:

data/test/test_avatar.rb

@@ -6,10 +6,31 @@ class TestFakerAvatar < Test::Unit::TestCase
   end
 
   def test_avatar
-    assert @tester.image.match(/http:\/\/robohash\.org\/(.+)/)[1] != nil
+    assert @tester.image.match(/http:\/\/robohash\.org\/(.+)\.png/)[1] != nil
   end
 
   def test_avatar_with_param
-    assert @tester.image('faker').match(/http:\/\/robohash\.org\/(.+)/)[1] == 'faker'
+    assert @tester.image('faker').match(/http:\/\/robohash\.org\/(.+)\.png/)[1] == 'faker'
   end
-end
+
+  def test_avatar_with_correct_size
+    assert @tester.image('faker', '150x320').match(/http:\/\/robohash\.org\/faker\.png\?size=(.+)/)[1] == '150x320'
+  end
+
+  def test_avatar_with_incorrect_size
+    assert_raise ArgumentError do
+      @tester.image(nil, '150x320z')
+    end
+  end
+
+  def test_avatar_with_supported_format
+    assert @tester.image('faker', '300x300', 'jpg').match(/http:\/\/robohash\.org\/faker\.jpg/)
+  end
+
+  def test_avatar_with_incorrect_format
+    assert_raise ArgumentError do
+      @tester.image(nil, '300x300', 'wrong_format')
+    end
+  end
+
+end

data/test/test_en_au_ocker_locale.rb

@@ -0,0 +1,23 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class TestEnUsLocale < Test::Unit::TestCase
+  def setup
+    Faker::Config.locale = nil
+  end
+
+  def teardown
+    Faker::Config.locale = nil
+  end
+
+  def test_au_ocker_methods_with_en_au_ocker_locale
+    Faker::Config.locale = 'en-au-ocker'
+
+    assert Faker::Name.first_name.is_a? String
+    assert Faker::Name.last_name.is_a? String
+    assert Faker::Name.ocker_first_name.is_a? String
+    assert Faker::Address.street_name.is_a? String
+    assert Faker::Address.city.is_a? String
+    assert Faker::Address.region.is_a? String
+  end
+
+end

data/test/test_en_locale.rb

@@ -15,4 +15,11 @@ class TesetEnLocale < Test::Unit::TestCase
     assert_equal LoadedYaml['en']['address']['state_abbr'].size, 50
     assert_equal LoadedYaml['en']['address']['state_abbr'], ['AL', 'AK', 'AZ', 'AR', 'CA', 'CO', 'CT', 'DE', 'FL', 'GA', 'HI', 'ID', 'IL', 'IN', 'IA', 'KS', 'KY', 'LA', 'ME', 'MD', 'MA', 'MI', 'MN', 'MS', 'MO', 'MT', 'NE', 'NV', 'NH', 'NJ', 'NM', 'NY', 'NC', 'ND', 'OH', 'OK', 'OR', 'PA', 'RI', 'SC', 'SD', 'TN', 'TX', 'UT', 'VT', 'VA', 'WA', 'WV', 'WI', 'WY']
   end
+
+  def test_us_zip_codes
+    Faker::Config.locale = 'en-US'
+    expected = /\d{5}(\-\d{4})?/
+    assert_match(expected, Faker::Address.zip_code)
+  end
+
 end

data/test/test_en_us_locale.rb

@@ -40,4 +40,40 @@ class TesetEnUsLocale < Test::Unit::TestCase
     us_number_validation_regex = /^(?:(?:\+?1\s*(?:[.-]\s*)?)?(?:\(\s*([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9])\s*\)|([2-9]1[02-9]|[2-9][02-8]1|[2-9][02-8][02-9]))\s*(?:[.-]\s*)?)?([2-9]1[02-9]|[2-9][02-9]1|[2-9][02-9]{2})\s*(?:[.-]\s*)?([0-9]{4})(?:\s*(?:#|x\.?|ext\.?|extension)\s*(\d+))?$/
     assert_match(us_number_validation_regex, Faker::PhoneNumber.phone_number)
   end
+
+  def test_us_invalid_state_raises_exception
+    Faker::Config.locale = 'en-US'
+    assert_raise I18n::MissingTranslationData do Faker::Address.zip_code('NA') end
+  end
+
+  def test_us_zip_codes_match_state
+
+    Faker::Config.locale = 'en-US'
+
+    state_abbr = 'AZ'
+    expected = /^850\d\d$/
+    assert_match(expected, Faker::Address.zip_code(state_abbr))
+
+    # disjointed ranges for these states
+    # http://www.fincen.gov/forms/files/us_state_territory_zip_codes.pdf
+    state_abbr = 'AR'
+    expected = /^717\d\d$/
+    assert_match(expected, Faker::Address.zip_code(state_abbr))
+    state_abbr = 'GA'
+    expected = /^301\d\d$/
+    assert_match(expected, Faker::Address.zip_code(state_abbr))
+    state_abbr = 'MA'
+    expected = /^026\d\d$/
+    assert_match(expected, Faker::Address.zip_code(state_abbr))
+    state_abbr = 'NY'
+    expected = /^122\d\d$/
+    assert_match(expected, Faker::Address.zip_code(state_abbr))
+    state_abbr = 'TX'
+    expected = /^798\d\d$/
+    assert_match(expected, Faker::Address.zip_code(state_abbr))
+    state_abbr = 'VA'
+    expected = /^222\d\d$/
+    assert_match(expected, Faker::Address.zip_code(state_abbr))
+
+  end
 end

data/test/test_faker_app.rb

@@ -0,0 +1,12 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class TestFakerApp < Test::Unit::TestCase
+  def setup
+    @tester = Faker::App
+  end
+
+  def test_name
+    assert @tester.author.match(/(\w+\.? ?){2,3}/)
+  end
+
+end

data/test/test_faker_commerce.rb

@@ -14,6 +14,47 @@ class TestFakerCommerce < Test::Unit::TestCase
     assert @tester.department.match(/[A-Z][a-z]+\.?/)
   end
   
+  def test_single_department_should_not_contain_separators
+    assert_match(/\A[A-Za-z]+\z/, @tester.department(1))
+  end
+
+  def test_department_should_have_ampersand_as_default_separator
+    assert_match ' & ', @tester.department(2, true)
+  end
+
+  def test_department_should_accept_localized_separator
+    data = {
+      :faker => {
+        :separator => ' + ',
+        :commerce => {
+          :department => ['Books', 'Movies']
+        }
+      }
+    }
+
+    I18n.backend.store_translations(:xy, data)
+    I18n.with_locale(:xy) do
+      assert_match ' + ', @tester.department(2, true)
+    end
+  end
+
+  def test_department_should_have_exact_number_of_categories_when_fixed_amount
+    assert_match(/\A([A-Za-z]+, ){8}[A-Za-z]+ & [A-Za-z]+\z/, @tester.department(10, true))
+  end
+
+  def test_department_should_never_exceed_the_max_number_of_categories_when_random_amount
+    100.times do
+      assert_match(/\A([A-Za-z]+(, | & )){0,5}[A-Za-z]+\z/, @tester.department(6))
+    end
+  end
+
+  def test_department_should_have_no_duplicate_categories
+    department = @tester.department(10, true)
+
+    departments = department.split(/[,& ]+/)
+    assert_equal departments, departments.uniq
+  end
+
   def test_product_name
     assert @tester.product_name.match(/[A-Z][a-z]+\.?/)
   end

data/test/test_faker_company.rb

@@ -5,6 +5,10 @@ class TestFakerCompany < Test::Unit::TestCase
     @tester = Faker::Company
   end
 
+  def test_ein
+    assert @tester.ein.match(/\d\d-\d\d\d\d\d\d\d/)
+  end
+
   def test_duns_number
     assert @tester.duns_number.match(/\d\d-\d\d\d-\d\d\d\d/)
   end

data/test/test_faker_date.rb

@@ -49,4 +49,29 @@ class TestFakerDate < Test::Unit::TestCase
       @tester.between("9999-99-99", "9999-99-99")
     end
   end
+
+  def test_birthday
+    min = 40
+    max = 90
+    100.times do
+      t = Date.today
+      date_min = Date.new(t.year - min, t.month, t.day)
+      date_max = Date.new(t.year - max, t.month, t.day)
+      birthday = @tester.birthday(min, max)
+      assert birthday > date_max, "Expect > \"#{date_max}\", but got #{birthday}"
+      assert birthday < date_min, "Expect > \"#{date_max}\", but got #{birthday}"
+    end
+  end
+  def test_default_birthday
+    min = 10
+    max = 65
+    100.times do
+      t = Date.today
+      date_min = Date.new(t.year - min, t.month, t.day)
+      date_max = Date.new(t.year - max, t.month, t.day)
+      birthday = @tester.birthday
+      assert birthday > date_max, "Expect > \"#{date_max}\", but got #{birthday}"
+      assert birthday < date_min, "Expect > \"#{date_max}\", but got #{birthday}"
+    end
+  end
 end

data/test/test_faker_lorem.rb

@@ -9,6 +9,14 @@ class TestFakerLorem < Test::Unit::TestCase
       @standard_wordlist + I18n.translate('faker.lorem.supplemental')
   end
 
+  def test_character
+    assert @tester.character.length == 1
+  end
+  
+  def test_character_type
+    assert @tester.character.class == String
+  end
+
   def test_characters
     assert @tester.characters.length == 255
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: faker
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: 1.4.3
 platform: ruby
 authors:
 - Benjamin Curtis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-08-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -39,6 +39,7 @@ files:
 - lib/extensions/symbol.rb
 - lib/faker.rb
 - lib/faker/address.rb
+- lib/faker/app.rb
 - lib/faker/avatar.rb
 - lib/faker/bitcoin.rb
 - lib/faker/business.rb
@@ -66,6 +67,7 @@ files:
 - lib/locales/en-IND.yml
 - lib/locales/en-NEP.yml
 - lib/locales/en-US.yml
+- lib/locales/en-au-ocker.yml
 - lib/locales/en.yml
 - lib/locales/es.yml
 - lib/locales/fa.yml
@@ -84,10 +86,12 @@ files:
 - lib/locales/zh-CN.yml
 - test/test_array_sample_method_compat.rb
 - test/test_avatar.rb
+- test/test_en_au_ocker_locale.rb
 - test/test_en_locale.rb
 - test/test_en_us_locale.rb
 - test/test_es_locale.rb
 - test/test_faker.rb
+- test/test_faker_app.rb
 - test/test_faker_bitcoin.rb
 - test/test_faker_business.rb
 - test/test_faker_city.rb
@@ -134,10 +138,12 @@ summary: Easily generate fake data
 test_files:
 - test/test_array_sample_method_compat.rb
 - test/test_avatar.rb
+- test/test_en_au_ocker_locale.rb
 - test/test_en_locale.rb
 - test/test_en_us_locale.rb
 - test/test_es_locale.rb
 - test/test_faker.rb
+- test/test_faker_app.rb
 - test/test_faker_bitcoin.rb
 - test/test_faker_business.rb
 - test/test_faker_city.rb