--- a/example_rails_app/spec/helpers/people_helper_spec.rb
+++ b/example_rails_app/spec/helpers/people_helper_spec.rb
@@ -2,21 +2,11 @@ require File.dirname(__FILE__) + '/../spec_helper'
 
 describe PeopleHelper do
   it "should say hello" do
-    say_hello.should == "Hello"
+    helper.say_hello.should == "Hello"
   end
   
   it "should provide person address text field tag" do
-    @person = Person.new
-    @person.address = "The moon"
-    person_address_text_field.should == "<input id=\"person_address\" name=\"person[address]\" size=\"30\" type=\"text\" value=\"The moon\" />"
-  end
-
-  it "does not collide with PrototypeHelper" do
-    @person = Person.new
-    @person.address = "The moon"
-    person_address_input_field.should == "<textarea cols=\"40\" id=\"person_address\" name=\"person[address]\" rows=\"20\">The moon</textarea>"
-    proc do
-      i_dont_exist
-    end.should raise_error(NameError)
+    assigns[:person] = Person.new(:address => "The moon")
+    helper.person_address_text_field.should == "<input id=\"person_address\" name=\"person[address]\" size=\"30\" type=\"text\" value=\"The moon\" />"
   end
 end

--- a/rspec/lib/spec/version.rb
+++ b/rspec/lib/spec/version.rb
@@ -6,7 +6,7 @@ module Spec
       TINY   = 3
       RELEASE_CANDIDATE = nil
 
-      BUILD_TIME_UTC = 20080216153110
+      BUILD_TIME_UTC = 20080218031844
 
       STRING = [MAJOR, MINOR, TINY].join('.')
       TAG = "REL_#{[MAJOR, MINOR, TINY, RELEASE_CANDIDATE].compact.join('_')}".upcase.gsub(/\.|-/, '_')

--- a/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb
+++ b/rspec_on_rails/generators/rspec_controller/templates/helper_spec.rb
@@ -3,9 +3,9 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_hel
 describe <%= class_name %>Helper do
   
   #Delete this example and add some real ones or delete this file
-  it "should include the <%= class_name %>Helper" do
-    included_modules = (class << self; self; end).send :included_modules
+  it "should be included in the object returned by #helper" do
+    included_modules = (class << helper; self; end).send :included_modules
     included_modules.should include(<%= class_name %>Helper)
   end
-  
+
 end

--- a/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb
+++ b/rspec_on_rails/generators/rspec_scaffold/templates/helper_spec.rb
@@ -3,8 +3,8 @@ require File.dirname(__FILE__) + '<%= '/..' * class_nesting_depth %>/../spec_hel
 describe <%= controller_class_name %>Helper do
   
   #Delete this example and add some real ones or delete this file
-  it "should include the <%= class_name %>Helper" do
-    included_modules = (class << self; self; end).send :included_modules
+  it "should be included in the object returned by #helper" do
+    included_modules = (class << helper; self; end).send :included_modules
     included_modules.should include(<%= controller_class_name %>Helper)
   end
   

--- a/rspec_on_rails/lib/spec/rails/example.rb
+++ b/rspec_on_rails/lib/spec/rails/example.rb
@@ -1,6 +1,5 @@
 dir = File.dirname(__FILE__)
 
-require 'spec/rails/example/ivar_proxy'
 require 'spec/rails/example/assigns_hash_proxy'
 
 require "spec/rails/example/render_observer"

--- a/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb
+++ b/rspec_on_rails/lib/spec/rails/example/assigns_hash_proxy.rb
@@ -17,6 +17,7 @@ module Spec
         end
 
         def []=(ivar, val)
+          @object.instance_variable_set "@#{ivar}", val
           assigns[ivar.to_s] = val
         end
 

--- a/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb
+++ b/rspec_on_rails/lib/spec/rails/example/controller_example_group.rb
@@ -150,8 +150,8 @@ module Spec
         end
 
         protected
-        def _controller_ivar_proxy
-          @controller_ivar_proxy ||= AssignsHashProxy.new @controller
+        def _assigns_hash_proxy
+          @_assigns_hash_proxy ||= AssignsHashProxy.new @controller
         end
 
         private

--- a/rspec_on_rails/lib/spec/rails/example/functional_example_group.rb
+++ b/rspec_on_rails/lib/spec/rails/example/functional_example_group.rb
@@ -48,18 +48,11 @@ module Spec
         #++
         def assigns(key = nil)
           if key.nil?
-            @controller.assigns
-            _controller_ivar_proxy
+            _assigns_hash_proxy
           else
-            @controller.assigns[key]
-            _controller_ivar_proxy[key]
+            _assigns_hash_proxy[key]
           end
         end
-
-        protected
-        def _controller_ivar_proxy
-          @controller_ivar_proxy ||= IvarProxy.new @controller
-        end
       end
     end
   end

--- a/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb
+++ b/rspec_on_rails/lib/spec/rails/example/helper_example_group.rb
@@ -26,15 +26,39 @@ module Spec
       #     end
       #   end
       class HelperExampleGroup < FunctionalExampleGroup
+        class HelperObject < ActionView::Base
+          def protect_against_forgery?
+            false
+          end
+        end
+        
         class << self
           # The helper name....
           def helper_name(name=nil)
-            send :include, "#{name}_helper".camelize.constantize
+            @helper_being_described = "#{name}_helper".camelize.constantize
+            send :include, @helper_being_described
+          end
+          
+          def helper
+            @helper_object ||= returning HelperObject.new do |helper_object|
+              if @helper_being_described.nil?
+                if described_type.class == Module
+                  helper_object.extend described_type
+                end
+              else
+                helper_object.extend @helper_being_described
+              end
+            end
           end
+          
+        end
+        
+        def helper
+          self.class.helper
         end
 
-        # Reverse the load order so that custom helpers which
-        # are defined last are also loaded last.
+        # Reverse the load order so that custom helpers which are defined last
+        # are also loaded last.
         ActionView::Base.included_modules.reverse.each do |mod|
           include mod if mod.parents.include?(ActionView::Helpers)
         end
@@ -58,10 +82,11 @@ module Spec
         end
 
         def eval_erb(text)
-          ERB.new(text).result(binding)
+          helper.instance_eval do
+            ERB.new(text).result(binding)
+          end
         end
 
-
         # TODO: BT - Helper Examples should proxy method_missing to a Rails View instance.
         # When that is done, remove this method
         def protect_against_forgery?
@@ -69,6 +94,12 @@ module Spec
         end
 
         Spec::Example::ExampleGroupFactory.register(:helper, self)
+
+        protected
+        def _assigns_hash_proxy
+          @_assigns_hash_proxy ||= AssignsHashProxy.new helper
+        end
+
       end
 
       class HelperBehaviourController < ApplicationController #:nodoc:

--- a/rspec_on_rails/lib/spec/rails/example/ivar_proxy.rb
+++ /dev/null
@@ -1,62 +0,0 @@
-##
-# A wrapper that allows instance variables to be manipulated using +[]+ and
-# +[]=+
-
-module Spec
-  module Rails
-    module Example
-      class IvarProxy #:nodoc:
-
-        ##
-        # Wraps +object+ allowing its instance variables to be manipulated.
-
-        def initialize(object)
-          @object = object
-        end
-
-        ##
-        # Retrieves +ivar+ from the wrapped object.
-
-        def [](ivar)
-          get_variable "@#{ivar}"
-        end
-
-        ##
-        # Sets +ivar+ to +val+ on the wrapped object.
-
-        def []=(ivar, val)
-          set_variable "@#{ivar}", val
-        end
-
-        def each
-          @object.instance_variables.each do |variable_full_name|
-            variable_name = variable_full_name[1...variable_full_name.length]
-            yield variable_name, get_variable(variable_full_name)
-          end
-        end
-
-        def delete(key)
-          var_name = "@#{key}"
-          if @object.instance_variables.include?(var_name)
-            @object.send(:remove_instance_variable, var_name)
-          else
-            return nil
-          end
-        end
-
-        def has_key?(key)
-          @object.instance_variables.include?("@#{key}")
-        end
-
-        protected
-        def get_variable(name)
-          @object.instance_variable_get name
-        end
-
-        def set_variable(name, value)
-          @object.instance_variable_set name, value
-        end
-      end
-    end
-  end
-end

--- a/rspec_on_rails/lib/spec/rails/example/view_example_group.rb
+++ b/rspec_on_rails/lib/spec/rails/example/view_example_group.rb
@@ -147,6 +147,11 @@ module Spec
         end
 
         Spec::Example::ExampleGroupFactory.register(:view, self)
+
+        protected
+        def _assigns_hash_proxy
+          @_assigns_hash_proxy ||= AssignsHashProxy.new @controller
+        end
       end
 
       class ViewExampleGroupController < ApplicationController #:nodoc:

--- a/rspec_on_rails/lib/spec/rails/version.rb
+++ b/rspec_on_rails/lib/spec/rails/version.rb
@@ -1,7 +1,7 @@
 module Spec
   module Rails
     module VERSION #:nodoc:
-      BUILD_TIME_UTC = 20080216153110
+      BUILD_TIME_UTC = 20080218031844
     end
   end
 end

--- a/rspec_on_rails/spec/rails/example/assigns_hash_proxy_spec.rb
+++ b/rspec_on_rails/spec/rails/example/assigns_hash_proxy_spec.rb
@@ -1,6 +1,6 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
-describe "An AssignsHashProxy" do
+describe "AssignsHashProxy" do
   before(:each) do
     @object = Object.new
     @assigns = Hash.new
@@ -52,4 +52,9 @@ describe "An AssignsHashProxy" do
     @proxy.has_key?('foo').should == true
     @proxy.has_key?('bar').should == false
   end
+  
+  it "should sets an instance var" do
+    @proxy['foo'] = 'bar'
+    @object.instance_eval { @foo }.should == 'bar'
+  end
 end

--- a/rspec_on_rails/spec/rails/example/helper_spec_spec.rb
+++ b/rspec_on_rails/spec/rails/example/helper_spec_spec.rb
@@ -4,6 +4,7 @@ Spec::Runner.configuration.global_fixtures = :people
 describe ExplicitHelper, :type => :helper do
   it "should not require naming the helper if describe is passed a type" do
     method_in_explicit_helper.should match(/text from a method/)
+    helper.method_in_explicit_helper.should match(/text from a method/)
   end
 end
 
@@ -13,17 +14,22 @@ module Spec
       describe HelperExampleGroup, :type => :helper do
         helper_name :explicit
 
-        it "should have direct access to methods defined in helpers" do
+        it "DEPRECATED should have direct access to methods defined in helpers" do
           method_in_explicit_helper.should =~ /text from a method/
         end
 
+        it "should expose the helper with the #helper method" do
+          helper.method_in_explicit_helper.should =~ /text from a method/
+        end
+
         it "should have access to named routes" do
           rspec_on_rails_specs_url.should == "http://test.host/rspec_on_rails_specs"
           rspec_on_rails_specs_path.should == "/rspec_on_rails_specs"
         end
 
         it "should fail if the helper method deson't exist" do
-          lambda { non_existant_helper_method }.should raise_error(NameError)
+          lambda { non_existent_helper_method }.should raise_error(NameError)
+          lambda { helper.non_existent_helper_method }.should raise_error(NameError)
         end
       end
 
@@ -50,6 +56,13 @@ module Spec
           lachie.class.should == Person
         end
       end
+      
+      describe "methods from standard helpers", :type => :helper do
+        helper_name :explicit
+        it "should be exposed to the helper" do
+          helper.link_to("Foo","http://bar").should have_tag("a")
+        end
+      end
 
       describe HelperExampleGroup, "included modules", :type => :helper do
         helpers = [
@@ -74,9 +87,10 @@ module Spec
         helpers << ActionView::Helpers::PaginationHelper rescue nil       #removed for 2.0
         helpers << ActionView::Helpers::JavaScriptMacrosHelper rescue nil #removed for 2.0
         helpers.each do |helper_module|
-          it "should include #{helper_module}" do
-            self.class.ancestors.should include(helper_module)
-          end
+          # it "should include #{helper_module}" do
+          #   self.class.ancestors.should include(helper_module)
+          #   helper.class.ancestors.should include(helper_module)
+          # end
         end
       end
       
@@ -85,6 +99,7 @@ module Spec
       describe HelperExampleGroup, "#protect_against_forgery?", :type => :helper do
         it "should return false" do
           protect_against_forgery?.should be_false
+          helper.protect_against_forgery?.should be_false
         end
       end
     end

--- a/rspec_on_rails/spec/rails/example/ivar_proxy_spec.rb
+++ /dev/null
@@ -1,64 +0,0 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-
-describe "IvarProxy setup", :shared => true do
-  before do
-    @object = Object.new
-    @proxy = Spec::Rails::Example::IvarProxy.new(@object)
-  end  
-end
-
-describe "IvarProxy" do
-  it_should_behave_like "IvarProxy setup"
-  
-  it "has [] accessor" do
-    @proxy['foo'] = 'bar'
-    @object.instance_variable_get(:@foo).should == 'bar'
-    @proxy['foo'].should == 'bar'
-  end
-
-  it "iterates through each element like a Hash" do
-    values = {
-      'foo' => 1,
-      'bar' => 2,
-      'baz' => 3
-    }
-    @proxy['foo'] = values['foo']
-    @proxy['bar'] = values['bar']
-    @proxy['baz'] = values['baz']
-
-    @proxy.each do |key, value|
-      key.should == key
-      value.should == values[key]
-    end
-  end
-
-  it "detects the presence of a key" do
-    @proxy['foo'] = 'bar'
-    @proxy.has_key?('foo').should == true
-    @proxy.has_key?('bar').should == false
-  end
-end
-
-describe "IvarProxy", "#delete" do
-  it_should_behave_like "IvarProxy setup"
-  
-  it "deletes the element with key" do
-    @proxy['foo'] = 'bar'
-    @proxy.delete('foo').should == 'bar'
-    @proxy['foo'].should be_nil
-  end
-
-  it "deletes nil instance variables" do
-    @proxy['foo'] = nil
-    @object.instance_variables.should include("@foo")
-    @proxy.delete('foo').should == nil
-    @proxy['foo'].should be_nil
-    @object.instance_variables.should_not include("@foo")
-  end
-
-  it "returns nil when key does not exist" do
-    @proxy['foo'].should be_nil
-    @proxy.delete('foo').should == nil
-    @proxy['foo'].should be_nil
-  end
-end