dchelimsky-rspec-rails 1.1.11.3 → 1.1.11.4

data/Manifest.txt

@@ -8,7 +8,6 @@ features/support/env.rb
 features/transactions/transactions_should_rollback.feature
 generators/rspec/CHANGES
 generators/rspec/rspec_generator.rb
-generators/rspec/templates/all_stories.rb
 generators/rspec/templates/previous_failures.txt
 generators/rspec/templates/rcov.opts
 generators/rspec/templates/rspec.rake
@@ -17,7 +16,6 @@ generators/rspec/templates/script/spec
 generators/rspec/templates/script/spec_server
 generators/rspec/templates/spec.opts
 generators/rspec/templates/spec_helper.rb
-generators/rspec/templates/stories_helper.rb
 generators/rspec_controller/USAGE
 generators/rspec_controller/rspec_controller_generator.rb
 generators/rspec_controller/templates/controller_spec.rb
@@ -55,11 +53,11 @@ lib/spec/rails/extensions/action_controller/rescue.rb
 lib/spec/rails/extensions/action_controller/test_response.rb
 lib/spec/rails/extensions/action_view/base.rb
 lib/spec/rails/extensions/active_record/base.rb
-lib/spec/rails/extensions/object.rb
-lib/spec/rails/extensions/spec/example/configuration.rb
 lib/spec/rails/extensions/spec/matchers/have.rb
+lib/spec/rails/extensions/spec/runner/configuration.rb
 lib/spec/rails/interop/testcase.rb
 lib/spec/rails/matchers.rb
+lib/spec/rails/matchers/ar_be_valid.rb
 lib/spec/rails/matchers/assert_select.rb
 lib/spec/rails/matchers/change.rb
 lib/spec/rails/matchers/have_text.rb
@@ -70,39 +68,10 @@ lib/spec/rails/mocks.rb
 lib/spec/rails/story_adapter.rb
 lib/spec/rails/version.rb
 rspec-rails.gemspec
-spec/rails/autotest/mappings_spec.rb
-spec/rails/example/assigns_hash_proxy_spec.rb
-spec/rails/example/configuration_spec.rb
-spec/rails/example/controller_isolation_spec.rb
-spec/rails/example/controller_spec_spec.rb
-spec/rails/example/cookies_proxy_spec.rb
-spec/rails/example/example_group_factory_spec.rb
-spec/rails/example/helper_spec_spec.rb
-spec/rails/example/model_spec_spec.rb
-spec/rails/example/shared_behaviour_spec.rb
-spec/rails/example/test_unit_assertion_accessibility_spec.rb
-spec/rails/example/view_spec_spec.rb
-spec/rails/extensions/action_controller_rescue_action_spec.rb
-spec/rails/extensions/action_view_base_spec.rb
-spec/rails/extensions/active_record_spec.rb
-spec/rails/interop/testcase_spec.rb
-spec/rails/matchers/assert_select_spec.rb
-spec/rails/matchers/description_generation_spec.rb
-spec/rails/matchers/errors_on_spec.rb
-spec/rails/matchers/have_text_spec.rb
-spec/rails/matchers/include_text_spec.rb
-spec/rails/matchers/redirect_to_spec.rb
-spec/rails/matchers/render_template_spec.rb
-spec/rails/matchers/should_change_spec.rb
-spec/rails/mocks/ar_classes.rb
-spec/rails/mocks/mock_model_spec.rb
-spec/rails/mocks/stub_model_spec.rb
-spec/rails/sample_modified_fixture.rb
-spec/rails/sample_spec.rb
-spec/rails/spec_server_spec.rb
-spec/rails/spec_spec.rb
+spec/autotest/mappings_spec.rb
 spec/rails_suite.rb
 spec/resources/controllers/action_view_base_spec_controller.rb
+spec/resources/controllers/application.rb
 spec/resources/controllers/controller_spec_controller.rb
 spec/resources/controllers/redirect_spec_controller.rb
 spec/resources/controllers/render_spec_controller.rb
@@ -112,6 +81,9 @@ spec/resources/helpers/explicit_helper.rb
 spec/resources/helpers/more_explicit_helper.rb
 spec/resources/helpers/plugin_application_helper.rb
 spec/resources/helpers/view_spec_helper.rb
+spec/resources/models/animal.rb
+spec/resources/models/person.rb
+spec/resources/models/thing.rb
 spec/resources/views/controller_spec/_partial.rhtml
 spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml
 spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml
@@ -155,4 +127,35 @@ spec/resources/views/view_spec/should_not_receive.rhtml
 spec/resources/views/view_spec/template_with_partial.rhtml
 spec/resources/views/view_spec/template_with_partial_using_collection.rhtml
 spec/resources/views/view_spec/template_with_partial_with_array.rhtml
+spec/spec/rails/example/assigns_hash_proxy_spec.rb
+spec/spec/rails/example/configuration_spec.rb
+spec/spec/rails/example/controller_isolation_spec.rb
+spec/spec/rails/example/controller_spec_spec.rb
+spec/spec/rails/example/cookies_proxy_spec.rb
+spec/spec/rails/example/example_group_factory_spec.rb
+spec/spec/rails/example/helper_spec_spec.rb
+spec/spec/rails/example/model_spec_spec.rb
+spec/spec/rails/example/shared_behaviour_spec.rb
+spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb
+spec/spec/rails/example/view_spec_spec.rb
+spec/spec/rails/extensions/action_controller_rescue_action_spec.rb
+spec/spec/rails/extensions/action_view_base_spec.rb
+spec/spec/rails/extensions/active_record_spec.rb
+spec/spec/rails/interop/testcase_spec.rb
+spec/spec/rails/matchers/ar_be_valid_spec.rb
+spec/spec/rails/matchers/assert_select_spec.rb
+spec/spec/rails/matchers/description_generation_spec.rb
+spec/spec/rails/matchers/errors_on_spec.rb
+spec/spec/rails/matchers/have_text_spec.rb
+spec/spec/rails/matchers/include_text_spec.rb
+spec/spec/rails/matchers/redirect_to_spec.rb
+spec/spec/rails/matchers/render_template_spec.rb
+spec/spec/rails/matchers/should_change_spec.rb
+spec/spec/rails/mocks/ar_classes.rb
+spec/spec/rails/mocks/mock_model_spec.rb
+spec/spec/rails/mocks/stub_model_spec.rb
+spec/spec/rails/sample_modified_fixture.rb
+spec/spec/rails/sample_spec.rb
+spec/spec/rails/spec_server_spec.rb
+spec/spec/rails/spec_spec.rb
 spec/spec_helper.rb

data/Rakefile

@@ -1,6 +1,11 @@
 require 'rubygems'
 require 'hoe'
 require './lib/spec/rails/version'
+require 'cucumber/rake/task'
+
+$:.unshift(File.join(File.dirname(__FILE__), "/../rspec/lib"))
+
+require 'spec/rake/spectask'
 
 class Hoe
   def extra_deps
@@ -15,7 +20,7 @@ Hoe.new('rspec-rails', Spec::Rails::VERSION::STRING) do |p|
   p.description = "Behaviour Driven Development for Ruby on Rails."
   p.rubyforge_name = 'rspec'
   p.developer('RSpec Development Team', 'rspec-devel@rubyforge.org')
-  p.extra_deps = [["rspec","1.1.11.3"]]
+  p.extra_deps = [["rspec","1.1.11.4"]]
   p.extra_dev_deps = [["cucumber",">= 0.1.13"]]
   p.remote_rdoc_dir = "rspec-rails/#{Spec::Rails::VERSION::STRING}"
 end
@@ -37,4 +42,14 @@ task :release => [:clean, :package] do |t|
   ["#{pkg}.gem", "#{pkg}.tgz"].each do |file|
     rubyforge.add_file('rspec', 'rspec', Spec::Rails::VERSION::STRING, file)
   end
-end
+end
+
+task :spec do
+  system "spec spec"
+end
+
+Spec::Rake::SpecTask.new
+
+Cucumber::Rake::Task.new
+
+task :default => [:features]

data/features/support/env.rb

@@ -9,3 +9,5 @@ Cucumber::Rails.use_transactional_fixtures
 # Comment out the next two lines if you're not using RSpec's matchers (should / should_not) in your steps.
 require 'cucumber/rails/rspec'
 # require 'webrat/rspec-rails'
+
+require File.join(File.dirname(__FILE__), "/../../spec/resources/models/person")

data/features/transactions/transactions_should_rollback.feature

@@ -5,11 +5,12 @@ Story: transactions should rollback in plain text
 
   Scenario: add one Person
     When I add a Person
+    Then there should be one person
 
-  Scenario: add another person
-    GivenScenario: add one Person
+  Scenario: add one Person for the second time
+    When I add a Person
     Then there should be one person
 
   Scenario: add yet another person
-    GivenScenario: add one Person
+    When I add a Person
     Then there should be one person

data/generators/rspec/rspec_generator.rb

@@ -24,10 +24,6 @@ class RspecGenerator < Rails::Generator::Base
       m.file      'rcov.opts',                     'spec/rcov.opts'
       m.file      'spec.opts',                     'spec/spec.opts'
       m.template  'spec_helper.rb',                'spec/spec_helper.rb'
-
-      m.directory 'stories'
-      m.file      'all_stories.rb',                'stories/all.rb'
-      m.file      'stories_helper.rb',             'stories/helper.rb'
     end
   end
 

data/generators/rspec/templates/spec_helper.rb

@@ -43,5 +43,5 @@ Spec::Runner.configure do |config|
   #
   # == Notes
   # 
-  # For more information take a look at Spec::Example::Configuration and Spec::Runner
+  # For more information take a look at Spec::Runner::Configuration and Spec::Runner
 end

data/lib/spec/rails/example/functional_example_group.rb

@@ -7,7 +7,7 @@ module Spec
 
         attr_reader :request, :response
         before(:each) do
-          @controller_class = Object.path2class @controller_class_name
+          @controller_class = @controller_class_name.split('::').inject(Object) { |k,n| k.const_get n }
           raise "Can't determine controller class for #{@controller_class_name}" if @controller_class.nil?
 
           @controller = @controller_class.new
@@ -15,7 +15,7 @@ module Spec
           @response = ActionController::TestResponse.new
           @response.session = @request.session
         end
-
+        
         def params
           request.parameters
         end

data/lib/spec/rails/extensions/spec/{example → runner}/configuration.rb

@@ -1,9 +1,9 @@
-require 'spec/example/configuration'
+require 'spec/runner/configuration'
 require 'test_help'
 
 begin
 module Spec
-  module Example
+  module Runner
     class Configuration
       
       TEST_CASE = ActiveSupport.const_defined?(:TestCase) ? ActiveSupport::TestCase : Test::Unit::TestCase

data/lib/spec/rails/extensions.rb

@@ -1,8 +1,6 @@
 require 'spec'
 
-require 'spec/rails/extensions/object'
-
-require 'spec/rails/extensions/spec/example/configuration'
+require 'spec/rails/extensions/spec/runner/configuration'
 require 'spec/rails/extensions/spec/matchers/have'
 
 require 'spec/rails/extensions/active_record/base'

data/lib/spec/rails/matchers/ar_be_valid.rb

@@ -0,0 +1,41 @@
+module Spec
+  module Rails
+    module Matchers
+    
+      class ArBeValid  #:nodoc:
+        
+        def initialize
+          @matcher = Spec::Matchers::Be.new :be_valid
+          @matcher.send :handling_predicate!
+        end
+
+        def matches?(actual)
+          @actual = actual
+          @matcher.matches? @actual
+        end
+      
+        def failure_message
+          if @actual.respond_to?(:errors) &&
+              ActiveRecord::Errors === @actual.errors
+            "Expected #{@actual.inspect} to be valid, but it was not\nErrors: " + @actual.errors.full_messages.join(", ")            
+          else
+            @matcher.failure_message
+          end
+        end
+        
+        def negative_failure_message
+          @matcher.negative_failure_message
+        end
+        
+      end
+
+      # :call-seq:
+      #   response.should be_valid
+      #   response.should_not be_valid
+      def be_valid
+        ArBeValid.new
+      end
+    
+    end
+  end
+end

data/lib/spec/rails/matchers.rb

@@ -1,4 +1,5 @@
 dir = File.dirname(__FILE__)
+require 'spec/rails/matchers/ar_be_valid'
 require 'spec/rails/matchers/assert_select'
 require 'spec/rails/matchers/change'
 require 'spec/rails/matchers/have_text'

data/lib/spec/rails/version.rb

@@ -5,7 +5,7 @@ module Spec
         MAJOR  = 1
         MINOR  = 1
         TINY   = 11
-        MINESCULE = 3
+        MINESCULE = 4
 
         STRING = [MAJOR, MINOR, TINY, MINESCULE].join('.')
 

data/rspec-rails.gemspec

@@ -2,35 +2,35 @@
 
 Gem::Specification.new do |s|
   s.name = %q{rspec-rails}
-  s.version = "1.1.11.3"
+  s.version = "1.1.11.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["RSpec Development Team"]
-  s.date = %q{2008-12-19}
+  s.date = %q{2008-12-29}
   s.description = %q{Behaviour Driven Development for Ruby on Rails.}
   s.email = ["rspec-devel@rubyforge.org"]
   s.extra_rdoc_files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "generators/rspec/templates/previous_failures.txt"]
-  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "features/step_definitions/people.rb", "features/support/env.rb", "features/transactions/transactions_should_rollback.feature", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/all_stories.rb", "generators/rspec/templates/previous_failures.txt", "generators/rspec/templates/rcov.opts", "generators/rspec/templates/rspec.rake", "generators/rspec/templates/script/autospec", "generators/rspec/templates/script/spec", "generators/rspec/templates/script/spec_server", "generators/rspec/templates/spec.opts", "generators/rspec/templates/spec_helper.rb", "generators/rspec/templates/stories_helper.rb", "generators/rspec_controller/USAGE", "generators/rspec_controller/rspec_controller_generator.rb", "generators/rspec_controller/templates/controller_spec.rb", "generators/rspec_controller/templates/helper_spec.rb", "generators/rspec_controller/templates/view_spec.rb", "generators/rspec_default_values.rb", "generators/rspec_model/USAGE", "generators/rspec_model/rspec_model_generator.rb", "generators/rspec_model/templates/model_spec.rb", "generators/rspec_scaffold/rspec_scaffold_generator.rb", "generators/rspec_scaffold/templates/controller_spec.rb", "generators/rspec_scaffold/templates/edit_erb_spec.rb", "generators/rspec_scaffold/templates/helper_spec.rb", "generators/rspec_scaffold/templates/index_erb_spec.rb", "generators/rspec_scaffold/templates/new_erb_spec.rb", "generators/rspec_scaffold/templates/routing_spec.rb", "generators/rspec_scaffold/templates/show_erb_spec.rb", "init.rb", "lib/autotest/discover.rb", "lib/autotest/rails_rspec.rb", "lib/spec/rails.rb", "lib/spec/rails/example.rb", "lib/spec/rails/example/assigns_hash_proxy.rb", "lib/spec/rails/example/controller_example_group.rb", "lib/spec/rails/example/cookies_proxy.rb", "lib/spec/rails/example/functional_example_group.rb", "lib/spec/rails/example/helper_example_group.rb", "lib/spec/rails/example/model_example_group.rb", "lib/spec/rails/example/rails_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/base.rb", "lib/spec/rails/extensions/action_controller/rescue.rb", "lib/spec/rails/extensions/action_controller/test_response.rb", "lib/spec/rails/extensions/action_view/base.rb", "lib/spec/rails/extensions/active_record/base.rb", "lib/spec/rails/extensions/object.rb", "lib/spec/rails/extensions/spec/example/configuration.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/assert_select.rb", "lib/spec/rails/matchers/change.rb", "lib/spec/rails/matchers/have_text.rb", "lib/spec/rails/matchers/include_text.rb", "lib/spec/rails/matchers/redirect_to.rb", "lib/spec/rails/matchers/render_template.rb", "lib/spec/rails/mocks.rb", "lib/spec/rails/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/rails/autotest/mappings_spec.rb", "spec/rails/example/assigns_hash_proxy_spec.rb", "spec/rails/example/configuration_spec.rb", "spec/rails/example/controller_isolation_spec.rb", "spec/rails/example/controller_spec_spec.rb", "spec/rails/example/cookies_proxy_spec.rb", "spec/rails/example/example_group_factory_spec.rb", "spec/rails/example/helper_spec_spec.rb", "spec/rails/example/model_spec_spec.rb", "spec/rails/example/shared_behaviour_spec.rb", "spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/rails/example/view_spec_spec.rb", "spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/rails/extensions/action_view_base_spec.rb", "spec/rails/extensions/active_record_spec.rb", "spec/rails/interop/testcase_spec.rb", "spec/rails/matchers/assert_select_spec.rb", "spec/rails/matchers/description_generation_spec.rb", "spec/rails/matchers/errors_on_spec.rb", "spec/rails/matchers/have_text_spec.rb", "spec/rails/matchers/include_text_spec.rb", "spec/rails/matchers/redirect_to_spec.rb", "spec/rails/matchers/render_template_spec.rb", "spec/rails/matchers/should_change_spec.rb", "spec/rails/mocks/ar_classes.rb", "spec/rails/mocks/mock_model_spec.rb", "spec/rails/mocks/stub_model_spec.rb", "spec/rails/sample_modified_fixture.rb", "spec/rails/sample_spec.rb", "spec/rails/spec_server_spec.rb", "spec/rails/spec_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/controller_spec_controller.rb", "spec/resources/controllers/redirect_spec_controller.rb", "spec/resources/controllers/render_spec_controller.rb", "spec/resources/controllers/rjs_spec_controller.rb", "spec/resources/helpers/addition_helper.rb", "spec/resources/helpers/explicit_helper.rb", "spec/resources/helpers/more_explicit_helper.rb", "spec/resources/helpers/plugin_application_helper.rb", "spec/resources/helpers/view_spec_helper.rb", "spec/resources/views/controller_spec/_partial.rhtml", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml", "spec/resources/views/controller_spec/action_with_errors_in_template.rhtml", "spec/resources/views/controller_spec/action_with_template.rhtml", "spec/resources/views/layouts/application.rhtml", "spec/resources/views/layouts/simple.rhtml", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.rhtml", "spec/resources/views/render_spec/action_with_alternate_layout.rhtml", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/render_spec/some_action.rhtml", "spec/resources/views/render_spec/some_action.rjs", "spec/resources/views/rjs_spec/_replacement_partial.rhtml", "spec/resources/views/rjs_spec/hide_div.rjs", "spec/resources/views/rjs_spec/hide_page_element.rjs", "spec/resources/views/rjs_spec/insert_html.rjs", "spec/resources/views/rjs_spec/replace.rjs", "spec/resources/views/rjs_spec/replace_html.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.rjs", "spec/resources/views/rjs_spec/visual_effect.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.rjs", "spec/resources/views/tag_spec/no_tags.rhtml", "spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml", "spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml", "spec/resources/views/view_spec/_partial.rhtml", "spec/resources/views/view_spec/_partial_used_twice.rhtml", "spec/resources/views/view_spec/_partial_with_local_variable.rhtml", "spec/resources/views/view_spec/_partial_with_sub_partial.rhtml", "spec/resources/views/view_spec/_spacer.rhtml", "spec/resources/views/view_spec/accessor.rhtml", "spec/resources/views/view_spec/block_helper.rhtml", "spec/resources/views/view_spec/entry_form.rhtml", "spec/resources/views/view_spec/explicit_helper.rhtml", "spec/resources/views/view_spec/foo/show.rhtml", "spec/resources/views/view_spec/implicit_helper.rhtml", "spec/resources/views/view_spec/multiple_helpers.rhtml", "spec/resources/views/view_spec/path_params.html.erb", "spec/resources/views/view_spec/should_not_receive.rhtml", "spec/resources/views/view_spec/template_with_partial.rhtml", "spec/resources/views/view_spec/template_with_partial_using_collection.rhtml", "spec/resources/views/view_spec/template_with_partial_with_array.rhtml", "spec/spec_helper.rb"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "features/step_definitions/people.rb", "features/support/env.rb", "features/transactions/transactions_should_rollback.feature", "generators/rspec/CHANGES", "generators/rspec/rspec_generator.rb", "generators/rspec/templates/previous_failures.txt", "generators/rspec/templates/rcov.opts", "generators/rspec/templates/rspec.rake", "generators/rspec/templates/script/autospec", "generators/rspec/templates/script/spec", "generators/rspec/templates/script/spec_server", "generators/rspec/templates/spec.opts", "generators/rspec/templates/spec_helper.rb", "generators/rspec_controller/USAGE", "generators/rspec_controller/rspec_controller_generator.rb", "generators/rspec_controller/templates/controller_spec.rb", "generators/rspec_controller/templates/helper_spec.rb", "generators/rspec_controller/templates/view_spec.rb", "generators/rspec_default_values.rb", "generators/rspec_model/USAGE", "generators/rspec_model/rspec_model_generator.rb", "generators/rspec_model/templates/model_spec.rb", "generators/rspec_scaffold/rspec_scaffold_generator.rb", "generators/rspec_scaffold/templates/controller_spec.rb", "generators/rspec_scaffold/templates/edit_erb_spec.rb", "generators/rspec_scaffold/templates/helper_spec.rb", "generators/rspec_scaffold/templates/index_erb_spec.rb", "generators/rspec_scaffold/templates/new_erb_spec.rb", "generators/rspec_scaffold/templates/routing_spec.rb", "generators/rspec_scaffold/templates/show_erb_spec.rb", "init.rb", "lib/autotest/discover.rb", "lib/autotest/rails_rspec.rb", "lib/spec/rails.rb", "lib/spec/rails/example.rb", "lib/spec/rails/example/assigns_hash_proxy.rb", "lib/spec/rails/example/controller_example_group.rb", "lib/spec/rails/example/cookies_proxy.rb", "lib/spec/rails/example/functional_example_group.rb", "lib/spec/rails/example/helper_example_group.rb", "lib/spec/rails/example/model_example_group.rb", "lib/spec/rails/example/rails_example_group.rb", "lib/spec/rails/example/render_observer.rb", "lib/spec/rails/example/view_example_group.rb", "lib/spec/rails/extensions.rb", "lib/spec/rails/extensions/action_controller/base.rb", "lib/spec/rails/extensions/action_controller/rescue.rb", "lib/spec/rails/extensions/action_controller/test_response.rb", "lib/spec/rails/extensions/action_view/base.rb", "lib/spec/rails/extensions/active_record/base.rb", "lib/spec/rails/extensions/spec/matchers/have.rb", "lib/spec/rails/extensions/spec/runner/configuration.rb", "lib/spec/rails/interop/testcase.rb", "lib/spec/rails/matchers.rb", "lib/spec/rails/matchers/ar_be_valid.rb", "lib/spec/rails/matchers/assert_select.rb", "lib/spec/rails/matchers/change.rb", "lib/spec/rails/matchers/have_text.rb", "lib/spec/rails/matchers/include_text.rb", "lib/spec/rails/matchers/redirect_to.rb", "lib/spec/rails/matchers/render_template.rb", "lib/spec/rails/mocks.rb", "lib/spec/rails/story_adapter.rb", "lib/spec/rails/version.rb", "rspec-rails.gemspec", "spec/autotest/mappings_spec.rb", "spec/rails_suite.rb", "spec/resources/controllers/action_view_base_spec_controller.rb", "spec/resources/controllers/application.rb", "spec/resources/controllers/controller_spec_controller.rb", "spec/resources/controllers/redirect_spec_controller.rb", "spec/resources/controllers/render_spec_controller.rb", "spec/resources/controllers/rjs_spec_controller.rb", "spec/resources/helpers/addition_helper.rb", "spec/resources/helpers/explicit_helper.rb", "spec/resources/helpers/more_explicit_helper.rb", "spec/resources/helpers/plugin_application_helper.rb", "spec/resources/helpers/view_spec_helper.rb", "spec/resources/models/animal.rb", "spec/resources/models/person.rb", "spec/resources/models/thing.rb", "spec/resources/views/controller_spec/_partial.rhtml", "spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml", "spec/resources/views/controller_spec/action_setting_the_assigns_hash.rhtml", "spec/resources/views/controller_spec/action_with_errors_in_template.rhtml", "spec/resources/views/controller_spec/action_with_template.rhtml", "spec/resources/views/layouts/application.rhtml", "spec/resources/views/layouts/simple.rhtml", "spec/resources/views/objects/_object.html.erb", "spec/resources/views/render_spec/_a_partial.rhtml", "spec/resources/views/render_spec/action_with_alternate_layout.rhtml", "spec/resources/views/render_spec/some_action.js.rjs", "spec/resources/views/render_spec/some_action.rhtml", "spec/resources/views/render_spec/some_action.rjs", "spec/resources/views/rjs_spec/_replacement_partial.rhtml", "spec/resources/views/rjs_spec/hide_div.rjs", "spec/resources/views/rjs_spec/hide_page_element.rjs", "spec/resources/views/rjs_spec/insert_html.rjs", "spec/resources/views/rjs_spec/replace.rjs", "spec/resources/views/rjs_spec/replace_html.rjs", "spec/resources/views/rjs_spec/replace_html_with_partial.rjs", "spec/resources/views/rjs_spec/visual_effect.rjs", "spec/resources/views/rjs_spec/visual_toggle_effect.rjs", "spec/resources/views/tag_spec/no_tags.rhtml", "spec/resources/views/tag_spec/single_div_with_no_attributes.rhtml", "spec/resources/views/tag_spec/single_div_with_one_attribute.rhtml", "spec/resources/views/view_spec/_partial.rhtml", "spec/resources/views/view_spec/_partial_used_twice.rhtml", "spec/resources/views/view_spec/_partial_with_local_variable.rhtml", "spec/resources/views/view_spec/_partial_with_sub_partial.rhtml", "spec/resources/views/view_spec/_spacer.rhtml", "spec/resources/views/view_spec/accessor.rhtml", "spec/resources/views/view_spec/block_helper.rhtml", "spec/resources/views/view_spec/entry_form.rhtml", "spec/resources/views/view_spec/explicit_helper.rhtml", "spec/resources/views/view_spec/foo/show.rhtml", "spec/resources/views/view_spec/implicit_helper.rhtml", "spec/resources/views/view_spec/multiple_helpers.rhtml", "spec/resources/views/view_spec/path_params.html.erb", "spec/resources/views/view_spec/should_not_receive.rhtml", "spec/resources/views/view_spec/template_with_partial.rhtml", "spec/resources/views/view_spec/template_with_partial_using_collection.rhtml", "spec/resources/views/view_spec/template_with_partial_with_array.rhtml", "spec/spec/rails/example/assigns_hash_proxy_spec.rb", "spec/spec/rails/example/configuration_spec.rb", "spec/spec/rails/example/controller_isolation_spec.rb", "spec/spec/rails/example/controller_spec_spec.rb", "spec/spec/rails/example/cookies_proxy_spec.rb", "spec/spec/rails/example/example_group_factory_spec.rb", "spec/spec/rails/example/helper_spec_spec.rb", "spec/spec/rails/example/model_spec_spec.rb", "spec/spec/rails/example/shared_behaviour_spec.rb", "spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb", "spec/spec/rails/example/view_spec_spec.rb", "spec/spec/rails/extensions/action_controller_rescue_action_spec.rb", "spec/spec/rails/extensions/action_view_base_spec.rb", "spec/spec/rails/extensions/active_record_spec.rb", "spec/spec/rails/interop/testcase_spec.rb", "spec/spec/rails/matchers/ar_be_valid_spec.rb", "spec/spec/rails/matchers/assert_select_spec.rb", "spec/spec/rails/matchers/description_generation_spec.rb", "spec/spec/rails/matchers/errors_on_spec.rb", "spec/spec/rails/matchers/have_text_spec.rb", "spec/spec/rails/matchers/include_text_spec.rb", "spec/spec/rails/matchers/redirect_to_spec.rb", "spec/spec/rails/matchers/render_template_spec.rb", "spec/spec/rails/matchers/should_change_spec.rb", "spec/spec/rails/mocks/ar_classes.rb", "spec/spec/rails/mocks/mock_model_spec.rb", "spec/spec/rails/mocks/stub_model_spec.rb", "spec/spec/rails/sample_modified_fixture.rb", "spec/spec/rails/sample_spec.rb", "spec/spec/rails/spec_server_spec.rb", "spec/spec/rails/spec_spec.rb", "spec/spec_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://rspec.info/}
   s.rdoc_options = ["--main", "README.txt"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{rspec}
   s.rubygems_version = %q{1.3.1}
-  s.summary = %q{rspec-rails 1.1.11.3}
+  s.summary = %q{rspec-rails 1.1.11.4}
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 2
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.3"])
+      s.add_runtime_dependency(%q<rspec>, ["= 1.1.11.4"])
       s.add_development_dependency(%q<cucumber>, [">= 0.1.13"])
       s.add_development_dependency(%q<hoe>, [">= 1.8.2"])
     else
-      s.add_dependency(%q<rspec>, ["= 1.1.11.3"])
+      s.add_dependency(%q<rspec>, ["= 1.1.11.4"])
     end
   else
-    s.add_dependency(%q<rspec>, ["= 1.1.11.3"])
+    s.add_dependency(%q<rspec>, ["= 1.1.11.4"])
   end
 end

data/spec/{rails/autotest → autotest}/mappings_spec.rb

@@ -1,6 +1,6 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
-require File.join(File.dirname(__FILE__), *%w[.. .. .. lib autotest rails_rspec])
-require File.join(File.dirname(__FILE__), *%w[.. .. .. .. rspec spec autotest autotest_matchers])
+require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../lib/autotest/rails_rspec'
+require File.dirname(__FILE__) + '/../../../rspec/spec/autotest/autotest_matchers'
 
 describe Autotest::RailsRspec, "file mapping" do
   before(:each) do

data/spec/resources/controllers/application.rb

@@ -0,0 +1,9 @@
+class ApplicationController < ActionController::Base
+  before_filter :i_should_only_be_run_once, 
+                :only => 'action_with_inherited_before_filter'
+  
+  def i_should_only_be_run_once
+    true
+  end
+  private :i_should_only_be_run_once
+end

data/spec/resources/models/animal.rb

@@ -0,0 +1,4 @@
+class Animal < ActiveRecord::Base
+  belongs_to :person
+  validates_uniqueness_of :name
+end

data/spec/resources/models/person.rb

@@ -0,0 +1,18 @@
+class Person < ActiveRecord::Base
+  has_many :animals do
+    def pups
+      find(:all, :conditions => 'age < 1')
+    end
+    def adults
+      find(:all, :conditions => 'age >= 1')
+    end
+  end
+  validates_presence_of :name
+  
+  def add_animal animal
+    animal.person = self
+    animals << animal
+    animal.save
+  end
+    
+end

data/spec/resources/models/thing.rb

@@ -0,0 +1,3 @@
+class Thing < ActiveRecord::Base
+  validates_presence_of :name
+end

data/spec/{rails → spec/rails}/example/assigns_hash_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "AssignsHashProxy" do
   def orig_assigns

data/spec/{rails → spec/rails}/example/configuration_spec.rb

@@ -1,7 +1,7 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module Spec
-  module Example
+  module Runner
     describe Configuration do
 
       def config
@@ -9,18 +9,18 @@ module Spec
       end
 
       describe "#use_transactional_fixtures" do
-        it "should return #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures" do
-          config.use_transactional_fixtures.should == Spec::Example::Configuration::TEST_CASE.use_transactional_fixtures
+        it "should return #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures" do
+          config.use_transactional_fixtures.should == Spec::Runner::Configuration::TEST_CASE.use_transactional_fixtures
         end
 
-        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures to false" do
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures to false" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_transactional_fixtures=).with(false)
           end
           config.use_transactional_fixtures = false
         end
 
-        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures to true" do
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures to true" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_transactional_fixtures=).with(true)
           end
@@ -29,18 +29,18 @@ module Spec
       end
 
       describe "#use_instantiated_fixtures" do
-        it "should return #{Spec::Example::Configuration::TEST_CASE}.use_transactional_fixtures" do
-          config.use_instantiated_fixtures.should == Spec::Example::Configuration::TEST_CASE.use_instantiated_fixtures
+        it "should return #{Spec::Runner::Configuration::TEST_CASE}.use_transactional_fixtures" do
+          config.use_instantiated_fixtures.should == Spec::Runner::Configuration::TEST_CASE.use_instantiated_fixtures
         end
 
-        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_instantiated_fixtures to false" do
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_instantiated_fixtures to false" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_instantiated_fixtures=).with(false)
           end
           config.use_instantiated_fixtures = false
         end
 
-        it "should set #{Spec::Example::Configuration::TEST_CASE}.use_instantiated_fixtures to true" do
+        it "should set #{Spec::Runner::Configuration::TEST_CASE}.use_instantiated_fixtures to true" do
           Configuration::EXAMPLE_GROUP_CLASSES.each do |example_group|
             example_group.should_receive(:use_instantiated_fixtures=).with(true)
           end

data/spec/{rails → spec/rails}/example/controller_isolation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'controller_spec_controller'
 
 describe "a controller spec running in isolation mode", :type => :controller do

data/spec/{rails → spec/rails}/example/controller_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'controller_spec_controller'
 
 ['integration', 'isolation'].each do |mode|

data/spec/{rails → spec/rails}/example/cookies_proxy_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 class CookiesProxyExamplesController < ActionController::Base
   def index

data/spec/{rails → spec/rails}/example/example_group_factory_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module Spec
   module Example

data/spec/{rails → spec/rails}/example/helper_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 Spec::Runner.configuration.global_fixtures = :people
 
 describe ExplicitHelper, :type => :helper do

data/spec/{rails → spec/rails}/example/model_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module Spec
   module Rails

data/spec/{rails → spec/rails}/example/shared_behaviour_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "A shared view example_group", :shared => true do
   it "should have some tag with some text" do

data/spec/{rails → spec/rails}/example/test_unit_assertion_accessibility_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "assert_equal", :shared => true do
   it "like assert_equal" do

data/spec/{rails → spec/rails}/example/view_spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "A template with an implicit helper", :type => :view do
   before(:each) do

data/spec/{rails → spec/rails}/extensions/action_controller_rescue_action_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 module ActionController
   describe "Rescue", "#rescue_action in default mode" do

data/spec/{rails → spec/rails}/extensions/action_view_base_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require 'spec/mocks/errors'
 
 describe ActionView::Base, "with RSpec extensions:", :type => :view do 

data/spec/{rails → spec/rails}/extensions/active_record_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "A model" do
   fixtures :things

data/spec/{rails → spec/rails}/interop/testcase_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 
 if ActiveSupport.const_defined?(:Callbacks) && Test::Unit::TestCase.include?(ActiveSupport::Callbacks)

data/spec/spec/rails/matchers/ar_be_valid_spec.rb

@@ -0,0 +1,35 @@
+require File.dirname(__FILE__) + '/../../../spec_helper'
+
+describe "be_valid" do
+  class CanBeValid
+    def initialize(valid)
+      @valid = valid
+    end
+    def valid?; @valid end
+  end
+
+  it "should behave like normal be_valid matcher" do
+    CanBeValid.new(true).should be_valid
+    CanBeValid.new(false).should_not be_valid
+  end
+
+  class CanHaveErrors
+    def initialize(errors)
+      @valid = !errors
+      @errors = ActiveRecord::Errors.new self
+      @errors.add :name, "is too short"
+    end
+    attr_reader :errors
+    def valid?; @valid end
+
+    def self.human_attribute_name(ignore)
+      "Name"
+    end
+  end
+
+  it "should show errors in the output if they're available" do
+    lambda { 
+      CanHaveErrors.new(true).should be_valid
+    }.should fail_with(/Name is too short/)
+  end
+end

data/spec/{rails → spec/rails}/matchers/assert_select_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 # assert_select plugins for Rails
 #

data/spec/{rails → spec/rails}/matchers/description_generation_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 class DescriptionGenerationSpecController < ActionController::Base
   def render_action

data/spec/{rails → spec/rails}/matchers/errors_on_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "error_on" do
   it "should provide a description including the name of what the error is on" do

data/spec/{rails → spec/rails}/matchers/have_text_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "have_text" do
   

data/spec/{rails → spec/rails}/matchers/include_text_spec.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "include_text" do
 

data/spec/{rails → spec/rails}/matchers/redirect_to_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 ['isolation','integration'].each do |mode|
   describe "redirect_to behaviour", :type => :controller do

data/spec/{rails → spec/rails}/matchers/render_template_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 ['isolation','integration'].each do |mode|
   describe "response.should render_template (in #{mode} mode)",

data/spec/{rails → spec/rails}/matchers/should_change_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 
 describe "should change" do
   describe "handling association proxies" do

data/spec/{rails → spec/rails}/mocks/mock_model_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require File.dirname(__FILE__) + '/ar_classes'
 
 describe "mock_model" do

data/spec/{rails → spec/rails}/mocks/stub_model_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../../spec_helper'
+require File.dirname(__FILE__) + '/../../../spec_helper'
 require File.dirname(__FILE__) + '/ar_classes'
 
 describe "stub_model" do

data/spec/{rails → spec/rails}/sample_modified_fixture.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "A sample spec", :type => :model do
   fixtures :animals

data/spec/{rails → spec/rails}/sample_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "A sample spec", :type => :model do
   fixtures :animals

data/spec/{rails → spec/rails}/spec_server_spec.rb

@@ -1,4 +1,4 @@
-# require File.dirname(__FILE__) + '/../spec_helper'
+# require File.dirname(__FILE__) + '/../../spec_helper'
 # 
 # describe "script/spec_server file", :shared => true do
 #   attr_accessor :tmbundle_install_directory

data/spec/{rails → spec/rails}/spec_spec.rb

@@ -1,4 +1,4 @@
-require File.dirname(__FILE__) + '/../spec_helper'
+require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "script/spec file" do
   it "should run a spec" do

data/spec/spec_helper.rb

@@ -3,6 +3,7 @@ $LOAD_PATH.unshift(File.expand_path("#{dir}/../rspec/lib"))
 $LOAD_PATH.unshift(File.expand_path("#{dir}/resources/controllers"))
 $LOAD_PATH.unshift(File.expand_path("#{dir}/resources/helpers"))
 require File.expand_path("#{dir}/../../../../spec/spec_helper")
+require File.expand_path("#{dir}/resources/controllers/application")
 require File.expand_path("#{dir}/resources/controllers/render_spec_controller")
 require File.expand_path("#{dir}/resources/controllers/rjs_spec_controller")
 require File.expand_path("#{dir}/resources/controllers/redirect_spec_controller")
@@ -13,6 +14,10 @@ require File.expand_path("#{dir}/resources/helpers/more_explicit_helper")
 require File.expand_path("#{dir}/resources/helpers/view_spec_helper")
 require File.expand_path("#{dir}/resources/helpers/plugin_application_helper")
 
+require File.expand_path("#{dir}/resources/models/animal")
+require File.expand_path("#{dir}/resources/models/person")
+require File.expand_path("#{dir}/resources/models/thing")
+
 extra_controller_paths = File.expand_path("#{dir}/resources/controllers")
 
 unless ActionController::Routing.controller_paths.include?(extra_controller_paths)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dchelimsky-rspec-rails
 version: !ruby/object:Gem::Version 
-  version: 1.1.11.3
+  version: 1.1.11.4
 platform: ruby
 authors: 
 - RSpec Development Team
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-12-19 00:00:00 -08:00
+date: 2008-12-29 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.1.11.3
+        version: 1.1.11.4
     version: 
 description: Behaviour Driven Development for Ruby on Rails.
 email: 
@@ -45,7 +45,6 @@ files:
 - features/transactions/transactions_should_rollback.feature
 - generators/rspec/CHANGES
 - generators/rspec/rspec_generator.rb
-- generators/rspec/templates/all_stories.rb
 - generators/rspec/templates/previous_failures.txt
 - generators/rspec/templates/rcov.opts
 - generators/rspec/templates/rspec.rake
@@ -54,7 +53,6 @@ files:
 - generators/rspec/templates/script/spec_server
 - generators/rspec/templates/spec.opts
 - generators/rspec/templates/spec_helper.rb
-- generators/rspec/templates/stories_helper.rb
 - generators/rspec_controller/USAGE
 - generators/rspec_controller/rspec_controller_generator.rb
 - generators/rspec_controller/templates/controller_spec.rb
@@ -92,11 +90,11 @@ files:
 - lib/spec/rails/extensions/action_controller/test_response.rb
 - lib/spec/rails/extensions/action_view/base.rb
 - lib/spec/rails/extensions/active_record/base.rb
-- lib/spec/rails/extensions/object.rb
-- lib/spec/rails/extensions/spec/example/configuration.rb
 - lib/spec/rails/extensions/spec/matchers/have.rb
+- lib/spec/rails/extensions/spec/runner/configuration.rb
 - lib/spec/rails/interop/testcase.rb
 - lib/spec/rails/matchers.rb
+- lib/spec/rails/matchers/ar_be_valid.rb
 - lib/spec/rails/matchers/assert_select.rb
 - lib/spec/rails/matchers/change.rb
 - lib/spec/rails/matchers/have_text.rb
@@ -107,39 +105,10 @@ files:
 - lib/spec/rails/story_adapter.rb
 - lib/spec/rails/version.rb
 - rspec-rails.gemspec
-- spec/rails/autotest/mappings_spec.rb
-- spec/rails/example/assigns_hash_proxy_spec.rb
-- spec/rails/example/configuration_spec.rb
-- spec/rails/example/controller_isolation_spec.rb
-- spec/rails/example/controller_spec_spec.rb
-- spec/rails/example/cookies_proxy_spec.rb
-- spec/rails/example/example_group_factory_spec.rb
-- spec/rails/example/helper_spec_spec.rb
-- spec/rails/example/model_spec_spec.rb
-- spec/rails/example/shared_behaviour_spec.rb
-- spec/rails/example/test_unit_assertion_accessibility_spec.rb
-- spec/rails/example/view_spec_spec.rb
-- spec/rails/extensions/action_controller_rescue_action_spec.rb
-- spec/rails/extensions/action_view_base_spec.rb
-- spec/rails/extensions/active_record_spec.rb
-- spec/rails/interop/testcase_spec.rb
-- spec/rails/matchers/assert_select_spec.rb
-- spec/rails/matchers/description_generation_spec.rb
-- spec/rails/matchers/errors_on_spec.rb
-- spec/rails/matchers/have_text_spec.rb
-- spec/rails/matchers/include_text_spec.rb
-- spec/rails/matchers/redirect_to_spec.rb
-- spec/rails/matchers/render_template_spec.rb
-- spec/rails/matchers/should_change_spec.rb
-- spec/rails/mocks/ar_classes.rb
-- spec/rails/mocks/mock_model_spec.rb
-- spec/rails/mocks/stub_model_spec.rb
-- spec/rails/sample_modified_fixture.rb
-- spec/rails/sample_spec.rb
-- spec/rails/spec_server_spec.rb
-- spec/rails/spec_spec.rb
+- spec/autotest/mappings_spec.rb
 - spec/rails_suite.rb
 - spec/resources/controllers/action_view_base_spec_controller.rb
+- spec/resources/controllers/application.rb
 - spec/resources/controllers/controller_spec_controller.rb
 - spec/resources/controllers/redirect_spec_controller.rb
 - spec/resources/controllers/render_spec_controller.rb
@@ -149,6 +118,9 @@ files:
 - spec/resources/helpers/more_explicit_helper.rb
 - spec/resources/helpers/plugin_application_helper.rb
 - spec/resources/helpers/view_spec_helper.rb
+- spec/resources/models/animal.rb
+- spec/resources/models/person.rb
+- spec/resources/models/thing.rb
 - spec/resources/views/controller_spec/_partial.rhtml
 - spec/resources/views/controller_spec/action_setting_flash_after_session_reset.rhtml
 - spec/resources/views/controller_spec/action_setting_flash_before_session_reset.rhtml
@@ -192,6 +164,37 @@ files:
 - spec/resources/views/view_spec/template_with_partial.rhtml
 - spec/resources/views/view_spec/template_with_partial_using_collection.rhtml
 - spec/resources/views/view_spec/template_with_partial_with_array.rhtml
+- spec/spec/rails/example/assigns_hash_proxy_spec.rb
+- spec/spec/rails/example/configuration_spec.rb
+- spec/spec/rails/example/controller_isolation_spec.rb
+- spec/spec/rails/example/controller_spec_spec.rb
+- spec/spec/rails/example/cookies_proxy_spec.rb
+- spec/spec/rails/example/example_group_factory_spec.rb
+- spec/spec/rails/example/helper_spec_spec.rb
+- spec/spec/rails/example/model_spec_spec.rb
+- spec/spec/rails/example/shared_behaviour_spec.rb
+- spec/spec/rails/example/test_unit_assertion_accessibility_spec.rb
+- spec/spec/rails/example/view_spec_spec.rb
+- spec/spec/rails/extensions/action_controller_rescue_action_spec.rb
+- spec/spec/rails/extensions/action_view_base_spec.rb
+- spec/spec/rails/extensions/active_record_spec.rb
+- spec/spec/rails/interop/testcase_spec.rb
+- spec/spec/rails/matchers/ar_be_valid_spec.rb
+- spec/spec/rails/matchers/assert_select_spec.rb
+- spec/spec/rails/matchers/description_generation_spec.rb
+- spec/spec/rails/matchers/errors_on_spec.rb
+- spec/spec/rails/matchers/have_text_spec.rb
+- spec/spec/rails/matchers/include_text_spec.rb
+- spec/spec/rails/matchers/redirect_to_spec.rb
+- spec/spec/rails/matchers/render_template_spec.rb
+- spec/spec/rails/matchers/should_change_spec.rb
+- spec/spec/rails/mocks/ar_classes.rb
+- spec/spec/rails/mocks/mock_model_spec.rb
+- spec/spec/rails/mocks/stub_model_spec.rb
+- spec/spec/rails/sample_modified_fixture.rb
+- spec/spec/rails/sample_spec.rb
+- spec/spec/rails/spec_server_spec.rb
+- spec/spec/rails/spec_spec.rb
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://rspec.info/
@@ -219,6 +222,6 @@ rubyforge_project: rspec
 rubygems_version: 1.2.0
 signing_key: 
 specification_version: 2
-summary: rspec-rails 1.1.11.3
+summary: rspec-rails 1.1.11.4
 test_files: []
 

data/generators/rspec/templates/all_stories.rb

@@ -1,4 +0,0 @@
-dir = File.dirname(__FILE__)
-Dir[File.expand_path("#{dir}/**/*.rb")].uniq.each do |file|
-  require file
-end

data/generators/rspec/templates/stories_helper.rb

@@ -1,3 +0,0 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec/rails/story_adapter'

data/lib/spec/rails/extensions/object.rb

@@ -1,5 +0,0 @@
-class Object # :nodoc:
-  def self.path2class(klassname)
-    klassname.split('::').inject(Object) { |k,n| k.const_get n }
-  end
-end