faker 1.3.0 → 1.4.0

data/lib/faker/version.rb

@@ -1,3 +1,3 @@
 module Faker #:nodoc:
-  VERSION = "1.3.0"
+  VERSION = "1.4.0"
 end

data/lib/locales/{de-at.yml → de-AT.yml}

@@ -1,4 +1,4 @@
-de-at:
+de-AT:
   faker:
     address:
       country: [Ägypten, Äquatorialguinea, Äthiopien, Österreich, Afghanistan, Albanien, Algerien, Amerikanisch-Samoa, Amerikanische Jungferninseln, Andorra, Angola, Anguilla, Antarktis, Antigua und Barbuda, Argentinien, Armenien, Aruba, Aserbaidschan, Australien, Bahamas, Bahrain, Bangladesch, Barbados, Belarus, Belgien, Belize, Benin, die Bermudas, Bhutan, Bolivien, Bosnien und Herzegowina, Botsuana, Bouvetinsel, Brasilien, Britische Jungferninseln, Britisches Territorium im Indischen Ozean, Brunei Darussalam, Bulgarien, Burkina Faso, Burundi, Chile, China, Cookinseln, Costa Rica, Dänemark, Demokratische Republik Kongo, Demokratische Volksrepublik Korea, Deutschland, Dominica, Dominikanische Republik, Dschibuti, Ecuador, El Salvador, Eritrea, Estland, Färöer, Falklandinseln, Fidschi, Finnland, Frankreich, Französisch-Guayana, Französisch-Polynesien, Französische Gebiete im südlichen Indischen Ozean, Gabun, Gambia, Georgien, Ghana, Gibraltar, Grönland, Grenada, Griechenland, Guadeloupe, Guam, Guatemala, Guinea, Guinea-Bissau, Guyana, Haiti, Heard und McDonaldinseln, Honduras, Hongkong, Indien, Indonesien, Irak, Iran, Irland, Island, Israel, Italien, Jamaika, Japan, Jemen, Jordanien, Jugoslawien, Kaimaninseln, Kambodscha, Kamerun, Kanada, Kap Verde, Kasachstan, Katar, Kenia, Kirgisistan, Kiribati, Kleinere amerikanische Überseeinseln, Kokosinseln, Kolumbien, Komoren, Kongo, Kroatien, Kuba, Kuwait, Laos, Lesotho, Lettland, Libanon, Liberia, Libyen, Liechtenstein, Litauen, Luxemburg, Macau, Madagaskar, Malawi, Malaysia, Malediven, Mali, Malta, ehemalige jugoslawische Republik Mazedonien, Marokko, Marshallinseln, Martinique, Mauretanien, Mauritius, Mayotte, Mexiko, Mikronesien, Monaco, Mongolei, Montserrat, Mosambik, Myanmar, Nördliche Marianen, Namibia, Nauru, Nepal, Neukaledonien, Neuseeland, Nicaragua, Niederländische Antillen, Niederlande, Niger, Nigeria, Niue, Norfolkinsel, Norwegen, Oman, Osttimor, Pakistan, Palau, Panama, Papua-Neuguinea, Paraguay, Peru, Philippinen, Pitcairninseln, Polen, Portugal, Puerto Rico, Réunion, Republik Korea, Republik Moldau, Ruanda, Rumänien, Russische Föderation, São Tomé und Príncipe, Südafrika, Südgeorgien und Südliche Sandwichinseln, Salomonen, Sambia, Samoa, San Marino, Saudi-Arabien, Schweden, Schweiz, Senegal, Seychellen, Sierra Leone, Simbabwe, Singapur, Slowakei, Slowenien, Somalien, Spanien, Sri Lanka, St. Helena, St. Kitts und Nevis, St. Lucia, St. Pierre und Miquelon, St. Vincent und die Grenadinen, Sudan, Surinam, Svalbard und Jan Mayen, Swasiland, Syrien, Türkei, Tadschikistan, Taiwan, Tansania, Thailand, Togo, Tokelau, Tonga, Trinidad und Tobago, Tschad, Tschechische Republik, Tunesien, Turkmenistan, Turks- und Caicosinseln, Tuvalu, Uganda, Ukraine, Ungarn, Uruguay, Usbekistan, Vanuatu, Vatikanstadt, Venezuela, Vereinigte Arabische Emirate, Vereinigte Staaten, Vereinigtes Königreich, Vietnam, Wallis und Futuna, Weihnachtsinsel, Westsahara, Zentralafrikanische Republik, Zypern]

data/lib/locales/{de-ch.yml → de-CH.yml}

@@ -1,4 +1,4 @@
-de-ch:
+de-CH:
   faker:
     address:
       country_code: [CH, CH, CH, DE, AT, US, LI, US, HK, VN]

data/lib/locales/{en-au.yml → en-AU.yml}

@@ -2,7 +2,7 @@
 # Using Top 200 Australian baby names of 2010
 # 286 Surnames familiar to Australian population
 
-en-au:
+en-AU:
   faker:
     name:
       first_name: [William, Jack, Oliver, Joshua, Thomas, Lachlan, Cooper, Noah, Ethan, Lucas, James, Samuel, Jacob, Liam, Alexander, Benjamin, Max, Isaac, Daniel, Riley, Ryan, Charlie, Tyler, Jake, Matthew, Xavier, Harry, Jayden, Nicholas, Harrison, Levi, Luke, Adam, Henry, Aiden, Dylan, Oscar, Michael, Jackson, Logan, Joseph, Blake, Nathan, Connor, Elijah, Nate, Archie, Bailey, Marcus, Cameron, Jordan, Zachary, Caleb, Hunter, Ashton, Toby, Aidan, Hayden, Mason, Hamish, Edward, Angus, Eli, Sebastian, Christian, Patrick, Andrew, Anthony, Luca, Kai, Beau, Alex, George, Callum, Finn, Zac, Mitchell, Jett, Jesse, Gabriel, Leo, Declan, Charles, Jasper, Jonathan, Aaron, Hugo, David, Christopher, Chase, Owen, Justin, Ali, Darcy, Lincoln, Cody, Phoenix, Sam, John, Joel, Isabella, Ruby, Chloe, Olivia, Charlotte, Mia, Lily, Emily, Ella, Sienna, Sophie, Amelia, Grace, Ava, Zoe, Emma, Sophia, Matilda, Hannah, Jessica, Lucy, Georgia, Sarah, Abigail, Zara, Eva, Scarlett, Jasmine, Chelsea, Lilly, Ivy, Isla, Evie, Isabelle, Maddison, Layla, Summer, Annabelle, Alexis, Elizabeth, Bella, Holly, Lara, Madison, Alyssa, Maya, Tahlia, Claire, Hayley, Imogen, Jade, Ellie, Sofia, Addison, Molly, Phoebe, Alice, Savannah, Gabriella, Kayla, Mikayla, Abbey, Eliza, Willow, Alexandra, Poppy, Samantha, Stella, Amy, Amelie, Anna, Piper, Gemma, Isabel, Victoria, Stephanie, Caitlin, Heidi, Paige, Rose, Amber, Audrey, Claudia, Taylor, Madeline, Angelina, Natalie, Charli, Lauren, Ashley, Violet, Mackenzie, Abby, Skye, Lillian, Alana, Lola, Leah, Eve, Kiara]

