greenbar 0.1.1 → 0.2.1

data/LICENSE

@@ -1,47 +1,20 @@
-NOTE: this is essentially the same license as Ruby has, without paragraphs
-that do not apply.
-
-
-Greenbar is copyrighted free software.
-You can redistribute it and/or modify it under the conditions below:
-
-  1. You may make and give away verbatim copies of the source form of the
-     software without restriction, provided that you duplicate all of the
-     original copyright notices and associated disclaimers.
-
-  2. You may modify your copy of the software in any way, provided that
-     you do at least ONE of the following:
-
-       a) place your modifications in the Public Domain or otherwise
-          make them Freely Available, such as by posting said
-          modifications to Usenet or an equivalent medium, or by allowing
-          the author to include your modifications in the software.
-
-       b) use the modified software only within your corporation or
-          organization.
-
-       c) rename any non-standard executables so the names do not conflict
-          with standard executables, which must also be provided.
-
-       d) make other distribution arrangements with the author.
-
-  3. You may distribute the software in object code or executable
-     form, provided that you do at least ONE of the following:
-
-       a) distribute the executables and library files of the software,
-          together with instructions (in the manual page or equivalent)
-          on where to get the original distribution.
-
-       b) accompany the distribution with the machine-readable source of
-          the software.
-
-       c) give non-standard executables non-standard names, with
-          instructions on where to get the original software distribution.
-
-       d) make other distribution arrangements with the author.
-
-  4. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
-     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
-     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-     PURPOSE.
-
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining 
+a copy of this software and associated documentation files 
+(the "Software"), to deal in the Software without restriction, 
+including without limitation the rights to use, copy, modify, 
+merge, publish, distribute, sublicense, and/or sell copies of the 
+Software, and to permit persons to whom the Software is furnished to 
+do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included 
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF 
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY 
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, 
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE 
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/doc/examples/DateSetup.rb

@@ -7,7 +7,7 @@ class DateDueCalculatorTest < Test::Unit::TestCase
   include Greenbar::DateSetup
   
   def test_calculate_date_due
-    Date.today = Date.civil(2006, 4, 15)
+    make_Date_today_return Date.civil(2006, 4, 15)
     calculator = DateDueCalculator.new
     assert_equal Date.civil(2006, 4, 22), calculator.calculate_due_date(Movie.new(:standard))
     assert_equal Date.civil(2006, 4, 19), calculator.calculate_due_date(Movie.new(:hotflick))

data/doc/examples/TimeSetup.rb

@@ -7,7 +7,7 @@ class WebServiceTest < Test::Unit::TestCase
   include Greenbar::TimeSetup
   
   def test_expires
-    Time.now = Time.local(2006, 4, 16, 15, 23)
+    make_Time_now_return Time.local(2006, 4, 16, 15, 23)
     response = WebService.new.handle_request
     assert_equal Time.local(2006, 4, 16, 16, 23), response.expires_at
   end

data/lib/greenbar/ClassMethodSetup.rb

@@ -44,10 +44,7 @@ end
 # ===Usage
 #  
 # 1. Include Greenbar::ClassMethodSetup in your test case.
-# 2. Use replace_class_method, define_class_method, or replace_new
-# as needed.
-#
-# You may change 'today' as often as you want. 
+# 2. Use replace_class_method, define_class_method, or replace_new as needed.
 #
 # ===Examples
 # 
@@ -85,7 +82,7 @@ module Greenbar::ClassMethodSetup
   # Replaces a class method _method_name_ on class _target_class_.  The implementation
   # will be the _block_, and may take any number of arguments.  The original method
   # will be restored automatically.  The primary purpose for this method is when you 
-  # need to provide a mock implementation of some class_method.
+  # need to provide a mock implementation of a class method.
   #
   def replace_class_method target_class, method_name, &block
     @class_methods_to_restore << [target_class, method_name]
@@ -107,12 +104,12 @@ module Greenbar::ClassMethodSetup
   
   # Replaces the new method on class _target_class_.  
   #
-  # In the canonical form, _results_ should will respond to to_hash.
+  # In the canonical form, _results_ should respond to to_hash.
   # The hash is keyed by arrays that match the expected arguments to the new method.
-  # the hash value is the object to return for that set of arguments.
+  # The hash value is the object to return for that set of arguments.
   #
-  # If _results_ does not respond to to_hash, is is assumed to be the desired
-  # return value for a no-argument call to new.
+  # If _results_ does not respond to to_hash, it provides the desired return value 
+  # for a no-argument call to new. That is, it is shorthand for {[] => results}.
   #
   def replace_new target_class, results
     argument_instance_map = results.respond_to?(:to_hash) ? results.to_hash : { [] => results } 

data/lib/greenbar/DateSetup.rb

@@ -23,7 +23,7 @@ class Date; end
 # ===Usage
 #  
 # 1. Include Greenbar::DateSetup in your test case.
-# 2. Use Date.today= to define the date you want to be 'today'
+# 2. Use make_Date_today_return to define the date you want to be 'today'
 #
 # You may change 'today' as often as you want. 
 #
@@ -31,12 +31,6 @@ class Date; end
 #
 #   :include: doc/examples/DateSetup.rb
 #
-# ===Additional definitions
-#   Date.today=(date)
-# 
-# sets the Date to returned as 'today' for Date.today
-# Must be called before Date.today if DateSetup is being used.
-#
 
 module Greenbar::DateSetup
   include Greenbar::TestSetup
@@ -44,19 +38,22 @@ module Greenbar::DateSetup
   
   def setup_mixin #:nodoc:
     replace_class_method(Date, :today) {
-      raise "Must use Date.today= when using DateSetup." unless defined? @today
+      raise "Must use make_Date_today_return() when using DateSetup." unless defined? @today
       @today
     }
 
-    def Date.today=(date)  #:nodoc:
-        @today = date
-    end
+  end
+
+#
+# Sets the Date to be returned for Date.today
+# Must be called before Date.today if DateSetup is being used.
+#
+  def make_Date_today_return date
+    Date.instance_variable_set '@today', date
   end
     
   def teardown_mixin #:nodoc:
-    class << Date
-      remove_method :today=
-    end
+    Date.instance_eval {remove_instance_variable '@today'} if Date.instance_variables.include?('@today')
   end
     
 end

data/lib/greenbar/TimeSetup.rb

@@ -22,7 +22,7 @@ class Time; end
 # ===Usage
 #  
 # 1. Include Greenbar::TimeSetup in your test case.
-# 2. Use Time.now= to define the time you want to be 'now'
+# 2. Use make_Time_now_return to define the time you want to be 'now'
 #
 # You may change 'now' as often as you want. 
 #
@@ -30,12 +30,6 @@ class Time; end
 #
 #   :include: doc/examples/TimeSetup.rb
 #
-# ===Additional definitions
-#   Time.now=(time)
-# 
-# sets the Time to returned as 'now' for Time.new and Time.now
-# Must be called before Time.new or Time.now if TimeSetup is being used.
-#
 module Greenbar::TimeSetup
   #:stopdoc:
   include Greenbar::TestSetup 
@@ -44,7 +38,7 @@ module Greenbar::TimeSetup
   
   def setup_mixin #:nodoc:
     replace_class_method(Time, :now) {
-      raise "Must use Time.now= when using TimeSetup." unless @now
+      raise "Must use make_Time_now_return() when using TimeSetup." unless @now
       @now
     }
 
@@ -52,15 +46,17 @@ module Greenbar::TimeSetup
       Time.now
     }
 
-    def Time.now=(time) #:nodoc:
-        @now = time
-    end
+  end
+#
+# Sets the Time to be returned for time.now
+# Must be called before Time.new or Time.now if TimeSetup is being used.
+#
+  def make_Time_now_return time
+    Time.instance_variable_set '@now', time
   end
     
   def teardown_mixin #:nodoc:
-    class << Time
-      remove_method :now=
-    end
+    Time.instance_eval {remove_instance_variable '@now'} if Time.instance_variables.include?('@now')
   end
     
 end

data/rakefile.rb

@@ -4,7 +4,7 @@ require 'rake/clean'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-GREENBAR_VERSION = '0.1.1' 
+GREENBAR_VERSION = '0.2.1' 
 WEB_BUILD="web/build"
 
 desc "Default Task"
@@ -43,15 +43,17 @@ Rake::TestTask.new(:examples) {|unitTest|
   unitTest.verbose = true
 }
 
+COMMON_RDOC_OPTIONS = [
+  '--title', '"Greenbar - Aids for Testing with Test::Unit"',
+  '--main', 'README',
+  '--line-numbers', '--inline-source',
+]
+
 rdoc = Rake::RDocTask.new("rdoc") {|rdoc|
   rdoc.rdoc_dir = 'html'
-  rdoc.template = 'jamis'
-  rdoc.title    = "Greenbar -- Test::Unit Tools"
-  rdoc.options << '--line-numbers' << '--inline-source'
-  rdoc.main = 'README'
-  rdoc.rdoc_files.include('README')
-  rdoc.rdoc_files.include('LICENSE')
-  rdoc.rdoc_files.include('lib/**/*.rb', 'doc/**/*.rdoc')
+  rdoc.template = 'jamis.rb'
+  rdoc.options += COMMON_RDOC_OPTIONS
+  rdoc.rdoc_files.include 'README', 'LICENSE', 'lib/**/*.rb', 'doc/**/*.rdoc'
 }
 
 FILES_TO_PACKAGE = FileList[
@@ -85,10 +87,7 @@ else
 
     spec.has_rdoc = true
     spec.extra_rdoc_files = rdoc.rdoc_files.reject {|filename| filename =~ /\.rb$/ }.to_a << 'README'
-    spec.rdoc_options <<
-      '--title' <<  'Greenbar - Aids for Testing with Test::Unit' <<
-      '--main' << 'README' <<
-      '--line-numbers' << '--inline-source'
+    spec.rdoc_options + COMMON_RDOC_OPTIONS
 
 #    spec.signing_key = 'gem-private_key.pem'
 #    spec.cert_chain  = ['gem-public_cert.pem']

data/test/DateSetupTest.rb

@@ -22,18 +22,23 @@ class DateSetupTest < Test::Unit::TestCase
     test = Test.new
     test.setup
     
-    assert_raise(RuntimeError, 'Expected a RuntimeError if Date.now= not called before Date.today') {
+    assert_raise(RuntimeError, 'Expected a RuntimeError if make_Date_today_return not called before Date.today') {
       Date.today
     }
 
-    Date.today = july4th2004
+    test.make_Date_today_return july4th2004
     assert_equal july4th2004, Date.today
     
     test.teardown
 
     assert Date.today > july4th2004
-    assert_raise(NoMethodError) {
-      Date.today = july4th2004
-    }
+    assert ! Date.instance_variables.include?('@today'), "Date@today should have been removed"
+  end
+  
+  def test_when_today_is_not_set
+    test = Test.new
+    test.setup
+    test.teardown
   end
+  
 end

data/test/TimeSetupTest.rb

@@ -30,16 +30,20 @@ class TimeSetupTest < Test::Unit::TestCase
       Time.new
     }
 
-    Time.now = july4th2004
+    test.make_Time_now_return july4th2004
     assert_equal july4th2004, Time.now
     assert_equal july4th2004, Time.new
     
     test.teardown
     assert Time.new > july4th2004
     assert Time.now > july4th2004
-    assert_raise(NoMethodError) {
-      Time.now = july4th2004
-    }
+    
+    assert ! Time.instance_variables.include?('@now'), "Time@now should have been removed"
   end
 
+  def test_when_now_is_not_set
+    test = Test.new
+    test.setup
+    test.teardown
+  end
 end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: greenbar
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2006-04-23 00:00:00 -04:00
+  version: 0.2.1
+date: 2006-04-28 00:00:00 -04:00
 summary: Test::Unit tools.
 require_paths: 
 - lib
@@ -57,13 +57,8 @@ files:
 - rakefile.rb
 test_files: 
 - test/allTests.rb
-rdoc_options: 
-- --title
-- Greenbar - Aids for Testing with Test::Unit
-- --main
-- README
-- --line-numbers
-- --inline-source
+rdoc_options: []
+
 extra_rdoc_files: 
 - README
 - LICENSE