Removed the Matchers namespace

lib/shoulda/action_controller.rb

@@ -9,31 +9,28 @@
 require 'shoulda/action_controller/redirect_to_matcher'
 require 'shoulda/action_controller/render_template_matcher'
 
-module Shoulda # :nodoc:
-  module ActionController # :nodoc:
-
-    # By using the matchers you can quickly and easily create concise and
-    # easy to read test suites.
-    #
-    # This code segment:
-    #
-    #   describe UsersController, "on GET to show with a valid id" do
-    #     before(:each) do
-    #       get :show, :id => User.first.to_param
-    #     end
-    #
-    #     it { should assign_to(:user) }
-    #     it { should respond_with(:success) }
-    #     it { should render_template(:show) }
-    #     it { should not_set_the_flash) }
-    #
-    #     it "should do something else really cool" do
-    #       assigns[:user].id.should == 1
-    #     end
-    #   end
-    #
-    # Would produce 5 tests for the show action
-    module Matchers
-    end
+module Shoulda
+  # By using the matchers you can quickly and easily create concise and
+  # easy to read test suites.
+  #
+  # This code segment:
+  #
+  #   describe UsersController, "on GET to show with a valid id" do
+  #     before(:each) do
+  #       get :show, :id => User.first.to_param
+  #     end
+  #
+  #     it { should assign_to(:user) }
+  #     it { should respond_with(:success) }
+  #     it { should render_template(:show) }
+  #     it { should not_set_the_flash) }
+  #
+  #     it "should do something else really cool" do
+  #       assigns[:user].id.should == 1
+  #     end
+  #   end
+  #
+  # Would produce 5 tests for the show action
+  module ActionController
   end
 end

lib/shoulda/action_controller/assign_to_matcher.rb

@@ -1,114 +1,112 @@
 module Shoulda # :nodoc:
   module ActionController # :nodoc:
-    module Matchers
-
-      # Ensures that the controller assigned to the named instance variable.
-      #
-      # Options:
-      # * <tt>with_kind_of</tt> - The expected class of the instance variable
-      #   being checked.
-      # * <tt>with</tt> - The value that should be assigned.
-      #
-      # Example:
-      #
-      #   it { should assign_to(:user) }
-      #   it { should_not assign_to(:user) }
-      #   it { should assign_to(:user).with_kind_of(User) }
-      #   it { should assign_to(:user).with(@user) }
-      def assign_to(variable)
-        AssignToMatcher.new(variable)
-      end
 
-      class AssignToMatcher # :nodoc:
+    # Ensures that the controller assigned to the named instance variable.
+    #
+    # Options:
+    # * <tt>with_kind_of</tt> - The expected class of the instance variable
+    #   being checked.
+    # * <tt>with</tt> - The value that should be assigned.
+    #
+    # Example:
+    #
+    #   it { should assign_to(:user) }
+    #   it { should_not assign_to(:user) }
+    #   it { should assign_to(:user).with_kind_of(User) }
+    #   it { should assign_to(:user).with(@user) }
+    def assign_to(variable)
+      AssignToMatcher.new(variable)
+    end
 
-        def initialize(variable)
-          @variable    = variable.to_s
-          @check_value = false
-        end
+    class AssignToMatcher # :nodoc:
 
-        def with_kind_of(expected_class)
-          @expected_class = expected_class
-          self
-        end
+      def initialize(variable)
+        @variable    = variable.to_s
+        @check_value = false
+      end
 
-        def with(expected_value = nil, &block)
-          @check_value       = true
-          @expected_value    = expected_value
-          @expectation_block = block
-          self
-        end
+      def with_kind_of(expected_class)
+        @expected_class = expected_class
+        self
+      end
 
-        def matches?(controller)
-          @controller = controller
-          @expected_value = @context.instance_eval(&@expectation_block) if @expectation_block
-          assigned_value? && kind_of_expected_class? && equal_to_expected_value?
-        end
+      def with(expected_value = nil, &block)
+        @check_value       = true
+        @expected_value    = expected_value
+        @expectation_block = block
+        self
+      end
 
-        attr_reader :failure_message, :negative_failure_message
+      def matches?(controller)
+        @controller = controller
+        @expected_value = @context.instance_eval(&@expectation_block) if @expectation_block
+        assigned_value? && kind_of_expected_class? && equal_to_expected_value?
+      end
 
-        def description
-          description = "assign @#{@variable}"
-          description << " with a kind of #{@expected_class}" if @expected_class
-          description
-        end
+      attr_reader :failure_message, :negative_failure_message
 
-        def in_context(context)
-          @context = context
-          self
-        end
+      def description
+        description = "assign @#{@variable}"
+        description << " with a kind of #{@expected_class}" if @expected_class
+        description
+      end
 