data/lib/locales/{en-bork.yml → en-BORK.yml}

@@ -1,4 +1,4 @@
-en-bork:
+en-BORK:
   faker:
     lorem:
       words: [Boot, I, Nu, Nur, Tu, Um, a, becoose-a, boot, bork, burn, chuuses, cumplete-a, cun, cunseqooences, curcoomstunces, dee, deeslikes, denuoonceeng, desures, du, eccuoont, ectooel, edfuntege-a, efueeds, egeeen, ell, ere-a, feend, foolt, frum, geefe-a, gesh, greet, heem, heppeeness, hes, hoo, hoomun, idea, ifer, in, incuoonter, injuy, itselff, ixcept, ixemple-a, ixerceese-a, ixpleeen, ixplurer, ixpuoond, ixtremely, knoo, lebureeuoos, lufes, meestekee, mester-booeelder, moost, mun, nu, nut, oobteeen, oocceseeunelly, ooccoor, ooff, oone-a, oor, peeen, peeenffool, physeecel, pleesoore-a, poorsooe-a, poorsooes, preeesing, prucoore-a, prudooces, reeght, reshunelly, resooltunt, sume-a, teecheengs, teke-a, thees, thet, thuse-a, treefiel, troot, tu, tueel, und, undertekes, unnuyeeng, uny, unyune-a, us, veell, veet, ves, vheech, vhu, yuoo, zee, zeere-a]

data/lib/locales/{en-ca.yml → en-CA.yml}

@@ -1,4 +1,4 @@
-en-ca:
+en-CA:
   faker:
     address:
       postcode: ['?#? #?#', '?#?#?#']

data/lib/locales/{en-gb.yml → en-GB.yml}

@@ -1,4 +1,4 @@
-en-gb:
+en-GB:
   faker:
     address:
       postcode: /[A-PR-UWYZ][A-HK-Y]?[0-9][ABEHMNPRVWXY0-9]? [0-9][ABD-HJLN-UW-Z]{2}/

data/lib/locales/{en-ind.yml → en-IND.yml}

@@ -1,7 +1,7 @@
 # India formatted data types
 # first_names and last_names courtesy http://www.indianhindunames.com
 
