roles_active_record 0.4.3 → 0.4.4

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.4.4

data/lib/generators/active_record/roles/roles_generator.rb

@@ -26,12 +26,12 @@ module ActiveRecord
         logger.debug "apply_role_strategy for : #{strategy} in model #{name}"
 
         if !valid_strategy?
-          say "Strategy '#{strategy}' is not valid, at least not for Active Record"
+          say "Strategy '#{strategy}' is not valid, at least not for Active Record", :red
           return 
         end
 
         if !has_model? :user                
-          say "Could not apply roles strategy to #{name} model since the model file was not found"
+          say "Could not apply roles strategy to #{name} model since the model file was not found", :red
           return 
         end
 
@@ -50,7 +50,9 @@ module ActiveRecord
       protected                  
 
       extend Rails3::Assist::UseMacro
+      
       use_orm :active_record
+      
       include Rails3::Assist::BasicLogger
 
       def copy_role_models

data/lib/generators/active_record/roles_migration/roles_migration_generator.rb

@@ -61,7 +61,7 @@ module ActiveRecord
       end
 
       def strategies
-        [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]          
+        [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]
       end
        
       def reverse?

data/lib/roles_active_record/base.rb

@@ -4,7 +4,9 @@ module Roles::Base
   end
 end
 
-module Roles::ActiveRecord  
+module Roles::ActiveRecord
+  mattr_accessor :warnings_on
+    
   def self.included(base) 
     base.extend Roles::Base
     base.extend ClassMethods
@@ -38,24 +40,37 @@ module Roles::ActiveRecord
 
       # one_role reference
       if strategy_name == :one_role
-        self.belongs_to :one_role, :foreign_key => 'role_id', :class_name => @role_class_name.to_s
+        self.belongs_to :one_role, :foreign_key => 'role_id', :class_name => role_class_name.to_s
       end
       
       # many_roles references
-      if strategy_name == :many_roles
-        user_roles_class = options[:user_roles_class] if options.kind_of? Hash 
-        user_roles_class ||= 'user_roles'
-      
-        instance_eval %{
-          has_many :many_roles, :through => :#{user_roles_class}, :source => :#{@role_class_name.to_s.underscore}
-          has_many :#{user_roles_class}
-        }
+      if strategy_name == :many_roles      
+        urc = user_roles_class options
+        instance_eval many_roles_stmt(urc)
       end
       
       set_role_strategy name, options
     end    
     
     private
+     
+    def many_roles_stmt urc
+      %{
+        has_many :many_roles, :through => :#{urc}, :source => :#{role_class_name.to_s.underscore}
+        has_many :#{urc}
+      }
+    end
+
+    def role_class_name options = {}
+      return @role_class_name if @role_class_name  
+      return options[:role_class] if options.kind_of?(Hash) && options[:role_class] 
+      'Role'    
+    end
+
+    def user_roles_class options
+      return options[:user_roles_class] if options.kind_of?(Hash) && options[:user_roles_class]
+      'user_roles'
+    end
 
     def set_role_class strategy_name, options = {}
       @role_class_name = !options.kind_of?(Symbol) ? get_role_class(strategy_name, options) : default_role_class(strategy_name)
@@ -70,7 +85,7 @@ module Roles::ActiveRecord
         require "roles_active_record/#{strategy_name}"
         return ::Role 
       end
-      raise "Default Role class not defined"
+      raise "Default Role class not defined" if Roles::ActiveRecord.warnings_on
     end
     
     def get_role_class strategy_name, options

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.4.3"
+  s.version = "0.4.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-01}
+  s.date = %q{2011-01-04}
   s.description = %q{Makes it easy to set a role strategy on your User model in Active Record}
   s.email = %q{kmandrup@gmail.com}
   s.extra_rdoc_files = [

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 3
-  version: 0.4.3
+  - 4
+  version: 0.4.4
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-01 00:00:00 +01:00
+date: 2011-01-04 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency