greenbar 0.2.1 → 1.0.0

data/lib/greenbar/RandSetup.rb

@@ -9,7 +9,6 @@
 # http://rubyforge.org/projects/greenbar/
 #
 require 'greenbar/TestSetup'
-#TODO - use ClassMethodSetup?
 
 #:startdoc:#
 #===Purpose
@@ -34,49 +33,50 @@ require 'greenbar/TestSetup'
 #
 #   :include: doc/examples/RandSetup.rb
 #
-#===Additional definitions
-#   Kernel#seed_rand_sequence=(max, sequence)
 # 
-# Initializes a re-usable sequence for calls to Kernel#rand with max.
-# The first element of the array is returned on the first call to rand(max),
-# and the sequence is rotated, appending this return to the end.
-#
 
 module Greenbar::RandSetup
 
   #:stopdoc:  
   include Greenbar::TestSetup
 
+  @@rand_sequences = {}
+  
   def setup_mixin
+    Kernel.instance_eval { 
+      rand_sequences = Greenbar::RandSetup.instance_eval { class_variable_get :@@rand_sequences }
+      class_variable_set :@@rand_sequences, rand_sequences 
+    }
+    
     Kernel.class_eval do
       
       alias :rand_saved_by_RandSetup :rand
       
       def rand(max=0)
-        @@rand_sequences ||= {}
         raise "Must use seed_rand_sequence(#{max}) before using rand(#{max})." unless @@rand_sequences.has_key? max
         @@rand_sequences[max] << @@rand_sequences[max].shift
         @@rand_sequences[max][-1]
       end
-      
-      def seed_rand_sequence(max, sequence)
-        array = sequence.to_a
-        raise "Must provide a non-empty sequence." if array.empty?
-        @@rand_sequences ||= {}
-        @@rand_sequences[max] = array
-      end
-      
     end
-      
   end
-    
+
   def teardown_mixin
     Kernel.class_eval do
       alias :rand :rand_saved_by_RandSetup
       remove_method :rand_saved_by_RandSetup
-      remove_method :seed_rand_sequence
-      @@rand_sequences = nil
+      Kernel.instance_eval { remove_class_variable :@@rand_sequences}
     end
   end
-  #:startdoc:#
+#:startdoc:#
+#  
+# Initializes a re-usable sequence for calls to Kernel#rand with max.
+# The first element of the array is returned on the first call to rand(max),
+# and the sequence is rotated, appending this return to the end.
+#
+  def seed_rand_sequence(max, sequence)
+    array = sequence.to_a
+    raise "Must provide a non-empty sequence." if array.empty?
+    @@rand_sequences[max] = array
+  end
+    
 end

data/rakefile.rb

@@ -4,7 +4,7 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-GREENBAR_VERSION = '0.2.1' 
+GREENBAR_VERSION = '1.0.0' 
 WEB_BUILD="web/build"
 
 desc "Default Task"

data/test/RandSetupTest.rb

@@ -28,12 +28,12 @@ class RandSetupTest < Test::Unit::TestCase
     newSequence   = [5, 7, 4, 2, 6]
     
     test.setup
-    seed_rand_sequence  8, sequence_for_8
-    seed_rand_sequence 10, sequence_for_10
+    test.seed_rand_sequence  8, sequence_for_8
+    test.seed_rand_sequence 10, sequence_for_10
     assert_equal sequence_for_8  * 3, test.random_sequence(sequence_for_8.length  * 3, 8)
     assert_equal sequence_for_10 * 3, test.random_sequence(sequence_for_10.length * 3, 10)
     
-    seed_rand_sequence 10, newSequence
+    test.seed_rand_sequence 10, newSequence
     assert_equal newSequence * 3, test.random_sequence(newSequence.length * 3, 10)
     
     test.teardown
@@ -57,10 +57,12 @@ class RandSetupTest < Test::Unit::TestCase
       end
     end
     
-    seed_rand_sequence 5, duck
+    test.seed_rand_sequence 5, duck
     assert_equal [0, 1, 2, 3, 4], test.random_sequence(5, 5)
     
     test.teardown
+    
+    assert ! Kernel.class_variables.include?('@@rand_sequences'), "Kernel@@rand_sequences should have been removed"
   end
 
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: greenbar
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
-date: 2006-04-28 00:00:00 -04:00
+  version: 1.0.0
+date: 2006-05-01 00:00:00 -04:00
 summary: Test::Unit tools.
 require_paths: 
 - lib