-en-ind:
+en-IND:
   faker:
     name:
       first_name: [Aadrika, Aanandinii, Aaratrika, Aarya, Arya, Aashritha, Aatmaja, Atmaja, Abhaya, Adwitiya, Agrata, Ahilya, Ahalya, Aishani, Akshainie, Akshata, Akshita, Akula, Ambar, Amodini, Amrita, Amritambu, Anala, Anamika, Ananda, Anandamayi, Ananta, Anila, Anjali, Anjushri, Anjushree, Annapurna, Anshula, Anuja, Anusuya, Anasuya, Anasooya, Anwesha, Apsara, Aruna, Asha, Aasa, Aasha, Aslesha, Atreyi, Atreyee, Avani, Abani, Avantika, Ayushmati, Baidehi, Vaidehi, Bala, Baala, Balamani, Basanti, Vasanti, Bela, Bhadra, Bhagirathi, Bhagwanti, Bhagwati, Bhamini, Bhanumati, Bhaanumati, Bhargavi, Bhavani, Bhilangana, Bilwa, Bilva, Buddhana, Chakrika, Chanda, Chandi, Chandni, Chandini, Chandani, Chandra, Chandira, Chandrabhaga, Chandrakala, Chandrakin, Chandramani, Chandrani, Chandraprabha, Chandraswaroopa, Chandravati, Chapala, Charumati, Charvi, Chatura, Chitrali, Chitramala, Chitrangada, Daksha, Dakshayani, Damayanti, Darshwana, Deepali, Dipali, Deeptimoyee, Deeptimayee, Devangana, Devani, Devasree, Devi, Daevi, Devika, Daevika, Dhaanyalakshmi, Dhanalakshmi, Dhana, Dhanadeepa, Dhara, Dharani, Dharitri, Dhatri, Diksha, Deeksha, Divya, Draupadi, Dulari, Durga, Durgeshwari, Ekaparnika, Elakshi, Enakshi, Esha, Eshana, Eshita, Gautami, Gayatri, Geeta, Geetanjali, Gitanjali, Gemine, Gemini, Girja, Girija, Gita, Hamsini, Harinakshi, Harita, Heema, Himadri, Himani, Hiranya, Indira, Jaimini, Jaya, Jyoti, Jyotsana, Kali, Kalinda, Kalpana, Kalyani, Kama, Kamala, Kamla, Kanchan, Kanishka, Kanti, Kashyapi, Kumari, Kumuda, Lakshmi, Laxmi, Lalita, Lavanya, Leela, Lila, Leela, Madhuri, Malti, Malati, Mandakini, Mandaakin, Mangala, Mangalya, Mani, Manisha, Manjusha, Meena, Mina, Meenakshi, Minakshi, Menka, Menaka, Mohana, Mohini, Nalini, Nikita, Ojaswini, Omana, Oormila, Urmila, Opalina, Opaline, Padma, Parvati, Poornima, Purnima, Pramila, Prasanna, Preity, Prema, Priya, Priyala, Pushti, Radha, Rageswari, Rageshwari, Rajinder, Ramaa, Rati, Rita, Rohana, Rukhmani, Rukmin, Rupinder, Sanya, Sarada, Sharda, Sarala, Sarla, Saraswati, Sarisha, Saroja, Shakti, Shakuntala, Shanti, Sharmila, Shashi, Shashikala, Sheela, Shivakari, Shobhana, Shresth, Shresthi, Shreya, Shreyashi, Shridevi, Shrishti, Shubha, Shubhaprada, Siddhi, Sitara, Sloka, Smita, Smriti, Soma, Subhashini, Subhasini, Sucheta, Sudeva, Sujata, Sukanya, Suma, Suma, Sumitra, Sunita, Suryakantam, Sushma, Swara, Swarnalata, Sweta, Shwet, Tanirika, Tanushree, Tanushri, Tanushri, Tanya, Tara, Trisha, Uma, Usha, Vaijayanti, Vaijayanthi, Baijayanti, Vaishvi, Vaishnavi, Vaishno, Varalakshmi, Vasudha, Vasundhara, Veda, Vedanshi, Vidya, Vimala, Vrinda, Vrund, Aadi, Aadidev, Aadinath, Aaditya, Aagam, Aagney, Aamod, Aanandaswarup, Anand Swarup, Aanjaneya, Anjaneya, Aaryan, Aryan, Aatmaj, Aatreya, Aayushmaan, Aayushman, Abhaidev, Abhaya, Abhirath, Abhisyanta, Acaryatanaya, Achalesvara, Acharyanandana, Acharyasuta, Achintya, Achyut, Adheesh, Adhiraj, Adhrit, Adikavi, Adinath, Aditeya, Aditya, Adityanandan, Adityanandana, Adripathi, Advaya, Agasti, Agastya, Agneya, Aagneya, Agnimitra, Agniprava, Agnivesh, Agrata, Ajit, Ajeet, Akroor, Akshaj, Akshat, Akshayakeerti, Alok, Aalok, Amaranaath, Amarnath, Amaresh, Ambar, Ameyatma, Amish, Amogh, Amrit, Anaadi, Anagh, Anal, Anand, Aanand, Anang, Anil, Anilaabh, Anilabh, Anish, Ankal, Anunay, Anurag, Anuraag, Archan, Arindam, Arjun, Arnesh, Arun, Ashlesh, Ashok, Atmanand, Atmananda, Avadhesh, Baalaaditya, Baladitya, Baalagopaal, Balgopal, Balagopal, Bahula, Bakula, Bala, Balaaditya, Balachandra, Balagovind, Bandhu, Bandhul, Bankim, Bankimchandra, Bhadrak, Bhadraksh, Bhadran, Bhagavaan, Bhagvan, Bharadwaj, Bhardwaj, Bharat, Bhargava, Bhasvan, Bhaasvan, Bhaswar, Bhaaswar, Bhaumik, Bhaves, Bheeshma, Bhisham, Bhishma, Bhima, Bhoj, Bhramar, Bhudev, Bhudeva, Bhupati, Bhoopati, Bhoopat, Bhupen, Bhushan, Bhooshan, Bhushit, Bhooshit, Bhuvanesh, Bhuvaneshwar, Bilva, Bodhan, Brahma, Brahmabrata, Brahmanandam, Brahmaanand, Brahmdev, Brajendra, Brajesh, Brijesh, Birjesh, Budhil, Chakor, Chakradhar, Chakravartee, Chakravarti, Chanakya, Chaanakya, Chandak, Chandan, Chandra, Chandraayan, Chandrabhan, Chandradev, Chandraketu, Chandramauli, Chandramohan, Chandran, Chandranath, Chapal, Charak, Charuchandra, Chaaruchandra, Charuvrat, Chatur, Chaturaanan, Chaturbhuj, Chetan, Chaten, Chaitan, Chetanaanand, Chidaakaash, Chidaatma, Chidambar, Chidambaram, Chidananda, Chinmayanand, Chinmayananda, Chiranjeev, Chiranjeeve, Chitraksh, Daiwik, Daksha, Damodara, Dandak, Dandapaani, Darshan, Datta, Dayaamay, Dayamayee, Dayaananda, Dayaanidhi, Kin, Deenabandhu, Deepan, Deepankar, Dipankar, Deependra, Dipendra, Deepesh, Dipesh, Deeptanshu, Deeptendu, Diptendu, Deeptiman, Deeptimoy, Deeptimay, Dev, Deb, Devadatt, Devagya, Devajyoti, Devak, Devdan, Deven, Devesh, Deveshwar, Devi, Devvrat, Dhananjay, Dhanapati, Dhanpati, Dhanesh, Dhanu, Dhanvin, Dharmaketu, Dhruv, Dhyanesh, Dhyaneshwar, Digambar, Digambara, Dinakar, Dinkar, Dinesh, Divaakar, Divakar, Deevakar, Divjot, Dron, Drona, Dwaipayan, Dwaipayana, Eekalabya, Ekalavya, Ekaksh, Ekaaksh, Ekaling, Ekdant, Ekadant, Gajaadhar, Gajadhar, Gajbaahu, Gajabahu, Ganak, Ganaka, Ganapati, Gandharv, Gandharva, Ganesh, Gangesh, Garud, Garuda, Gati, Gatik, Gaurang, Gauraang, Gauranga, Gouranga, Gautam, Gautama, Goutam, Ghanaanand, Ghanshyam, Ghanashyam, Giri, Girik, Girika, Girindra, Giriraaj, Giriraj, Girish, Gopal, Gopaal, Gopi, Gopee, Gorakhnath, Gorakhanatha, Goswamee, Goswami, Gotum, Gautam, Govinda, Gobinda, Gudakesha, Gudakesa, Gurdev, Guru, Hari, Harinarayan, Harit, Himadri, Hiranmay, Hiranmaya, Hiranya, Inder, Indra, Indra, Jagadish, Jagadisha, Jagathi, Jagdeep, Jagdish, Jagmeet, Jahnu, Jai, Javas, Jay, Jitendra, Jitender, Jyotis, Kailash, Kama, Kamalesh, Kamlesh, Kanak, Kanaka, Kannan, Kannen, Karan, Karthik, Kartik, Karunanidhi, Kashyap, Kiran, Kirti, Keerti, Krishna, Krishnadas, Krishnadasa, Kumar, Lai, Lakshman, Laxman, Lakshmidhar, Lakshminath, Lal, Laal, Mahendra, Mohinder, Mahesh, Maheswar, Mani, Manik, Manikya, Manoj, Marut, Mayoor, Meghnad, Meghnath, Mohan, Mukesh, Mukul, Nagabhushanam, Nanda, Narayan, Narendra, Narinder, Naveen, Navin, Nawal, Naval, Nimit, Niranjan, Nirbhay, Niro, Param, Paramartha, Pran, Pranay, Prasad, Prathamesh, Prayag, Prem, Puneet, Purushottam, Rahul, Raj, Rajan, Rajendra, Rajinder, Rajiv, Rakesh, Ramesh, Rameshwar, Ranjit, Ranjeet, Ravi, Ritesh, Rohan, Rohit, Rudra, Sachin, Sameer, Samir, Sanjay, Sanka, Sarvin, Satish, Satyen, Shankar, Shantanu, Shashi, Sher, Shiv, Siddarth, Siddhran, Som, Somu, Somnath, Subhash, Subodh, Suman, Suresh, Surya, Suryakant, Suryakanta, Sushil, Susheel, Swami, Swapnil, Tapan, Tara, Tarun, Tej, Tejas, Trilochan, Trilochana, Trilok, Trilokesh, Triloki, Triloki Nath, Trilokanath, Tushar, Udai, Udit, Ujjawal, Ujjwal, Umang, Upendra, Uttam, Vasudev, Vasudeva, Vedang, Vedanga, Vidhya, Vidur, Vidhur, Vijay, Vimal, Vinay, Vishnu, Bishnu, Vishwamitra, Vyas, Yogendra, Yoginder, Yogesh]

