faker 1.9.1 → 1.9.2

data/lib/faker/default/industry_segments.rb

@@ -0,0 +1,25 @@
+# frozen_string_literal: true
+
+module Faker
+  class IndustrySegments < Base
+    flexible :industry_segments
+
+    class << self
+      def industry
+        fetch('industry_segments.industry')
+      end
+
+      def super_sector
+        fetch('industry_segments.super_sector')
+      end
+
+      def sector
+        fetch('industry_segments.sector')
+      end
+
+      def sub_sector
+        fetch('industry_segments.sub_sector')
+      end
+    end
+  end
+end

data/lib/faker/{internet.rb → default/internet.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Internet < Base
     class << self
@@ -19,10 +21,12 @@ module Faker
 
       def username(specifier = nil, separators = %w[. _])
         with_locale(:en) do
-          return shuffle(specifier.scan(/\w+/)).join(sample(separators)).downcase if specifier.respond_to?(:scan)
+          return shuffle(specifier.scan(/[[:word:]]+/)).join(sample(separators)).downcase if specifier.respond_to?(:scan)
+
           if specifier.is_a?(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.
             result = nil
             loop do
@@ -30,7 +34,7 @@ module Faker
               tries += 1
               break unless result.length < specifier && tries < 7
             end
-            return result * (specifier / result.length + 1) if specifier > 0
+            return result * (specifier / result.length + 1) if specifier.positive?
           elsif specifier.is_a?(Range)
             tries = 0
             result = nil
@@ -54,7 +58,7 @@ module Faker
       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
+        if diff_length.positive?
           diff_rand = rand(diff_length + 1)
           temp += Lorem.characters(diff_rand)
         end
@@ -98,8 +102,8 @@ module Faker
       end
 
       def ip_v4_address
-        ary = (2..254).to_a
-        [sample(ary), sample(ary), sample(ary), sample(ary)].join('.')
+        [rand_in_range(0, 255), rand_in_range(0, 255),
+         rand_in_range(0, 255), rand_in_range(0, 255)].join('.')
       end
 
       def private_ip_v4_address
@@ -170,7 +174,7 @@ module Faker
       end
 
       def slug(words = nil, glue = nil)
-        glue ||= sample(%w[- _ .])
+        glue ||= sample(%w[- _])
         (words || Faker::Lorem.words(2).join(' ')).delete(',.').gsub(' ', glue).downcase
       end
 

data/lib/faker/{invoice.rb → default/invoice.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Invoice < Base
     flexible :invoice
@@ -37,7 +39,7 @@ module Faker
           check_digit = check_digit.to_s.rjust(check_digit_match[0].length, '0')
 
           # Replace all of the
-          ref.sub!(check_digit_match[0], check_digit)
+          ref = ref.sub(check_digit_match[0], check_digit)
         end
 
         ref

data/lib/faker/default/japanese_media.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Faker
+  module JapaneseMedia
+  end
+end

data/lib/faker/{job.rb → default/job.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Job < Base
     flexible :job

data/lib/faker/default/json.rb

@@ -0,0 +1,70 @@
+module Faker
+  class Json < Base
+    require 'json'
+
+    class << self
+      def shallow_json(width = 3, options = { key: 'Name.first_name', value: 'Name.first_name' })
+        options[:key] = options[:key].prepend('Faker::')
+        options[:value] = options[:value].prepend('Faker::')
+
+        hash = build_shallow_hash(width, options)
+        JSON.generate(hash)
+      end
+
+      def add_depth_to_json(json = shallow_json, width = 3, options = { key: 'Name.first_name', value: 'Name.first_name' })
+        options[:key] = options[:key].prepend('Faker::')
+        options[:value] = options[:value].prepend('Faker::')
+
+        hash = JSON.parse(json)
+        hash.each do |key, _|
+          add_hash_to_bottom(hash, [key], width, options)
+        end
+        JSON.generate(hash)
+      end
+
+      private
+
+      def build_shallow_hash(width, options)
+        key = options[:key]
+        value = options[:value]
+
+        hash = {}
+        width.times do
+          hash[eval(key)] = eval(value)
+        end
+        hash
+      end
+
+      def add_hash_to_bottom(hash, key_array, width, options)
+        key_string = build_keys_from_array(key_array)
+        if eval("hash#{key_string}").is_a?(::Hash)
+          eval("hash#{key_string}").each do |key, _|
+            key_array << key
+            add_hash_to_bottom(hash, key_array, width, options)
+          end
+        else
+          add_hash(key_array, hash, width, options)
+          key_array.pop
+        end
+      end
+
+      def add_hash(key_array, hash, width, options)
+        string_to_eval = 'hash'
+        key_array.length.times do |index|
+          string_to_eval << "['#{key_array[index]}']"
+        end
+        string_to_eval << " = #{build_shallow_hash(width, options)}"
+        eval(string_to_eval)
+        hash
+      end
+
+      def build_keys_from_array(key_array)
+        key_string = ''
+        key_array.each do |value|
+          key_string << "['#{value}']"
+        end
+        key_string
+      end
+    end
+  end
+end

data/lib/faker/{kpop.rb → default/kpop.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Kpop < Base
     class << self

data/lib/faker/{lorem.rb → default/lorem.rb}

@@ -1,8 +1,8 @@
+# frozen_string_literal: true
+
 module Faker
   # Based on Perl's Text::Lorem
   class Lorem < Base
-    CHARACTERS = ('0'..'9').to_a + ('a'..'z').to_a
-
     class << self
       def word
         sample(translate('faker.lorem.words'))
@@ -19,17 +19,15 @@ module Faker
       end
 
       def character
-        sample(CHARACTERS)
+        sample(Types::CHARACTERS)
       end
 
       def characters(char_count = 255)
-        char_count = resolve(char_count)
-        return '' if char_count.to_i < 1
-        Array.new(char_count) { sample(CHARACTERS) }.join
+        Alphanumeric.alphanumeric(char_count)
       end
 
       def multibyte
-        sample('faker.multibyte')
+        sample(translate('faker.lorem.multibyte')).pack('C*').force_encoding('utf-8')
       end
 
       def sentence(word_count = 4, supplemental = false, random_words_to_add = 0)
@@ -77,16 +75,6 @@ module Faker
       def locale_question_mark
         translate('faker.lorem.punctuation.question_mark') || '?'
       end
-
-      # 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 sample(value)
-        when Range then rand value
-        else value
-        end
-      end
     end
   end
 end

data/lib/faker/{lorem_flickr.rb → default/lorem_flickr.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class LoremFlickr < Base
     class << self

data/lib/faker/{lorem_pixel.rb → default/lorem_pixel.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class LoremPixel < Base
     class << self

data/lib/faker/{markdown.rb → default/markdown.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Markdown < Base
     class << self
@@ -51,8 +53,10 @@ module Faker
         table.join("\n")
       end
 
-      def random
-        send(available_methods[rand(0..available_methods.length - 1)])
+      def random(*args)
+        method_list = available_methods
+        args&.each { |ex| method_list.delete_if { |meth| meth == ex.to_sym } }
+        send(method_list[rand(0..method_list.length - 1)])
       end
 
       def sandwich(sentences = 3, repeat = 1)

data/lib/faker/default/marketing.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Faker
+  class Marketing < Base
+    flexible :marketing
+
+    class << self
+      def buzzwords
+        fetch('marketing.buzzwords')
+      end
+    end
+  end
+end

data/lib/faker/{measurement.rb → default/measurement.rb}

@@ -1,8 +1,10 @@
+# frozen_string_literal: true
+
 module Faker
   class Measurement < Base
     class << self
-      ALL = 'all'.freeze
-      NONE = 'none'.freeze
+      ALL = 'all'
+      NONE = 'none'
 
       def height(amount = rand(10))
         define_measurement_locale(amount, 'height')

data/lib/faker/{military.rb → default/military.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Military < Base
     class << self

data/lib/faker/default/movies.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module Faker
+  module Movies
+  end
+end

data/lib/faker/{name.rb → default/name.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class Name < Base
     flexible :name
@@ -24,14 +26,19 @@ module Faker
       def male_first_name
         fetch('name.male_first_name')
       end
+      alias first_name_men male_first_name
+      alias masculine_name male_first_name
 
       def female_first_name
         fetch('name.female_first_name')
       end
+      alias first_name_women female_first_name
+      alias feminine_name female_first_name
 
       def last_name
         parse('name.last_name')
       end
+      alias middle_name last_name
 
       def prefix
         fetch('name.prefix')
@@ -41,20 +48,9 @@ module Faker
         fetch('name.suffix')
       end
 
-      def title
-        Faker::Job.title
-      end
-
       def initials(character_count = 3)
         (0...character_count).map { rand(65..90).chr }.join
       end
-
-      def job_titles
-        fetch_all('job.position')
-      end
-
-      deprecate :title, 'Faker::Job.title', 2018, 9
-      deprecate :job_titles, :none, 2018, 9
     end
   end
 end

data/lib/faker/{nation.rb → default/nation.rb}

@@ -1,11 +1,20 @@
+# frozen_string_literal: true
+
 module Faker
   class Nation < Base
     flexible :nation
     class << self
+      # Fetch random nationality
       def nationality
         fetch('nation.nationality')
       end
 
+      # Fetch random national flag emoji
+      def flag
+        sample(translate('faker.nation.flag')).pack('C*').force_encoding('utf-8')
+      end
+
+      # Fetch random language
       def language
         fetch('nation.language')
       end

data/lib/faker/{nato_phonetic_alphabet.rb → default/nato_phonetic_alphabet.rb}

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Faker
   class NatoPhoneticAlphabet < Base
     class << self

data/lib/faker/default/nhs.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module Faker
+  class NationalHealthService < Base
+    class << self
+      def british_number
+        base_number = rand(400_000_001...499_999_999)
+        # If the check digit is equivalent to 10, the number is invalid.
+        # See https://en.wikipedia.org/wiki/NHS_number
+        base_number -= 1 if check_digit(base_number) == 10
+        "#{base_number}#{check_digit(base_number)}".to_s
+                                                   .chars
+                                                   .insert(3, ' ')
+                                                   .insert(7, ' ')
+                                                   .join('')
+      end
+
+      def check_digit(number = 0)
+        sum = 0
+        number.to_s.chars.each_with_index do |digit, idx|
+          position = idx + 1
+          sum += (digit.to_i * (11 - position))
+        end
+        result = 11 - (sum % 11)
+
+        # A value of 11 is considered the same as 0
+        # See https://en.wikipedia.org/wiki/NHS_number
+        return 0 if result == 11
+
+        result
+      end
+    end
+  end
+end

data/lib/faker/{number.rb → default/number.rb}

@@ -1,17 +1,21 @@
+# frozen_string_literal: true
+
 module Faker
   class Number < Base
     class << self
       def number(digits = 10)
         num = ''
+
         if digits > 1
           num = non_zero_digit
           digits -= 1
         end
-        num + leading_zero_number(digits)
+
+        num + (1..digits).collect { digit }.join
       end
 
       def leading_zero_number(digits = 10)
-        (1..digits).collect { digit }.join
+        '0' + (2..digits).collect { digit }.join
       end
 
       def decimal_part(digits = 10)
@@ -26,6 +30,7 @@ module Faker
       def decimal(l_digits = 5, r_digits = 2)
         l_d = number(l_digits)
         r_d = decimal_part(r_digits)
+
         "#{l_d}.#{r_d}"
       end
 
@@ -54,13 +59,19 @@ module Faker
         Faker::Base.rand_in_range(from, to)
       end
 
+      def within(range = 1.00..5000.00)
+        between(range.min, range.max)
+      end
+
       def positive(from = 1.00, to = 5000.00)
         random_number = between(from, to)
+
         greater_than_zero(random_number)
       end
 
       def negative(from = -5000.00, to = -1.00)
         random_number = between(from, to)
+
         less_than_zero(random_number)
       end