faker 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c6c36a94960622277ebd5a4297ec2433f7e5fe2b
-  data.tar.gz: ca8eee943c3f67e2201c695ac8f9e73d6129c913
+  metadata.gz: 16afea76964cc1fb1d8779296e32ed88e450ed42
+  data.tar.gz: 1470483a239699d09a0cf0c2e8133069f4a82b29
 SHA512:
-  metadata.gz: bf565c6375b6e3dab4c7e6598f618c2bb2930d8d8bc70bb9202f886d65b9b5f9f4430ffc3554fc13e99a0739a9af4893eabbb452f9f7fbc0c7649f9f3a6bdcf7
-  data.tar.gz: 09a408f05ef48d4aa320cb1c4a75ddf2f6d3da570430e81abb3cd888d5f27b3909e285654dbb458f64e03e3b2527b5790b6d9fbef6724978bfc41bb1c7c1e4a7
+  metadata.gz: e5940ec8586f709c265b428d64a11ab0e13ecdd91201a95b2213e4cc04bff2708f5441fba29fabfac9097328e4c3d516a2c2ef87dee41eef315fd662e3005624
+  data.tar.gz: b4b9b8e736b664fbc4e8974d1dd3dd38d1956763f48d8d21b2426d3fc9ace02547d0ba95fb0587cbce8379051a13d9303593b29363d4a746f254a32757bb73ea

data/History.txt

@@ -1,3 +1,8 @@
+== 1.6.0 2015-11-20
+* Lots of bug fixes -- most notably, a fix for email addresses and domains in non-en locales
+* Updated locales: de, en-AU, en-NZ, en-SG, en-US, en-au-ocker, en, es, fr, he, it, ja, nb-NO, pl, pt-BR, sk, and zh-CN
+* Updated classes: Address, Avatar, Book, Code, Commerce, Company, Hipster, IDNumber, Internet, Number, Placeholdit, Shakespeare, and Time 
+
 == 1.5.0 2015-08-17
 * Added logos
 * Added Slack Emoji

data/README.md

@@ -141,10 +141,13 @@ Faker::Company.ein #=> "34-8488813"
 Faker::Company.duns_number #=> "08-341-3736"
 
 # Get a random company logo url in PNG format.
-Faker::Company.logo #=> "http://pigment.github.com/fake-logos/logos/medium/color/5.png"
+Faker::Company.logo #=> "https://pigment.github.com/fake-logos/logos/medium/color/5.png"
 
 Faker::Company.swedish_organisation_number #=> "7718797652"
 
+# Get a random profession
+Faker::Company.profession #=> "firefighter"
+
 ```
 
 ###Faker::Date
@@ -194,6 +197,10 @@ Faker::Internet.password(8) #=> "yfgjik0hgzdqs0"
 
 Faker::Internet.password(10, 20) #=> "eoc9shwd1hwq4vbgfw"
 
+Faker::Internet.password(10, 20, true) #=> "3k5qS15aNmG"
+
+Faker::Internet.password(10, 20, true, true) #=> "*%NkOnJsH4"
+
 Faker::Internet.domain_name #=> "effertz.info"
 
 Faker::Internet.fix_umlauts('äöüß') #=> "aeoeuess"
@@ -204,6 +211,10 @@ Faker::Internet.domain_suffix #=> "info"
 
 Faker::Internet.ip_v4_address #=> "24.29.18.175"
 
+# Guaranteed not to be in 10.0.0.0/8, 127.0.0.0/8, 169.254.0.0/16,
+# 172.16.0.0/12, or 192.168.0.0/16
+Faker::Internet.public_ip_v4_address #=> "24.29.18.175"
+
 Faker::Internet.ip_v6_address #=> "ac5f:d696:3807:1d72:2eb5:4e81:7d2b:e1df"
 
 # Optional argument prefix=''
@@ -289,15 +300,17 @@ Faker::Name.title #=> "Legacy Creative Director"
 
 ```ruby
 
-Faker::Avatar.image #=> "http://robohash.org/sitsequiquia.png?size=300x300"
+Faker::Avatar.image #=> "https://robohash.org/sitsequiquia.png?size=300x300"
+
+Faker::Avatar.image("my-own-slug") #=> "https://robohash.org/my-own-slug.png?size=300x300"
 
-Faker::Avatar.image("my-own-slug") #=> "http://robohash.org/my-own-slug.png?size=300x300"
+Faker::Avatar.image("my-own-slug", "50x50") #=> "https://robohash.org/my-own-slug.png?size=50x50"
 
-Faker::Avatar.image("my-own-slug", "50x50") #=> "http://robohash.org/my-own-slug.png?size=50x50"
+Faker::Avatar.image("my-own-slug", "50x50", "jpg") #=> "https://robohash.org/my-own-slug.jpg?size=50x50"
 
-Faker::Avatar.image("my-own-slug", "50x50", "jpg") #=> "http://robohash.org/my-own-slug.jpg?size=50x50"
+Faker::Avatar.image("my-own-slug", "50x50", "bmp") #=> "https://robohash.org/my-own-slug.bmp?size=50x50"
 
-Faker::Avatar.image("my-own-slug", "50x50", "bmp") #=> "http://robohash.org/my-own-slug.bmp?size=50x50"
+Faker::Avatar.image("my-own-slug", "50x50", "bmp", "set1", "bg1") #=> "https://robohash.org/my-own-slug.bmp?size=50x50&set=set1&bgset=bg1"
 ```
 
 ###Faker::Number
@@ -498,6 +511,9 @@ Faker::Book.author #=> "Alysha Olsen"
 # Random Publisher
 Faker::Book.publisher #=> "Opus Reader"
 
+# Random Genre
+Faker::Book.genre #=> "Mystery"
+
 ```
 
 ###Faker::University
