Fixed unnecessary pluralization of controller.name

lib/in_controller.rb

@@ -216,7 +216,7 @@ def permit! (contr)
       if @filter_block
         return contr.instance_eval(&@filter_block)
       end
-      context = @context || contr.class.controller_name.pluralize.to_sym
+      context = @context || contr.class.controller_name.to_sym
       object = @attribute_check ? load_object(contr, context) : nil
       privilege = @privilege || :"#{contr.action_name}"
 

test/authorization_test.rb

@@ -19,6 +19,20 @@ def test_permit
     assert !engine.permit?(:test, :context => :permissions, 
       :user => MockUser.new(:test_role_2))
   end
+
+  def test_permit_context_people
+    reader = Authorization::Reader::DSLReader.new
+    reader.parse %{
+      authorization do
+        role :test_role do
+          has_permission_on :people, :to => :test
+        end
+      end
+    }
+    engine = Authorization::Engine.new(reader)
+    assert engine.permit?(:test, :context => :people, 
+      :user => MockUser.new(:test_role))
+  end
 
   def test_permit_multiple_contexts
     reader = Authorization::Reader::DSLReader.new

test/controller_test.rb

@@ -35,7 +35,7 @@ class LoadObjectMockController < MockController
   end
   filter_access_to :view, :attribute_check => true, :load_method => :load_method
   def self.controller_name
-    "load_mock_object"
+    "load_mock_objects"
   end
   def load_method
     MockDataObject.new(:test => 2)
@@ -48,6 +48,14 @@ class AccessOverwriteController < MockController
   filter_access_to :test_action, :require => :test, :context => :permissions
 end
 
+class PeopleController < MockController
+  filter_access_to :all
+  action_methods :show
+  def self.controller_name
+    "people"
+  end
+end
+
 
 class ControllerTest < Test::Unit::TestCase
 
@@ -260,4 +268,18 @@ def test_filter_access_overwrite
     controller.request!(MockUser.new(:test_role), "test_action")
     assert !controller.called_render
   end
+
+  def test_filter_access_people_controller
+    reader = Authorization::Reader::DSLReader.new
+    reader.parse %{
+      authorization do
+        role :test_role do
+          has_permission_on :people, :to => :show
+        end
+      end
+    }
+    controller = PeopleController.new(reader)
+    controller.request!(MockUser.new(:test_role), "show")
+    assert !controller.called_render
+  end
 end

test/test_helper.rb

@@ -67,7 +67,7 @@ def self.action_methods (*methods)
   end
 
   def self.controller_name
-    "mock"
+    "mocks"
   end
 
   def self.before_filters