faker 1.6.3 → 1.6.4

data/lib/faker/company.rb

@@ -48,6 +48,13 @@ module Faker
         base + luhn_algorithm(base).to_s
       end
 
+      def australian_business_number
+        base = ('%09d' % rand(10 ** 9))
+        abn = '00' + base
+
+        (99 - (abn_checksum(abn) % 89)).to_s + base
+      end
+
       def profession
         fetch('company.profession')
       end
@@ -81,6 +88,18 @@ module Faker
 
         control_digit
       end
+
+      def abn_checksum(abn)
+        abn_weights = [10,1,3,5,7,9,11,13,15,17,19]
+        sum = 0
+
+        abn_weights.each_with_index do |weight, i|
+          sum += weight * abn[i].to_i
+        end
+
+        sum
+      end
+
     end
   end
 end

data/lib/faker/crypto.rb

@@ -0,0 +1,19 @@
+require 'digest'
+
+module Faker
+  class Crypto < Base
+    class << self
+      def md5
+        Digest::MD5.hexdigest(Lorem.characters)
+      end
+
+      def sha1
+        Digest::SHA1.hexdigest(Lorem.characters)
+      end
+
+      def sha256
+        Digest::SHA256.hexdigest(Lorem.characters)
+      end
+    end
+  end
+end

data/lib/faker/date.rb

@@ -32,14 +32,42 @@ module Faker
 
       def birthday(min_age = 18, max_age = 65)
         t = ::Date.today
-        from =  ::Date.new(t.year - min_age, t.month, t.day)
-        to   =  ::Date.new(t.year - max_age, t.month, t.day)
+        top_bound, bottom_bound = prepare_bounds(t, min_age, max_age)
+        years = handled_leap_years(top_bound, bottom_bound)
+
+        from =  ::Date.new(years[0], t.month, t.day)
+        to   =  ::Date.new(years[1], t.month, t.day)
 
         between(from, to).to_date
       end
 
       private
 
+      def prepare_bounds(t, min_age, max_age)
+        [t.year - min_age, t.year - max_age]
+      end
+
+      def handled_leap_years(top_bound, bottom_bound)
+        if (top_bound % 4) != 0 || (bottom_bound % 4) != 0
+          [
+            customized_bound(top_bound),
+            customized_bound(bottom_bound, true)
+          ]
+        else
+          [top_bound, bottom_bound]
+        end
+      end
+
+      def customized_bound(bound, increase = false)
+        if (bound % 4) != 0
+          bound = bound + 1 if increase
+          bound = bound - 1 unless increase
+          customized_bound(bound, increase)
+        else
+          bound
+        end
+      end
+
       def get_date_object(date)
         date = ::Date.parse(date) if date.is_a?(String)
         date = date.to_date if date.respond_to?(:to_date)

data/lib/faker/educator.rb

@@ -0,0 +1,23 @@
+module Faker
+  class Educator < Base
+    flexible :educator
+
+    class << self
+      def university
+        "#{fetch('educator.name')} #{fetch('educator.tertiary.type')}"
+      end
+
+      def course
+        "#{fetch('educator.tertiary.course.type')} #{fetch('educator.tertiary.course.subject')}"
+      end
+
+      def secondary_school
+        "#{fetch('educator.name')} #{fetch('educator.secondary')}"
+      end
+
+      def campus
+        "#{fetch('educator.name')} Campus"
+      end
+    end
+  end
+end

data/lib/faker/file.rb

@@ -0,0 +1,23 @@
+# encoding: utf-8
+module Faker
+  class File < Base
+    class << self
+      def extension
+        fetch('file.extension')
+      end
+
+      def mime_type
+        fetch('file.mime_type')
+      end
+
+      def file_name(dir = nil, name = nil, ext = nil, directory_separator = '/')
+
+        dir = Faker::Internet::slug unless dir
+        name = Faker::Lorem::word().downcase unless name
+        ext = extension unless ext
+
+        [dir, name].join(directory_separator) + ".#{ext}"
+      end
+    end
+  end
+end

data/lib/faker/internet.rb

@@ -97,28 +97,39 @@ module Faker
       end
 
       def ip_v4_address
-        ary = (2..254).to_a
-        [ary.sample,
-        ary.sample,
-        ary.sample,
-        ary.sample].join('.')
+        (1..4).map { rand(2..254) }.join('.')
+      end
+
+      def private_ip_v4_address
+        is_private = private_net_checker
+        addr = nil
+        begin
+          addr = ip_v4_address
+        end while !is_private[addr]
+        addr
       end
 
       def public_ip_v4_address
-        private_nets = [
+        is_private = private_net_checker
+        addr = nil
+        begin
+          addr = ip_v4_address
+        end while is_private[addr]
+        addr
+      end
+
+      def private_nets_regex
+        [
           /^10\./,
           /^127\./,
           /^169\.254\./,
           /^172\.(16|17|18|19|2\d|30|31)\./,
           /^192\.168\./
         ]
+      end
 
-        is_private = lambda {|addr| private_nets.any?{|net| net =~ addr}}
-        addr = nil
-        begin
-          addr = ip_v4_address
-        end while is_private[addr]
-        addr
+      def private_net_checker
+        lambda { |addr| private_nets_regex.any? { |net| net =~ addr } }
       end
 
       def ip_v4_cidr
@@ -126,9 +137,7 @@ module Faker
       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(':')
+        (1..8).map { rand(65536).to_s(16) }.join(':')
       end
 
       def ip_v6_cidr

data/lib/faker/lorem.rb

@@ -1,6 +1,8 @@
 module Faker
   # Based on Perl's Text::Lorem
   class Lorem < Base
+    CHARACTERS = ('0'..'9').to_a + ('a'..'z').to_a
+
     class << self
       def word
         translate('faker.lorem.words').sample
@@ -17,17 +19,17 @@ module Faker
       end
 
       def character
-        characters(1)
+        CHARACTERS.sample
       end
 
       def characters(char_count = 255)
-        return '' if char_count.respond_to?(:to_i) && char_count.to_i < 1
         char_count = resolve(char_count)
-        rand(36**char_count).to_s(36).rjust(char_count, '0').chars.to_a.shuffle.join
+        return '' if char_count.to_i < 1
+        Array.new(char_count) { CHARACTERS.sample }.join
       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).join(' ').capitalize + '.'
+        words(word_count + rand(random_words_to_add.to_i), supplemental).join(' ').capitalize + '.'
       end
 
       def sentences(sentence_count = 3, supplemental = false)
@@ -39,7 +41,7 @@ module Faker
       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(' ')
+        sentences(resolve(sentence_count) + rand(random_sentences_to_add.to_i), supplemental).join(' ')
       end
 
       def paragraphs(paragraph_count = 3, supplemental = false)
@@ -50,14 +52,26 @@ module Faker
         end
       end
 
