stympy master

.travis.yml

@@ -4,4 +4,9 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
+  - 2.2.2
+  - ruby-head
 script: bundle exec rake test
+matrix:
+ allow_failures:
+   - rvm: ruby-head

README.md

@@ -50,12 +50,14 @@ Faker::Address.city_suffix #=> "fort"
 
 Faker::Address.city_prefix #=> "Lake"
 
-Faker::Address.state_abbr #=> "AP"
-
 Faker::Address.state #=> "California"
 
+Faker::Address.state_abbr #=> "AP"
+
 Faker::Address.country #=> "French Guiana"
 
+Faker::Address.country_code #=> "IT"
+
 Faker::Address.latitude #=> "-58.17256227443719"
 
 Faker::Address.longitude #=> "-156.65548382095133"
@@ -246,14 +248,14 @@ Faker::Lorem.sentences(1, true) #=> ["Quis capillus curo ager veritatis voro et
 # Optional arguments: sentence_count=3, supplemental=false, random_sentences_to_add=3
 Faker::Lorem.paragraph #=> "Neque dicta enim quasi. Qui corrupti est quisquam. Facere animi quod aut. Qui nulla consequuntur consectetur sapiente."
 Faker::Lorem.paragraph(2) #=> "Illo qui voluptas. Id sit quaerat enim aut cupiditate voluptates dolorum. Porro necessitatibus numquam dolor quia earum."
-Faker::Lorem.paragraph(2, true) #=> ""
-Faker::Lorem.paragraph(2, false, 4) #=> ""
-Faker::Lorem.paragraph(2, true, 4) #=> ""
+Faker::Lorem.paragraph(2, true) #=> "Cedo vero adipisci. Theatrum crustulum coaegresco tonsor crastinus stabilis. Aliqua crur consequatur amor una tolero sum."
+Faker::Lorem.paragraph(2, false, 4) #=> "Neque aut et nemo aut incidunt voluptates. Dolore cum est sint est. Vitae assumenda porro odio dolores fugiat. Est voluptatum quia rerum."
+Faker::Lorem.paragraph(2, true, 4) #=> "Vomito unde uxor annus. Et patior utilis sursum."
 
 # Optional arguments: paragraph_count=3, supplemental=false
-Faker::Lorem.paragraphs #=> ""
-Faker::Lorem.paragraphs(1) #=> ""
-Faker::Lorem.paragraphs(1, true) #=> ""
+Faker::Lorem.paragraphs #=> ["Dolores quis quia ad quo voluptates. Maxime delectus totam numquam. Necessitatibus vel atque qui dolore.", "Id neque nemo. Dolores iusto facere est ad. Accusamus ipsa dolor ut.", "Et officiis ut hic. Sunt asperiores minus distinctio debitis ipsa dolor. Minima eos deleniti."]
+Faker::Lorem.paragraphs(1) #=> ["Labore voluptas sequi. Ratione nulla eaque quia molestiae fugit. At quam laboriosam aut ut dignissimos."]
+Faker::Lorem.paragraphs(1, true) #=> ["Depulso animi cunctatio amicitia adficio. Vester viduo qui despirmatio voluptas. Validus laudantium adopto ut agnitio venustas. Aer arcus odio esse."]
 
 ```
 
@@ -351,9 +353,11 @@ Faker::PhoneNumber.extension #=> "3764"
 
 ```ruby
 # Random date between dates
-Faker::Time.between(2.days.ago, Time.now) #=> "2014-09-18 12:30:59 -0700"
+Faker::Time.between(DateTime.now - 1, DateTime.now) #=> "2014-09-18 12:30:59 -0700"
 
 # Random date between dates (within specified part of the day)
+# You can install the active_support gem to facilitate time manipulation like 45.minutes + 2.hours
+require "as-duration"
 Faker::Time.between(2.days.ago, Time.now, :all) #=> "2014-09-19 07:03:30 -0700"
 Faker::Time.between(2.days.ago, Time.now, :day) #=> "2014-09-18 16:28:13 -0700"
 Faker::Time.between(2.days.ago, Time.now, :night) #=> "2014-09-20 19:39:38 -0700"
@@ -407,6 +411,40 @@ Faker::App.author #=> "Daphne Swift"
 
 ```
 
+###Faker::SlackEmoji
+-----------------
+
+```ruby
+
+# Random Slack Emoji from people category
+Faker::SlackEmoji.people #=> ":sleepy:"
+
+# Random Slack Emoji from nature category
+Faker::SlackEmoji.nature #=> ":chestnut:"
+
+# Random Slack Emoji from food and drink category
+Faker::SlackEmoji.food_and_drink #=> ":tangerine:"
+
+# Random Slack Emoji from celebration category
+Faker::SlackEmoji.celebration #=> ":ribbon:"
+
+# Random Slack Emoji from activity category
+Faker::SlackEmoji.activity #=> ":performing_arts:"
+
+# Random Slack Emoji from travel and places category
+Faker::SlackEmoji.travel_and_places #=> ":truck:"
+
+# Random Slack Emoji from objects & symbols category
+Faker::SlackEmoji.objects_and_symbols #=> ":alarm_clock:"
+
+# Random Slack Emoji from custom category
+Faker::SlackEmoji.custom #=> ":suspect:"
+
+# Random Slack Emoji from any category
+Faker::SlackEmoji.emoji #=> ":last_quarter_moon:"
+
+```
+
 Customization
 ------------
 Since you may want to make addresses and other types of data look different
@@ -425,7 +463,7 @@ and you can then override or add elements to suit
 en-au-ocker:
   faker:
     name:
-      # Exiting faker field, new data
+      # Existing faker field, new data
       first_name: [Charlotte, Ava, Chloe, Emily]
 
       # New faker fields

faker.gemspec

@@ -12,8 +12,6 @@ Gem::Specification.new do |s|
   s.description = %q{Faker, a port of Data::Faker from Perl, is used to easily generate fake data: names, addresses, phone numbers, etc.}
   s.license     = 'MIT'
 
-  s.rubyforge_project = "faker"
-
   s.add_dependency('i18n', '~> 0.5')
 
   s.files         = `git ls-files -- lib/*`.split("\n") + %w(History.txt License.txt README.md)

lib/faker.rb

@@ -159,6 +159,7 @@ def rand_in_range(from, to)
 
 require 'faker/address'
 require 'faker/code'
+require 'faker/color'
 require 'faker/company'
 require 'faker/finance'
 require 'faker/internet'
@@ -177,6 +178,7 @@ def rand_in_range(from, to)
 require 'faker/number'
 require 'faker/hacker'
 require 'faker/app'
+require 'faker/slack_emoji'
 
 require 'extensions/array'
 require 'extensions/symbol'

lib/faker/avatar.rb

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

lib/faker/business.rb

@@ -10,7 +10,7 @@ def credit_card_number
       end
 
       def credit_card_expiry_date
-        ::Date.parse(fetch('business.credit_card_expiry_dates'))
+        ::Date.today + (365 * (rand(4) + 1))
       end
 
       def credit_card_type

lib/faker/color.rb

@@ -0,0 +1,49 @@
+module Faker
+  class Color < Base
+    class << self
+      def hex_color
+        @hex_color = "#%06x" % (rand * 0xffffff)
+      end
+
+      def single_rgb_color
+        @single_rgb_color = (0..255).to_a.sample
+        @single_rgb_color
+      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
+      end
+
+      def hsl_color
+        @hsl_colors = []
+        3.times do
+          @hsl_colors.push single_hsl_color
+        end
+        @hsl_colors
+      end
+
+      def hsla_color
+        @hsla_colors = []
+        3.times do
+          @hsla_colors.push single_hsl_color
+        end
+        @hsla_colors.push alpha_channel
+        @hsla_colors
+      end
+    end
+  end
+end

lib/faker/commerce.rb

@@ -23,10 +23,14 @@ def product_name
         fetch('commerce.product_name.adjective') + ' ' + fetch('commerce.product_name.material') + ' ' + fetch('commerce.product_name.product')
       end
 
+      def material
+        fetch('commerce.product_name.material')
+      end
+
       def price
         random = Random.new
         (random.rand(0..100.0) * 100).floor/100.0
-      end    
+      end
 
       private
 

lib/faker/company.rb

@@ -16,6 +16,10 @@ def catch_phrase
         translate('faker.company.buzzwords').collect {|list| list.sample }.join(' ')
       end
 
+      def buzzword
+        translate('faker.company.buzzwords').flatten.sample
+      end
+
       # When a straight answer won't do, BS to the rescue!
       def bs
         translate('faker.company.bs').collect {|list| list.sample }.join(' ')
@@ -34,7 +38,41 @@ def logo
         rand_num = Random.rand(13) + 1
         "http://pigment.github.io/fake-logos/logos/medium/color/#{rand_num}.png"
       end
-    end
 
+      def swedish_organisation_number
+        base = ('%09d' % rand(10 ** 9))
+        base + luhn_algorithm(base).to_s
+      end
+
+    private
+
+      def luhn_algorithm(number)
+        multiplications = []
+
+        number.split(//).each_with_index do |digit, i|
+          if i % 2 == 0
+              multiplications << digit.to_i * 2
+            else
+              multiplications << digit.to_i
+          end
+        end
+
+        sum = 0
+
+        multiplications.each do |num|
+          num.to_s.each_byte do |character|
+            sum += character.chr.to_i
+          end
+        end
+
+        if sum % 10 == 0
+          control_digit = 0
+        else
+          control_digit = (sum / 10 + 1) * 10 - sum
+        end
+
+        control_digit
+      end
+    end
   end
 end

lib/faker/slack_emoji.rb

@@ -0,0 +1,43 @@
+module Faker
+  class SlackEmoji < Base
+    class << self
+
+      def people
+        fetch('slack_emoji.people')
+      end
+
+      def nature
+        fetch('slack_emoji.nature')
+      end
+
+      def food_and_drink
+        fetch('slack_emoji.food_and_drink')
+      end
+
+      def celebration
+        fetch('slack_emoji.celebration')
+      end
+
+      def activity
+        fetch('slack_emoji.activity')
+      end
+
+      def travel_and_places
+        fetch('slack_emoji.travel_and_places')
+      end
+
+      def objects_and_symbols
+        fetch('slack_emoji.objects_and_symbols')
+      end
+
+      def custom
+        fetch('slack_emoji.custom')
+      end
+
+      def emoji
+        parse('slack_emoji.emoji')
+      end
+
+    end
+  end
+end

lib/locales/en-CA.yml

@@ -1,7 +1,7 @@
 en-CA:
   faker:
     address:
-      postcode: /[A-VX-Y][0-9][A-CEJ-NPR-TV-Z] ?[0-9][A-CEJ-NPR-TV-Z][0-9]/
+      postcode: /[A-CEJ-NPR-TVXY][0-9][A-CEJ-NPR-TV-Z] ?[0-9][A-CEJ-NPR-TV-Z][0-9]/
       state: [Alberta, British Columbia, Manitoba, New Brunswick, Newfoundland and Labrador, Nova Scotia, Northwest Territories, Nunavut, Ontario, Prince Edward Island, Quebec, Saskatchewan, Yukon]
       state_abbr: ["AB", "BC", "MB", "NB", "NL", "NS", "NU", "NT", "ON", "PE", "QC", "SK", "YT"]
       default_country: [Canada]

lib/locales/en-US.yml

@@ -1,7 +1,7 @@
 en-US:
   faker:
     internet:
-      domain_suffix: [com, us, biz, info, name, net, org]
+      domain_suffix: [com, us, biz, info, name, net, org, io, co]
     address:
       default_country: [United States, United States of America, USA]
       postcode_by_state: