lib/canard/user_model.rb in canard-0.3.5 vs lib/canard/user_model.rb in canard-0.3.6

@@ -1,15 +1,14 @@
 module Canard
-
   module UserModel
 
     # Canard applies roles to a model using the acts_as_user class method. The following User model
     # will be given the :manager and :admin roles
     #
     #   class User < ActiveRecord::Base
     #
-    #     acts_as_user :roles =>  :manager, :admin
+    #     acts_as_user :roles => [:manager, :admin]
     #
     #   end
     #
     # If using Canard with a non ActiveRecord class you can still assign roles but you will need to
     # extend the class with Canard::UserModel and add a roles_mask attribute.
@@ -18,18 +17,23 @@
     #
     #     extend Canard::UserModel
     #
     #     attr_accessor :roles_mask
     #
-    #     acts_as_user :roles =>  :manager, :admin
+    #     acts_as_user :roles => [:manager, :admin]
     #
     #   end
     #
+    # You can choose the attribute used for the roles_mask by specifying :roles_mask. If no
+    # roles_mask is specified it uses RoleModel's default of 'roles_mask'
+    #
+    #    acts_as_user :roles_mask => :my_roles_mask, :roles => [:manager, :admin]
+    #
     # == Scopes
     #
-    # Beyond applying the roles to model acts_as_user also creates some useful scopes on the User
-    # model for ActiveRecord models;
+    # Beyond applying the roles to the model, acts_as_user also creates some useful scopes for
+    # ActiveRecord models;
     #
     #   User.with_any_role(:manager, :admin)
     #
     # returns all the managers and admins
     #
@@ -52,68 +56,28 @@
     #   User.non_managers
     #
     # returns all the users who don't have the manager role.
     def acts_as_user(*args)
       include RoleModel
+      extend Adapters::ActiveRecord if defined?(ActiveRecord) && self < ActiveRecord::Base
 
-      options = args.extract_options!.symbolize_keys
+      options = args.last.is_a?(Hash) ? args.pop : {}
 
-      roles options[:roles] if options.has_key?(:roles) && has_roles_mask_attribute? || has_roles_mask_accessors?
+      roles_attribute options[:roles_mask] if options.has_key?(:roles_mask)
+      
+      roles options[:roles] if options.has_key?(:roles) && has_roles_mask_accessors?
 
-      if active_record_table?
-        valid_roles.each do |role|
-          define_scopes_for_role role
-        end
-
-        define_scope_method(:with_any_role) do |*roles|
-          where("#{role_mask_column} & :role_mask > 0", { :role_mask => mask_for(*roles) })
-        end
-
-        define_scope_method(:with_all_roles) do |*roles|
-          where("#{role_mask_column} & :role_mask = :role_mask", { :role_mask => mask_for(*roles) })
-        end
-      end
+      add_role_scopes if respond_to?(:add_role_scopes, true)
     end
 
     private
 
-    def active_record_table?
-      respond_to?(:table_exists?) && table_exists?
-    end
-
+    # This is overridden by the ActiveRecord adapter as the attribute accessors
+    # don't show up in instance_methods.
     def has_roles_mask_accessors?
       instance_method_names = instance_methods.map { |method_name| method_name.to_s }
       [roles_attribute_name.to_s, "#{roles_attribute_name}="].all? do |accessor| 
         instance_method_names.include?(accessor)
       end
     end
-
-    def has_roles_mask_attribute?
-      active_record_table? && column_names.include?(roles_attribute_name.to_s)
-    end
-
-    def define_scopes_for_role(role)
-      include_scope   = role.to_s.pluralize
-      exclude_scope   = "non_#{include_scope}"
-
-      define_scope_method(include_scope) do
-        where("#{role_mask_column} & :role_mask > 0", { :role_mask => mask_for(role) })
-      end
-
-      define_scope_method(exclude_scope) do
-        where("#{role_mask_column} & :role_mask = 0 or #{role_mask_column} is null", { :role_mask => mask_for(role) })
-      end
-    end
-
-    def define_scope_method(method, &block)
-      (class << self; self end).class_eval do
-        define_method(method, block)
-      end
-    end
-
-    def role_mask_column
-      %{"#{table_name}"."#{roles_attribute_name}"}
-    end
-
   end
-
 end