+      def question(word_count = 4, supplemental = false, random_words_to_add = 6)
+        words(word_count + rand(random_words_to_add.to_i).to_i, supplemental).join(' ').capitalize + '?'
+      end
+
+      def questions(question_count = 3, supplemental = false)
+        [].tap do |questions|
+          1.upto(resolve(question_count)) do
+            questions << question(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
+        when Array then value.sample
+        when Range then rand value
         else value
         end
       end

data/lib/faker/music.rb

@@ -0,0 +1,21 @@
+module Faker
+  class Music < Base
+    class << self
+      def key
+        keys.sample + key_variants.sample
+      end
+
+      def instrument
+        fetch('music.instruments')
+      end
+
+      def keys
+        ['C', 'D', 'E', 'F', 'G', 'A', 'B']
+      end
+
+      def key_variants
+        ['b', '#', '']
+      end
+    end
+  end
+end

data/lib/faker/name.rb

@@ -8,6 +8,10 @@ module Faker
         parse('name.name')
       end
 
+      def name_with_middle
+        parse('name.name_with_middle')
+      end
+
       def first_name; fetch('name.first_name'); end
       def last_name;  fetch('name.last_name'); end
       def prefix;     fetch('name.prefix'); end
@@ -17,6 +21,9 @@ module Faker
       # Wordlist from http://www.bullshitjob.com/title/
       def title; fetch('name.title.descriptor') + ' ' + fetch('name.title.level') + ' ' + fetch('name.title.job'); end
 
+      def job_titles
+        fetch_all('name.title.job')
+      end
     end
   end
 end

data/lib/faker/placeholdit.rb

@@ -3,14 +3,14 @@ module Faker
     class << self
       SUPPORTED_FORMATS = %w(png jpg gif jpeg)
 
-      def image(size = '300x300', format = 'png', background_color = '000', text_color = nil, text = nil)
+      def image(size = '300x300', format = 'png', background_color = nil, text_color = nil, text = 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)
-        raise ArgumentError, "background_color must be a hex value without '#'" unless background_color.match(/((?:^\h{3}$)|(?:^\h{6}$)){1}(?!.*\H)/)
+        raise ArgumentError, "background_color must be a hex value without '#'" unless background_color.nil? || background_color.match(/((?:^\h{3}$)|(?:^\h{6}$)){1}(?!.*\H)/)
         raise ArgumentError, "text_color must be a hex value without '#'" unless text_color.nil? || text_color.match(/((?:^\h{3}$)|(?:^\h{6}$)){1}(?!.*\H)/)
 
         image_url = "https://placehold.it/#{size}.#{format}"
-        image_url += "/#{background_color}"
+        image_url += "/#{background_color}" if background_color
         image_url += "/#{text_color}" if text_color
         image_url += "?text=#{text}" if text
         image_url

data/lib/faker/space.rb

@@ -0,0 +1,54 @@
+module Faker
+  class Space < Base
+    flexible :space
+    class << self
+      def planet
+        fetch('space.planet')
+      end
+
+      def moon
+        fetch('space.moon')
+      end
+
+      def galaxy
+        fetch('space.galaxy')
+      end
+
+      def nebula
+        fetch('space.nebula')
+      end
+
+      def star_cluster
+        fetch('space.star_cluster')
+      end
+
+      def constellation
+        fetch('space.constellation')
+      end
+
+      def star
+        fetch('space.star')
+      end
+
+      def agency
+        fetch('space.agency')
+      end
+
+      def agency_abv
+        fetch('space.agency_abv')
+      end
+
+      def nasa_space_craft
+        fetch('space.nasa_space_craft')
+      end
+
+      def company
+        fetch('space.company')
+      end
+
+      def distance_measurement
+        rand(10..100).to_s + ' ' + fetch('space.distance_measurement')
+      end
+    end
+  end
+end

data/lib/faker/time.rb

@@ -12,41 +12,30 @@ module Faker
 
     class << self
       def between(from, to, period = :all)
-        time_parameters = from.is_a?(::Time) && to.is_a?(::Time)
-
-        if time_parameters
-          random_time = Faker::Base::rand_in_range(from.to_f, to.to_f)
-          random_time = ::Time.at(random_time)
-        else
-          random_time = super(from, to).to_time + random_time(period)
-        end
-
-        random_time
+        date_with_random_time(super(from, to), period)
       end
 
       def forward(days = 365, period = :all)
-        super(days).to_time + random_time(period)
+        date_with_random_time(super(days), period)
       end
 
       def backward(days = 365, period = :all)
-        super(days).to_time + random_time(period)
+        date_with_random_time(super(days), period)
       end
 
       private
 
-      def random_time(period)
-        hours(period) + minutes + seconds
+      def date_with_random_time(date, period)
+        ::Time.local(date.year, date.month, date.day, hours(period), minutes, seconds)
       end
 
       def hours(period)
         raise ArgumentError, 'invalid period' unless TIME_RANGES.has_key? period
-        hour_at_period = TIME_RANGES[period].to_a.sample
-
-        (60 * 60 * hour_at_period)
+        TIME_RANGES[period].to_a.sample
       end
 
       def minutes
-        60 * seconds
+        seconds
       end
 
       def seconds

data/lib/faker/vehicle.rb

@@ -0,0 +1,37 @@
+module Faker
+  class Vehicle < Base
+    @vin_chars = '0123456789.ABCDEFGH..JKLMN.P.R..STUVWXYZ'
+    @vin_map = '0123456789X'
+    @vin_weights = '8765432X098765432'
+
+    class << self
+      #ISO 3779
+      def vin
+        manufacture = fetch_all('vehicle.manufacture').sample
+
+        c = @vin_chars.split('').reject{ |n| n == '.'}
+        vehicle_identification_number = manufacture["wmi"].split('').concat( Array.new(14) { c.sample } )
+        (12..14).to_a.each_with_index { |n, i| vehicle_identification_number[n] = manufacture["win_ext"][i] } unless manufacture["win_ext"].nil?
+        vehicle_identification_number[10] = fetch('vehicle.year')
+        vehicle_identification_number[8] = vin_checksum(vehicle_identification_number)
+
+        vehicle_identification_number.join.upcase
+      end
+
+      def manufacture
+        fetch_all('vehicle.manufacture').sample["name"]
+      end
+      
+    private
+
+      def calculate_vin_weight(character, i)
+        (@vin_chars.index(character) % 10) * @vin_map.index(@vin_weights [i])
+      end
+
+      def vin_checksum(vehicle_identification_number)
+        @vin_map[vehicle_identification_number.each_with_index.map(&method(:calculate_vin_weight)).inject(:+) % 11]
+      end
+
+    end
+  end
+end