fixnum.rb in brightbox-rujitsu-0.2

- old
+ new

@@ -1,18 +1,18 @@
 class Fixnum
   # produce a string of N random vowels
-  def random_vowels
-    generate_random_string_using VOWELS
+  def random_vowels opts={}
+    generate_random_string_using VOWELS, opts
   end
   # produce a string of N random consonants
-  def random_consonants
-    generate_random_string_using CONSONANTS
+  def random_consonants opts={}
+    generate_random_string_using CONSONANTS, opts
   end
   # produce a string of N random letters
   #   5.random_letters
-  def random_letters
-    generate_random_string_using LETTERS
+  def random_letters opts={}
+    generate_random_string_using LETTERS, opts
   end
   # produce a string of N random numbers
   #   5.random_numbers
   # optionally specific limits on the numbers
   #   5.random_numbers(:from => 1, :to => 5)
@@ -32,25 +32,37 @@
     n << end_number_choices(only).select {|x| (lower <= x) && (x <= upper) }.sort_by { rand }.first.to_s
     n.join("")
   end
   # produce a string of N random characters
   #   5.random_characters
-  def random_characters
-    generate_random_string_using CHARACTERS
+  def random_characters opts={}
+    generate_random_string_using CHARACTERS, opts
   end
   
   private
 
-  VOWELS = ['a', 'e', 'i', 'o', 'u']  
+  VOWELS = %w(a e i o u)
   LETTERS = ('a'..'z').to_a
   CONSONANTS = LETTERS - VOWELS
   NUMBERS = ('0'..'9').to_a
   CHARACTERS = LETTERS + NUMBERS
   EVENS = %w(0 2 4 6 8).map {|x| x.to_i }
   ODDS = %w(1 3 5 7 9).map {|x| x.to_i }
 
-  def generate_random_string_using(legal_characters)
+  def generate_random_string_using(legal_characters, opts={})
+    # Check if we have anything to exclude from the legal_characters
+    if (chars = opts[:except])
+      # Make sure we can iterate over it
+      chars = [chars] unless chars.respond_to?(:each)
+      # Run through them all and remove them
+      chars.each do | char |
+        legal_characters.delete(char)
+      end
+    end
+    
     upper_limit = legal_characters.size - 1
+
+    srand # seed rand
     (1..self).collect do |num|
       legal_characters[rand(upper_limit)]
     end.join
   end
   