Added secondary_address for suite and apartment numbers. New option f…

…or street_address to determine whether to return the secondary address (defaults to false).
omghax · Jan 2, 2008 · 87578bb · 87578bb
1 parent 741ea01
commit 87578bb
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/lib/faker/address.rb b/lib/faker/address.rb
@@ -24,15 +24,19 @@ def street_name
         ].rand.call
       end
 
-      def street_address
+      def street_address(include_secondary = false)
         Faker.numerify([
-          Proc.new { '##### %s' % street_name },
-          Proc.new { '##### %s' % street_name },
-          Proc.new { '##### %s' % street_name },
-          Proc.new { '##### %s' % street_name },
-          Proc.new { '##### %s Apt. ###' % street_name },
-          Proc.new { '##### %s Suite ###' % street_name }
-        ].rand.call)
+          '##### %s' % street_name,
+          '#### %s' % street_name,
+          '### %s' % street_name
+        ].rand + (include_secondary ? ' ' + secondary_address : ''))
+      end
+
+      def secondary_address
+        Faker.numerify([
+          'Apt. ###',
+          'Suite ###'
+        ].rand)
       end
 
       # UK Variants
@@ -46,9 +50,9 @@ def uk_country
 
       def uk_postcode
         Faker.bothify([
-          Proc.new { '??# #??' },
-          Proc.new { '??## #??' }
-        ].rand.call).upcase
+          '??# #??',
+          '??## #??'
+        ].rand).upcase
       end      
     end
   end