cleaner scoping

- def classes/modules in RSpec::Rails::Matchers instead of
  RSpec::Matchers
- less opening classes/more includuing modules

lib/rspec/rails/example/rails_example_group.rb

@@ -4,6 +4,7 @@ module RailsExampleGroup
       extend ActiveSupport::Concern
       include RSpec::Rails::SetupAndTeardownAdapter
       include RSpec::Rails::TestUnitAssertionAdapter
+      include RSpec::Rails::Matchers
     end
   end
 end

lib/rspec/rails/matchers/be_a_new.rb

@@ -1,6 +1,6 @@
-module RSpec::Matchers
+module RSpec::Rails::Matchers
   class BeANew
-    include BaseMatcher
+    include RSpec::Matchers::BaseMatcher
 
     # @api private
     def matches?(actual)

lib/rspec/rails/matchers/be_new_record.rb

@@ -1,6 +1,6 @@
-module RSpec::Matchers
+module RSpec::Rails::Matchers
   class BeANewRecord
-    include BaseMatcher
+    include RSpec::Matchers::BaseMatcher
 
     # @api private
     def matches?(actual)

lib/rspec/rails/matchers/have_extension.rb

@@ -1,29 +1,35 @@
 require 'active_support/core_ext/module/aliasing'
 require 'rspec/matchers/have'
 
-module RSpec
-  module Matchers
-    class Have
-      # @api private
-      #
-      # Enhances the failure message for `should have(n)` matchers
-      def failure_message_for_should_with_errors_on_extensions
-        return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
-        return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}"  if @collection_name == :error_on
-        return failure_message_for_should_without_errors_on_extensions
-      end
-      alias_method_chain :failure_message_for_should, :errors_on_extensions
+module RSpec::Rails::Matchers
+  module HaveExtensions
+    extend ActiveSupport::Concern
+
+    # @api private
+    #
+    # Enhances the failure message for `should have(n)` matchers
+    def failure_message_for_should_with_errors_on_extensions
+      return "expected #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}, got #{@actual}" if @collection_name == :errors_on
+      return "expected #{relativities[@relativity]}#{@expected} error on :#{@args[0]}, got #{@actual}"  if @collection_name == :error_on
+      return failure_message_for_should_without_errors_on_extensions
+    end
 
-      # @api private
-      #
-      # Enhances the description for `should have(n)` matchers
-      def description_with_errors_on_extensions
-        return "have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
-        return "have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}"  if @collection_name == :error_on
-        return description_without_errors_on_extensions
-      end
+    # @api private
+    #
+    # Enhances the description for `should have(n)` matchers
+    def description_with_errors_on_extensions
+      return "have #{relativities[@relativity]}#{@expected} errors on :#{@args[0]}" if @collection_name == :errors_on
+      return "have #{relativities[@relativity]}#{@expected} error on :#{@args[0]}"  if @collection_name == :error_on
+      return description_without_errors_on_extensions
+    end
+
+    included do
+      alias_method_chain :failure_message_for_should, :errors_on_extensions
       alias_method_chain :description, :errors_on_extensions
     end
   end
 end
 
+RSpec::Matchers::Have.class_eval do
+  include RSpec::Rails::Matchers::HaveExtensions
+end

lib/rspec/rails/matchers/match_unless_raises.rb

@@ -1,5 +1,6 @@
 module RSpec::Rails::Matchers
   module MatchUnlessRaises
+    # @api private
     attr_accessor :rescued_exception
 
     # @api private

spec/rspec/rails/matchers/be_a_new_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe "be_a_new matcher" do
+  include RSpec::Rails::Matchers
+
   context "new record" do
     let(:record) do
       Class.new do

spec/rspec/rails/matchers/be_new_record_spec.rb

@@ -1,6 +1,8 @@
 require "spec_helper"
 
 describe "be_new_record" do
+  include RSpec::Rails::Matchers
+
   context "un-persisted record" do
     it "passes" do
       record = double('record', :persisted? => false)