rbacanable 0.2 → 0.2.1

data/examples/basic.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rubygems'
-require 'active_support'
+require 'activesupport'
 require 'canable'
 
 class User
@@ -12,7 +12,7 @@ class User
     @name = attributes[:name]
   end
   
-  def can_update_article(article)
+  def can_update_article?(article)
     article.creator == @name
   end
 end

data/examples/roles.rb

@@ -1,7 +1,7 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'rubygems'
-require 'active_support'
+require 'activesupport'
 require 'canable'
 require 'terminal-table/import'
 
@@ -47,14 +47,13 @@ end
 class User
   include Canable::Actor
   attr_accessor :name
-  
+  attr_accessor :role
   default_role Canable::Roles::BasicRole
-  # role_attribute :@role -- RBACanable by default looks in @role for a Module constant or string to use as a role
+  #role_attribute :@role #-- RBACanable by default looks in @role for a Module constant or string to use as a role
   
   def initialize(attributes = {})
     @name = attributes[:name]
     @role = attributes[:role]
-    self.__initialize_canable_role # nessecary since initialize is overridden
   end
   
   def to_s
@@ -90,10 +89,10 @@ posts = [
 
 
 user_table = table do |t|
-  t.headings = "User", "Resource", "Can View?", "Can Create?", "Can Update?", "Can Destroy?", "Role"
+  t.headings = "User", "Resource", "Can View?", "Can Create?", "Can Update?", "Can Destroy?", "@role", "Included Role"
   users.each do |user|
     posts.each do |post|
-      t << [user.to_s, post.to_s, user.can_view?(post), user.can_create?(post), user.can_update?(post), user.can_destroy?(post), user.canable_included_role]
+      t << [user.to_s, post.to_s, user.can_view?(post), user.can_create?(post), user.can_update?(post), user.can_destroy?(post), user.role, user.canable_included_role]
     end
   end
 end

data/lib/canable.rb

@@ -1,5 +1,5 @@
 module Canable
-  Version = '0.2'
+  Version = '0.2.1'
 
   # Module that holds all the can_action? methods.
   module Cans; end
@@ -9,7 +9,6 @@ module Canable
   
   # Module that is included by a role implementation
   module Role
-    include Cans # each role has a distinct set of responses to all the can_action? methods
     
     def self.included(base)
       base.extend(ClassMethods)
@@ -53,39 +52,25 @@ module Canable
   end
   
   module Actor
+    include Cans # each role has a distinct set of responses to all the can_action? methods
     attr_accessor :canable_included_role
-
+    
     def self.included(base)
       base.extend(ClassMethods)
     end
-    
-    module ClassMethods
-      attr_accessor :canable_default_role
-      attr_accessor :canable_role_attribute
-      # ---------------
-      # RBAC Actor building DSL
-      # ---------------
-      
-      def default_role(role)
-        self.canable_default_role = role
-      end
-      
-      def role_attribute(attribute)
-        self.canable_role_attribute = attribute
-      end
-      
-    end
-    
-    def initialize(*args)
-      super(*args)
+
+    # Override attr_accessor to make sure the role has been included so that we can return an accurate value
+    # "lazy" role including
+    def canable_included_role
       self.__initialize_canable_role
-      self
+      @canable_included_role
     end
     
+    # Called every time a role is needed to make sure the lazy load has been completed
     def __initialize_canable_role
-      attribute = self.class.canable_role_attribute
-      attribute ||= :@role
-      role_constant = self.instance_variable_get(attribute)
+      return if @_canable_initialized == true 
+      @_canable_intialize == true
+      role_constant = self.__get_role_constant
       if role_constant == nil
         default_role = self.class.canable_default_role
         self.act(default_role) unless default_role == nil
@@ -94,13 +79,46 @@ module Canable
       end
     end
     
+    def __get_role_constant
+      if self.class.canable_role_proc.respond_to?(:call)
+        attribute = self.class.canable_role_proc.call(self)
+      elsif self.instance_variable_get(:@role)
+        attribute = @role
+      end
+      attribute || nil
+    end
+    
     # Sets the role of this actor by including a role module
     def act(role)
+      unless(role.respond_to?(:included))
+        role = Canable::Roles.const_get((role.to_s.capitalize+"Role").intern)
+      end
+      self.extend role
       self.canable_included_role = role
-      if(role.respond_to?(:included))
-        self.extend role
-      else
-        self.extend Canable::Roles.const_get((role.to_s.capitalize+"Role").intern)
+    end
+    
+    
+      # ---------------
+      # RBAC Actor building DSL
+      # ---------------
+    
+    module ClassMethods
+      attr_accessor :canable_default_role
+      attr_accessor :canable_role_proc
+      
+      
+      def default_role(role)
+        self.canable_default_role = role
+      end
+      
+      def role_attribute(attribute)
+        self.canable_role_proc = Proc.new {|actor|
+          role = actor.instance_variable_get(attribute)
+        }
+      end
+      
+      def role_proc(proc)
+        self.canable_role_proc = proc
       end
     end
   end
@@ -154,6 +172,7 @@ module Canable
     def self.add_can_method(can)
       Cans.module_eval <<-EOM
         def can_#{can}?(resource)
+          self.__initialize_canable_role if self.class.include?(Canable::Actor)
           method = ("can_#{can}_"+resource.class.name.gsub(/::/,"_").downcase+"?").intern
           if self.respond_to?(method, true)
             self.send method, resource

data/test/test_roles.rb

@@ -134,7 +134,6 @@ class RolesTest < Test::Unit::TestCase
           
           def initialize(role=nil)
             @role = role
-            self.__initialize_canable_role # nessecary since initialize is overridden
           end
         end
         
@@ -164,7 +163,37 @@ class RolesTest < Test::Unit::TestCase
           
           def initialize(role=nil)
             @nonstandard = role
-            self.__initialize_canable_role # nessecary since initialize is overridden
+          end
+        end
+        
+        @default_user = userklass.new
+        @nondefault_user = userklass.new(@role2klass)
+      end
+      
+      should "have included the correct roles" do
+        assert_equal @role1klass, @default_user.canable_included_role
+        assert_equal @role2klass, @nondefault_user.canable_included_role 
+      end
+      
+      should "be governed by the rules in their roles" do
+        assert @default_user.can_view?(@resource)
+        assert ! @nondefault_user.can_view?(@resource)
+      end
+    end
+    
+    context "and actors with a default role and a role proc" do
+      setup do
+        role1klass = @role1klass
+        userklass = Class.new do
+          include Canable::Actor
+          attr_accessor :attributes
+          
+          default_role role1klass
+          role_proc Proc.new {|actor| actor.attributes[:role]}
+          
+          def initialize(role=nil)
+            @attributes = {}
+            @attributes[:role] = role
           end
         end
         
@@ -245,7 +274,6 @@ class RolesTest < Test::Unit::TestCase
           def initialize(_name, _role)
             @name = _name
             @role = _role
-            self.__initialize_canable_role # nessecary since initialize is overridden
           end         
         end
             

metadata

@@ -5,7 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  version: "0.2"
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - John Nunemaker
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-31 00:00:00 -04:00
+date: 2010-04-01 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency