random_data 1.1.0 → 1.2.0

data/History.txt

@@ -1,17 +1,21 @@
-== 1.1.0 2007-10-20
+== 1.2.0 2007-09-17
 
-* 1 minor feature added by Hugh Sasse:
-  * Separate methods for generating random male first names and random female first names
+Thanks to Paul Barry and Hugh Sasse for some awesome patches!
 
-* 2 minor fix:
-  * Names are alphabetized
-  * More names added
+* 1 major enhancement:
+  * Added method_missing to Random class, which looks for a method_name.dat and fetches a random line for you (see docs for details) (Hugh Sasse)
+  * added Random.date_between method to get a date between 2 given dates (Paul Barry)
+  * added Random.boolean method to get a random true or false (Paul Barry)
+  * added Random.number to get a random number less than a number or within a given range (Paul Barry)
 
-== 1.0.2 2007-09-17
+* 1 minor enhancement:
+  * enhanced Random.date method to handle a Range as well as a Fixnum, which allows you to get a date guaranteed to be in the past (Paul Barry)
 
 * 1 minor fix:
-  * Not finding lib files properly, now fixed
-
+  * Location sources organized into more understandable categories, for easier future expansion (Hugh Sasse)
+  * Fixed path of require statements in random_data.rb (Paul Barry)
+  * make initial never return nil, because if it returns nil then ContactInfo#email can thrown and error because it tries to call nil. (Paul Barry)
+  
 == 1.0.1 2007-09-17
 
 * 1 minor fix:

data/README.txt

@@ -1,4 +1,4 @@
-= RandomData
+= Random
 
 This gem provides a Random singleton class with a series of methods for generating random test data including names, mailing addresses, dates, phone numbers, e-mail addresses, and text.  Instead of:
 
@@ -26,7 +26,7 @@ Random.date
 Random.address_line_1, Random.address_line_2, Random.zipcode, Random.state, Random.country, Random.city,
 	
 === Name Methods
-Random.firstname, Random.firstname_male, Random.firstname_female, Random.initial, Random.lastname
+Random.firstname, Random.initial, Random.lastname, 
 
 === Text Methods
 Random.alphanumeric, Random.paragraphs

data/lib/random_data/dates.rb

@@ -6,15 +6,41 @@ module RandomData
   
   module Dates
   
-    # Returns a date within a specified range of days (plus or minus half what you specify).  The default is ten days, so by default you will
-    # get a date within plus or minus five days of today.
+    # Returns a date within a specified range of days.  If dayrange is an Integer, then the date
+    # returned will be plus or minus half what you specify.  The default is ten days, so by default 
+    # you will get a date within plus or minus five days of today.
+    #
+    # If dayrange is a Range, then you will get a date the falls between that range
     #
     # Example:
     #
-    # >> Random.date.to_s = "2007-09-16"
-      
+    # Random.date # => a Date +/- 5 days of today
+    # Random.date(20) # => a Date +/- 10 days of today
+    # Random.date(-60..-30) # => a Date between 60 days ago and 30 days ago  
+    #
     def date(dayrange=10)
-      (Date.today + (rand(dayrange*2) - dayrange))
+      if dayrange.is_a?(Range)
+        offset = rand(dayrange.max-dayrange.min) + dayrange.min
+      else
+        offset = rand(dayrange*2) - dayrange
+      end
+      Date.today + offset
+    end
+    
+    # Returns a date within the specified Range. The Range can be Date or String objects.
+    #
+    #Example:
+    # min = Date.parse('1966-11-15')
+    # max = Date.parse('1990-01-01')
+    # Random.date(min..max) # => a Date between 11/15/1996 and 1/1/1990
+    # Random.date('1966-11-15'..'1990-01-01') # => a Date between 11/15/1996 and 1/1/1990
+    #
+    def date_between(range)
+      min_date = range.min.is_a?(Date) ? range.min : Date.parse(range.min)
+      max_date = range.max.is_a?(Date) ? range.max : Date.parse(range.max)
+
+      diff = (max_date - min_date).to_i
+      min_date + rand(diff)
     end
 
   end

data/lib/random_data/locations.rb

@@ -4,8 +4,14 @@ module RandomData
   
   module Locations
 
-    @@streetnames = %w( Park Washington Maple Oak Lincoln Walnut Elm Jefferson Highland Madison Pine Cedar Sunset Jackson Franklin Willow 3rd Wilson 2nd Laurel 
-                        5th Chestnut 4th Adams Virginia Linden Woodland Cherry Rose 1st)
+    
+    trees = %w( Acacia Beech Birch Cedar Cherry Chestnut Elm Larch Laurel
+                Linden Maple Oak Pine Rose Walnut Willow)
+    people = %w( Adams Franklin Jackson Jefferson Lincoln
+                  Madison Washington Wilson)
+    places = %w( Highland Hill Park Woodland Sunset Virginia)
+    numbers = %w( 1st 2nd 4th 5th )
+    @@streetnames =  trees + people + places + numbers
                     
     @@street_types = %w(St Ave Rd Blvd Trl Ter Rdg Pl Pkwy Ct Circle)
 
@@ -103,4 +109,4 @@ module RandomData
       @@cities.rand
     end
   end
-end
+end

data/lib/random_data/names.rb

@@ -6,25 +6,12 @@ module RandomData
     # Returns a random letter
     
     def initial
-      
-      choice = rand(26) + 66
-
-      if choice == 91
-        return nil
-      else
-        return choice.chr
-      end
-  
+      ('A'..'Z').to_a.rand
     end
 
 
-    @@lastnames = %w(ABEL ANDERSON ANDREWS ANTHONY BAKER BROWN
-BURROWS CLARK CLARKE CLARKSON DAVIDSON DAVIES DAVIS DENT EDWARDS GARCIA
-GRANT HALL HARRIS HARRISON JACKSON JEFFRIES JEFFERSON JOHNSON JONES
-KIRBY KIRK LAKE LEE LEWIS MARTIN MARTINEZ MAJOR MILLER MOORE OATES
-PETERS PETERSON ROBERTSON ROBINSON RODRIGUEZ SMITH SMYTHE STEVENS
-TAYLOR THATCHER THOMAS THOMPSON WALKER WASHINGTON WHITE WILLIAMS
-WILSON YORKE)
+    @@lastnames = %w( SMITH JOHNSON WILLIAMS JONES BROWN DAVIS MILLER WILSON MOORE TAYLOR ANDERSON THOMAS JACKSON WHITE HARRIS MARTIN THOMPSON GARCIA MARTINEZ 
+                      ROBINSON CLARK RODRIGUEZ LEWIS LEE WALKER )
 
     # Returns a random lastname
     #
@@ -36,50 +23,18 @@ WILSON YORKE)
       @@lastnames.rand.capitalize
     end
 
-    @@male_first_names = %w(ADAM ANTHONY ARTHUR BRIAN CHARLES
-CHRISTOPHER DANIEL DAVID DONALD EDGAR EDWARD EDWIN GEORGE HAROLD
-HERBERT HUGH JAMES JASON JOHN JOSEPH KENNETH KEVIN MARCUS MARK
-MATTHEW MICHAEL PAUL PHILIP RICHARD ROBERT ROGER RONALD SIMON
-STEVEN TERRY THOMAS WILLIAM)
-    @@female_first_names = %w(ALISON ANN ANNA ANNE BARBARA BETTY BERYL
-CAROL CHARLOTTE CHERYL DEBORAH DIANA DONNA DOROTHY ELIZABETH EVE FELICITY
-FIONA HELEN HELENA JENNIFER JESSICA JUDITH KAREN KIMBERLY LAURA LINDA
-LISA LUCY MARGARET MARIA MARY MICHELLE NANCY PATRICIA POLLY ROBYN RUTH
-SANDRA SARAH SHARON SUSAN TABITHA URSULA VICTORIA WENDY)
-
-    @@first_names = @@male_first_names + @@female_first_names
+    @@firstnames = %w(JAMES JOHN ROBERT MICHAEL WILLIAM DAVID RICHARD CHARLES JOSEPH THOMAS CHRISTOPHER DANIEL PAUL MARK DONALD GEORGE KENNETH STEVEN EDWARD BRIAN 
+                      RONALD ANTHONY KEVIN JASON MARY PATRICIA LINDA BARBARA ELIZABETH JENNIFER MARIA SUSAN MARGARET DOROTHY LISA NANCY KAREN BETTY HELEN SANDRA 
+                      DONNA CAROL RUTH SHARON MICHELLE LAURA SARAH KIMBERLY DEBORAH)
 
-
-    # Returns a random firstname, male or female
+    # Returns a random firstname
     #
     # >> Random.firstname
     # 
     # "Sandra"
 
     def firstname
-      @@first_names.rand.capitalize
-    end
-
-
-    # Returns a random male firstname
-    #
-    # >> Random.firstname_male
-    # 
-    # "James"
-
-    def firstname_male
-      @@male_first_names.rand.capitalize
-    end
-
-
-    # Returns a random female firstname
-    #
-    # >> Random.firstname_female
-    # 
-    # "Mary"
-
-    def firstname_female
-      @@female_first_names.rand.capitalize
+      @@firstnames.rand.capitalize
     end
 
   end

data/lib/random_data/version.rb

@@ -1,7 +1,7 @@
 module RandomData #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 1
-    MINOR = 1
+    MINOR = 2
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

data/lib/random_data.rb

@@ -1,16 +1,47 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'random_data/array_randomizer'
+require 'random_data/booleans'
 require 'random_data/contact_info'
 require 'random_data/dates'
 require 'random_data/locations'
 require 'random_data/names'
+require 'random_data/numbers'
 require 'random_data/text'
 
 class Random
+  extend RandomData::Booleans
   extend RandomData::ContactInfo
   extend RandomData::Dates
   extend RandomData::Locations
   extend RandomData::Names
+  extend RandomData::Numbers
   extend RandomData::Text
-end
+
+  # Looks for a file with the name methodname.dat, reads the lines from that file, then gives you a random line from that file
+  # Will also search your load path for the file.  Raises an error if it can't find the file.
+  
+  def self.method_missing(methodname)
+    thing = "#{methodname}.dat"
+    filename = find_path(thing)
+
+    if filename.nil?
+      super
+    else
+      array = []
+      File.open(filename, 'r') { |f| array = f.read.split(/[\r\n]+/) }
+      return array.rand
+    end
+  end
+  
+  private
+  
+  def self.find_path(filename)
+    $:.each do |path|
+      new_path = File.join(path,filename)
+      return new_path if File.exist?(new_path)
+    end    
+    return nil
+  end
+  
+end

data/test/test_random_data.rb

@@ -16,7 +16,7 @@ class TestRandomData < Test::Unit::TestCase
   end
   
   def test_should_return_random_email
-    assert_equal "jjones@webmail.com", Random.email
+    assert_equal "iwalker@webmail.com", Random.email
   end
 
   def test_should_return_random_date
@@ -30,7 +30,7 @@ class TestRandomData < Test::Unit::TestCase
   end
   
   def test_should_return_random_address_line_1
-    assert_equal "38408 Virginia Blvd", Random.address_line_1    
+    assert_equal "38408 Highland Blvd", Random.address_line_1    
   end
 
   def test_should_return_random_address_line_2
@@ -58,23 +58,15 @@ class TestRandomData < Test::Unit::TestCase
   end
 
   def test_should_return_random_firstname
-    assert_equal "Donald", Random.firstname    
-  end
-
-  def test_should_return_random_firstname_male
-    assert_equal "Donald", Random.firstname_male    
-  end
-
-  def test_should_return_random_firstname_female
-    assert_equal "Charlotte", Random.firstname_female    
+    assert_equal "Joseph", Random.firstname    
   end
 
   def test_should_return_random_initial
-    assert_equal "J", Random.initial    
+    assert_equal "I", Random.initial    
   end
 
   def test_should_return_random_lastname
-    assert_equal "Clarke", Random.lastname    
+    assert_equal "Moore", Random.lastname    
   end
 
   def test_should_return_random_alphanumeric
@@ -94,4 +86,101 @@ class TestRandomData < Test::Unit::TestCase
     assert_equal num_paragraphs, Random.paragraphs(num_paragraphs).scan(/\n\n/).size
   end
 
+  def test_initial_should_not_return_nil
+    srand(11) #This would force the nil case in the old implementation
+    assert_not_nil Random.initial
+  end
+
+  def test_should_return_random_date_using_range
+    Date.expects(:today).returns(Date.civil(2007,9,15))    
+    assert_equal '1998-03-30', Random.date(-5000..-1000).to_s
+  end
+
+  def test_should_return_random_date_between_using_range_of_dates
+    min = Date.parse('1966-11-15')
+    max = Date.parse('1990-01-01')    
+    assert_equal '1982-04-25', Random.date_between(min..max).to_s    
+  end
+  
+  def test_should_return_random_date_between_using_range_of_strings
+    assert_equal '1982-04-25', Random.date_between('1966-11-15'..'1990-01-01').to_s    
+  end
+  
+  def test_should_return_random_boolean_true
+    srand(99)
+    assert_equal true, Random.boolean
+  end
+  
+  def test_should_return_random_boolean_false
+    assert_equal false, Random.boolean
+  end
+
+  def test_should_return_random_number_less_than_10
+    assert_equal 8, Random.number(9)
+  end
+
+  def test_should_return_random_number_within_range
+    assert_equal 13, Random.number(5..15)
+  end
+  
+end
+
+class TestRandomDataMethodMissing < Test::Unit::TestCase
+
+  def sports
+    @sports ||= %w(hockey basketball water\ polo five-a-side football judo pole\ vault steeple\ chase)
+  end
+
+  def lines
+    @lines ||= sports.join("\r\n")
+  end
+  
+  def path
+    @path ||= File.join("lib","sport.dat")
+  end
+
+  def setup
+    @file = stub('file', :read => lines)
+    $:.stubs(:each).yields("lib")
+    File.stubs(:exist?).returns(true)    
+    File.stubs(:open).yields(@file)
+  end
+
+  def test_should_search_load_path_for_file
+    $:.expects(:each).yields("lib")
+    Random.sport
+  end
+
+  def test_should_join_path_with_methodname_dot_dat
+    File.expects(:join).with("lib","sport.dat").returns("lib/sport.dat")
+    Random.sport
+  end
+  
+  def test_should_test_for_existence_of_filename_matching_method_missing_call
+    File.expects(:exist?).with(path).returns(true)
+    Random.sport
+  end
+
+  def test_should_call_super_if_unable_to_find_file
+    # can't test super call directly, so we test whether MethodMissing gets raised properly
+    File.stubs(:exist?).returns(false)
+    assert_raise(NoMethodError) { Random.horse }
+  end
+  
+  def test_should_open_file_matching_method_missing_call
+    File.expects(:open).with(path,"r").yields(@file)
+    Random.sport
+  end
+
+  def test_should_read_lines_from_file
+    @file.expects(:read).returns(@lines)
+    Random.sport
+  end
+
+  def test_should_return_random_line_from_a_file
+    srand(101)
+    assert_equal 'steeple chase', Random.sport
+    assert_equal 'five-a-side', Random.sport
+  end
+  
 end

metadata

@@ -1,33 +1,30 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: random_data
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
-date: 2007-10-20 00:00:00 -04:00
-summary: A Ruby gem that provides a Random singleton class with a series of methods for generating random test data including names, mailing addresses, dates, phone numbers, e-mail addresses, and text.
-require_paths: 
-- lib
-email: mike@subelsky.com
-homepage: http://random-data.rubyforge.org
-rubyforge_project: random-data
-description: A Ruby gem that provides a Random singleton class with a series of methods for generating random test data including names, mailing addresses, dates, phone numbers, e-mail addresses, and text.
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
-platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
+  version: 1.2.0
+platform: ""
 authors: 
 - Mike Subelsky
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2007-11-29 00:00:00 -05:00
+default_executable: 
+dependencies: []
+
+description: A Ruby gem that provides a Random singleton class with a series of methods for generating random test data including names, mailing addresses, dates, phone numbers, e-mail addresses, and text.
+email: mike@subelsky.com
+executables: []
+
+extensions: []
+
+extra_rdoc_files: 
+- History.txt
+- License.txt
+- Manifest.txt
+- README.txt
+- website/index.txt
 files: 
 - History.txt
 - License.txt
@@ -59,23 +56,33 @@ files:
 - website/javascripts/rounded_corners_lite.inc.js
 - website/stylesheets/screen.css
 - website/template.rhtml
-test_files: 
-- test/test_helper.rb
-- test/test_random_data.rb
+has_rdoc: true
+homepage: http://random-data.rubyforge.org
+post_install_message: 
 rdoc_options: 
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- License.txt
-- Manifest.txt
-- README.txt
-- website/index.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
 requirements: []
 
-dependencies: []
-
+rubyforge_project: random-data
+rubygems_version: 0.9.5
+signing_key: 
+specification_version: 2
+summary: A Ruby gem that provides a Random singleton class with a series of methods for generating random test data including names, mailing addresses, dates, phone numbers, e-mail addresses, and text.
+test_files: 
+- test/test_helper.rb
+- test/test_random_data.rb