faker 1.0.0 → 1.0.1

data/History.txt

@@ -1,4 +1,10 @@
-== 1.0.0 2011-09-05
+== 1.0.1 2011-09-27
+* 1 minor enhancement
+  * Added safe_email method to get someaddress@example.com [Kazimierz Kiełkowicz]
+* 1 bug fix:
+  * Use the locale fallback properly when parsing string formats
+
+== 1.0.0 2011-09-08
 * 2 major enhancements
   * Moved all formats to locale files
   * Stopped interfering with I18n's global settings for fallbacks

data/lib/faker.rb

@@ -47,7 +47,18 @@ module Faker
       # into method calls that can be used to generate a
       # formatted translation: e.g., "#{first_name} #{last_name}".
       def parse(key)
-        fetch(key).scan(/#\{([A-Za-z]+\.)?([^\}]+)\}([^#]+)?/).map {|kls, meth, etc| (kls ? Faker.const_get(kls.chop) : self).send(meth) + etc.to_s }.join
+        fetch(key).scan(/#\{([A-Za-z]+\.)?([^\}]+)\}([^#]+)?/).map {|kls, meth, etc| 
+          # If the token had a class Prefix (e.g., Name.first_name)
+          # grab the constant, otherwise use self
+          cls = kls ? Faker.const_get(kls.chop) : self
+
+          # If the class has the method, call it, otherwise
+          # fetch the transation (i.e., faker.name.first_name)
+          text = cls.respond_to?(meth) ? cls.send(meth) : fetch("#{(kls || self).to_s.split('::').last.downcase}.#{meth.downcase}")
+          
+          # And tack on spaces, commas, etc. left over in the string
+          text += etc.to_s
+        }.join
       end
       
       # Call I18n.translate with our configured locale if no

data/lib/faker/internet.rb

@@ -10,6 +10,10 @@ module Faker
         [ user_name(name), fetch('internet.free_email') ].join('@')
       end
       
+      def safe_email(name = nil)
+        [user_name(name), 'example.'+ %w[org com net].shuffle.first].join('@')
+      end
+      
       def user_name(name = nil)
         return name.scan(/\w+/).shuffle.join(%w(. _).sample).downcase if name
         

data/lib/faker/version.rb

@@ -1,3 +1,3 @@
 module Faker #:nodoc:
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/test/test_faker_internet.rb

@@ -14,6 +14,10 @@ class TestFakerInternet < Test::Unit::TestCase
     assert @tester.free_email.match(/.+@(gmail|hotmail|yahoo)\.com/)
   end
   
+  def test_safe_email
+    assert @tester.safe_email.match(/.+@example.(com|net|org)/)
+  end
+  
   def test_user_name
     assert @tester.user_name.match(/[a-z]+((_|\.)[a-z]+)?/)
   end

data/test/test_faker_street.rb

@@ -35,4 +35,10 @@ class TestFakerStreet < Test::Unit::TestCase
       assert_match(/Wide Cheerful Path \d \(Green Door\)/, Faker::Address.street_address(:include_secondary))
     end
   end
+  
+  def test_street_address_with_locale_fallback
+    I18n.with_locale('en-gb') do
+      assert_match(/^\d+ \w+ \w+/, Faker::Address.street_address)
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: faker
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - Benjamin Curtis
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-08 00:00:00 -07:00
+date: 2011-09-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency