brightbox-rujitsu 0.1.9 → 0.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+= Version 0.2 (2009-04-06)
+
+Adding :exclude to Fixnum#random_*
+
 = Version 0.1.9 (2009-02-20)
 
 Added specifying only even or odd random numbers

data/Rakefile

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rake'
 require 'echoe'
 
-Echoe.new('rujitsu', '0.1.9') do | config | 
+Echoe.new('rujitsu', '0.2') do | config | 
   config.description = 'Various helper methods to smooth over Ruby development'
   config.url = 'http://github.com/rahoub/rujitsu'
   config.author = 'Brightbox Systems Ltd'
@@ -11,6 +11,9 @@ Echoe.new('rujitsu', '0.1.9') do | config |
   config.development_dependencies = []
 end
 
+desc "Generates manifest & gemspec in one go"
+task :build => [:manifest, :build_gemspec]
+
 Dir["#{File.dirname(__FILE__)}/tasks/*.rake"].sort.each do | rake_file | 
   load rake_file
 end

data/lib/rujitsu/fixnum.rb

@@ -1,16 +1,16 @@
 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
@@ -34,13 +34,13 @@ class Fixnum
   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
@@ -48,8 +48,20 @@ class Fixnum
   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

data/rujitsu.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rujitsu}
-  s.version = "0.1.9"
+  s.version = "0.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
   s.authors = ["Brightbox Systems Ltd"]
-  s.date = %q{2009-02-20}
+  s.date = %q{2009-04-06}
   s.description = %q{Various helper methods to smooth over Ruby development}
   s.email = %q{hello@brightbox.co.uk}
   s.extra_rdoc_files = ["CHANGELOG", "lib/rujitsu/fixnum.rb", "lib/rujitsu/grammar.rb", "lib/rujitsu/numeric.rb", "lib/rujitsu/range.rb", "lib/rujitsu/string.rb", "lib/rujitsu.rb", "README.rdoc", "tasks/rspec.rake"]

data/spec/fixnum_spec.rb

@@ -16,6 +16,22 @@ describe Fixnum do
         str.should match( /^[aeiou]+$/ )
       end
     end
+    
+    it "should exclude a character" do
+      # Given there are 5 vowels, 5^3 should 
+      # contain at least one instance of every vowel
+      str = (5**3).random_vowels(:except => "a")
+      str.should be_a_kind_of( String )
+      str.length.should == 5**3
+      str.should_not match(/a/)
+    end
+    
+    it "should exclude characters" do
+      str = (5**3).random_vowels(:except => %w(i o u))
+      str.should be_a_kind_of( String )
+      str.length.should == 5**3
+      str.should_not match(/iou/)
+    end
   end
 
   describe "random_consonants" do
@@ -27,11 +43,32 @@ describe Fixnum do
     it "should produce a string of random consonants" do
       [ 5, 10, 15, 25, 29 ].each do |i|
         str = i.random_consonants
+        
         str.should be_a_kind_of( String )
         str.length.should == i
         str.should match( /^[bcdfghjklmnpqrstvwxyz]+$/ )
       end
     end
+    
+    it "should exclude a character" do
+      # 26^5 should be large enough to get at least one
+      # instance of every character.
+      str = (26**2).random_consonants(:except => "c")
+      
+      str.should be_a_kind_of( String )
+      str.length.should == (26**2)
+      str.should_not match(/c/)
+    end
+    
+    it "should exclude characters" do
+      # 26^5 should be large enough to get at least one
+      # instance of every character.
+      str = (26**2).random_consonants(:except => %w(c d f))
+      
+      str.should be_a_kind_of( String )
+      str.length.should == (26**2)
+      str.should_not match(/cdf/)
+    end
   end
 
   describe "random_letters" do
@@ -48,6 +85,26 @@ describe Fixnum do
         str.should match( /^[a-z]+$/ )
       end
     end
+    
+    it "should exclude a character" do
+      # 26^5 should be large enough to get at least one
+      # instance of every character.
+      str = (26**2).random_letters(:except => "d")
+      
+      str.should be_a_kind_of( String )
+      str.length.should == (26**2)
+      str.should_not match(/d/)
+    end
+    
+    it "should exclude characters" do
+      # 26^5 should be large enough to get at least one
+      # instance of every character.
+      str = (26**2).random_letters(:except => %w(c d f))
+      
+      str.should be_a_kind_of( String )
+      str.length.should == (26**2)
+      str.should_not match(/cdf/)
+    end
   end
 
   describe "random_numbers" do
@@ -138,6 +195,28 @@ describe Fixnum do
         str.should match( /^[a-z0-9]+$/ )
       end
     end
+    
+    
+    it "should exclude a character" do
+      # 26^5 should be large enough to get at least one
+      # instance of every character.
+      str = (26**2).random_characters(:except => "c")
+      
+      str.should be_a_kind_of( String )
+      str.length.should == (26**2)
+      str.should_not match(/c/)
+    end
+    
+    
+    it "should exclude characters" do
+      # 26^5 should be large enough to get at least one
+      # instance of every character.
+      str = (26**2).random_characters(:except => %w(c d f))
+      
+      str.should be_a_kind_of( String )
+      str.length.should == (26**2)
+      str.should_not match(/cdf/)
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: brightbox-rujitsu
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: "0.2"
 platform: ruby
 authors: 
 - Brightbox Systems Ltd
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-20 00:00:00 -08:00
+date: 2009-04-06 00:00:00 -07:00
 default_executable: 
 dependencies: []