-        private
-
-        def assigned_value?
-          if !@controller.instance_variables.include?("@#{@variable}")
-            @failure_message =
-              "Expected action to assign a value for @#{@variable}"
-            false
-          else
-            @negative_failure_message =
-              "Didn't expect action to assign a value for @#{@variable}, " <<
-              "but it was assigned to #{assigned_value.inspect}"
-            true
-          end
-        end
+      def in_context(context)
+        @context = context
+        self
+      end
 
-        def kind_of_expected_class?
-          return true unless @expected_class
-          if assigned_value.kind_of?(@expected_class)
-            @negative_failure_message =
-              "Didn't expect action to assign a kind of #{@expected_class} " <<
-              "for #{@variable}, but got one anyway"
-            true
-          else
-            @failure_message =
-              "Expected action to assign a kind of #{@expected_class} " <<
-              "for #{@variable}, but got #{@variable.inspect} " <<
-              "(#{@variable.class.name})"
-            false
-          end
+      private
+
+      def assigned_value?
+        if !@controller.instance_variables.include?("@#{@variable}")
+          @failure_message =
+            "Expected action to assign a value for @#{@variable}"
+          false
+        else
+          @negative_failure_message =
+            "Didn't expect action to assign a value for @#{@variable}, " <<
+            "but it was assigned to #{assigned_value.inspect}"
+          true
         end
+      end
 
-        def equal_to_expected_value?
-          return true unless @check_value
-          if @expected_value == assigned_value
-            @negative_failure_message =
-              "Didn't expect action to assign #{@expected_value.inspect} " <<
-              "for #{@variable}, but got it anyway"
-            true
-          else
-            @failure_message =
-              "Expected action to assign #{@expected_value.inspect} " <<
-              "for #{@variable}, but got #{assigned_value.inspect}"
-            false
-          end
+      def kind_of_expected_class?
+        return true unless @expected_class
+        if assigned_value.kind_of?(@expected_class)
+          @negative_failure_message =
+            "Didn't expect action to assign a kind of #{@expected_class} " <<
+            "for #{@variable}, but got one anyway"
+          true
+        else
+          @failure_message =
+            "Expected action to assign a kind of #{@expected_class} " <<
+            "for #{@variable}, but got #{@variable.inspect} " <<
+            "(#{@variable.class.name})"
+          false
         end
+      end
 
-        def assigned_value
-          @controller.instance_variable_get("@#{@variable}")
+      def equal_to_expected_value?
+        return true unless @check_value
+        if @expected_value == assigned_value
+          @negative_failure_message =
+            "Didn't expect action to assign #{@expected_value.inspect} " <<
+            "for #{@variable}, but got it anyway"
+          true
+        else
+          @failure_message =
+            "Expected action to assign #{@expected_value.inspect} " <<
+            "for #{@variable}, but got #{assigned_value.inspect}"
+          false
         end
+      end
 
+      def assigned_value
+        @controller.instance_variable_get("@#{@variable}")
       end
 
     end
+
   end
 end

lib/shoulda/action_controller/filter_param_matcher.rb

@@ -1,50 +1,48 @@
 module Shoulda # :nodoc:
   module ActionController # :nodoc:
-    module Matchers
-
-      # Ensures that filter_parameter_logging is set for the specified key.
-      #
-      # Example:
-      #
-      #   it { should filter_param(:password) }
-      def filter_param(key)
-        FilterParamMatcher.new(key)
-      end
 
-      class FilterParamMatcher # :nodoc:
+    # Ensures that filter_parameter_logging is set for the specified key.
+    #
+    # Example:
+    #
+    #   it { should filter_param(:password) }
+    def filter_param(key)
+      FilterParamMatcher.new(key)
+    end
 
-        def initialize(key)
-          @key = key.to_s
-        end
+    class FilterParamMatcher # :nodoc:
 
-        def matches?(controller)
-          @controller = controller
-          filters_key?
-        end
+      def initialize(key)
+        @key = key.to_s
+      end
 
-        def failure_message
-          "Expected #{@key} to be filtered; filtered keys: #{filtered_keys.join(', ')}"
-        end
+      def matches?(controller)
+        @controller = controller
+        filters_key?
+      end
 
-        def negative_failure_message
-          "Did not expect #{@key} to be filtered"
-        end
+      def failure_message
+        "Expected #{@key} to be filtered; filtered keys: #{filtered_keys.join(', ')}"
+      end
 
-        def description
-          "filter #{@key}"
-        end
+      def negative_failure_message
+        "Did not expect #{@key} to be filtered"
+      end
 
-        private
+      def description
+        "filter #{@key}"
+      end
 
-        def filters_key?
-          filtered_keys.include?(@key)
-        end
+      private
 
-        def filtered_keys
-          Rails.application.config.filter_parameters.map { |filter| filter.to_s }
-        end
+      def filters_key?
+        filtered_keys.include?(@key)
       end
 
+      def filtered_keys
+        Rails.application.config.filter_parameters.map { |filter| filter.to_s }
+      end
     end
+
   end
 end