data/lib/locales/{en-us.yml → en-US.yml}

@@ -1,4 +1,4 @@
-en-us:
+en-US:
   faker:
     internet:
       domain_suffix: [com, us, biz, info, name, net, org]

data/lib/locales/en.yml

@@ -3,7 +3,8 @@ en:
     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: [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]
       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 ###']
@@ -77,7 +78,7 @@ en:
       # Buzzword wordlist from http://www.1728.com/buzzword.htm
       buzzwords:
         - ["Adaptive", "Advanced", "Ameliorated", "Assimilated", "Automated", "Balanced", "Business-focused", "Centralized", "Cloned", "Compatible", "Configurable", "Cross-group", "Cross-platform", "Customer-focused", "Customizable", "Decentralized", "De-engineered", "Devolved", "Digitized", "Distributed", "Diverse", "Down-sized", "Enhanced", "Enterprise-wide", "Ergonomic", "Exclusive", "Expanded", "Extended", "Face to face", "Focused", "Front-line", "Fully-configurable", "Function-based", "Fundamental", "Future-proofed", "Grass-roots", "Horizontal", "Implemented", "Innovative", "Integrated", "Intuitive", "Inverse", "Managed", "Mandatory", "Monitored", "Multi-channelled", "Multi-lateral", "Multi-layered", "Multi-tiered", "Networked", "Object-based", "Open-architected", "Open-source", "Operative", "Optimized", "Optional", "Organic", "Organized", "Persevering", "Persistent", "Phased", "Polarised", "Pre-emptive", "Proactive", "Profit-focused", "Profound", "Programmable", "Progressive", "Public-key", "Quality-focused", "Reactive", "Realigned", "Re-contextualized", "Re-engineered", "Reduced", "Reverse-engineered", "Right-sized", "Robust", "Seamless", "Secured", "Self-enabling", "Sharable", "Stand-alone", "Streamlined", "Switchable", "Synchronised", "Synergistic", "Synergized", "Team-oriented", "Total", "Triple-buffered", "Universal", "Up-sized", "Upgradable", "User-centric", "User-friendly", "Versatile", "Virtual", "Visionary", "Vision-oriented"]
-        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "assymetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
+        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "asymmetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
         - ["ability", "access", "adapter", "algorithm", "alliance", "analyzer", "application", "approach", "architecture", "archive", "artificial intelligence", "array", "attitude", "benchmark", "budgetary management", "capability", "capacity", "challenge", "circuit", "collaboration", "complexity", "concept", "conglomeration", "contingency", "core", "customer loyalty", "database", "data-warehouse", "definition", "emulation", "encoding", "encryption", "extranet", "firmware", "flexibility", "focus group", "forecast", "frame", "framework", "function", "functionalities", "Graphic Interface", "groupware", "Graphical User Interface", "hardware", "help-desk", "hierarchy", "hub", "implementation", "info-mediaries", "infrastructure", "initiative", "installation", "instruction set", "interface", "internet solution", "intranet", "knowledge user", "knowledge base", "local area network", "leverage", "matrices", "matrix", "methodology", "middleware", "migration", "model", "moderator", "monitoring", "moratorium", "neural-net", "open architecture", "open system", "orchestration", "paradigm", "parallelism", "policy", "portal", "pricing structure", "process improvement", "product", "productivity", "project", "projection", "protocol", "secured line", "service-desk", "software", "solution", "standardization", "strategy", "structure", "success", "superstructure", "support", "synergy", "system engine", "task-force", "throughput", "time-frame", "toolset", "utilisation", "website", "workforce"]
       # BS wordlist from http://dack.com/web/bullshit.html
       bs:
@@ -134,3 +135,10 @@ en:
       creature: ['ants', 'bats', 'bears', 'bees', 'birds', 'buffalo', 'cats', 'chickens', 'cattle', 'dogs', 'dolphins', 'ducks', 'elephants', 'fishes', 'foxes', 'frogs', 'geese', 'goats', 'horses', 'kangaroos', 'lions', 'monkeys', 'owls', 'oxen', 'penguins', 'people', 'pigs', 'rabbits', 'sheep', 'tigers', 'whales', 'wolves', 'zebras', 'banshees', 'crows', 'black cats', 'chimeras', 'ghosts', 'conspirators', 'dragons', 'dwarves', 'elves', 'enchanters', 'exorcists', 'sons', 'foes', 'giants', 'gnomes', 'goblins', 'gooses', 'griffins', 'lycanthropes', 'nemesis', 'ogres', 'oracles', 'prophets', 'sorcerors', 'spiders', 'spirits', 'vampires', 'warlocks', 'vixens', 'werewolves', 'witches', 'worshipers', 'zombies', 'druids']
       name:
         - "#{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]
+      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]

data/lib/locales/fr.yml

@@ -21,7 +21,7 @@ fr:
       # Buzzword wordlist from http://www.1728.com/buzzword.htm
       buzzwords:
         - ["Adaptive", "Advanced", "Ameliorated", "Assimilated", "Automated", "Balanced", "Business-focused", "Centralized", "Cloned", "Compatible", "Configurable", "Cross-group", "Cross-platform", "Customer-focused", "Customizable", "Decentralized", "De-engineered", "Devolved", "Digitized", "Distributed", "Diverse", "Down-sized", "Enhanced", "Enterprise-wide", "Ergonomic", "Exclusive", "Expanded", "Extended", "Face to face", "Focused", "Front-line", "Fully-configurable", "Function-based", "Fundamental", "Future-proofed", "Grass-roots", "Horizontal", "Implemented", "Innovative", "Integrated", "Intuitive", "Inverse", "Managed", "Mandatory", "Monitored", "Multi-channelled", "Multi-lateral", "Multi-layered", "Multi-tiered", "Networked", "Object-based", "Open-architected", "Open-source", "Operative", "Optimized", "Optional", "Organic", "Organized", "Persevering", "Persistent", "Phased", "Polarised", "Pre-emptive", "Proactive", "Profit-focused", "Profound", "Programmable", "Progressive", "Public-key", "Quality-focused", "Reactive", "Realigned", "Re-contextualized", "Re-engineered", "Reduced", "Reverse-engineered", "Right-sized", "Robust", "Seamless", "Secured", "Self-enabling", "Sharable", "Stand-alone", "Streamlined", "Switchable", "Synchronised", "Synergistic", "Synergized", "Team-oriented", "Total", "Triple-buffered", "Universal", "Up-sized", "Upgradable", "User-centric", "User-friendly", "Versatile", "Virtual", "Visionary", "Vision-oriented"]
-        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "assymetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
+        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "asymmetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
         - ["ability", "access", "adapter", "algorithm", "alliance", "analyzer", "application", "approach", "architecture", "archive", "artificial intelligence", "array", "attitude", "benchmark", "budgetary management", "capability", "capacity", "challenge", "circuit", "collaboration", "complexity", "concept", "conglomeration", "contingency", "core", "customer loyalty", "database", "data-warehouse", "definition", "emulation", "encoding", "encryption", "extranet", "firmware", "flexibility", "focus group", "forecast", "frame", "framework", "function", "functionalities", "Graphic Interface", "groupware", "Graphical User Interface", "hardware", "help-desk", "hierarchy", "hub", "implementation", "info-mediaries", "infrastructure", "initiative", "installation", "instruction set", "interface", "internet solution", "intranet", "knowledge user", "knowledge base", "local area network", "leverage", "matrices", "matrix", "methodology", "middleware", "migration", "model", "moderator", "monitoring", "moratorium", "neural-net", "open architecture", "open system", "orchestration", "paradigm", "parallelism", "policy", "portal", "pricing structure", "process improvement", "product", "productivity", "project", "projection", "protocol", "secured line", "service-desk", "software", "solution", "standardization", "strategy", "structure", "success", "superstructure", "support", "synergy", "system engine", "task-force", "throughput", "time-frame", "toolset", "utilisation", "website", "workforce"]
       # BS wordlist from http://dack.com/web/bullshit.html
       bs:

data/lib/locales/ja.yml

@@ -16,6 +16,8 @@ ja:
         - "#{Name.last_name}#{street_suffix}"
     phone_number:
       formats: ['0####-#-####', '0###-##-####', '0##-###-####', '0#-####-####']
+    cell_phone:
+      formats: ['090-####-####', '080-####-####', '070-####-####']
     name:
       last_name: ["佐藤", "鈴木", "高橋", "田中", "渡辺", "伊藤", "山本", "中村", "小林", "加藤", "吉田", "山田", "佐々木", "山口", "斎藤", "松本", "井上", "木村", "林", "清水"]
       first_name: ["大翔", "蓮", "颯太", "樹", "大和", "陽翔", "陸斗", "太一", "海翔", "蒼空", "翼", "陽菜", "結愛", "結衣", "杏", "莉子", "美羽", "結菜", "心愛", "愛菜", "美咲"]

data/lib/locales/{nb-no.yml → nb-NO.yml}

@@ -1,5 +1,5 @@
 # coding: utf-8
-nb-no:
+nb-NO:
   faker:
     address:
       city_root: ["Fet", "Gjes", "Høy", "Inn", "Fager", "Lille", "Lo", "Mal", "Nord", "Nær", "Sand", "Sme", "Stav", "Stor", "Tand", "Ut", "Vest"]

data/lib/locales/pl.yml

@@ -24,7 +24,7 @@ pl:
       # Buzzword wordlist from http://www.1728.com/buzzword.htm
       buzzwords:
         - ["Adaptive", "Advanced", "Ameliorated", "Assimilated", "Automated", "Balanced", "Business-focused", "Centralized", "Cloned", "Compatible", "Configurable", "Cross-group", "Cross-platform", "Customer-focused", "Customizable", "Decentralized", "De-engineered", "Devolved", "Digitized", "Distributed", "Diverse", "Down-sized", "Enhanced", "Enterprise-wide", "Ergonomic", "Exclusive", "Expanded", "Extended", "Face to face", "Focused", "Front-line", "Fully-configurable", "Function-based", "Fundamental", "Future-proofed", "Grass-roots", "Horizontal", "Implemented", "Innovative", "Integrated", "Intuitive", "Inverse", "Managed", "Mandatory", "Monitored", "Multi-channelled", "Multi-lateral", "Multi-layered", "Multi-tiered", "Networked", "Object-based", "Open-architected", "Open-source", "Operative", "Optimized", "Optional", "Organic", "Organized", "Persevering", "Persistent", "Phased", "Polarised", "Pre-emptive", "Proactive", "Profit-focused", "Profound", "Programmable", "Progressive", "Public-key", "Quality-focused", "Reactive", "Realigned", "Re-contextualized", "Re-engineered", "Reduced", "Reverse-engineered", "Right-sized", "Robust", "Seamless", "Secured", "Self-enabling", "Sharable", "Stand-alone", "Streamlined", "Switchable", "Synchronised", "Synergistic", "Synergized", "Team-oriented", "Total", "Triple-buffered", "Universal", "Up-sized", "Upgradable", "User-centric", "User-friendly", "Versatile", "Virtual", "Visionary", "Vision-oriented"]
-        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "assymetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
+        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "asymmetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
         - ["ability", "access", "adapter", "algorithm", "alliance", "analyzer", "application", "approach", "architecture", "archive", "artificial intelligence", "array", "attitude", "benchmark", "budgetary management", "capability", "capacity", "challenge", "circuit", "collaboration", "complexity", "concept", "conglomeration", "contingency", "core", "customer loyalty", "database", "data-warehouse", "definition", "emulation", "encoding", "encryption", "extranet", "firmware", "flexibility", "focus group", "forecast", "frame", "framework", "function", "functionalities", "Graphic Interface", "groupware", "Graphical User Interface", "hardware", "help-desk", "hierarchy", "hub", "implementation", "info-mediaries", "infrastructure", "initiative", "installation", "instruction set", "interface", "internet solution", "intranet", "knowledge user", "knowledge base", "local area network", "leverage", "matrices", "matrix", "methodology", "middleware", "migration", "model", "moderator", "monitoring", "moratorium", "neural-net", "open architecture", "open system", "orchestration", "paradigm", "parallelism", "policy", "portal", "pricing structure", "process improvement", "product", "productivity", "project", "projection", "protocol", "secured line", "service-desk", "software", "solution", "standardization", "strategy", "structure", "success", "superstructure", "support", "synergy", "system engine", "task-force", "throughput", "time-frame", "toolset", "utilisation", "website", "workforce"]
       # BS wordlist from http://dack.com/web/bullshit.html
       bs:

data/lib/locales/{pt-br.yml → pt-BR.yml}

@@ -1,4 +1,4 @@
-pt-br:
+pt-BR:
   faker:
     address:
       city_prefix: [Nova, Velha, Grande, Vila, Município de]
@@ -54,4 +54,4 @@ pt-br:
       suffix: ["Jr.", "Neto", "Filho"]
 
     phone_number:
-      formats: ["###-###-####", "(##)###-####", "55-(##)-###-####", "###.####"]
+      formats: ["(##) ####-####", "+55 (##) ####-####", "(##) #####-####"]

data/lib/locales/ru.yml

@@ -41,3 +41,12 @@ ru:
 
     phone_number:
       formats: ['(9##)###-##-##']
+
+    commerce:
+      color: [красный, зеленый, синий, желтый, багровый, мятный, зеленовато-голубой, белый, черный, оранжевый, розовый, серый, красно-коричневый, фиолетовый, бирюзовый, желто-коричневый, небесно голубой, оранжево-розовый, темно-фиолетовый, орхидный, оливковый, пурпурный, лимонный, кремовый, сине-фиолетовый, золотой, красно-пурпурный, голубой, лазурный, лиловый, серебряный]
+      department: ["Книги", "Фильмы, музыка и игры", "Электроника и компьютеры", "Дом, сад и инструмент", "Бакалея, здоровье и красота", "Игрушки, детское и для малышей", "Одежда, обувь и украшения", "Спорт и туризм", "Автомобильное и промышленное"]
+      product_name:
+        adjective: [Маленький, Эргономичный, Грубый, Интеллектуальный, Великолепный, Невероятный, Фантастический, Практчиный, Лоснящийся, Потрясающий]
+        material: [Стальной, Деревянный, Бетонный, Пластиковый, Хлопковый, Гранитный, Резиновый]
+        product: [Стул, Автомобиль, Компьютер, Берет, Кулон, Стол, Свитер, Ремень, Ботинок]
+

data/lib/locales/sk.yml

@@ -25,7 +25,7 @@ sk:
       # Buzzword wordlist from http://www.1728.com/buzzword.htm
       buzzwords:
         - ["Adaptive", "Advanced", "Ameliorated", "Assimilated", "Automated", "Balanced", "Business-focused", "Centralized", "Cloned", "Compatible", "Configurable", "Cross-group", "Cross-platform", "Customer-focused", "Customizable", "Decentralized", "De-engineered", "Devolved", "Digitized", "Distributed", "Diverse", "Down-sized", "Enhanced", "Enterprise-wide", "Ergonomic", "Exclusive", "Expanded", "Extended", "Face to face", "Focused", "Front-line", "Fully-configurable", "Function-based", "Fundamental", "Future-proofed", "Grass-roots", "Horizontal", "Implemented", "Innovative", "Integrated", "Intuitive", "Inverse", "Managed", "Mandatory", "Monitored", "Multi-channelled", "Multi-lateral", "Multi-layered", "Multi-tiered", "Networked", "Object-based", "Open-architected", "Open-source", "Operative", "Optimized", "Optional", "Organic", "Organized", "Persevering", "Persistent", "Phased", "Polarised", "Pre-emptive", "Proactive", "Profit-focused", "Profound", "Programmable", "Progressive", "Public-key", "Quality-focused", "Reactive", "Realigned", "Re-contextualized", "Re-engineered", "Reduced", "Reverse-engineered", "Right-sized", "Robust", "Seamless", "Secured", "Self-enabling", "Sharable", "Stand-alone", "Streamlined", "Switchable", "Synchronised", "Synergistic", "Synergized", "Team-oriented", "Total", "Triple-buffered", "Universal", "Up-sized", "Upgradable", "User-centric", "User-friendly", "Versatile", "Virtual", "Visionary", "Vision-oriented"]
-        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "assymetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
+        - ["24 hour", "24/7", "3rd generation", "4th generation", "5th generation", "6th generation", "actuating", "analyzing", "asymmetric", "asynchronous", "attitude-oriented", "background", "bandwidth-monitored", "bi-directional", "bifurcated", "bottom-line", "clear-thinking", "client-driven", "client-server", "coherent", "cohesive", "composite", "context-sensitive", "contextually-based", "content-based", "dedicated", "demand-driven", "didactic", "directional", "discrete", "disintermediate", "dynamic", "eco-centric", "empowering", "encompassing", "even-keeled", "executive", "explicit", "exuding", "fault-tolerant", "foreground", "fresh-thinking", "full-range", "global", "grid-enabled", "heuristic", "high-level", "holistic", "homogeneous", "human-resource", "hybrid", "impactful", "incremental", "intangible", "interactive", "intermediate", "leading edge", "local", "logistical", "maximized", "methodical", "mission-critical", "mobile", "modular", "motivating", "multimedia", "multi-state", "multi-tasking", "national", "needs-based", "neutral", "next generation", "non-volatile", "object-oriented", "optimal", "optimizing", "radical", "real-time", "reciprocal", "regional", "responsive", "scalable", "secondary", "solution-oriented", "stable", "static", "systematic", "systemic", "system-worthy", "tangible", "tertiary", "transitional", "uniform", "upward-trending", "user-facing", "value-added", "web-enabled", "well-modulated", "zero administration", "zero defect", "zero tolerance"]
         - ["ability", "access", "adapter", "algorithm", "alliance", "analyzer", "application", "approach", "architecture", "archive", "artificial intelligence", "array", "attitude", "benchmark", "budgetary management", "capability", "capacity", "challenge", "circuit", "collaboration", "complexity", "concept", "conglomeration", "contingency", "core", "customer loyalty", "database", "data-warehouse", "definition", "emulation", "encoding", "encryption", "extranet", "firmware", "flexibility", "focus group", "forecast", "frame", "framework", "function", "functionalities", "Graphic Interface", "groupware", "Graphical User Interface", "hardware", "help-desk", "hierarchy", "hub", "implementation", "info-mediaries", "infrastructure", "initiative", "installation", "instruction set", "interface", "internet solution", "intranet", "knowledge user", "knowledge base", "local area network", "leverage", "matrices", "matrix", "methodology", "middleware", "migration", "model", "moderator", "monitoring", "moratorium", "neural-net", "open architecture", "open system", "orchestration", "paradigm", "parallelism", "policy", "portal", "pricing structure", "process improvement", "product", "productivity", "project", "projection", "protocol", "secured line", "service-desk", "software", "solution", "standardization", "strategy", "structure", "success", "superstructure", "support", "synergy", "system engine", "task-force", "throughput", "time-frame", "toolset", "utilisation", "website", "workforce"]
       # BS wordlist from http://dack.com/web/bullshit.html
       bs:

data/lib/locales/zh-CN.yml

