authoritah 0.1.1 → 0.1.2

data/lib/authoritah.rb

@@ -12,6 +12,8 @@ module Authoritah
       base.send(:include, InstanceMethods)
       
       base.before_filter :check_permissions
+      base.class_inheritable_accessor :controller_permissions
+      base.controller_permissions = PermissionSet.new
     end
     
     module ClassMethods
@@ -37,8 +39,7 @@ module Authoritah
         role_method     = options.to_a.first[0]
         role_predicate  = options.to_a.first[1]
         
-        controller_permissions[controller_name.to_sym] ||= PermissionSet.new
-        controller_permissions[controller_name.to_sym] << {
+        controller_permissions << {
           :type => perm_type,
           :role_method => role_method,
           :role_predicate => role_predicate,
@@ -47,22 +48,14 @@ module Authoritah
         }
       end
       
-      def this_controllers_permissions
-        controller_permissions[controller_name.to_sym]
-      end
-      
       protected
       
         def check_role_selectors(options)
           raise Authoritah::Controller::OptionsError.new("Too many role selectors") if options.size > 1
         end
         
-        def controller_permissions
-          @@controller_permissions ||= {}
-        end
-        
         def clear_permissions
-          @@controller_permissions = {}
+          self.controller_permissions = PermissionSet.new
         end
     end
     
@@ -79,7 +72,7 @@ module Authoritah
         end
       
         def permitted?(action)
-          return true unless permissions = self.class.this_controllers_permissions
+          return true unless permissions = self.controller_permissions
           permissions.permits?(self, action)
         end
     end

data/spec/authoritah_spec.rb

@@ -5,6 +5,8 @@ describe Authoritah::Controller do
   before(:each) do
     ActionController::Base.send(:include, Authoritah::Controller)
     ActionController::Base.send(:clear_permissions)
+    TestAuthorizerController.send(:clear_permissions)
+    SpecialisedTestAuthorizerController.send(:clear_permissions)
   end
   
   describe "adding methods to controllers" do
@@ -30,7 +32,7 @@ describe Authoritah::Controller do
   describe "a basic permits wildcard rule with no predicate" do
     before(:each) do
       TestAuthorizerController.permits(:current_user)
-      @permissions = TestAuthorizerController.send(:controller_permissions)[:test_authorizer]
+      @permissions = TestAuthorizerController.send(:controller_permissions)
     end
     it "should have one permission" do @permissions.size.should == 1 end
     it "should use current_user to retrieve the 'role object'" do @permissions.first[:role_method].should == :current_user end
@@ -41,9 +43,11 @@ describe Authoritah::Controller do
   describe "a basic permits wildcard rule" do
     before(:each) do
       TestAuthorizerController.permits(:current_user => :logged_in?)
-      @permissions = TestAuthorizerController.send(:controller_permissions)[:test_authorizer]
+      @permissions = TestAuthorizerController.send(:controller_permissions)
+    end
+    it "should have one permission" do
+      @permissions.size.should == 1 
     end
-    it "should have one permission" do @permissions.size.should == 1 end
     it "should use current_user to retrieve the 'role object'" do @permissions.first[:role_method].should == :current_user end
     it "should use logged_in? as the predicate to call on the 'role object'" do @permissions.first[:role_predicate].should == :logged_in? end
     it "should not specify the actions" do @permissions.first[:actions].should == [:all] end
@@ -52,7 +56,7 @@ describe Authoritah::Controller do
   describe "a basic permits rule on a single action" do
     before(:each) do
       TestAuthorizerController.permits(:current_user => :logged_in?, :to => :show)
-      @permissions = TestAuthorizerController.send(:controller_permissions)[:test_authorizer]
+      @permissions = TestAuthorizerController.send(:controller_permissions)
     end
     it "should have one permission" do @permissions.size.should == 1 end
     it "should use current_user to retrieve the 'role object'" do @permissions.first[:role_method].should == :current_user end
@@ -63,7 +67,7 @@ describe Authoritah::Controller do
   describe "a basic rule on many actions" do
     before(:each) do
       TestAuthorizerController.permits(:current_user => :logged_in?, :to => [:show, :create, :update])
-      @permissions = TestAuthorizerController.send(:controller_permissions)[:test_authorizer]
+      @permissions = TestAuthorizerController.send(:controller_permissions)
     end
     it "should specify the actions" do @permissions.first[:actions].should == [:show, :create, :update] end
   end
@@ -74,12 +78,25 @@ describe TestAuthorizerController, :type => :controller do
   before(:each) do
     TestAuthorizerController.send(:include, Authoritah::Controller)
     TestAuthorizerController.send(:clear_permissions)
+    SpecialisedTestAuthorizerController.send(:include, Authoritah::Controller)
+    SpecialisedTestAuthorizerController.send(:clear_permissions)
   end
   
   context "with no permissions set " do
     it "should render the index" do get :index; response.should render_template('index') end
   end
   
+  it "should inherit rules in a subclass" do
+    class ParentController < ActionController::Base
+      include Authoritah::Controller
+      permits :current_user
+    end
+    class ChildController < ParentController
+    end
+    ChildController.controller_permissions.size.should == 1
+    ChildController.controller_permissions.first[:role_method].should == :current_user
+  end
+  
   describe "specifying permit rules" do
     context "with a wildcard permission (no predicate)" do
       before(:each) do

data/spec/railsenv/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your server when you modify this file
 
 # Specifies gem version of Rails to use when vendor/rails is not present
-RAILS_GEM_VERSION = '2.3.4' unless defined? RAILS_GEM_VERSION
+RAILS_GEM_VERSION = '2.3.5' unless defined? RAILS_GEM_VERSION
 
 # Bootstrap the Rails environment, frameworks, and default configuration
 require File.join(File.dirname(__FILE__), 'boot')

data/spec/spec_helper.rb

@@ -31,3 +31,5 @@ class TestAuthorizerController < ActionController::Base
 
 end
 
+class SpecialisedTestAuthorizerController < TestAuthorizerController
+end

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: authoritah
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  prerelease: false
+  segments: 
+  - 0
+  - 1
+  - 2
+  version: 0.1.2
 platform: ruby
 authors: 
 - Steven Mohapi-Banks
@@ -9,39 +14,51 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-18 00:00:00 +00:00
+date: 2010-03-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: rspec-rails
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 9
         version: 1.2.9
-    version: 
+  type: :development
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: mocha
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id003
 description: A description of a really simple authorization plugin for Rails.
 email: steven.mohapibanks@me.com
 executables: []
@@ -69,18 +86,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: A really simple authorization plugin for Rails.