ffaker 1.16.0 → 1.16.1

data/Changelog.rdoc

@@ -1,3 +1,6 @@
+== 1.16.1
+Fixes for ruby 1.8.x
+
 == 1.16.0
 Many module additions from different contributors!
 

data/ffaker.gemspec

@@ -4,8 +4,8 @@ Gem::Specification.new do |s|
   s.rubygems_version = '1.3.5'
 
   s.name              = 'ffaker'
-  s.version           = '1.16.0'
-  s.date              = '2013-04-28'
+  s.version           = '1.16.1'
+  s.date              = '2013-05-02'
   s.rubyforge_project = 'ffaker'
 
   s.summary     = "Faster Faker, generates dummy data."

data/lib/ffaker.rb

@@ -1,5 +1,5 @@
 module Faker
-  VERSION = "1.16.0"
+  VERSION = "1.16.1"
 
   require 'ffaker/utils/array_utils'
   require 'ffaker/utils/module_utils'
@@ -7,7 +7,6 @@ module Faker
   extend ModuleUtils
 
   LETTERS = k('a'..'z')
-  CAPITAL_LETTERS = k('A'..'Z')
 
   def self.numerify(*masks)
     mask = ArrayUtils.rand(masks.flatten)
@@ -15,18 +14,14 @@ module Faker
     mask
   end
 
-  def self.letterify(capitalize = false, *masks)
+  def self.letterify(*masks)
     mask = ArrayUtils.rand(masks.flatten)
-    if capitalize
-      mask.gsub!(/\?/) {CAPITAL_LETTERS.rand}
-    else
-      mask.gsub!(/\?/) { LETTERS.rand }
-    end
+    mask.gsub!(/\?/) { LETTERS.rand }
     mask
   end
 
-  def self.bothify(capitalize = false, masks)
-    letterify(capitalize, numerify(masks))
+  def self.bothify(masks)
+    letterify(numerify(masks))
   end
 
   autoload :Address,       'ffaker/address'

data/lib/ffaker/address.rb

@@ -42,7 +42,7 @@ module Faker
     end
 
     def building_number
-      Faker.numerify ( '#' * rand(3) ) << '###'
+      Faker.numerify(( '#' * rand(3) ) << '###')
     end
 
     def street_name

data/lib/ffaker/address_mx.rb

@@ -6,6 +6,10 @@ module Faker
     extend ModuleUtils
     extend self
 
+    def zip_code
+      Faker::AddressUS.zip_code
+    end
+
     def postal_code
       Faker.numerify POSTAL_CODE_FORMATS.rand
     end

data/lib/ffaker/identification.rb

@@ -4,7 +4,7 @@ module Faker
     extend self
 
     def drivers_license
-      Faker.bothify(true, '?###-###-##-###-#')
+      Faker.bothify('?###-###-##-###-#').upcase
     end
 
     def ssn
@@ -22,4 +22,4 @@ module Faker
     ETHNICITIES = k ['African American', 'Asian/Pacific Islander', 'Caucasian', 'Hispanic', 'Native American', 'Multiracial', 'Other', 'Prefer not to respond']
     GENDERS = k %w(Male Female)
   end
-end
+end

data/lib/ffaker/movie.rb

@@ -26,39 +26,40 @@ module Faker
     private
 
     def title_with_prefix
-      "#{PREFIXES.sample} #{maybe_adj_or_adv}#{NOUNS.sample}"
+      "#{PREFIXES.rand} #{maybe_adj_or_adv}#{NOUNS.rand}"
     end
 
     def title_with_suffix
-      "The #{maybe_adj_or_adv}#{NOUNS.sample} #{SUFFIXES.sample}"
+      "The #{maybe_adj_or_adv}#{NOUNS.rand} #{SUFFIXES.rand}"
     end
 
     def maybe_adj_or_adv
       if rand(2) == 1
-        ADJ_AND_ADV.sample + " "
+        ADJ_AND_ADV.rand + " "
       end
     end
 
     def simple_title
-      "#{ADJ_AND_ADV.sample} #{NOUNS.sample}"
+      "#{ADJ_AND_ADV.rand} #{NOUNS.rand}"
     end
 
     def title_from_formula
-      [
-      "#{NOUNS.sample} 2: Electric Boogaloo",
-      "The #{NOUNS.sample} Without a #{NOUNS.sample}",
-      "The #{NOUNS.sample} from #{rand(20_000)} Leagues",
-      "#{simple_title}: The #{Faker::Name.name} Story",
-      "When #{Faker::Name.first_name} Met #{Faker::Name.first_name}",
-      "Dr. #{NOUNS.sample}",
-      "Je Vous Presente, #{Faker::Name.first_name}",
-      "#{rand(3000)} A.D.",
-      "The #{NOUNS.sample} from #{Faker::Address.neighborhood}",
-      "Christmas on #{Faker::Address.street_name}",
-      "The #{ %w{ Red Yellow Black White }.sample } Rose of #{Faker::AddressUK.country}",
-      "Hard Boiled #{NOUNS.sample}",
-      String.new.tap{|s| n = simple_title; s.replace("#{n} 2: Son of #{n}")}
-      ].sample
+      case rand(13)
+      when 0 then "#{NOUNS.rand} 2: Electric Boogaloo"
+      when 1 then "The #{NOUNS.rand} Without a #{NOUNS.rand}"
+      when 2 then "The #{NOUNS.rand} from #{rand(20_000)} Leagues"
+      when 3 then "#{simple_title}: The #{Faker::Name.name} Story"
+      when 4 then "When #{Faker::Name.first_name} Met #{Faker::Name.first_name}"
+      when 5 then "Dr. #{NOUNS.rand}"
+      when 6 then "Je Vous Presente, #{Faker::Name.first_name}"
+      when 7 then "#{rand(3000)} A.D."
+      when 8 then "The #{NOUNS.rand} from #{Faker::Address.neighborhood}"
+      when 9 then "Christmas on #{Faker::Address.street_name}"
+      when 10 then "The #{ %w{ Red Yellow Black White }.rand } Rose of #{Faker::AddressUK.country}"
+      when 11 then "Hard Boiled #{NOUNS.rand}"
+      else
+        String.new.tap{|s| n = simple_title; s.replace("#{n} 2: Son of #{n}")}
+      end
     end
   end
 end

data/lib/ffaker/ssn_se.rb

@@ -26,7 +26,7 @@ module Faker
     def ssn(opts = {})
       from   = opts[:from]   || ::Time.local(1940, 1, 1)
       to     = opts[:to]     || ::Time.now
-      gender = opts[:gender] || genders.sample
+      gender = opts[:gender] || GENDERS.rand
 
       raise_error_on_bad_arguments(from, to, gender)
 
@@ -48,13 +48,10 @@ module Faker
       raise ArgumentError, "Invalid from argument: from" unless to.is_a? ::Time
       raise ArgumentError, "Invalid from argument: from" unless from.is_a? ::Time
       raise ArgumentError, "Invalid argument: from > to" if from > to
-      raise ArgumentError, "Invalid argument: gender" unless genders.include?(gender)
+      raise ArgumentError, "Invalid argument: gender" unless GENDERS.include?(gender.to_s)
     end
 
-    def genders
-      # XXX Don't like this def.
-      [:female, :male]
-    end
+    GENDERS = k ["female", "male"]
 
     def random_birth_time_between(from=::Time.local(1940, 1, 1), to=::Time.now)
       ::Time.at(from + rand * (to.to_f - from.to_f))
@@ -62,18 +59,18 @@ module Faker
 
     def get_random_region_for(gender)
       region_number = case gender
-        when :female then get_random_region_even
-        when :male then get_random_region_odd
+      when "female" then get_random_region_even
+      when "male" then get_random_region_odd
       end
       three_character_string(region_number)
     end
 
     def get_random_region_even
-      (0..998).step(2).to_a.sample
+      rand(499) * 2
     end
 
     def get_random_region_odd
-      get_random_region_even + 1
+      rand(499) * 2 + 1
     end
 
     def three_character_string(number)

data/lib/ffaker/time.rb

@@ -10,19 +10,19 @@ module Faker
     def date(params={})
       years_back = params[:year_range] || 5
       latest_year  = params [:year_latest] || 0
-      year = (rand * (years_back)).ceil + (Object::Time.now.year - latest_year - years_back)
+      year = (rand * (years_back)).ceil + (::Time.now.year - latest_year - years_back)
       month = (rand * 12).ceil
       day = (rand * 31).ceil
-      series = [date = Object::Time.local(year, month, day)]
+      series = [date = ::Time.local(year, month, day)]
       if params[:series]
         params[:series].each do |some_time_after|
           series << series.last + (rand * some_time_after).ceil
         end
         return series
       end
-      date
+      date.strftime "%Y-%m-%d %T %z"
     end
 
     MONTHS = k %w(January February March April May June July August September October November December)
   end
-end
+end

data/test/test_faker.rb

@@ -4,40 +4,25 @@ class TestFaker < Test::Unit::TestCase
   def test_numerify
     assert Faker.numerify('###').match(/\d{3}/)
   end
-  
+
   def test_numerify_with_array
     assert Faker.numerify(['###', '###']).match(/\d{3}/)
   end
 
   def test_letterify
-    assert Faker.letterify(false, '???').match(/[a-z]{3}/)
-  end
-
-  def test_capital_letterify
-    assert Faker.letterify(true, '???').match(/[A-Z]{3}/)
+    assert Faker.letterify('???').match(/[a-z]{3}/)
   end
 
   def test_letterify_with_array
-    assert Faker.letterify(false, ['???', '???']).match(/[a-z]{3}/)
+    assert Faker.letterify(['???', '???']).match(/[a-z]{3}/)
   end
 
-  def test_capital_letterify_with_array
-      assert Faker.letterify(true, ['???', '???']).match(/[A-Z]{3}/)
-    end
-
   def test_bothify
     assert Faker.bothify('???###').match(/[a-z]{3}\d{3}/)
   end
 
-  def test_capital_bothify
-    assert Faker.bothify(true, '???###').match(/[A-Z]{3}\d{3}/)
-  end
-
   def test_bothify_with_array
-    assert Faker.bothify(false, ['???###', '???###']).match(/[a-z]{3}\d{3}/)
+    assert Faker.bothify(['???###', '???###']).match(/[a-z]{3}\d{3}/)
   end
 
-  def test_capital_bothify_with_array
-    assert Faker.bothify(true, ['???###', '???###']).match(/[A-Z]{3}\d{3}/)
-  end
 end

data/test/test_ssn_se.rb

@@ -14,14 +14,14 @@ class TestSSN < Test::Unit::TestCase
   end
 
   def test_ssn_with_gender
-    ssn_male = Faker::SSNSE.ssn(gender: :male)
+    ssn_male = Faker::SSNSE.ssn(:gender => :male)
     assert is_equal?(ssn_male[10].to_i)
 
-    ssn_female = Faker::SSNSE.ssn(gender: :female)
+    ssn_female = Faker::SSNSE.ssn(:gender => :female)
     assert is_equal?(ssn_female[10].to_i)
 
     assert_raise ArgumentError do
-      Faker::SSNSE.ssn(gender: :unkown)
+      Faker::SSNSE.ssn(:gender => :unkown)
     end
   end
 
@@ -30,7 +30,7 @@ class TestSSN < Test::Unit::TestCase
       from = Time.local(1980, 2, 28)
       to = Time.local(2000, 2, 28)
 
-      ssn = Faker::SSNSE.ssn(from: from, to: to)
+      ssn = Faker::SSNSE.ssn(:from => from, :to => to)
       year = ssn[0..3].to_i
       month = ssn[4..5].to_i
       day = ssn[6..7].to_i

metadata

@@ -1,57 +1,61 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: ffaker
-version: !ruby/object:Gem::Version
-  version: 1.16.0
+version: !ruby/object:Gem::Version 
+  hash: 85
   prerelease: 
+  segments: 
+  - 1
+  - 16
+  - 1
+  version: 1.16.1
 platform: ruby
-authors:
+authors: 
 - Emmanuel Oga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2013-05-02 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: test-unit
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: test-unit
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  version_requirements: *id002
 description: Faster Faker, generates dummy data.
 email: EmmanuelOga@gmail.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - README.rdoc
 - LICENSE
 - Changelog.rdoc
-files:
+files: 
 - Changelog.rdoc
 - Gemfile
 - LICENSE
@@ -169,30 +173,38 @@ files:
 - test/test_venue.rb
 homepage: http://github.com/emmanueloga/ffaker
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --charset=UTF-8
-require_paths:
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: ffaker
 rubygems_version: 1.8.25
 signing_key: 
 specification_version: 2
 summary: Faster Faker, generates dummy data.
-test_files:
+test_files: 
 - test/test_address.rb
 - test/test_address_au.rb
 - test/test_address_ca.rb