@@ -0,0 +1,27 @@
+# coding: utf-8
+zh-CN:
+  faker:
+    address:
+      city_prefix: [长, 上, 南, 西, 北, 诸, 宁, 珠, 武, 衡, 成, 福, 厦, 贵, 吉, 海, 太, 济, 安, 吉, 包]
+      city_suffix: [沙市, 京市, 宁市, 安市, 乡县, 海市, 码市, 汉市, 阳市, 都市, 州市, 门市, 阳市, 口市, 原市, 南市, 徽市, 林市, 头市]
+      building_number: ['#####', '####', '###', '##', '#']
+      street_suffix: [巷, 街, 路, 桥, 侬, 旁, 中心, 栋]
+      postcode: ['######']
+      state: [北京市, 上海市, 天津市, 重庆市, 黑龙江省, 吉林省, 辽宁省, 内蒙古, 河北省, 新疆, 甘肃省, 青海省, 陕西省, 宁夏, 河南省, 山东省, 山西省, 安徽省, 湖北省, 湖南省, 江苏省, 四川省, 贵州省, 云南省, 广西省, 西藏, 浙江省, 江西省, 广东省, 福建省, 台湾省, 海南省, 香港, 澳门]
+      state_abbr: [京, 沪, 津, 渝, 黑, 吉, 辽, 蒙, 冀, 新, 甘, 青, 陕, 宁, 豫, 鲁, 晋, 皖, 鄂, 湘, 苏, 川, 黔, 滇, 桂, 藏, 浙, 赣, 粤, 闽, 台, 琼, 港, 澳]
+      city:
+        - "#{city_prefix}#{city_suffix}"
+      street_name:
+        - "#{Name.last_name}#{street_suffix}"
+      street_address:
+        - "#{street_name}#{building_number}号"
+      default_country: [中国]
+
+
+    name:
+      first_name: [王, 李, 张, 刘, 陈, 杨, 黄, 吴, 赵, 周, 徐, 孙, 马, 朱, 胡, 林, 郭, 何, 高, 罗, 郑, 梁, 谢, 宋, 唐, 许, 邓, 冯, 韩, 曹, 曾, 彭, 萧, 蔡, 潘, 田, 董, 袁, 于, 余, 叶, 蒋, 杜, 苏, 魏, 程, 吕, 丁, 沈, 任, 姚, 卢, 傅, 钟, 姜, 崔, 谭, 廖, 范, 汪, 陆, 金, 石, 戴, 贾, 韦, 夏, 邱, 方, 侯, 邹, 熊, 孟, 秦, 白, 江, 阎, 薛, 尹, 段, 雷, 黎, 史, 龙, 陶, 贺, 顾, 毛, 郝, 龚, 邵, 万, 钱, 严, 赖, 覃, 洪, 武, 莫, 孔]
+      last_name: [绍齐, 博文, 梓晨, 胤祥, 瑞霖, 明哲, 天翊, 凯瑞, 健雄, 耀杰, 潇然, 子涵, 越彬, 钰轩, 智辉, 致远, 俊驰, 雨泽, 烨磊, 晟睿, 文昊, 修洁, 黎昕, 远航, 旭尧, 鸿涛, 伟祺, 荣轩, 越泽, 浩宇, 瑾瑜, 皓轩, 擎苍, 擎宇, 志泽, 子轩, 睿渊, 弘文, 哲瀚, 雨泽, 楷瑞, 建辉, 晋鹏, 天磊, 绍辉, 泽洋, 鑫磊, 鹏煊, 昊强, 伟宸, 博超, 君浩, 子骞, 鹏涛, 炎彬, 鹤轩, 越彬, 风华, 靖琪, 明辉, 伟诚, 明轩, 健柏, 修杰, 志泽, 弘文, 峻熙, 嘉懿, 煜城, 懿轩, 烨伟, 苑博, 伟泽, 熠彤, 鸿煊, 博涛, 烨霖, 烨华, 煜祺, 智宸, 正豪, 昊然, 明杰, 立诚, 立轩, 立辉, 峻熙, 弘文, 熠彤, 鸿煊, 烨霖, 哲瀚, 鑫鹏, 昊天, 思聪, 展鹏, 笑愚, 志强, 炫明, 雪松, 思源, 智渊, 思淼, 晓啸, 天宇, 浩然, 文轩, 鹭洋, 振家, 乐驹, 晓博, 文博, 昊焱, 立果, 金鑫, 锦程, 嘉熙, 鹏飞, 子默, 思远, 浩轩, 语堂, 聪健, 明, 文, 果, 思, 鹏, 驰, 涛, 琪, 浩, 航, 彬]
+      name:
+        - "#{first_name}#{last_name}"
+    phone_number:
+      formats: ['###-########', '####-########', '###########']

data/test/test_en_us_locale.rb

@@ -22,7 +22,7 @@ class TesetEnUsLocale < Test::Unit::TestCase
   end
 
   def test_us_phone_methods_with_en_us_locale
-    Faker::Config.locale = 'en-us'
+    Faker::Config.locale = 'en-US'
 
     assert Faker::PhoneNumber.area_code.is_a? String
     assert Faker::PhoneNumber.area_code.to_i.is_a? Integer
@@ -34,7 +34,7 @@ class TesetEnUsLocale < Test::Unit::TestCase
   end
 
   def test_validity_of_phone_method_output
-    Faker::Config.locale = 'en-us'
+    Faker::Config.locale = 'en-US'
 
     # got the following regex from http://stackoverflow.com/a/123666/1210055 as an expression of the NANP standard.
     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+))?$/

data/test/test_faker_code.rb

@@ -12,4 +12,16 @@ class TestFakerCode < Test::Unit::TestCase
   def test_default_isbn13_regexp
     assert @tester.isbn(13).match(/^\d{12}-\d$/)
   end
+
+  def test_default_ean_regexp
+    assert @tester.ean.match(/^\d{13}$/)
+  end
+
+  def test_default_ean8_regexp
+    assert @tester.ean(8).match(/^\d{8}$/)
+  end
+
+  def test_rut
+    assert @tester.rut.match(/^\d{1,8}-(\d|k)$/)
+  end
 end

data/test/test_faker_company.rb

@@ -8,4 +8,11 @@ class TestFakerCompany < Test::Unit::TestCase
   def test_duns_number
     assert @tester.duns_number.match(/\d\d-\d\d\d-\d\d\d\d/)
   end
+
+  require "open-uri"
+  def test_logo
+    open("#{ @tester.logo }") do |f|
+	  assert f.readline.include?("GIF")
+	end
+  end
 end

data/test/test_faker_date.rb

@@ -0,0 +1,52 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class TestFakerDate < Test::Unit::TestCase
+  def setup
+    @tester = Faker::Date
+  end
+
+  def test_between
+    from = Date.parse("2012-01-01")
+    to   = Date.parse("2013-01-01")
+
+    100.times do
+      random_date = @tester.between(from, to)
+      assert random_date >= from, "Expected >= \"#{from}\", but got #{random_date}"
+      assert random_date <= to  , "Expected <= \"#{to}\", but got #{random_date}"
+    end
+  end
+
+  def test_forward
+    today = Date.today
+
+    100.times do
+      random_date = @tester.forward(5)
+      assert random_date > today, "Expected > \"#{today}\", but got #{random_date}"
+    end
+  end
+
+  def test_backward
+    today = Date.today
+
+    100.times do
+      random_date = @tester.backward(5)
+      assert random_date < today, "Expected < \"#{today}\", but got #{random_date}"
+    end
+  end
+
+  def test_return_type
+    random_forward  = @tester.forward(5)
+    random_backward = @tester.backward(5)
+    random_between  = @tester.between(Date.today, Date.today + 5)
+
+    [random_forward, random_backward, random_between].each do |result|
+      assert result.is_a?(Date), "Expected a Date object, but got #{result.class}"
+    end
+  end
+
+  def test_invalid_date
+    assert_raise ArgumentError do
+      @tester.between("9999-99-99", "9999-99-99")
+    end
+  end
+end

