permissive 0.2.5.alpha → 0.2.6.alpha

data/VERSION

@@ -1 +1 @@
-0.2.5.alpha
+0.2.6.alpha

data/lib/permissive/has_permissions.rb

@@ -81,7 +81,7 @@ module Permissive
           end
 
           def bits_for(scope, permissions)
-            on = PermissionDefinition.normalize_scope(proxy_owner.class, scope)
+            on = Permissive::PermissionDefinition.normalize_scope(proxy_owner.class, scope)
             permissions.flatten.map do |permission|
               proxy_owner.class.permissions[on].try(:permissions).try(:[], permission.to_s.underscore.gsub('/', '_').to_sym) || raise(Permissive::InvalidPermissionError.new("#{proxy_owner.class.name} does not have a#{'n' if permission.to_s[0, 1].downcase =~ /[aeiou]/} #{permission} permission#{" on #{on}" if on}"))
             end

data/lib/permissive/permission.rb

@@ -12,7 +12,8 @@ module Permissive
         {:conditions => {:scoped_object_id => scoped_object.id, :scoped_object_type => scoped_object.class.to_s}}
       when Class
         {:conditions => {:scoped_object_id => nil, :scoped_object_type => scoped_object.name}}
-      when Symbol
+      when String, Symbol
+        scope = 
         {:conditions => {:scoped_object_id => nil, :scoped_object_type => scoped_object.to_s.classify}}
       else
         {:conditions => {:scoped_object_id => nil, :scoped_object_type => nil}}

data/lib/permissive/permission_definition.rb

@@ -32,6 +32,8 @@ module Permissive
       def normalize_scope(model, scope)
         return :global if scope.to_s == 'global'
         scope = case scope
+        when ActiveRecord::Base
+          scope.class.name.to_s.tableize
         when Class
           scope.name.tableize
         when String, Symbol
@@ -86,12 +88,10 @@ module Permissive
           def role=(role_name)
             if role_name
               self.permissions = self.class.permissions[:global].roles[role_name.to_s.downcase.to_sym]
-              if respond_to?(:write_attribute)
-                write_attribute(:role, role_name.to_s.downcase.strip)
-              end
             else
               self.permissions = []
             end
+            write_attribute(:role, role_name.to_s.downcase.strip)
           end
         end
       else

data/spec/permission_definition_spec.rb

@@ -0,0 +1,31 @@
+require File.join File.dirname(__FILE__), 'spec_helper'
+load File.join File.dirname(__FILE__), 'spec_models.rb'
+
+describe Permissive::PermissionDefinition do
+  describe "normalize_scope" do
+    it "should normalize an ActiveRecord::Base instance" do
+      user = Permissive::User.create!
+      Permissive::PermissionDefinition.normalize_scope(user.class, user).should == :permissive_users
+    end
+
+    it "should normalize a symbol" do
+      user = Permissive::User.create!
+      Permissive::PermissionDefinition.normalize_scope(user.class, :foobar).should == :foobars
+    end
+
+    it "should normalize a string" do
+      user = Permissive::User.create!
+      Permissive::PermissionDefinition.normalize_scope(user.class, 'baz').should == :bazs
+    end
+
+    it "should normalize a class" do
+      user = Permissive::User.create!
+      Permissive::PermissionDefinition.normalize_scope(user.class, Permissive::Organization).should == :permissive_organizations
+    end
+
+    it "should interpolate a class's name" do
+      user = Permissive::User.create!
+      Permissive::PermissionDefinition.normalize_scope(user.class, :organizations).should == :permissive_organizations
+    end
+  end
+end

data/spec/roles_spec.rb

@@ -82,5 +82,13 @@ describe Permissive, "roles" do
       user.is_hungry_person?.should be_true
       user.is_sleepy_person?.should be_false
     end
+
+    it "should allow setting the role to 'nil'" do
+      user = UserWithRole.create!(:role => 'hungry_person')
+      user.can_eat?.should be_true
+      user.update_attributes(:role => nil)
+      user.can_eat?.should be_false
+    end
+
   end
 end

data/spec/scoping_permissions_spec.rb

@@ -29,7 +29,9 @@ describe Permissive, "scoped permissions" do
 
     it "should not respond to generic permissions on scoped permissions" do
       @user.can!(:manage_games, :on => @organization)
-      @user.can?(:manage_games).should be_false
+      lambda {
+        @user.can?(:manage_games).should be_false
+      }.should raise_error(Permissive::InvalidPermissionError)
       @user.can?(:manage_games, :on => @organization).should be_true
     end
 

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 5
+  - 6
   - alpha
-  version: 0.2.5.alpha
+  version: 0.2.6.alpha
 platform: ruby
 authors: 
 - Flip Sasser
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-20 00:00:00 -04:00
+date: 2010-04-21 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
@@ -52,6 +52,7 @@ files:
 - spec/defining_permissions_spec.rb
 - spec/has_permissions_spec.rb
 - spec/metaprogramming_spec.rb
+- spec/permission_definition_spec.rb
 - spec/rcov.opts
 - spec/roles_spec.rb
 - spec/scoping_permissions_spec.rb
@@ -95,6 +96,7 @@ test_files:
 - spec/defining_permissions_spec.rb
 - spec/has_permissions_spec.rb
 - spec/metaprogramming_spec.rb
+- spec/permission_definition_spec.rb
 - spec/roles_spec.rb
 - spec/scoping_permissions_spec.rb
 - spec/spec_helper.rb