faker 1.6.6 → 1.7.1

data/lib/faker.rb

@@ -90,7 +90,7 @@ module Faker
       def fetch(key)
         fetched = translate("faker.#{key}")
         fetched = fetched.sample if fetched.respond_to?(:sample)
-        if fetched.match(/^\//) and fetched.match(/\/$/) # A regex
+        if fetched && fetched.match(/^\//) and fetched.match(/\/$/) # A regex
           regexify(fetched)
         else
           fetched
@@ -180,7 +180,11 @@ module Faker
       # Generates a random value between the interval
       def rand_in_range(from, to)
         from, to = to, from if to < from
-        Random.new.rand(from..to)
+        rand(from..to)
+      end
+
+      def unique(max_retries = 10_000)
+        @unique_generator ||= UniqueGenerator.new(self, max_retries)
       end
     end
   end
@@ -226,11 +230,23 @@ require 'faker/educator'
 require 'faker/space'
 require 'faker/yoda'
 require 'faker/music'
+require 'faker/artist'
 require 'faker/vehicle'
 require 'faker/game_of_thrones'
 require 'faker/pokemon'
+require 'faker/food'
+require 'faker/lorem_pixel'
+require 'faker/esport'
+require 'faker/bank'
+require 'faker/ancient'
+require 'faker/twin_peaks'
+require 'faker/lord_of_the_rings'
+require 'faker/rock_band'
+require 'faker/fillmurray'
+require 'faker/job'
 
 require 'extensions/array'
 require 'extensions/symbol'
 
 require 'helpers/char'
+require 'helpers/unique_generator'

data/lib/faker/address.rb

@@ -3,8 +3,8 @@ module Faker
     flexible :address
 
     class << self
-      def city
-        parse('address.city')
+      def city(options = {})
+        parse(options[:with_state] ? 'address.city_with_state' : 'address.city')
       end
 
       def street_name
@@ -16,7 +16,7 @@ module Faker
       end
 
       def secondary_address
-        numerify(fetch('address.secondary_address'))
+        bothify(fetch('address.secondary_address'))
       end
 
       def building_number
@@ -53,6 +53,10 @@ module Faker
       def longitude
         ((rand * 360) - 180).to_s
       end
+
+      def full_address
+        parse('address.full_address')
+      end
     end
   end
 end

data/lib/faker/ancient.rb

@@ -0,0 +1,21 @@
+module Faker
+  class Ancient < Base
+    class << self
+      def god
+        fetch('ancient.god')
+      end
+
+      def primordial
+        fetch('ancient.primordial')
+      end
+
+      def titan
+        fetch('ancient.titan')
+      end
+
+      def hero
+        fetch('ancient.hero')
+      end
+    end
+  end
+end

data/lib/faker/artist.rb

@@ -0,0 +1,9 @@
+module Faker
+  class Artist < Base
+    class << self
+      def name
+        fetch('artist.names')
+      end
+    end
+  end
+end

data/lib/faker/bank.rb

@@ -0,0 +1,30 @@
+module Faker
+  class Bank < Base
+    flexible :bank
+
+    class << self
+      def name
+        fetch('bank.name')
+      end
+
+      def swift_bic
+        fetch('bank.swift_bic')
+      end
+
+      def iban(bank_country_code="GB")
+        details = iban_details.find { |country| country["bank_country_code"] == bank_country_code.upcase }
+        bcc = details["bank_country_code"] + 2.times.map{ rand(10) }.join
+        ilc = (0...details["iban_letter_code"].to_i).map{ (65 + rand(26)).chr }.join
+        ib  = details["iban_digits"].to_i.times.map{ rand(10) }.join
+        bcc + ilc + ib
+      end
+
+      private
+
+      def iban_details
+        fetch_all('bank.iban_details')
+      end
+    end
+  end
+end
+

data/lib/faker/bitcoin.rb

@@ -39,8 +39,7 @@ module Faker
 
       def address_for(network)
         version = PROTOCOL_VERSIONS.fetch(network)
-        hash = SecureRandom.hex(20)
-        packed = version.chr + [hash].pack("H*")
+        packed = version.chr + Random::DEFAULT.bytes(20)
         checksum = Digest::SHA2.digest(Digest::SHA2.digest(packed))[0..3]
         base58(packed + checksum)
       end

data/lib/faker/code.rb

@@ -6,7 +6,7 @@ module Faker
       # Generates a 10 digit NPI (National Provider Identifier
       # issued to health care providers in the United States)
       def npi
-        Random.new.rand(10 ** 10).to_s.rjust(10, '0')
+        rand(10 ** 10).to_s.rjust(10, '0')
       end
 
       # By default generates 10 sign isbn code in format 123456789-X
@@ -77,9 +77,9 @@ module Faker
 
         # Calculate the Luhn checksum of the values thus far
         len_offset = (len + 1) % 2
-        for pos in (0..(len - 1))
-          if (pos + len_offset) % 2 != 0
-            t = str[pos] * 2
+        (0..(len - 1)).each do |position|
+          if (position + len_offset) % 2 != 0
+            t = str[position] * 2
 
             if t > 9
               t -= 9
@@ -87,7 +87,7 @@ module Faker
 
             sum += t
           else
-            sum += str[pos]
+            sum += str[position]
           end
         end
 

data/lib/faker/color.rb

@@ -2,7 +2,7 @@ module Faker
   class Color < Base
     class << self
       def hex_color
-        @hex_color = "#%06x" % (rand * 0xffffff)
+        '#%06x' % (rand * 0xffffff)
       end
 
       def color_name
@@ -10,43 +10,20 @@ module Faker
       end
 
       def single_rgb_color
-        @single_rgb_color = (0..255).to_a.sample
-        @single_rgb_color
+        (0..255).to_a.sample
       end
 
       def rgb_color
-        @rgb_colors = []
-        3.times do
-          @rgb_colors.push single_rgb_color
-        end
-        @rgb_colors
-      end
-
-      def single_hsl_color
-        @single_hsla_color = Faker::Base::rand_in_range(0.0, 360.00).round(2)
-        @single_hsla_color
-      end
-
-      def alpha_channel
-        @alpha_channel = rand
-        @alpha_channel
+        3.times.collect { single_rgb_color }
       end
 
+      # returns [hue, saturation, lightness]
       def hsl_color
-        @hsl_colors = []
-        3.times do
-          @hsl_colors.push single_hsl_color
-        end
-        @hsl_colors
+        [(0..360).to_a.sample, rand.round(2), rand.round(2)]
       end
 
       def hsla_color
-        @hsla_colors = []
-        3.times do
-          @hsla_colors.push single_hsl_color
-        end
-        @hsla_colors.push alpha_channel
-        @hsla_colors
+        hsl_color << rand.round(1)
       end
     end
   end

data/lib/faker/commerce.rb

@@ -6,6 +6,14 @@ module Faker
         fetch('color.name')
       end
 
+      def promotion_code(digits = 6)
+        [
+          fetch('commerce.promotion_code.adjective'),
+          fetch('commerce.promotion_code.noun'),
+          Faker::Number.number(digits)
+        ].join
+      end
+
       def department(max = 3, fixed_amount = false)
         num = max if fixed_amount
         num ||= 1 + rand(max)
@@ -27,9 +35,14 @@ module Faker
         fetch('commerce.product_name.material')
       end
 
-      def price(range=0..100.0)
+      def price(range=0..100.0, string=false)
         random = Random::DEFAULT
-        (random.rand(range) * 100).floor/100.0
+        price = (random.rand(range) * 100).floor/100.0
+        if string
+          price_parts = price.to_s.split('.')
+          price = price_parts[0] + price_parts[-1].ljust(2, "0")
+        end
+        price
       end
 
       private

data/lib/faker/company.rb

@@ -43,8 +43,12 @@ module Faker
         "https://pigment.github.io/fake-logos/logos/medium/color/#{rand_num}.png"
       end
 
+      # Get a random Swedish organization number. See more here https://sv.wikipedia.org/wiki/Organisationsnummer
       def swedish_organisation_number
-        base = ('%09d' % rand(10 ** 9))
+        # Valid leading digit: 1, 2, 3, 5, 6, 7, 8, 9
+        # Valid third digit: >= 2
+        # Last digit is a control digit
+        base = [[1, 2, 3, 5, 6, 7, 8, 9].sample, (0..9).to_a.sample, (2..9).to_a.sample, ('%06d' % rand(10 ** 6))].join
         base + luhn_algorithm(base).to_s
       end
 
@@ -65,10 +69,10 @@ module Faker
         multiplications = []
 
         number.split(//).each_with_index do |digit, i|
-          if i % 2 == 0
-              multiplications << digit.to_i * 2
-            else
-              multiplications << digit.to_i
+          if i.even?
+            multiplications << digit.to_i * 2
+          else
+            multiplications << digit.to_i
           end
         end
 

data/lib/faker/educator.rb

@@ -4,7 +4,7 @@ module Faker
 
     class << self
       def university
-        "#{fetch('educator.name')} #{fetch('educator.tertiary.type')}"
+        "#{parse('educator.name')} #{fetch('educator.tertiary.type')}"
       end
 
       def course
@@ -12,11 +12,11 @@ module Faker
       end
 
       def secondary_school
-        "#{fetch('educator.name')} #{fetch('educator.secondary')}"
+        "#{parse('educator.name')} #{fetch('educator.secondary')}"
       end
 
       def campus
-        "#{fetch('educator.name')} Campus"
+        "#{parse('educator.name')} Campus"
       end
     end
   end

data/lib/faker/esport.rb

@@ -0,0 +1,25 @@
+module Faker
+  class Esport < Base
+    class << self
+      def player
+        fetch('esports.players')
+      end
+
+      def team
+        fetch('esports.teams')
+      end
+
+      def league
+        fetch('esports.leagues')
+      end
+
+      def event
+        fetch('esports.events')
+      end
+
+      def game
+        fetch('esports.games')
+      end
+    end
+  end
+end

data/lib/faker/fillmurray.rb

@@ -0,0 +1,18 @@
+
+
+module Faker
+  class Fillmurray < Base
+    class << self
+
+      def image(grayscale = false, width = 200, height = 200)
+        raise ArgumentError, "Width should be a number in string format" unless width.match(/^[0-9]+$/)
+        raise ArgumentError, "Height should be a number in string format" unless height.match(/^[0-9]+$/)
+        raise ArgumentError, "Grayscale should be a boolean" unless [true, false].include?(grayscale)
+
+        fillmurray_url = grayscale == true ? "https://fillmurray.com/g/#{width}/#{height}" : "https://fillmurray.com/#{width}/#{height}"
+
+        fillmurray_url
+      end
+    end
+  end
+end

data/lib/faker/finance.rb

@@ -1,6 +1,8 @@
 module Faker
   class Finance < Base
-    CREDIT_CARD_TYPES = [ :visa, :mastercard,  :discover, :american_express, :diners_club, :jcb, :switch, :solo, :dankort, :maestro, :forbrugsforeningen, :laser ]
+    CREDIT_CARD_TYPES = [:visa, :mastercard, :discover, :american_express,
+                         :diners_club, :jcb, :switch, :solo, :dankort,
+                         :maestro, :forbrugsforeningen, :laser].freeze
 
     class << self
       def credit_card(*types)

data/lib/faker/food.rb

@@ -0,0 +1,17 @@
+module Faker
+  class Food < Base
+    class << self
+      def ingredient
+        fetch('food.ingredients')
+      end
+
+      def spice
+        fetch('food.spices')
+      end
+
+      def measurement
+        fetch('food.measurement_sizes') + ' ' + fetch('food.measurements')
+      end
+    end
+  end
+end

data/lib/faker/game_of_thrones.rb

@@ -12,6 +12,14 @@ module Faker
       def city
         fetch('game_of_thrones.cities')
       end
+
+      def quote
+        fetch('game_of_thrones.quotes')
+      end
+
+      def dragon
+        fetch('game_of_thrones.dragons')
+      end
     end
   end
 end

data/lib/faker/hipster.rb

@@ -50,7 +50,7 @@ module Faker
       def resolve(value)
         case value
         when Array then value[rand(value.size)]
-        when Range then rand((value.last+1) - value.first) + value.first
+        when Range then value.to_a[rand(value.size)]
         else value
         end
       end

data/lib/faker/internet.rb

@@ -19,14 +19,14 @@ module Faker
           if specifier.kind_of? String
             return specifier.scan(/\w+/).shuffle.join(separators.sample).downcase
           elsif specifier.kind_of? Integer
+            # If specifier is Integer and has large value, Argument error exception is raised to overcome memory full error 
+            raise ArgumentError, "Given argument is too large" if specifier > 10**6
             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
+            result = result * (specifier/result.length + 1) if specifier > 0
             return result
           elsif specifier.kind_of? Range
             tries = 0
@@ -53,7 +53,6 @@ module Faker
           diff_rand = rand(diff_length + 1)
           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|
@@ -144,8 +143,8 @@ module Faker
         "#{ip_v6_address}/#{1 + rand(127)}"
       end
 
-      def url(host = domain_name, path = "/#{user_name}")
-        "http://#{host}#{path}"
+      def url(host = domain_name, path = "/#{user_name}", scheme = 'http')
+        "#{scheme}://#{host}#{path}"
       end
 
       def slug(words = nil, glue = nil)