roles_active_record 0.4.2 → 0.4.3

data/VERSION

@@ -1 +1 @@
-0.4.2
+0.4.3

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

@@ -9,10 +9,11 @@ module ActiveRecord
       # argument name
       
       class_option :strategy, :type => :string, :aliases => "-s", :default => 'role_string', 
-                   :desc => "Role strategy to use (admin_flag, role_string, roles_string, role_strings, one_role, many_roles, roles_mask)"
+                   :desc => "Role strategy to use (admin_flag, role_string, one_role, many_roles, roles_mask)"
 
       class_option :roles,            :type => :array,  :aliases => "-r", :default => [], :desc => "Valid roles"
       class_option :role_class,       :type => :string, :aliases => "-rc", :default => 'Role', :desc => "Role class"
+      class_option :user_class,       :type => :string, :aliases => "-uc", :default => 'User', :desc => "User class"
       class_option :user_role_class,  :type => :string, :aliases => "-urc", :default => 'UserRole', :desc => "User Role join class"
       
       class_option :default_roles,    :type => :boolean,  :default => true, :desc => "Use default roles :admin and :base"
@@ -23,15 +24,34 @@ module ActiveRecord
       def apply_role_strategy
         logger.add_logfile :logfile => logfile if logfile
         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"
+          return 
+        end
+
+        if !has_model? :user                
+          say "Could not apply roles strategy to #{name} model since the model file was not found"
+          return 
+        end
+
         begin
           insert_into_model name do
             insertion_text
           end
+      
+          copy_role_models if roles_model_strategy?
         rescue
-          logger.debug "Model #{name} not found"
-          say "Model #{name} not found"
+          # logger.debug "Error applying roles strategy to #{name}"
+          say "Error applying roles strategy to #{name}"
         end
       end 
+            
+      protected                  
+
+      extend Rails3::Assist::UseMacro
+      use_orm :active_record
+      include Rails3::Assist::BasicLogger
 
       def copy_role_models
         logger.debug 'copy_role_models'
@@ -42,12 +62,6 @@ module ActiveRecord
           copy_many_roles_models
         end
       end
-            
-      protected                  
-
-      extend Rails3::Assist::UseMacro
-      use_orm :active_record
-      include Rails3::Assist::BasicLogger
 
       def copy_one_role_model
         logger.debug "copy_one_role_model: #{role_class.underscore}"
@@ -62,6 +76,18 @@ module ActiveRecord
         template 'many_roles/user_role.rb', "app/models/#{user_role_class.underscore}.rb"
       end
 
+      def valid_strategy?
+        valid_strategies.include? strategy.to_sym
+      end
+
+      def valid_strategies
+        [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]
+      end        
+
+      def roles_model_strategy?
+        [:one_role, :many_roles].include? strategy.to_sym
+      end  
+
       def user_class
         options[:user_class].classify || 'User'
       end
@@ -108,13 +134,14 @@ module ActiveRecord
       end
   
       def role_strategy_statement 
-        "strategy :#{strategy}, #{strategy_options}"
+        "strategy :#{strategy} #{strategy_options}"
       end
 
       def strategy_options
         if role_class != 'Role' || user_role_class != 'UserRole' && role_ref_strategy?
-          return ":role_class => :#{options[:role_class] || 'role'}, :user_role_class => :#{options[:user_role_class] || 'user_role'}"
+          return ", :role_class => :#{options[:role_class] || 'role'}, :user_role_class => :#{options[:user_role_class] || 'user_role'}"
         end
+        ''        
       end
     
       def insertion_text

data/lib/generators/active_record/roles/templates/many_roles/role.rb

@@ -4,4 +4,6 @@ class <%= role_class %> < ActiveRecord::Base
   has_many :<%= user_role_class.pluralize.underscore %>
 
   validates :name, :uniqueness => true
+  
+  extend RoleClass::ClassMethods  
 end

data/lib/generators/active_record/roles/templates/one_role/role.rb

@@ -3,4 +3,6 @@ class <%= role_class %> < ActiveRecord::Base
   has_many :<%= user_class.pluralize.underscore %>
 
   validates :name, :uniqueness => true  
+  
+  extend RoleClass::ClassMethods  
 end

data/lib/roles_active_record/base.rb

@@ -18,7 +18,7 @@ module Roles::ActiveRecord
     end
 
     def valid_multi_strategies
-      [:many_roles, :roles_mask, :role_strings]
+      [:many_roles, :roles_mask]
     end
 
     def strategies_with_role_class

data/lib/roles_active_record/many_roles.rb

@@ -3,6 +3,8 @@ class Role < ActiveRecord::Base
   has_many :users, :through => :user_roles
   has_many :user_roles
   validates :name, :uniqueness => true
+  
+  extend RoleClass::ClassMethods  
 end
 
 class UserRole < ActiveRecord::Base

data/lib/roles_active_record/one_role.rb

@@ -2,4 +2,6 @@ class Role < ActiveRecord::Base
   scope :named, lambda{|role_names| where(:name.in => role_names.flatten)}
   has_many :users
   validates :name, :uniqueness => true  
+  
+  extend RoleClass::ClassMethods
 end

data/lib/roles_active_record/role.rb

@@ -10,11 +10,11 @@ module Roles::Base
         end
       end
     end
-  end
+  end  
 end
 
-class Role < ActiveRecord::Base
-  class << self
+module RoleClass
+  module ClassMethods
     def find_roles(*role_names) 
       where(:name.in => role_names.flatten)
     end
@@ -23,6 +23,6 @@ class Role < ActiveRecord::Base
       raise ArgumentError, "#find_role takes a single role name as argument, not: #{role_name.inspect}" if !role_name.kind_of_label?
       res = find_roles(role_name)
       res ? res.first : res
-    end
+    end  
   end
-end  
+end

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.4.2"
+  s.version = "0.4.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-26}
+  s.date = %q{2011-01-01}
   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 = [

data/spec/fixtures/many_roles_setup.rb

@@ -1,8 +1,6 @@
 class User < ActiveRecord::Base    
   include Roles::ActiveRecord
   
-  strategy :many_roles, :default
-  role_class :role
-
+  strategy :many_roles
   valid_roles_are :admin, :guest, :user
 end

data/spec/fixtures/many_roles_setup_unique_check.rb

@@ -1,8 +1,6 @@
 class User < ActiveRecord::Base    
   include Roles::ActiveRecord
   
-  strategy :many_roles, :default
-  role_class :role
-
+  strategy :many_roles
   valid_roles_are :admin, :guest, :user, :guest
 end

data/spec/fixtures/one_role_setup.rb

@@ -1,8 +1,6 @@
 class User < ActiveRecord::Base
   include Roles::ActiveRecord 
   
-  strategy :one_role, :default
-  # role_class :role
-
+  strategy :one_role
   valid_roles_are :admin, :guest, :user
 end

data/spec/fixtures/one_role_setup_unique_check.rb

@@ -1,8 +1,6 @@
 class User < ActiveRecord::Base
   include Roles::ActiveRecord 
   
-  strategy :one_role, :default
-  role_class :role
-
+  strategy :one_role
   valid_roles_are :admin, :guest, :user, :guest
 end

data/spec/roles_active_record/strategy/multi/many_roles_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper'
 
+class Role < ActiveRecord::Base
+end
+
 def api_migrate
   migrate('many_roles')
 end

data/spec/roles_active_record/strategy/single/one_role_spec.rb

@@ -1,5 +1,8 @@
 require 'spec_helper' 
 
+class Role < ActiveRecord::Base
+end
+
 def api_fixture
   load 'fixtures/one_role_setup.rb'
 end

metadata

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