roles_active_record 0.1.0 → 0.2.0

data/README.markdown

@@ -19,7 +19,7 @@ It also implements the following Role strategies:
 
 ## Rails generator
 
-Needs some more refactoring (see notes below!)
+Will create admin and guest roles by default
 
 <code>$ rails g active_record:roles User --strategy admin_flag --roles admin guest</code>
 

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.2.0

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

@@ -1,46 +1,75 @@
+require 'rails3_artifactor'
+require 'logging_assist'
+
 module ActiveRecord 
   module Generators
-    class RolesGenerator < Rails::Generators::NamedBase
-      desc "Generate roles model for User" 
+    class RolesGenerator < Rails::Generators::NamedBase      
+      desc "Add role strategy to a model" 
       
-      argument :role_strategy, :type => :string, :aliases => "-r", :default => 'inline_role', :desc => "Create roles model for user"
+      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)"
 
-      hook_for :orm
-            
-      def self.source_root
-        @source_root ||= File.expand_path("../../templates", __FILE__)
-      end
 
-      def apply_role_strategy   
-        insert_into_model('user', role_strategy_statement)
+      class_option :roles, :type => :array, :aliases => "-r", :default => [], :desc => "Valid roles"
+
+      class_option :default_roles, :type => :boolean, :default => true, :desc => "Use default roles :admin and :base"
+
+
+      def apply_role_strategy
+        log.add_logfile
+        log.debug "apply_role_strategy for : #{strategy} in model #{name}"
+        begin
+          insert_into_model name do
+            insertion_text
+          end
+        rescue
+          say "Model #{name} not found"
+        end
       end 
       
       protected                  
 
-      def match_expr
-        /< (.+?)\w+\s/
-      end
+      extend Rails3::Assist::UseMacro
+      use_orm :active_record
+      include Rails::Assist::BasicLogging
 
+      def orm
+        :active_record
+      end
+  
+      def default_roles
+        options[:default_roles] ? [:admin, :guest] : []        
+      end
+  
+      def roles_to_add
+        @roles_to_add ||= default_roles.concat(options[:roles]).to_symbols.uniq
+      end
+  
+      def roles        
+        roles_to_add.map{|r| ":#{r}" }
+      end
+  
       def role_strategy_statement 
-        "role_strategy #{role_strategy}"        
+        "strategy :#{strategy}, :default\n#{role_class_stmt}"
       end
 
-      def role_strategy
-        options[:role_strategy]                
+      def role_class_stmt
+        "  role_class :role" if [:one_role, :many_roles].include? (strategy.to_sym)
+      end
+  
+      def roles_statement
+        roles ? "valid_roles_are #{roles.join(', ')}" : ''
+      end
+  
+      def insertion_text
+        %Q{include Roles::#{orm.to_s.camelize} 
+  #{role_strategy_statement}
+  #{roles_statement}}
+      end
+  
+      def strategy
+        options[:strategy]                
       end
-      
-      def model_file(name)                          
-        File.join(Rails.root, "app/models/#{name}.rb")        
-      end
-        
-      def insert_into_model(model_name, insert_text)
-        model_name = model_name.to_s
-        file = File.new(model_file(model_name))
-        return if (file.read =~ /#{insert_text}/) 
-        gsub_file model_file(model_name), match_expr do |match|
-          match << insert_text
-        end
-      end              
     end
   end
 end

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

@@ -1,12 +1,9 @@
-# require 'generators/migration_helper'
-# require 'generators/role_migrations'
-# require 'auth_assistant/model/user_config'
+require 'migration_assist'
 
 module ActiveRecord 
   module Generators
     class RolesMigrationGenerator < Rails::Generators::NamedBase 
-      include Rails::Generators::MigrationHelper        
-      include RSpec::Rails::App
+      include Rails::Migration::Assist
       
       desc "Generates user role migrations" 
 
@@ -22,7 +19,7 @@ module ActiveRecord
       end
 
       def valid_strategy?
-        if ![:admin_flag, :role_string, :one_role, :many_roles, :roles_mask].include?(strategy.to_sym)
+        if !strategies.include?(strategy.to_sym)
           info "Unknown role strategy #{strategy}"
           raise ArgumentError, "Unknown role strategy #{strategy}"
         end
@@ -37,6 +34,10 @@ module ActiveRecord
       end   
       
       protected                  
+
+      def strategies
+        [:admin_flag, :role_string, :one_role, :many_roles, :roles_mask]          
+      end
        
       def reverse?
         options[:reverse]

data/lib/roles_active_record/role.rb

@@ -3,7 +3,7 @@ module Roles::Base
     strategy_class.valid_roles = role_list.to_symbols
     if role_class_name
       role_list.each do |name|
-        res = role_class_name.create(:name => name.to_s)        
+        role_class_name.create(:name => name.to_s)        
       end
     end
   end

data/lib/{roles_for_active_record.rb → roles_active_record.rb}

@@ -2,7 +2,7 @@ require 'roles_generic'
 require 'require_all'    
 require 'set'
 require 'sugar-high/array'
-
+require 'rails'
 require 'arel'
 require 'meta_where'
 require 'yaml'

data/logging.log

@@ -0,0 +1,26 @@
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : one_role in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : one_role in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : admin_flag in model User
+[Rails::Assist::Logging]
+apply_role_strategy for : one_role in model User

data/roles_active_record.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.1.0"
+  s.version = "0.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-09-06}
+  s.date = %q{2010-09-12}
   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 = [
@@ -32,8 +32,9 @@ Gem::Specification.new do |s|
      "lib/generators/active_record/roles_migration/templates/add_many_roles_strategy.erb",
      "lib/generators/active_record/roles_migration/templates/add_one_role_strategy.erb",
      "lib/generators/active_record/roles_migration/templates/add_role_string_strategy.erb",
-     "lib/generators/active_record/roles_migration/templates/add_roles_mask_to_users_migration.erb",
+     "lib/generators/active_record/roles_migration/templates/add_roles_mask_strategy.erb",
      "lib/generators/active_record/setup/setup_generator.rb",
+     "lib/roles_active_record.rb",
      "lib/roles_active_record/base.rb",
      "lib/roles_active_record/namespaces.rb",
      "lib/roles_active_record/role.rb",
@@ -43,9 +44,9 @@ Gem::Specification.new do |s|
      "lib/roles_active_record/strategy/single/admin_flag.rb",
      "lib/roles_active_record/strategy/single/one_role.rb",
      "lib/roles_active_record/strategy/single/role_string.rb",
-     "lib/roles_for_active_record.rb",
      "lib/views/_multi_role_selector.erb.html",
      "lib/views/_single_role_selector.erb.html",
+     "logging.log",
      "roles_active_record.gemspec",
      "roles_for_ar.gemspec",
      "sandbox/Rakefile",
@@ -62,6 +63,8 @@ Gem::Specification.new do |s|
      "spec/db/database.yml",
      "spec/fixtures/many_roles_setup.rb",
      "spec/fixtures/one_role_setup.rb",
+     "spec/generator_spec_helper.rb",
+     "spec/migration_spec_helper.rb",
      "spec/migrations/admin_flag/004_add_admin_flag_to_users.rb",
      "spec/migrations/many_roles/002_create_roles.rb",
      "spec/migrations/many_roles/003_create_user_roles.rb",
@@ -71,7 +74,7 @@ Gem::Specification.new do |s|
      "spec/migrations/roles_mask/005_add_roles_mask_to_users.rb",
      "spec/migrations/users/001_create_users.rb",
      "spec/roles_active_record/admin_flag_spec.rb",
-     "spec/roles_active_record/generators/migration_spec_helper.rb",
+     "spec/roles_active_record/generators/roles_generator_spec.rb",
      "spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb",
      "spec/roles_active_record/generators/roles_migration/many_roles_spec.rb",
      "spec/roles_active_record/generators/roles_migration/one_role_spec.rb",
@@ -82,7 +85,15 @@ Gem::Specification.new do |s|
      "spec/roles_active_record/one_role_spec.rb",
      "spec/roles_active_record/role_string_spec.rb",
      "spec/roles_active_record/roles_mask_spec.rb",
-     "spec/spec_helper.rb"
+     "spec/spec_helper.rb",
+     "tmp/rails/app/models/user.rb",
+     "tmp/rails/config/routes.rb",
+     "tmp/rails/db/migrations/20100912101428_add_admin_flag_strategy.rb",
+     "tmp/rails/db/migrations/20100912101429_remove_admin_flag_strategy.rb",
+     "tmp/rails/db/migrations/20100912105055_add_many_roles_strategy.rb",
+     "tmp/rails/db/migrations/20100912105323_add_one_role_strategy.rb",
+     "tmp/rails/db/migrations/20100912110044_add_role_string_strategy.rb",
+     "tmp/rails/db/migrations/20100912110249_add_roles_mask_strategy.rb"
   ]
   s.homepage = %q{http://github.com/kristianmandrup/roles_for_dm}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -92,6 +103,8 @@ Gem::Specification.new do |s|
   s.test_files = [
     "spec/fixtures/many_roles_setup.rb",
      "spec/fixtures/one_role_setup.rb",
+     "spec/generator_spec_helper.rb",
+     "spec/migration_spec_helper.rb",
      "spec/migrations/admin_flag/004_add_admin_flag_to_users.rb",
      "spec/migrations/many_roles/002_create_roles.rb",
      "spec/migrations/many_roles/003_create_user_roles.rb",
@@ -101,7 +114,7 @@ Gem::Specification.new do |s|
      "spec/migrations/roles_mask/005_add_roles_mask_to_users.rb",
      "spec/migrations/users/001_create_users.rb",
      "spec/roles_active_record/admin_flag_spec.rb",
-     "spec/roles_active_record/generators/migration_spec_helper.rb",
+     "spec/roles_active_record/generators/roles_generator_spec.rb",
      "spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb",
      "spec/roles_active_record/generators/roles_migration/many_roles_spec.rb",
      "spec/roles_active_record/generators/roles_migration/one_role_spec.rb",

data/spec/generator_spec_helper.rb

@@ -0,0 +1,13 @@
+require 'rspec'
+require 'rspec/autorun'     
+require 'rails3_artifactor'
+require 'generator-spec'
+require 'roles_generic'
+
+RSpec::Generator.configure do |config|
+  config.debug = false
+  config.remove_temp_dir = false # true
+  config.default_rails_root(__FILE__) 
+  config.lib = File.dirname(__FILE__) + '/../lib'
+  config.logger = :stdout  
+end

data/spec/migration_spec_helper.rb

@@ -0,0 +1,20 @@
+require 'rspec'
+require 'rspec/autorun'
+require 'active_record'
+require 'yaml'
+require 'logger'
+require 'database_cleaner'
+require 'roles_active_record'
+require 'migration-spec'
+require 'generator-spec'
+
+Rails::Migration::Assist.rails_root_dir = File.expand_path(File.dirname(__FILE__) + '/../tmp/rails')
+
+RSpec::Generator.configure do |config|
+  config.debug = true
+  config.remove_temp_dir = false # true
+  config.default_rails_root(__FILE__) 
+  config.lib = File.dirname(__FILE__) + '/../lib'
+  config.logger = :stdout
+end
+  

data/spec/roles_active_record/generators/roles_generator_spec.rb

@@ -0,0 +1,75 @@
+require 'generator_spec_helper'
+require_generator :active_record => :roles
+
+# root_dir = Rails3::Assist::Directory.rails_root
+root_dir = File.join(Rails.application.config.root_dir, 'rails')
+
+describe 'role strategy generator: admin_flag' do
+  describe 'ORM: active_record' do  
+    use_orm :active_record
+
+    before do              
+      setup_generator 'datamapper_roles_generator' do
+        tests ActiveRecord::Generators::RolesGenerator
+      end    
+    end
+    
+    before :each do              
+      remove_model :user    
+    end
+
+    after :each do
+      # remove_model :user
+    end
+
+    it "should configure 'admin_flag' strategy without default roles" do            
+      create_model :user do
+        '# content'
+      end
+      with_generator do |g|   
+        arguments = "User --strategy admin_flag --roles special --no-default-roles"
+        puts "arguments: #{arguments}"
+        g.run_generator arguments.args
+        root_dir.should have_model :user do |clazz|
+          clazz.should include_module 'Roles::ActiveRecord'
+          clazz.should have_call :valid_roles_are, :args => ':special'
+          clazz.should have_call :strategy, :args => ":admin_flag"        
+        end
+      end
+    end
+        
+    it "should configure 'admin_flag' strategy" do            
+      create_model :user do
+        '# content'
+      end
+      with_generator do |g|   
+        arguments = "User --strategy admin_flag --roles admin user"
+        puts "arguments: #{arguments}"
+        g.run_generator arguments.args
+        root_dir.should have_model :user do |clazz|
+          clazz.should include_module 'Roles::ActiveRecord'
+          clazz.should have_call :valid_roles_are, :args => ':admin, :guest, :user'
+          clazz.should have_call :strategy, :args => ":admin_flag"        
+        end
+      end
+    end
+    
+    it "should configure 'one_role' strategy" do            
+      create_model :user do
+        '# content'
+      end
+      with_generator do |g|   
+        arguments = "User --strategy one_role --roles admin user"
+        puts "arguments: #{arguments}"
+        g.run_generator arguments.args
+        root_dir.should have_model :user do |clazz|
+          clazz.should include_module 'Roles::ActiveRecord'
+          clazz.should have_call :valid_roles_are, :args => ':admin, :guest, :user'
+          clazz.should have_call :role_class, :args => ":role"        
+          clazz.should have_call :strategy, :args => ":one_role"        
+        end
+      end
+    end    
+  end
+end
+

data/spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb

@@ -1,12 +1,18 @@
-require File.expand_path(File.dirname(__FILE__) + '/../migration_spec_helper')
+require 'migration_spec_helper'
 
 require_generator :active_record => :roles_migration
 
+root_dir = Rails::Migration::Assist.rails_root_dir
+Rails3::Assist::Directory.rails_root = root_dir
+Rails::Migration::Assist.orm = :active_record
+
+puts "root_dir: #{root_dir}"
+
 describe 'roles_migration_generator' do
-  use_orm :active_record  
-  helpers :migration
+  use_orm     :active_record
+  use_helper  :migration
   
-  before :each do              
+  before do              
     setup_generator 'roles_migration_generator' do
       tests ActiveRecord::Generators::RolesMigrationGenerator      
     end    
@@ -15,28 +21,26 @@ describe 'roles_migration_generator' do
   after :each do
   end
     
-  # it "should generate migration 'add_admin_flag_strategy' for role strategy 'admin_flag'" do    
-  #   with_generator do |g|
-  #     remove_migration :add_admin_flag_strategy
-  #     g.run_generator "User --strategy admin_flag".args
-  # 
-  #     g.should generate_migration :add_admin_flag_strategy do |content|
-  #       content.should have_migration :add_admin_flag_strategy do |klass|
-  #         klass.should have_up do |up|
-  #           up.should have_change_table :users do |tbl_content|
-  #             tbl_content.should have_add_column :admin_flag, :boolean
-  #           end
-  #         end
-  # 
-  #         klass.should have_down do |down|
-  #           down.should have_change_table :users do |tbl_content|
-  #             tbl_content.should have_remove_column :admin_flag
-  #           end
-  #         end
-  #       end
-  #     end      
-  #   end # with
-  # end
+  it "should generate migration 'add_admin_flag_strategy' for role strategy 'admin_flag'" do    
+    with_generator do |g|
+      remove_migration :add_admin_flag_strategy
+      g.run_generator "User --strategy admin_flag".args
+  
+      g.should generate_migration :add_admin_flag_strategy do |content|  
+        content.should have_up do |up|
+          up.should have_change_table :users do |tbl_content|
+            tbl_content.should have_add_column :admin_flag, :boolean
+          end
+        end
+
+        content.should have_down do |down|
+          down.should have_change_table :users do |tbl_content|
+            tbl_content.should have_remove_column :admin_flag
+          end
+        end
+      end      
+    end # with
+  end
   
   it "should generate reverse migration 'remove_admin_flag_strategy' for role strategy 'admin_flag'" do    
     with_generator do |g|
@@ -44,17 +48,15 @@ describe 'roles_migration_generator' do
       g.run_generator "User --strategy admin_flag --reverse".args
   
       g.should generate_migration :remove_admin_flag_strategy do |content|
-        content.should have_migration :remove_admin_flag_strategy do |klass|
-          klass.should have_down do |down|
-            down.should have_change_table :users do |tbl_content|
-              tbl_content.should have_add_column :admin_flag, :boolean
-            end
+        content.should have_down do |down|
+          down.should have_change_table :users do |tbl_content|
+            tbl_content.should have_add_column :admin_flag, :boolean
           end
-  
-          klass.should have_up do |up|
-            up.should have_change_table :users do |tbl_content|
-              tbl_content.should have_remove_column :admin_flag
-            end
+        end
+
+        content.should have_up do |up|
+          up.should have_change_table :users do |tbl_content|
+            tbl_content.should have_remove_column :admin_flag
           end
         end
       end      

data/spec/roles_active_record/generators/roles_migration/many_roles_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../migration_spec_helper')
+require 'migration_spec_helper'
 require_generator :active_record => :roles_migration
 
 describe 'roles_migration_generator' do
   use_orm :active_record  
-  helpers :migration
+  use_helper :migration
   
   before :each do              
     setup_generator 'roles_migration_generator' do
@@ -20,36 +20,34 @@ describe 'roles_migration_generator' do
       g.run_generator "User --strategy many_roles".args
   
       g.should generate_migration :add_many_roles_strategy do |content|
-        content.should have_migration :add_many_roles_strategy do |klass|
-          klass.should have_class_self do |class_self|
-            class_self.should have_method :up do |up|
-              up.should have_call :create_user_roles
-              up.should have_call :create_roles
-            end
-            
-            class_self.should have_method :create_user_roles do |method|
-              method.should have_create_table :user_roles do |tbl_content|
-                tbl_content.should have_add_column :role_id, :integer
-                tbl_content.should have_add_column :user_id, :integer
-                tbl_content.should have_timestamps
-              end
+        content.should have_class_self do |class_self|
+          class_self.should have_method :up do |up|
+            up.should have_call :create_user_roles
+            up.should have_call :create_roles
+          end
+          
+          class_self.should have_method :create_user_roles do |method|
+            method.should have_create_table :user_roles do |tbl_content|
+              tbl_content.should have_add_column :role_id, :integer
+              tbl_content.should have_add_column :user_id, :integer
+              tbl_content.should have_timestamps
             end
+          end
 
-            class_self.should have_method :create_roles do |method|        
-              method.should have_create_table :roles do |tbl_content|
-                tbl_content.should have_add_column :name, :string
-                tbl_content.should have_timestamps
-              end
+          class_self.should have_method :create_roles do |method|        
+            method.should have_create_table :roles do |tbl_content|
+              tbl_content.should have_add_column :name, :string
+              tbl_content.should have_timestamps
             end
-            
-            class_self.should have_method :down do |down|
-              down.should have_call :drop_user_roles
-              down.should have_call :drop_roles 
-            end
-            
-            class_self.should have_method :drop_user_roles
-            class_self.should have_method :drop_roles
           end
+          
+          class_self.should have_method :down do |down|
+            down.should have_call :drop_user_roles
+            down.should have_call :drop_roles 
+          end
+          
+          class_self.should have_method :drop_user_roles
+          class_self.should have_method :drop_roles
         end
       end
     end # with

data/spec/roles_active_record/generators/roles_migration/one_role_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../migration_spec_helper')
+require 'migration_spec_helper'
 require_generator :active_record => :roles_migration
 
 describe 'roles_migration_generator' do
   use_orm :active_record  
-  helpers :migration
+  use_helper :migration
   
   before :each do              
     setup_generator 'roles_migration_generator' do
@@ -21,36 +21,29 @@ describe 'roles_migration_generator' do
             
       g.run_generator [:user, %w{--strategy one_role}].args
 
-      g.should generate_migration :add_role_to_users do |content|
-        content.should have_migration :add_role_to_users do |klass|
-          klass.should have_up do |up|
-            up.should have_change_table :users do |tbl_content|
-              tbl_content.should have_add_column :role_id, :integer
-            end
+      # def up          
+      #   create_roles
+      #   add_user_role
+      # end
+      # 
+      # def down      
+      #   drop_roles
+      #   remove_user_role
+      # end
+
+      g.should generate_migration :add_one_role_strategy do |content|
+        content.should have_class_self do |class_self|        
+          class_self.should have_method :up do |up|
+            up.should have_call :create_roles
+            up.should have_call :add_user_role
           end
 
-          klass.should have_down do |down|
-            down.should have_change_table :users do |tbl_content|
-              tbl_content.should have_remove_column :role_id
-            end
+          class_self.should have_method :down do |down|
+            down.should have_call :drop_roles
+            down.should have_call :remove_user_role
           end
         end
-      end      
-
-      g.should generate_migration :create_roles do |content|
-        content.should have_migration :create_roles do |klass|
-          klass.should have_up do |up|
-            up.should have_create_table :roles do |tbl_content|
-              tbl_content.should have_add_column :name, :string
-              tbl_content.should have_timestamps             
-            end
-          end
-
-          klass.should have_down do |down|
-            down.should have_drop_table :roles
-          end
-        end
-      end      
+      end
     end # with
   end
 end

data/spec/roles_active_record/generators/roles_migration/role_string_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../migration_spec_helper')
+require 'migration_spec_helper'
 require_generator :active_record => :roles_migration
 
 describe 'roles_migration_generator' do
   use_orm :active_record  
-  helpers :migration
+  use_helper :migration
   
   before :each do              
     setup_generator 'roles_migration_generator' do
@@ -15,26 +15,40 @@ describe 'roles_migration_generator' do
   end
 
 
-  it "should generate migration 'add_inline_role_to_user' for role strategy 'role_string'" do    
+  it "should generate migration 'add_role_string_strategy' for role strategy 'role_string'" do    
+    
+    # class AddRoleStringStrategy < ActiveRecord::Migration
+    #   def self.up           
+    #     change_table :users do |t|
+    #       t.string :role, :default => 'guest'
+    #     end
+    #   end
+    # 
+    #   def self.down
+    #     change_table :users do |t|
+    #       t.remove :role
+    #     end
+    #   end
+    # end
+    
+    
     with_generator do |g|
-      remove_migration :add_inline_role_to_users
+      remove_migration :add_role_string_strategy
       g.run_generator [:user, %w{--strategy role_string}].args
 
-      g.should generate_migration :add_inline_role_to_users do |content|
-        content.should have_migration :add_inline_role_to_users do |klass|
-          klass.should have_up do |up|
-            up.should have_change_table :users do |tbl_content|
-              tbl_content.should have_add_column :role, :string
-            end
+      g.should generate_migration :add_role_string_strategy do |content|
+        content.should have_up do |up|
+          up.should have_change_table :users do |tbl_content|
+            tbl_content.should have_add_column :role, :string
           end
+        end
 
-          klass.should have_down do |down|
-            down.should have_change_table :users do |tbl_content|
-              tbl_content.should have_remove_column :role
-            end
+        content.should have_down do |down|
+          down.should have_change_table :users do |tbl_content|
+            tbl_content.should have_remove_column :role
           end
         end
-      end      
+      end
     end # with
   end
 end 

data/spec/roles_active_record/generators/roles_migration/roles_mask_spec.rb

@@ -1,9 +1,9 @@
-require File.expand_path(File.dirname(__FILE__) + '/../migration_spec_helper')
+require 'migration_spec_helper'
 require_generator :active_record => :roles_migration
 
 describe 'roles_migration_generator' do
   use_orm :active_record  
-  helpers :migration
+  use_helper :migration
   
   before :each do              
     setup_generator 'roles_migration_generator' do
@@ -11,23 +11,21 @@ describe 'roles_migration_generator' do
     end    
   end
 
-  it "should generate migration 'add_roles_mask_to_users' for role strategy 'roles_mask'" do    
+  it "should generate migration 'add_roles_mask_strategy' for role strategy 'roles_mask'" do    
     with_generator do |g|
-      remove_migration :add_roles_mask_to_users
+      remove_migration :add_roles_mask_strategy
       g.run_generator [:user, %w{--strategy roles_mask}].args
 
-      g.should generate_migration :add_roles_mask_to_users do |content|
-        content.should have_migration :add_roles_mask_to_users do |klass|
-          klass.should have_up_method do |up|
-            up.should have_change_table :users do |tbl_content|
-              tbl_content.should have_add_column :roles_mask, :integer
-            end
+      g.should generate_migration :add_roles_mask_strategy do |content|
+        content.should have_up_method do |up|
+          up.should have_change_table :users do |tbl_content|
+            tbl_content.should have_add_column :roles_mask, :integer
           end
+        end
 
-          klass.should have_down_method do |down|
-            down.should have_change_table :users do |tbl_content|
-              tbl_content.should have_remove_column :roles_mask
-            end
+        content.should have_down_method do |down|
+          down.should have_change_table :users do |tbl_content|
+            tbl_content.should have_remove_column :roles_mask
           end
         end
       end      

data/tmp/rails/app/models/user.rb

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

data/tmp/rails/config/routes.rb

@@ -0,0 +1,2 @@
+Rails.application.routes.draw do
+end

data/tmp/rails/db/migrations/20100912101428_add_admin_flag_strategy.rb

@@ -0,0 +1,14 @@
+class AddAdminFlagStrategy < ActiveRecord::Migration
+
+  def self.up           
+    change_table :users do |t|
+      t.boolean :admin_flag, :default => false
+    end
+  end
+
+  def self.down
+    change_table :users do |t|
+      t.remove :admin_flag
+    end
+  end
+end

data/tmp/rails/db/migrations/20100912101429_remove_admin_flag_strategy.rb

@@ -0,0 +1,14 @@
+class RemoveAdminFlagStrategy < ActiveRecord::Migration
+
+  def self.down           
+    change_table :users do |t|
+      t.boolean :admin_flag, :default => false
+    end
+  end
+
+  def self.up
+    change_table :users do |t|
+      t.remove :admin_flag
+    end
+  end
+end

data/tmp/rails/db/migrations/20100912105055_add_many_roles_strategy.rb

@@ -0,0 +1,40 @@
+class AddManyRolesStrategy < ActiveRecord::Migration
+  class << self
+
+    def up          
+      create_roles
+      create_user_roles
+    end
+
+    def down      
+      drop_roles
+      drop_user_roles
+    end
+
+    protected
+
+    def create_user_roles
+      create_table :user_roles do |t|
+        t.integer :user_id
+        t.integer :role_id
+        t.timestamps
+      end
+    end
+
+    def drop_user_roles
+      drop_table :user_roles
+    end
+
+
+    def create_roles
+      create_table :roles do |t|
+        t.string  :name
+        t.timestamps
+      end
+    end
+
+    def drop_roles
+      drop_table :roles
+    end
+  end
+end

data/tmp/rails/db/migrations/20100912105323_add_one_role_strategy.rb

@@ -0,0 +1,40 @@
+class AddOneRoleStrategy < ActiveRecord::Migration
+  class << self
+
+    def up          
+      create_roles
+      add_user_role
+    end
+
+    def down      
+      drop_roles
+      remove_user_role
+    end
+
+    protected
+
+    def add_user_role
+      change_table :users do |t|
+        t.integer :role_id
+      end
+    end
+
+    def remove_user_role
+      change_table :users do |t|
+        t.remove :role_id
+      end
+    end
+
+
+    def create_roles
+      create_table :roles do |t|
+        t.string  :name
+        t.timestamps
+      end
+    end
+
+    def drop_roles
+      drop_table :roles
+    end
+  end
+end

data/tmp/rails/db/migrations/20100912110044_add_role_string_strategy.rb

@@ -0,0 +1,13 @@
+class AddRoleStringStrategy < ActiveRecord::Migration
+  def self.up           
+    change_table :users do |t|
+      t.string :role, :default => 'guest'
+    end
+  end
+
+  def self.down
+    change_table :users do |t|
+      t.remove :role
+    end
+  end
+end

data/tmp/rails/db/migrations/20100912110249_add_roles_mask_strategy.rb

@@ -0,0 +1,13 @@
+class AddRolesMaskStrategy < ActiveRecord::Migration
+  def self.up           
+    change_table :users do |t|
+      t.integer :roles_mask, :default => 1
+    end
+  end
+
+  def self.down
+    change_table :users do |t|
+      t.remove :roles_mask
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
+  - 2
   - 0
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-06 00:00:00 +02:00
+date: 2010-09-12 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -209,8 +209,9 @@ files:
 - lib/generators/active_record/roles_migration/templates/add_many_roles_strategy.erb
 - lib/generators/active_record/roles_migration/templates/add_one_role_strategy.erb
 - lib/generators/active_record/roles_migration/templates/add_role_string_strategy.erb
-- lib/generators/active_record/roles_migration/templates/add_roles_mask_to_users_migration.erb
+- lib/generators/active_record/roles_migration/templates/add_roles_mask_strategy.erb
 - lib/generators/active_record/setup/setup_generator.rb
+- lib/roles_active_record.rb
 - lib/roles_active_record/base.rb
 - lib/roles_active_record/namespaces.rb
 - lib/roles_active_record/role.rb
@@ -220,9 +221,9 @@ files:
 - lib/roles_active_record/strategy/single/admin_flag.rb
 - lib/roles_active_record/strategy/single/one_role.rb
 - lib/roles_active_record/strategy/single/role_string.rb
-- lib/roles_for_active_record.rb
 - lib/views/_multi_role_selector.erb.html
 - lib/views/_single_role_selector.erb.html
+- logging.log
 - roles_active_record.gemspec
 - roles_for_ar.gemspec
 - sandbox/Rakefile
@@ -239,6 +240,8 @@ files:
 - spec/db/database.yml
 - spec/fixtures/many_roles_setup.rb
 - spec/fixtures/one_role_setup.rb
+- spec/generator_spec_helper.rb
+- spec/migration_spec_helper.rb
 - spec/migrations/admin_flag/004_add_admin_flag_to_users.rb
 - spec/migrations/many_roles/002_create_roles.rb
 - spec/migrations/many_roles/003_create_user_roles.rb
@@ -248,7 +251,7 @@ files:
 - spec/migrations/roles_mask/005_add_roles_mask_to_users.rb
 - spec/migrations/users/001_create_users.rb
 - spec/roles_active_record/admin_flag_spec.rb
-- spec/roles_active_record/generators/migration_spec_helper.rb
+- spec/roles_active_record/generators/roles_generator_spec.rb
 - spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb
 - spec/roles_active_record/generators/roles_migration/many_roles_spec.rb
 - spec/roles_active_record/generators/roles_migration/one_role_spec.rb
@@ -260,6 +263,14 @@ files:
 - spec/roles_active_record/role_string_spec.rb
 - spec/roles_active_record/roles_mask_spec.rb
 - spec/spec_helper.rb
+- tmp/rails/app/models/user.rb
+- tmp/rails/config/routes.rb
+- tmp/rails/db/migrations/20100912101428_add_admin_flag_strategy.rb
+- tmp/rails/db/migrations/20100912101429_remove_admin_flag_strategy.rb
+- tmp/rails/db/migrations/20100912105055_add_many_roles_strategy.rb
+- tmp/rails/db/migrations/20100912105323_add_one_role_strategy.rb
+- tmp/rails/db/migrations/20100912110044_add_role_string_strategy.rb
+- tmp/rails/db/migrations/20100912110249_add_roles_mask_strategy.rb
 has_rdoc: true
 homepage: http://github.com/kristianmandrup/roles_for_dm
 licenses: []
@@ -295,6 +306,8 @@ summary: Implementation of Roles generic API for Active Record
 test_files: 
 - spec/fixtures/many_roles_setup.rb
 - spec/fixtures/one_role_setup.rb
+- spec/generator_spec_helper.rb
+- spec/migration_spec_helper.rb
 - spec/migrations/admin_flag/004_add_admin_flag_to_users.rb
 - spec/migrations/many_roles/002_create_roles.rb
 - spec/migrations/many_roles/003_create_user_roles.rb
@@ -304,7 +317,7 @@ test_files:
 - spec/migrations/roles_mask/005_add_roles_mask_to_users.rb
 - spec/migrations/users/001_create_users.rb
 - spec/roles_active_record/admin_flag_spec.rb
-- spec/roles_active_record/generators/migration_spec_helper.rb
+- spec/roles_active_record/generators/roles_generator_spec.rb
 - spec/roles_active_record/generators/roles_migration/admin_flag_spec.rb
 - spec/roles_active_record/generators/roles_migration/many_roles_spec.rb
 - spec/roles_active_record/generators/roles_migration/one_role_spec.rb

data/spec/roles_active_record/generators/migration_spec_helper.rb

@@ -1,17 +0,0 @@
-require 'rspec'
-require 'rspec/autorun'
-require 'active_record'
-require 'yaml'
-require 'logger'
-require 'database_cleaner'
-require 'roles_for_ar'
-require 'generator_spec'
-
-RSpec::Generator.configure do |config|
-  config.debug = true
-  config.remove_temp_dir = true
-  config.default_rails_root(__FILE__) 
-  config.lib = File.dirname(__FILE__) + '/../../../lib'
-  config.logger = :stdout
-end
-