data/test/test_faker_hacker_talk.rb

@@ -0,0 +1,37 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class TestFakerHacker < Test::Unit::TestCase      
+  def setup
+     @hacker = Faker::Hacker
+     @phrases = @hacker.phrases     
+  end
+  
+  def test_phrases    
+    assert @phrases.size == 8    
+    @phrases.each do |phrase|
+       assert !phrase.nil?
+       assert phrase != ""
+    end        
+  end  
+  
+  def test_noun 
+    assert @hacker.noun.match(/\w+/)
+  end
+  
+  def test_abbreviation
+    assert @hacker.abbreviation.match(/\w+/)
+  end
+  
+  def test_adjective
+    assert @hacker.adjective.match(/\w+/)
+  end
+  
+  def test_verb
+    assert @hacker.verb.match(/\w+/)
+  end
+  
+  def test_ingverb
+    assert @hacker.ingverb.match(/\w+/)
+  end
+  
+end

data/test/test_faker_internet.rb

@@ -72,6 +72,13 @@ class TestFakerInternet < Test::Unit::TestCase
     end
   end
 
+  def test_password_max_with_integer_arg
+    (1..32).each do |min_length|
+      max_length = min_length + 4
+      assert @tester.password(min_length, max_length).length <= max_length
+    end
+  end
+
   def test_domain_name
     assert @tester.domain_name.match(/\w+\.\w+/)
   end

data/test/test_faker_number.rb

@@ -1,17 +1,21 @@
 require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
 
 class TestFakerNumber < Test::Unit::TestCase
-
   def setup
     @tester = Faker::Number
   end
 
   def test_number
     assert @tester.number(10).match(/[0-9]{10}/)
+
     10.times do |digits|
       digits += 1
       assert @tester.number(digits).match(/^[0-9]{#{digits}}$/)
     end
+
+    assert @tester.number(10).length == 10
+    assert @tester.number(1).length == 1
+    assert @tester.number(0) == ""
   end
 
   def test_decimal
@@ -21,6 +25,53 @@ class TestFakerNumber < Test::Unit::TestCase
 
   def test_digit
     assert @tester.digit.match(/[0-9]{1}/)
+    assert (1..1000).collect {|i| @tester.digit == "9"}.include?(true)
+  end
+
+  def test_between
+    100.times do
+      random_number = @tester.between(-50, 50)
+      assert random_number >= -50, "Expected >= -50, but got #{random_number}"
+      assert random_number <=  50, "Expected <= 50, but got #{random_number}"
+    end
   end
 
+  def test_positive
+    100.times do
+      random_number = @tester.positive(1, 100)
+      assert random_number >= 1,   "Expected >= 1, but got #{random_number}"
+      assert random_number <= 100, "Expected <= 100, but got #{random_number}"
+    end
+  end
+
+  def test_negative
+    100.times do
+      random_number = @tester.negative(-1, -100)
+      assert random_number <= -1,   "Expected <= -1, but got #{random_number}"
+      assert random_number >= -100, "Expected >= -100, but got #{random_number}"
+    end
+  end
+
+  def test_force_positive
+    random_number = @tester.positive(-1, -100)
+    assert random_number >= 1,   "Expected >= 1, but got #{random_number}"
+    assert random_number <= 100, "Expected <= 100, but got #{random_number}"
+  end
+
+  def test_force_negative
+    random_number = @tester.negative(1, 100)
+    assert random_number <= -1,   "Expected <= -1, but got #{random_number}"
+    assert random_number >= -100, "Expected >= -100, but got #{random_number}"
+  end
+
+  def test_parameters_order
+    random_number = @tester.between(100, 1)
+    assert random_number >= 1,   "Expected >= 1, but got #{random_number}"
+    assert random_number <= 100, "Expected <= 100, but got #{random_number}"
+  end
+
+  def test_hexadecimal
+    assert @tester.hexadecimal(4).match(/[0-9a-f]{4}/)
+    assert @tester.hexadecimal(7).match(/[0-9a-f]{7}/)
+  end
 end

data/test/test_faker_street.rb

@@ -38,7 +38,7 @@ class TestFakerStreet < Test::Unit::TestCase
   end
   
   def test_street_address_with_locale_fallback
-    I18n.with_locale('en-gb') do
+    I18n.with_locale('en-GB') do
       assert_match(/^\d+ \w+ \w+/, Faker::Address.street_address)
     end
   end

data/test/test_faker_time.rb

@@ -0,0 +1,74 @@
+require File.expand_path(File.dirname(__FILE__) + '/test_helper.rb')
+
+class TestFakerTime < Test::Unit::TestCase
+  def setup
+    @tester      = Faker::Time
+    @time_ranges = Faker::Time::TIME_RANGES
+  end
+
+  def test_between
+    from = Time.local(2012, 01, 01,  0,  0,  0)
+    to   = Time.local(2013, 01, 01, 23, 59, 59)
+
+    100.times do
+      random_time = @tester.between(from, to)
+      assert random_time >= from, "Expected >= \"#{from}\", but got #{random_time}"
+      assert random_time <= to  , "Expected <= \"#{to}\", but got #{random_time}"
+    end
+  end
+
+  def test_forward
+    today = Date.today
+
+    100.times do
+      random_time = @tester.forward(10)
+      assert random_time > today.to_time, "Expected > \"#{today}\", but got #{random_time}"
+    end
+  end
+
+  def test_backward
+    tomorrow = Date.today + 1
+
+    100.times do
+      random_time = @tester.backward(10)
+      assert random_time < tomorrow.to_time, "Expected < \"#{tomorrow}\", but got #{random_time}"
+    end
+  end
+
+  def test_invalid_period_error
+    from = Date.today
+    to   = Date.today + 15
+
+    assert_raise ArgumentError do
+      @tester.between(from, to, :invalid_period)
+    end
+  end
+
+  def test_return_type
+    random_backward = @tester.backward(5)
+    random_between  = @tester.between(Date.today, Date.today + 5)
+    random_forward  = @tester.forward(5)
+
+    [random_backward, random_between, random_forward].each do |result|
+      assert result.is_a?(Time), "Expected a Time object, but got #{result.class}"
+    end
+  end
+
+  def test_time_period
+    from = Date.today
+    to   = Date.today + 15
+
+    100.times do
+      period          = @time_ranges.keys.to_a.sample
+      period_range    = @time_ranges[period]
+
+      random_backward = @tester.backward(30, period)
+      random_between  = @tester.between(from, to, period)
+      random_forward  = @tester.forward(30, period)
+
+      [random_backward, random_between, random_forward].each do |result|
+        assert period_range.include?(result.hour), "\"#{result.hour}\" expected to be included in Faker::Time::TIME_RANGES[:#{period}] range"
+      end
+    end
+  end
+end