faker 0.9.3 → 0.9.4

data/History.txt

@@ -1,4 +1,8 @@
-== 0.9.2 2010-12-28
+== 0.9.4 2010-12-29
+* 1 minor bug fix:
+  * Stopped getting in the way of Rails' late locale loading
+
+== 0.9.3 2010-12-28
 * 1 minor enhancement:
   * Added a faker namespace for translations
 

data/README.md

@@ -13,6 +13,19 @@ Usage
 * Faker::Name.name => "Christophe Bartell"
 * Faker::Internet.email => "kirsten.greenholt@corkeryfisher.info"
 
+Usage with Rails
+----------------
+
+If you want to change your locale with Rails from the default of :en, change
+config/application.rb, setting config.i18n.locale to whatever locale you
+want.  Change locale rather than default_locale (as suggested by the comments
+in that file) so that I18n's fallbacks will work properly and Faker can use
+the formats and data in en.yml (if there is no Faker localization for your
+locale).  If you'd prefer to set default_locale rather than locale, then
+you'll also need to add config.i18n.fallbacks.defaults = [:en] to your
+configuration to make the fallbacks work for Faker.
+
+
 Customization
 ------------
 Since you may want to make addresses and other types of data look different

data/lib/faker.rb

@@ -25,6 +25,12 @@ module Faker
       def bothify(string)
         letterify(numerify(string))
       end
+      
+      # Helper for the common approach of grabbing a translation with an array
+      # of values and selecting one of them
+      def fetch(key)
+        I18n.translate("faker.#{key}").rand
+      end
     end
   end
 end

data/lib/faker/address.rb

@@ -18,25 +18,26 @@ module Faker
       end
 
       def street_address(include_secondary = false)
-        numerify("#{I18n.translate('faker.address.street_address').rand} #{street_name}#{' ' + secondary_address if include_secondary}")
+        numerify("#{fetch('address.street_address')} #{street_name}#{' ' + secondary_address if include_secondary}")
       end
 
       def secondary_address
-        numerify(I18n.translate('faker.address.secondary_address').rand)
+        numerify(fetch('address.secondary_address'))
       end
 
       def zip_code
-        bothify(I18n.translate('faker.address.postcode').rand).upcase
+        bothify(fetch('address.postcode')).upcase
       end
       alias_method :zip, :zip_code
       alias_method :postcode, :zip_code
-
-      %w(street_suffix city_suffix city_prefix state_abbr state country county).each do |meth|
-        define_method(meth) do
-          I18n.translate("faker.address.#{meth}").rand
-        end
-      end
       
+      def street_suffix; fetch('address.street_suffix'); end
+      def city_suffix;   fetch('address.city_suffix');   end
+      def city_prefix;   fetch('address.city_prefix');   end
+      def state_abbr;    fetch('address.state_abbr');    end
+      def state;         fetch('address.state');         end
+      def country;       fetch('address.country');       end
+
       # You can add whatever you want to the locale file, and it will get 
       # caught here... e.g., create a country_code array in your locale, 
       # then you can call #country_code and it will act like #country
@@ -54,7 +55,7 @@ module Faker
       alias_method :us_state, :state
       alias_method :us_state_abbr, :state_abbr
       alias_method :uk_postcode, :zip_code
-      alias_method :uk_county, :county
+      def uk_county; county; end
 
     end
   end

data/lib/faker/company.rb

@@ -6,7 +6,7 @@ module Faker
       end
     
       def suffix
-        I18n.translate('faker.company.suffix').rand
+        fetch('company.suffix')
       end
       
       # Generate a buzzword-laden catch phrase.

data/lib/faker/internet.rb

@@ -6,7 +6,7 @@ module Faker
       end
       
       def free_email(name = nil)
-        [ user_name(name), I18n.translate('faker.internet.free_email').rand ].join('@')
+        [ user_name(name), fetch('internet.free_email') ].join('@')
       end
       
       def user_name(name = nil)
@@ -30,7 +30,7 @@ module Faker
       end
       
       def domain_suffix
-        I18n.translate('faker.internet.domain_suffix').rand
+        fetch('internet.domain_suffix')
       end
       
       def ip_v4_address

data/lib/faker/name.rb

@@ -3,16 +3,14 @@ module Faker
     class << self
       
       def name
-        I18n.translate('faker.name.formats').rand.collect {|meth| self.send(meth) }.join(' ')
+        fetch('name.formats').collect {|meth| self.send(meth) }.join(' ')
       end
       
-      # defines methods first_name, last_name, prefix, suffix
-      (I18n.translate(:faker)[:name].keys - [:formats]).each do |meth|
-        define_method(meth) do
-          I18n.translate("faker.name.#{meth}").rand
-        end
-      end      
-
+      def first_name; fetch('name.first_name'); end
+      def last_name;  fetch('name.last_name'); end
+      def prefix;     fetch('name.prefix'); end
+      def suffix;     fetch('name.suffix'); end
+      
     end
   end
 end

data/lib/faker/phone_number.rb

@@ -2,7 +2,7 @@ module Faker
   class PhoneNumber < Base
     class << self
       def phone_number
-        numerify(I18n.translate('faker.phone_number.formats').rand)
+        numerify(fetch('phone_number.formats'))
       end
     end
   end

data/lib/faker/version.rb

@@ -1,3 +1,3 @@
 module Faker #:nodoc:
-  VERSION = "0.9.3"
+  VERSION = "0.9.4"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faker
 version: !ruby/object:Gem::Version 
-  hash: 61
+  hash: 51
   prerelease: false
   segments: 
   - 0
   - 9
-  - 3
-  version: 0.9.3
+  - 4
+  version: 0.9.4
 platform: ruby
 authors: 
 - Benjamin Curtis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-28 00:00:00 -08:00
+date: 2010-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency