expectations 0.2.3 → 0.2.4

data/lib/expectations.rb

@@ -2,13 +2,12 @@ module Expectations
 end
 
 def Expectations(&block)
-  Expectations::SuiteRunner.suite_eval &block
+  Expectations::SuiteRunner.suite_eval(&block)
 rescue
   Expectations::SuiteRunner.do_not_run
   raise
 end
 
-require 'rubygems'
 require 'mocha'
 require 'mocha/standalone'
 require 'singleton'
@@ -16,6 +15,7 @@ require 'benchmark'
 require 'erb'
 require 'fileutils'
 require File.expand_path(File.dirname(__FILE__) + '/expectations/object')
+require File.expand_path(File.dirname(__FILE__) + '/expectations/blank_slate')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/recorder')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/delegate_recorder')
 require File.expand_path(File.dirname(__FILE__) + '/expectations/recorded_expectation')

data/lib/expectations/blank_slate.rb

@@ -0,0 +1,113 @@
+#!/usr/bin/env ruby
+#--
+# Copyright 2004, 2006 by Jim Weirich (jim@weirichhouse.org).
+# All rights reserved.
+
+# Permission is granted for use, copying, modification, distribution,
+# and distribution of modified versions of this work as long as the
+# above copyright notice is included.
+#++
+
+######################################################################
+# BlankSlate provides an abstract base class with no predefined
+# methods (except for <tt>\_\_send__</tt> and <tt>\_\_id__</tt>).
+# BlankSlate is useful as a base class when writing classes that
+# depend upon <tt>method_missing</tt> (e.g. dynamic proxies).
+#
+class BlankSlate
+  class << self
+
+    # Hide the method named +name+ in the BlankSlate class.  Don't
+    # hide +instance_eval+ or any method beginning with "__".
+    def hide(name)
+      if instance_methods.include?(name.to_s) and
+        name !~ /^(__|instance_eval|extend|is_a?)/
+        @hidden_methods ||= {}
+        @hidden_methods[name.to_sym] = instance_method(name)
+        undef_method name
+      end
+    end
+
+    def find_hidden_method(name)
+      @hidden_methods ||= {}
+      @hidden_methods[name] || superclass.find_hidden_method(name)
+    end
+
+    # Redefine a previously hidden method so that it may be called on a blank
+    # slate object.
+    def reveal(name)
+      bound_method = nil
+      unbound_method = find_hidden_method(name)
+      fail "Don't know how to reveal method '#{name}'" unless unbound_method
+      define_method(name) do |*args|
+        bound_method ||= unbound_method.bind(self)
+        bound_method.call(*args)
+      end
+    end
+  end
+
+  instance_methods.each { |m| hide(m) }
+end
+
+######################################################################
+# Since Ruby is very dynamic, methods added to the ancestors of
+# BlankSlate <em>after BlankSlate is defined</em> will show up in the
+# list of available BlankSlate methods.  We handle this by defining a
+# hook in the Object and Kernel classes that will hide any method
+# defined after BlankSlate has been loaded.
+#
+module Kernel
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+
+    # Detect method additions to Kernel and remove them in the
+    # BlankSlate class.
+    def method_added(name)
+      result = blank_slate_method_added(name)
+      return result if self != Kernel
+      BlankSlate.hide(name)
+      result
+    end
+  end
+end
+
+######################################################################
+# Same as above, except in Object.
+#
+class Object
+  class << self
+    alias_method :blank_slate_method_added, :method_added
+
+    # Detect method additions to Object and remove them in the
+    # BlankSlate class.
+    def method_added(name)
+      result = blank_slate_method_added(name)
+      return result if self != Object
+      BlankSlate.hide(name)
+      result
+    end
+
+    def find_hidden_method(name)
+      nil
+    end
+  end
+end
+
+######################################################################
+# Also, modules included into Object need to be scanned and have their
+# instance methods removed from blank slate.  In theory, modules
+# included into Kernel would have to be removed as well, but a
+# "feature" of Ruby prevents late includes into modules from being
+# exposed in the first place.
+#
+class Module
+  alias blankslate_original_append_features append_features
+  def append_features(mod)
+    result = blankslate_original_append_features(mod)
+    return result if mod != Object
+    instance_methods.each do |name|
+      BlankSlate.hide(name)
+    end
+    result
+  end
+end

data/lib/expectations/recorded_expectation.rb

@@ -2,7 +2,7 @@ module Expectations::RecordedExpectation
   def execute
     begin
       mocha_setup
-      instance_exec expected.subject!, &block if block
+      instance_exec(expected.subject!, &block) if block
       if expected.verify!
         self.extend(Expectations::Results::Fulfilled)
       else
@@ -21,4 +21,4 @@ module Expectations::RecordedExpectation
     self
   end
 
-end
+end

data/lib/expectations/recorder.rb

@@ -1,5 +1,5 @@
-class Expectations::Recorder
-
+class Expectations::Recorder < BlankSlate
+  
   attr_reader :subject
   def initialize(subject)
     @subject = subject

data/lib/expectations/suite.rb

@@ -2,6 +2,10 @@ class Expectations::Suite
   
   include Mocha::Standalone
   
+  def initialize
+    @do_not_run = false
+  end
+  
   def xml(string)
     Expectations::XmlString.new(string)
   end
@@ -18,7 +22,7 @@ class Expectations::Suite
   end
   
   def expect(expected, &block)
-    expectations << Expectations::Expectation.new(expected, *caller.first.split(/:/), &block)
+    expectations << Expectations::Expectation.new(expected, *caller.first.split(/:/)[0..1], &block)
   end
   
   def do_not_run

data/lib/expectations/suite_runner.rb

@@ -14,7 +14,7 @@ class Expectations::SuiteRunner
   end
   
   def self.suite_eval(&block)
-    self.instance.suite.instance_eval &block
+    self.instance.suite.instance_eval(&block)
   end
     
 end

data/rakefile.rb

@@ -46,7 +46,7 @@ specification = Gem::Specification.new do |s|
   expect NoMethodError do 
     Object.invalid_method_call 
   end."
-  s.version = "0.2.3"
+  s.version = "0.2.4"
   s.author = 'Jay Fields'
   s.description = "A lightweight unit testing framework. Tests (expectations) will be written as follows 
   expect 2 do 

data/test/test_helper.rb

@@ -1,2 +1,3 @@
+require 'rubygems'
 require File.dirname(__FILE__) + '/silent'
 require File.dirname(__FILE__) + '/../lib/expectations'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: expectations
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors: 
 - Jay Fields
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-03-07 00:00:00 -08:00
+date: 2008-03-27 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,6 +30,7 @@ extensions: []
 extra_rdoc_files: 
 - README
 files: 
+- lib/expectations/blank_slate.rb
 - lib/expectations/delegate_recorder.rb
 - lib/expectations/expectation.rb
 - lib/expectations/mock_recorder.rb