cjbottaro-aegis 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/aegis.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aegis}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Henning Koch"]
-  s.date = %q{2009-09-07}
+  s.date = %q{2009-09-08}
   s.description = %q{Aegis is a role-based permission system, where all users are given a role. It is possible to define detailed and complex permissions for each role very easily.}
   s.email = %q{github@makandra.de}
   s.extra_rdoc_files = [

data/lib/aegis/has_role.rb

@@ -127,7 +127,7 @@ module Aegis
       
       def role_forced
         aegis_forced_roles.each do |proc, role_name|
-          return role_name if proc.call(self)
+          return ::Permissions.find_role_by_name!(role_name.to_sym) if proc.call(self)
         end
         nil
       end
@@ -137,8 +137,7 @@ module Aegis
       # Delegate may_...? and may_...! methods to the user's role.
       def method_missing_with_aegis_permissions(symb, *args)
         method_name = symb.to_s
-        if method_name =~ /^may_(.+?)_in[\!\?]$/
-          #method_name = method_name[0...-4] + method_name[-1, 1] # may_edit_post_in? => may_edit_post?
+        if method_name =~ /^may_(.+?)_(in|for)[\!\?]$/
           role_in(args.first).send(method_name, self, *args)
         elsif method_name =~ /^may_(.+?)[\!\?]$/
           role.send(symb, self, *args)

data/test/app_root/app/models/permissions.rb

@@ -4,6 +4,7 @@ class Permissions < Aegis::Permissions
   role :guest
   role :student
   role :admin, :default_permission => :allow
+  role :superuser, :default_permission => :allow
   
   role :reader
   role :writer

data/test/has_role_test.rb

@@ -64,11 +64,11 @@ class HasRoleTest < ActiveSupport::TestCase
     create_role_assignments
     user = users(:with_hierarchy)
     user.update_attribute(:is_admin, true)
-    assert_equal "superuser", user.role
-    assert_equal "superuser", user.role_in(accounts(:google))
-    assert_equal "superuser", user.role_in(forums(:searching))
-    assert_equal "superuser", user.role_in(posts(:searching101))
-    assert_equal "superuser", user.role_in(posts(:searching102))
+    assert_equal :superuser, user.role.name
+    assert_equal :superuser, user.role_in(accounts(:google)).name
+    assert_equal :superuser, user.role_in(forums(:searching)).name
+    assert_equal :superuser, user.role_in(posts(:searching101)).name
+    assert_equal :superuser, user.role_in(posts(:searching102)).name
   end
   
 private

data/test/permissions_test.rb

@@ -113,5 +113,11 @@ class PermissionsTest < ActiveSupport::TestCase
     assert_nothing_raised{ user.may_create_post_in?(forums(:searching)) }
     assert_raise(Aegis::PermissionError){ user.may_create_post_in?(posts(:searching101)) }
   end
+  
+  def test_forced_role
+    user = users(:with_hierarchy)
+    user.update_attribute(:is_admin, true)
+    assert user.may_create_post_in?(forums(:searching))
+  end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: cjbottaro-aegis
 version: !ruby/object:Gem::Version 
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors: 
 - Henning Koch
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-07 00:00:00 -07:00
+date: 2009-09-08 00:00:00 -07:00
 default_executable: 
 dependencies: []