@@ -510,6 +526,64 @@ Faker::University.name #=> "South Texas College"
 
 ```
 
+###Faker::Placeholdit
+----------------
+
+```ruby
+
+Faker::Placeholdit.image #=> "http://placehold.it/300x300.png/000"
+
+Faker::Placeholdit.image("50x50") #=> "http://placehold.it/50x50.png/000"
+
+Faker::Placeholdit.image("50x50", 'jpg') #=> "http://placehold.it/50x50.jpg/000"
+
+Faker::Placeholdit.image("50x50", 'gif', 'ffffff') #=> "http://placehold.it/50x50.gif/ffffff"
+
+Faker::Placeholdit.image("50x50", 'jpeg', 'ffffff', '000') #=> "http://placehold.it/50x50.jpeg/ffffff/000"
+
+Faker::Placeholdit.image("50x50", 'jpg', 'ffffff', '000', 'Some Custom Text') #=> "http://placehold.it/50x50.jpg/ffffff/000?text='Some Custom Text'"
+
+```
+
+###Faker::Hipster
+----------------
+Adapted from [Hipster Ipsum](http://hipsum.co/)
+
+```ruby
+
+Faker::Hipster.word #=> "irony"
+
+# Optional arguments: num=3, supplemental=false, spaces_allowed = false
+Faker::Hipster.words #=> ["pug", "pitchfork", "chia"]
+Faker::Hipster.words(4) #=> ["ugh", "cardigan", "poutine", "stumptown"]
+Faker::Hipster.words(4, true) #=> ["iste", "seitan", "normcore", "provident"]
+Faker::Hipster.words(4, true, true) #=> ["qui", "magni", "craft beer", "est"] 
+
+# Optional arguments: word_count=4, supplemental=false, random_words_to_add=6
+Faker::Hipster.sentence #=> "Park iphone leggings put a bird on it."
+Faker::Hipster.sentence(3) #=> "Pour-over swag godard."
+Faker::Hipster.sentence(3, true) #=> "Beard laboriosam sequi celiac."
+Faker::Hipster.sentence(3, false, 4) #=> "Bitters retro mustache aesthetic biodiesel 8-bit."
+Faker::Hipster.sentence(3, true, 4) #=> "Occaecati deleniti messenger bag meh crucifix autem."
+
+# Optional arguments: sentence_count=3, supplemental=false
+Faker::Hipster.sentences #=> ["Godard pitchfork vinegar chillwave everyday 90's whatever.", "Pour-over artisan distillery street waistcoat.", "Salvia yr leggings franzen blue bottle."]
+Faker::Hipster.sentences(1) #=> ["Before they sold out pinterest venmo umami try-hard ugh hoodie artisan."]
+Faker::Hipster.sentences(1, true) #=> ["Et sustainable optio aesthetic et."]
+
+# Optional arguments: sentence_count=3, supplemental=false, random_sentences_to_add=3
+Faker::Hipster.paragraph #=> "Migas fingerstache pbr&b tofu. Polaroid distillery typewriter echo tofu actually. Slow-carb fanny pack pickled direct trade scenester mlkshk plaid. Banjo venmo chambray cold-pressed typewriter. Fap skateboard intelligentsia."
+Faker::Hipster.paragraph(2) #=> "Yolo tilde farm-to-table hashtag. Lomo kitsch disrupt forage +1."
+Faker::Hipster.paragraph(2, true) #=> "Typewriter iste ut viral kombucha voluptatem. Sint voluptates saepe. Direct trade irony chia excepturi yuccie. Biodiesel esse listicle et quam suscipit."
+Faker::Hipster.paragraph(2, false, 4) #=> "Selvage vhs chartreuse narwhal vinegar. Authentic vinyl truffaut carry vhs pop-up. Hammock everyday iphone locavore thundercats bitters vegan goth. Fashion axe banh mi shoreditch whatever artisan."
+Faker::Hipster.paragraph(2, true, 4) #=> "Deep v gluten-free unde waistcoat aperiam migas voluptas dolorum. Aut drinking illo sustainable sapiente. Direct trade fanny pack kale chips ennui semiotics."
+
+# Optional arguments: paragraph_count=3, supplemental=false
+Faker::Hipster.paragraphs #=> ["Tilde microdosing blog cliche meggings. Intelligentsia five dollar toast forage yuccie. Master kitsch knausgaard. Try-hard everyday trust fund mumblecore.", "Normcore viral pickled. Listicle humblebrag swag tote bag. Taxidermy street hammock neutra butcher cred kale chips. Blog portland humblebrag trust fund irony.", "Single-origin coffee fixie cleanse tofu xoxo. Post-ironic tote bag ramps gluten-free locavore mumblecore hammock. Umami loko twee. Ugh kitsch before they sold out."]
+Faker::Hipster.paragraphs(1) #=> ["Skateboard cronut synth +1 fashion axe. Pop-up polaroid skateboard asymmetrical. Ennui fingerstache shoreditch before they sold out. Tattooed pitchfork ramps. Photo booth yr messenger bag raw denim bespoke locavore lomo synth."]
+Faker::Hipster.paragraphs(1, true) #=> ["Quae direct trade pbr&b quo taxidermy autem loko. Umami quas ratione migas cardigan sriracha minima. Tenetur perspiciatis pickled sed eum doloribus truffaut. Excepturi dreamcatcher meditation."]
+```
+
 Customization
 ------------
 Since you may want to make addresses and other types of data look different

data/lib/faker.rb

@@ -122,10 +122,13 @@ module Faker
         opts[:raise] = true
         I18n.translate(*(args.push(opts)))
       rescue I18n::MissingTranslationData
+        opts = args.last.is_a?(Hash) ? args.pop : {}
+        opts[:locale] = :en
+
         # Super-simple fallback -- fallback to en if the
         # translation was missing.  If the translation isn't
         # in en either, then it will raise again.
-        I18n.translate(*(args.push(opts.merge(:locale => :en))))
+        I18n.translate(*(args.push(opts)))
       end
 
       def flexible(key)
@@ -174,13 +177,17 @@ require 'faker/version'
 require 'faker/number'
 require 'faker/bitcoin'
 require 'faker/avatar'
+require 'faker/placeholdit'
 require 'faker/date'
 require 'faker/time'
 require 'faker/number'
 require 'faker/hacker'
 require 'faker/app'
+require 'faker/id_number'
 require 'faker/slack_emoji'
 require 'faker/book'
+require 'faker/hipster'
+require 'faker/shakespeare'
 
 require 'extensions/array'
 require 'extensions/symbol'

data/lib/faker/address.rb

@@ -53,7 +53,6 @@ module Faker
       def longitude
         ((rand * 360) - 180).to_s
       end
-
     end
   end
 end

data/lib/faker/avatar.rb

@@ -3,11 +3,12 @@ module Faker
     class << self
       SUPPORTED_FORMATS = %w(png jpg bmp)
 
-      def image(slug = nil, size = '300x300', format = 'png', set = 'set1')
+      def image(slug = nil, size = '300x300', format = 'png', set = 'set1', bgset = nil)
         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}.#{format}?size=#{size}&set=#{set}"
+        bgset_query = "&bgset=#{bgset}" if bgset
+        "https://robohash.org/#{slug}.#{format}?size=#{size}&set=#{set}#{bgset_query}"
       end
     end
   end

data/lib/faker/book.rb

@@ -8,12 +8,16 @@ module Faker
       end
 
       def author
-        fetch('book.author')
+        parse('book.author')
       end
 
       def publisher
         fetch('book.publisher')
       end
+
+      def genre
+        fetch('book.genre')
+      end
     end
   end
 end

data/lib/faker/code.rb

@@ -26,6 +26,17 @@ module Faker
         value << "-#{vd}"
       end
 
+      # By default generates a Singaporean NRIC ID for someone
+      # who is born between the age of 18 and 65.
+      def nric(min_age = 18, max_age = 65)
+        birthyear = Date.birthday(min_age, max_age).year
+        prefix = birthyear < 2000 ? 'S' : 'T'
+        values = birthyear.to_s[-2..-1]
+        values << regexify(/\d{5}/)
+        check_alpha = generate_nric_check_alphabet(values, prefix)
+        "#{prefix}#{values}#{check_alpha}"
+      end
+
     private
 
       def generate_base10_isbn
@@ -65,6 +76,13 @@ module Faker
         total = rut.to_s.rjust(8, '0').split(//).zip(%w(3 2 7 6 5 4 3 2)).collect{|a, b| a.to_i * b.to_i}.inject(:+)
         (11 - total % 11).to_s.gsub(/10/, 'k').gsub(/11/, '0')
       end
+
+      def generate_nric_check_alphabet(values, prefix)
+        weight = %w(2 7 6 5 4 3 2)
+        total = values.split(//).zip(weight).collect { |a, b| a.to_i * b.to_i }.inject(:+)
+        total = total + 4 if prefix == 'T'
+        %w(A B C D E F G H I Z J)[10 - total % 11]
+      end
     end
   end
 end

data/lib/faker/commerce.rb

@@ -27,9 +27,9 @@ module Faker
         fetch('commerce.product_name.material')
       end
 
-      def price
-        random = Random.new
-        (random.rand(0..100.0) * 100).floor/100.0
+      def price(range=0..100.0)
+        random = Random::DEFAULT
+        (random.rand(range) * 100).floor/100.0
       end
 
       private

data/lib/faker/company.rb

@@ -11,6 +11,10 @@ module Faker
         fetch('company.suffix')
       end
 
+      def industry
+        fetch('company.industry')
+      end
+
       # Generate a buzzword-laden catch phrase.
       def catch_phrase
         translate('faker.company.buzzwords').collect {|list| list.sample }.join(' ')
@@ -36,7 +40,7 @@ module Faker
       # Get a random company logo url in PNG format.
       def logo
         rand_num = Random.rand(13) + 1
-        "http://pigment.github.io/fake-logos/logos/medium/color/#{rand_num}.png"
+        "https://pigment.github.io/fake-logos/logos/medium/color/#{rand_num}.png"
       end
 
       def swedish_organisation_number
@@ -44,6 +48,10 @@ module Faker
         base + luhn_algorithm(base).to_s
       end
 
+      def profession
+        fetch('company.profession')
+      end
+
     private
 
       def luhn_algorithm(number)

data/lib/faker/hipster.rb

@@ -0,0 +1,59 @@
+module Faker
+  class Hipster < Base
+    class << self
+      def word
+        random_word = translate('faker.hipster.words').sample
+        random_word.match(/\s/) ? word : random_word
+      end
+
+      def words(num = 3, supplemental = false, spaces_allowed = false)
+        resolved_num = resolve(num)
+        word_list = (
+          translate('faker.hipster.words') +
+          (supplemental ? translate('faker.lorem.words') : [])
+        )
+        word_list = word_list * ((resolved_num / word_list.length) + 1)
+
+        return word_list.shuffle[0, resolved_num] if spaces_allowed
+        words = word_list.shuffle[0, resolved_num]
+        words.each_with_index { |w, i| words[i] = word if w.match(/\s/) }
+      end
+
+      def sentence(word_count = 4, supplemental = false, random_words_to_add = 6)
+        words(word_count + rand(random_words_to_add.to_i).to_i, supplemental, true).join(' ').capitalize + '.'
+      end
+
+      def sentences(sentence_count = 3, supplemental = false)
+        [].tap do |sentences|
+          1.upto(resolve(sentence_count)) do
+            sentences << sentence(3, supplemental)
+          end
+        end
+      end
+
+      def paragraph(sentence_count = 3, supplemental = false, random_sentences_to_add = 3)
+        sentences(resolve(sentence_count) + rand(random_sentences_to_add.to_i).to_i, supplemental).join(' ')
+      end
+
+      def paragraphs(paragraph_count = 3, supplemental = false)
+        [].tap do |paragraphs|
+          1.upto(resolve(paragraph_count)) do
+            paragraphs << paragraph(3, supplemental)
+          end
+        end
+      end
+
+    private
+
+      # If an array or range is passed, a random value will be selected.
+      # All other values are simply returned.
+      def resolve(value)
+        case value
+        when Array then value[rand(value.size)]
+        when Range then rand((value.last+1) - value.first) + value.first
+        else value
+        end
+      end
+    end
+  end
+end

data/lib/faker/id_number.rb

@@ -0,0 +1,36 @@
+module Faker
+  class IDNumber < Base
+    INVALID_SSN = [
+        /0{3}-\d{2}-\d{4}/,
+        /\d{3}-0{2}-\d{4}/,
+        /\d{3}-\d{2}-0{4}/,
+        /666-\d{2}-\d{4}/,
+        /9\d{2}-\d{2}-\d{4}/
+    ]
+    class << self
+
+      def valid
+        _translate 'valid'
+      end
+
+      def invalid
+        _translate 'invalid'
+      end
+
+      def ssn_valid
+        ssn = regexify(/[0-8]\d{2}-\d{2}-\d{4}/)
+        # We could still have all 0s in one segment or another
+        INVALID_SSN.any? { |regex| regex =~ ssn } ? ssn_valid : ssn
+      end
+
+      private
+      def _translate key
+        if parse("id_number.#{key}") == ''
+          numerify(fetch("id_number.#{key}"))
+        else
+          parse("id_number.#{key}")
+        end
+      end
+    end
+  end
+end

data/lib/faker/internet.rb

@@ -15,36 +15,38 @@ module Faker
       end
 
       def user_name(specifier = nil, separators = %w(. _))
-        if specifier.kind_of? String
-          return specifier.scan(/\w+/).shuffle.join(separators.sample).downcase
-        elsif specifier.kind_of? Integer
-          tries = 0 # Don't try forever in case we get something like 1_000_000.
-          begin
-            result = user_name nil, separators
-            tries += 1
-          end while result.length < specifier and tries < 7
-          until result.length >= specifier
-            result = result * 2
+        I18n.with_locale(:en) do
+          if specifier.kind_of? String
+            return specifier.scan(/\w+/).shuffle.join(separators.sample).downcase
+          elsif specifier.kind_of? Integer
+            tries = 0 # Don't try forever in case we get something like 1_000_000.
+            begin
+              result = user_name nil, separators
+              tries += 1
+            end while result.length < specifier and tries < 7
+            until result.length >= specifier
+              result = result * 2
+            end
+            return result
+          elsif specifier.kind_of? Range
+            tries = 0
+            begin
+              result = user_name specifier.min, separators
+              tries += 1
+            end while not specifier.include? result.length and tries < 7
+            return result[0...specifier.max]
           end
-          return result
-        elsif specifier.kind_of? Range
-          tries = 0
-          begin
-            result = user_name specifier.min, separators
-            tries += 1
-          end while not specifier.include? result.length and tries < 7
-          return result[0...specifier.max]
-        end
 
-        [
-          Char.prepare(Name.first_name),
-          [Name.first_name, Name.last_name].map{ |name|
-            Char.prepare name
-          }.join(separators.sample)
-        ].sample
+          [
+            Char.prepare(Name.first_name),
+            [Name.first_name, Name.last_name].map{ |name|
+              Char.prepare name
+            }.join(separators.sample)
+          ].sample
+        end
       end
 
-      def password(min_length = 8, max_length = 16)
+      def password(min_length = 8, max_length = 16, mix_case = true, special_chars = false)
         temp = Lorem.characters(min_length)
         diff_length = max_length - min_length
         if diff_length > 0
@@ -52,11 +54,25 @@ module Faker
           temp += Lorem.characters(diff_rand)
         end
         temp = temp[0..min_length] if min_length > 0
+
+        if mix_case
+          temp.chars.each_with_index do |char, index|
+            temp[index] = char.upcase if index % 2 == 0
+          end
+        end
+
+        if special_chars
+          chars = %w(! @ # $ % ^ & *)
+          Random.rand(min_length).times do |i|
+            temp[i] = chars[Random.rand(chars.length)]
+          end
+        end
+
         return temp
       end
 
       def domain_name
-        [Char.prepare(domain_word), domain_suffix].join('.')
+        I18n.with_locale(:en) { [Char.prepare(domain_word), domain_suffix].join('.') }
       end
 
       def fix_umlauts(string)
@@ -88,12 +104,37 @@ module Faker
         ary.sample].join('.')
       end
 
+      def public_ip_v4_address
+        private_nets = [
+          /^10\./,
+          /^127\./,
+          /^169\.254\./,
+          /^172\.(16|17|18|19|2\d|30|31)\./,
+          /^192\.168\./
+        ]
+
+        is_private = lambda {|addr| private_nets.any?{|net| net =~ addr}}
+        addr = nil
+        begin
+          addr = ip_v4_address
+        end while is_private[addr]
+        addr
+      end
+
+      def ip_v4_cidr
+        "#{ip_v4_address}/#{[1..32].sample}"
+      end
+
       def ip_v6_address
         @@ip_v6_space ||= (0..65535).to_a
         container = (1..8).map{ |_| @@ip_v6_space.sample }
         container.map{ |n| n.to_s(16) }.join(':')
       end
 
+      def ip_v6_cidr
+        "#{ip_v6_address}/#{[1..128].sample}"
+      end
+
       def url(host = domain_name, path = "/#{user_name}")
         "http://#{host}#{path}"
       end