roles_active_record 0.4.4 → 0.4.5

data/NOTES.textile

@@ -0,0 +1,28 @@
+h1. Alternative Multi Roles setup
+
+<pre>
+  class UsersHaveAndBelongToManyRoles < ActiveRecord::Migration
+    def self.up
+      create_table :roles_users, :id => false do |t|
+        t.references :role, :user
+      end
+    end
+
+    def self.down
+      drop_table :roles_users
+    end
+  end  
+</pre>
+
+And your models look like this:
+
+<pre>
+  # User Model
+  class User < ActiveRecord::Base
+    has_and_belongs_to_many :roles
+  ....
+  # Role model
+  class Role < ActiveRecord::Base
+    has_and_belongs_to_many :users
+  end  
+</pre>

data/VERSION

@@ -1 +1 @@
-0.4.4
+0.4.5

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

@@ -0,0 +1,14 @@
+# TODO: 
+# model_file_name and similar methods in rails3_assist and rails3_artifaftor should be fixed to always call underscore on filenames
+
+class String
+  def as_filename
+    self.underscore  
+  end
+end
+
+class Symbol
+  def as_filename
+    self.to_s.underscore  
+  end
+end

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

@@ -1,49 +1,50 @@
 require 'rails3_artifactor'
 require 'logging_assist'
+require 'generators/active_record/roles/core_ext'
 
 module ActiveRecord 
   module Generators
     class RolesGenerator < Rails::Generators::NamedBase      
-      desc "Add role strategy to a model" 
+      desc "Add role strategy to a User model" 
 
-      # argument name
+      argument     :user_class,         :type => :string,   :default => 'User',           :desc => "User class name"
       
-      class_option :strategy, :type => :string, :aliases => "-s", :default => 'role_string', 
+      class_option :strategy,           :type => :string,   :aliases => "-s",   :default => 'role_string', 
                    :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 :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_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"
-      class_option :logfile,          :type => :string,   :default => nil,   :desc => "Logfile location"
+      class_option :default_roles,      :type => :boolean,  :aliases => "-dr",  :default => true,       :desc => "Use default roles :admin and :base"
+      class_option :logfile,            :type => :string,   :aliases => "-l",   :default => nil,        :desc => "Logfile location"
 
       source_root File.dirname(__FILE__) + '/templates'
 
       def apply_role_strategy
         logger.add_logfile :logfile => logfile if logfile
-        logger.debug "apply_role_strategy for : #{strategy} in model #{name}"
+        logger.debug "apply_role_strategy for : #{strategy} in model #{user_class}"
 
         if !valid_strategy?
           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", :red
+        if !has_model? user_class                
+          say "Could not apply roles strategy to #{user_class} model since the model file was not found", :red
           return 
         end
 
-        begin
-          insert_into_model name do
+        begin                    
+          logger.debug "Trying to insert roles code into #{user_class}"
+          insert_into_model name.as_filename do
             insertion_text
           end
       
           copy_role_models if roles_model_strategy?
         rescue
           # logger.debug "Error applying roles strategy to #{name}"
-          say "Error applying roles strategy to #{name}"
+          say "Error applying roles strategy to #{user_class}"
         end
       end 
             
@@ -90,10 +91,6 @@ module ActiveRecord
         [:one_role, :many_roles].include? strategy.to_sym
       end  
 
-      def user_class
-        options[:user_class].classify || 'User'
-      end
-
       def role_class
         options[:role_class].classify || 'Role'
       end
@@ -106,10 +103,6 @@ module ActiveRecord
         options[:logfile]
       end
 
-      def user_class
-        name || 'User'
-      end
-
       def orm
         :active_record
       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.4"
+  s.version = "0.4.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2011-01-04}
+  s.date = %q{2011-01-09}
   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 = [
@@ -21,11 +21,13 @@ Gem::Specification.new do |s|
     ".rspec",
     "Gemfile",
     "LICENSE",
+    "NOTES.textile",
     "README.textile",
     "Rakefile",
     "VERSION",
     "config/database.yml",
     "development.sqlite3",
+    "lib/generators/active_record/roles/core_ext.rb",
     "lib/generators/active_record/roles/roles_generator.rb",
     "lib/generators/active_record/roles/templates/many_roles/role.rb",
     "lib/generators/active_record/roles/templates/many_roles/user_role.rb",

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 4
-  version: 0.4.4
+  - 5
+  version: 0.4.5
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-04 00:00:00 +01:00
+date: 2011-01-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -343,11 +343,13 @@ files:
 - .rspec
 - Gemfile
 - LICENSE
+- NOTES.textile
 - README.textile
 - Rakefile
 - VERSION
 - config/database.yml
 - development.sqlite3
+- lib/generators/active_record/roles/core_ext.rb
 - lib/generators/active_record/roles/roles_generator.rb
 - lib/generators/active_record/roles/templates/many_roles/role.rb
 - lib/generators/active_record/roles/templates/many_roles/user_role.rb