roles_active_record 0.4.0 → 0.4.1

data/README.textile

@@ -62,11 +62,20 @@ For strategies that use a separate Role model you must call the class method #ro
 
   strategy :one_role, :role_class => :rolle
   valid_roles_are :admin, :guest
-  ...
 end
 </pre>    
 
-Here the role names have been customized
+h3. Strategy: many_roles
+
+Both the Role class and join class between User and Role can be customized using options
+
+<pre>class Bruger < ActiveRecord::Base
+  include Roles::ActiveRecord 
+
+  strategy :one_role, :role_class => :rolle, :user_role_class => :bruger_rolle
+  valid_roles_are :admin, :guest
+end
+</pre>    
 
 h3. Default Role classes
 

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.4.1

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

@@ -113,9 +113,8 @@ module ActiveRecord
 
       def strategy_options
         if role_class != 'Role' || user_role_class != 'UserRole' && role_ref_strategy?
-          return ":role_class => '#{role_class}', :user_role_class => 'user_role_class'"
+          return ":role_class => :#{options[:role_class] || 'role'}, :user_role_class => :#{options[:user_role_class] || 'user_role'}"
         end
-        ":default"
       end
     
       def insertion_text

data/lib/roles_active_record/base.rb

@@ -12,56 +12,68 @@ module Roles::ActiveRecord
   end
 
   module ClassMethods      
-    MAP = {
-      :admin_flag   => "attr_accessor :admin_flag",
 
-      :many_roles   => "attr_accessor :many_roles",
-      :one_role     => "belongs_to :one_role, :foreign_key => :role_id, :class_name => 'Role'",
+    def valid_single_strategies
+      [:admin_flag, :one_role, :role_string]
+    end
+
+    def valid_multi_strategies
+      [:many_roles, :roles_mask, :role_strings]
+    end
 
-      :embed_many_roles   => "attr_accessor :many_roles",
-      :embed_one_role     => "attr_accessor :one_role",
+    def strategies_with_role_class
+      [:one_role, :many_roles]
+    end 
 
-      :roles_mask   => "attr_accessor :roles_mask",
-      :role_string  => "attr_accessor :role_string",
-      :role_strings => "attr_accessor :role_strings",
-      :roles_string => "attr_accessor :roles_string"
-    }    
+    def valid_strategies
+      valid_single_strategies + valid_multi_strategies
+    end
     
     def strategy name, options = {}
       strategy_name = name.to_sym
-      raise ArgumentError, "Unknown role strategy #{strategy_name}" if !MAP.keys.include? strategy_name
+      raise ArgumentError, "Unknown role strategy #{strategy_name}" if !valid_strategies.include? strategy_name
       use_roles_strategy strategy_name
             
-      if !options.kind_of? Symbol
-        @role_class_name = get_role_class(strategy_name, options)
-      else
-        @role_class_name = default_role_class(strategy_name) if strategies_with_role_class.include? strategy_name
-      end
-
-      if (options == :default || options[:config] == :default) && MAP[name]
-        instance_eval statement(MAP[strategy_name])
-      end       
+      set_role_class(strategy_name, options) if strategies_with_role_class.include? strategy_name
 
+      # one_role reference
+      if strategy_name == :one_role
+        puts "setup one_role"
+        instance_eval "belongs_to :one_role, :class_name => '#{@role_class_name}'"
+      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}
+        }
+      end
+      
       set_role_strategy name, options
     end    
     
     private
 
+    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)
+    end
+
     def statement code_str
       code_str.gsub /Role/, @role_class_name.to_s
     end
 
     def default_role_class strategy_name
-      if defined? ::Role
+      if defined? ::Role             
+        puts "require one_role"
         require "roles_active_record/#{strategy_name}"
         return ::Role 
       end
-      raise Error, "Default Role class not defined"
+      raise "Default Role class not defined"
     end
-
-    def strategies_with_role_class
-      [:one_role, :embed_one_role, :many_roles,:embed_many_roles]
-    end 
     
     def get_role_class strategy_name, options
       options[:role_class] ? options[:role_class].to_s.camelize.constantize : default_role_class(strategy_name)

data/lib/roles_active_record/role.rb

@@ -6,7 +6,7 @@ module Roles::Base
         begin
           role_class_name.create(:name => name.to_s) # if !role_class_name.where(:name => name.to_s).first
         rescue
-          puts "Role name: #{name} is a duplicate"
+          # puts "Role name: #{name} is a duplicate"
         end
       end
     end

data/lib/roles_active_record/strategy/multi.rb

@@ -14,6 +14,7 @@ module Roles::ActiveRecord
         new_roles = select_valid_roles(roles)
         if !new_roles.empty?
           self.roles = self.roles + new_roles
+          self.save
         end
       end      
       

data/lib/roles_active_record/strategy/multi/many_roles.rb

@@ -9,8 +9,6 @@ module RoleStrategy::ActiveRecord
     def self.included base
       base.extend Roles::Generic::Role::ClassMethods
       base.extend ClassMethods
-      base.has_many :many_roles, :through => :user_roles, :source => :role
-      base.has_many :user_roles
     end
 
     module ClassMethods

data/lib/roles_active_record/strategy/multi/roles_mask.rb

@@ -18,7 +18,9 @@ module RoleStrategy::ActiveRecord
       def in_role(role)     
         mask = calc_index(role.to_s)
         all.select do |user| 
-          (user.send(role_attribute) & mask) > 0
+          v = user.send(role_attribute) || 0
+          value = (v & mask)
+          value && value > 0
         end
       end    
 
@@ -26,7 +28,9 @@ module RoleStrategy::ActiveRecord
         all.select do |user| 
           roles.flatten.any? do |role|
             mask = calc_index(role.to_s)
-            (user.send(role_attribute) & mask) > 0
+            v = user.send(role_attribute) || 0
+            value = (v & mask)
+            value && value > 0
           end
         end
       end    

data/lib/roles_active_record/strategy/shared.rb

@@ -2,20 +2,14 @@ module Roles::ActiveRecord
   module Strategy
     module Shared
       def set_role role
-        vr = new_role(role)
-        # self.send("#{role_attribute}=", vr)
-        update_attributes(role_attribute => vr)
+        update_attributes(role_attribute => new_role(role))
       end
       alias_method :set_roles, :set_role
 
       def get_role
         r = self.send(role_attribute)
-        # respond_to?(:present_role) ? present_role(r) : r
-      end
-
-      def get_roles
-        r = self.send(role_attribute)
       end
+      alias_method :get_roles, :get_role
 
       def select_valid_roles *roles
         roles.flat_uniq.select{|role| valid_role? role }

data/lib/roles_active_record/strategy/single/one_role.rb

@@ -9,7 +9,6 @@ module RoleStrategy::ActiveRecord
     def self.included base
       base.extend Roles::Generic::Role::ClassMethods
       base.extend ClassMethods
-      # base.belongs_to :one_role, :foreign_key => :role_id, :class_name => 'Role'
     end
 
     module ClassMethods
@@ -18,13 +17,20 @@ module RoleStrategy::ActiveRecord
       end
 
       def in_any_role(*role_names)
-        joins(:one_role) & Role.named(role_names)
+        matching_roles = Role.named(role_names)
+        User.where(:role_id => matching_roles.map(&:id))
       end
     end
 
     module Implementation
       include Roles::ActiveRecord::Strategy::Single
 
+      def set_role role
+        role = role.first if role.kind_of? Array
+        role.users << self
+      end
+      alias_method :set_roles, :set_role
+
       def new_role role
         role_class.find_role(extract_role role)
       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.0"
+  s.version = "0.4.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]
-  s.date = %q{2010-12-25}
+  s.date = %q{2010-12-26}
   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 = [
@@ -54,17 +54,6 @@ Gem::Specification.new do |s|
     "lib/views/_multi_role_selector.erb.html",
     "lib/views/_single_role_selector.erb.html",
     "roles_active_record.gemspec",
-    "sandbox/Rakefile",
-    "sandbox/add_role_to_users_migration.erb",
-    "sandbox/create_roles_migration.erb",
-    "sandbox/create_user_roles_migration.erb",
-    "sandbox/database.log",
-    "sandbox/database.yml",
-    "sandbox/development.sqlite3",
-    "sandbox/migrate/201002508_create_roles.rb",
-    "sandbox/migrate/20102507_create_users.rb",
-    "sandbox/model_base.rb",
-    "sandbox/test.rb",
     "spec/db/database.yml",
     "spec/fixtures/many_roles_setup.rb",
     "spec/fixtures/many_roles_setup_unique_check.rb",

data/spec/roles_active_record/strategy/api_examples.rb

@@ -22,192 +22,192 @@ describe "Roles for Active Record: #{api_name}" do
     end
   end
 
-  describe '#in_any_role' do
-    it "should return first user matching role" do        
-      if User.respond_to? :in_roles
-        User.in_any_role(:guest, :user).first.name.should == 'Guest user'      
-        User.in_any_role(:admin, :guest).should be_empty
-      end
-    end
-  end
-  
-  it "should be true that a User that includes Roles::Generic has a complete Roles::Generic interface" do
-    # mutation API
-    [:roles=, :role=, :add_roles, :add_role, :remove_role, :remove_roles, :exchange_roles, :exchange_role].each do |api_method|
-      @admin_user.respond_to?(api_method).should be_true
-    end
-  
-    # inspection API
-    [:valid_role?, :valid_roles?, :has_roles?, :has_role?, :has?, :is?, :roles, :roles_list, :admin?].each do |api_method|
-      @admin_user.respond_to?(api_method).should be_true
-    end                  
-  
-    # class method API
-    [:valid_role?, :valid_roles?, :valid_roles].each do |class_api_method|
-      @admin_user.class.respond_to?(class_api_method).should be_true
-    end
-  end 
-  
-  describe '#valid_role?' do
-    it "should be true that the admin user has a valid role of :guest" do      
-      # @admin_user.valid_role?(:guest).should be_true
-    end
-  
-    it "should be true that the User class has a valid role of :guest" do      
-      # User.valid_role?(:guest).should be_true
-    end
-  end  
-  
-  describe '#valid_roles' do
-    it "should be true that the admin user has a valid role of :guest" do      
-      # @admin_user.valid_roles.should include(:guest, :admin)
-    end
-  
-    it "should be true that the User class has a valid role of :guest" do      
-      User.valid_roles.should include(:guest, :admin)
-    end
-  end
-  
-  describe '#valid_roles?' do
-    it "should be true that the admin user has a valid role of :guest" do      
-      @admin_user.valid_roles?(:guest, :admin).should be_true
-    end
-  
-    it "should be true that the User class has a valid role of :guest" do      
-      User.valid_roles?(:guest, :admin).should be_true
-    end
-  end  
-  
-  describe '#has_role?' do     
-    it "should have admin user role to :admin and not to :user" do            
-      @admin_user.has_role?(:user).should be_false
-      @admin_user.has_role?(:admin).should be_true
-    end
-  
-    it "should be true that guest user has role :guest and not :admin" do      
-      puts "Guest user: #{@guest_user.roles_list}"
-      @guest_user.has_role?(:guest).should be_true    
-      @guest_user.has_role?(:admin).should be_false
-    end
-  end  
-  
-  describe '#has?' do    
-    it "should be true that the admin_user has the :admin role" do      
-      @admin_user.has?(:admin).should be_true      
-    end
-  
-    it "should NOT be true that the admin_user has the :admin role" do      
-      @guest_user.has?(:admin).should be_false
-    end
-  end
-  
-  describe '#has_roles?' do
-    it "should be true that the admin_user has the roles :admin" do      
-      # @admin_user.has_roles?(:admin).should be_true
-    end
-  
-    it "should NOT be true that the user has the roles :admin" do
-      @guest_user.has_roles?(:admin).should be_false
-    end
-  end 
-           
-  describe '#roles_list' do
-    it "should be true that the first role of admin_user is the :admin role" do      
-      @admin_user.roles_list.should include(:admin)
-    end
-  
-    it "should be true that the first role of admin_user is the :user role" do            
-      case @normal_user.class.role_strategy.multiplicity
-      when :single
-        #if @normal_user.class.role_strategy.name == :admin_flag
-        @normal_user.roles_list.should include(:guest)
-        # else
-        #   @normal_user.roles_list.should include(:user)
-        #end
-      when :multi
-        puts "Norm: #{@normal_user.roles}"
-        @normal_user.roles_list.should include(:user, :guest)
-      end
-    end
-  end 
-  
-  describe '#roles' do
-    it "should be true that the roles of admin_user is an array with the role :admin" do      
-      roles = @admin_user.roles
-      if defined?(Role) && roles.kind_of?(Role)
-        roles.name.to_sym.should == :admin
-      elsif roles.kind_of? Array
-        if @normal_user.class.role_strategy.type == :complex
-          roles.first.name.to_sym.should == :admin
-        end
-        if @normal_user.class.role_strategy.name == :admin_flag
-          roles.first.should == true          
-        end
-      else       
-        roles.to_sym.should == :admin
-      end
-    end
-  end 
-  
-  describe '#admin?' do    
-    it "should be true that admin_user is in the :admin role" do      
-      @admin_user.admin?.should be_true
-    end
-  
-    it "should NOT be true that the user is in the :admin role" do      
-      @guest_user.admin?.should be_false
-    end
-  end 
-  
-  describe '#is?' do          
-    it "should be true that admin_user is in the :admin role" do      
-      @admin_user.is?(:admin).should be_true
-    end
-  
-    it "should NOT be true that the user is in the :admin role" do      
-      @guest_user.is?(:admin).should be_false
-    end
-  end    
-  
-  describe '#roles=' do
-    it "should set user role to :admin" do
-      @guest_user.roles = :admin      
-      @guest_user.has_role?(:admin).should be_true      
-      @guest_user.roles = :guest            
-    end    
-  end 
-  
-  describe '#exchange_roles' do
-    it "should exchange user role :user with role :admin" do
-      @guest_user.exchange_role :guest, :with => :admin      
-      @guest_user.has?(:guest).should be_false
-      @guest_user.has?(:admin).should be_true
-    end    
-  
-    it "should exchange user role :admin with roles :user and :guest" do
-      case @admin_user.class.role_strategy.multiplicity
-      when :single     
-        lambda { @admin_user.exchange_role :admin, :with => [:user, :guest] }.should raise_error(ArgumentError)
-      when :multi
-        @admin_user.exchange_role :admin, :with => [:user, :guest]
-        @admin_user.has_role?(:user).should be_true
-        @admin_user.has_role?(:guest).should be_true
-        @admin_user.has?(:admin).should be_false        
-      end
-    end    
-  end 
-  
-  describe '#remove_roles' do
-    it "should remove user role :admin using #remove_roles" do
-      @admin_user.remove_roles :admin
-      @admin_user.has_role?(:admin).should_not be_true
-    end    
-  
-    it "should remove user role :admin using #remove_role" do
-      @guest_user.add_role :admin
-      @guest_user.has_role?(:admin).should be_true
-      @guest_user.remove_role :admin
-      @guest_user.has_role?(:admin).should_not be_true
-    end  
-  end
+  # describe '#in_any_role' do
+  #   it "should return first user matching role" do        
+  #     if User.respond_to? :in_roles
+  #       User.in_any_role(:guest, :user).first.name.should == 'Guest user'      
+  #       User.in_any_role(:admin, :guest).should be_empty
+  #     end
+  #   end
+  # end
+  
+  # it "should be true that a User that includes Roles::Generic has a complete Roles::Generic interface" do
+  #   # mutation API
+  #   [:roles=, :role=, :add_roles, :add_role, :remove_role, :remove_roles, :exchange_roles, :exchange_role].each do |api_method|
+  #     @admin_user.respond_to?(api_method).should be_true
+  #   end
+  # 
+  #   # inspection API
+  #   [:valid_role?, :valid_roles?, :has_roles?, :has_role?, :has?, :is?, :roles, :roles_list, :admin?].each do |api_method|
+  #     @admin_user.respond_to?(api_method).should be_true
+  #   end                  
+  # 
+  #   # class method API
+  #   [:valid_role?, :valid_roles?, :valid_roles].each do |class_api_method|
+  #     @admin_user.class.respond_to?(class_api_method).should be_true
+  #   end
+  # end 
+  # 
+  # describe '#valid_role?' do
+  #   it "should be true that the admin user has a valid role of :guest" do      
+  #     # @admin_user.valid_role?(:guest).should be_true
+  #   end
+  # 
+  #   it "should be true that the User class has a valid role of :guest" do      
+  #     # User.valid_role?(:guest).should be_true
+  #   end
+  # end  
+  # 
+  # describe '#valid_roles' do
+  #   it "should be true that the admin user has a valid role of :guest" do      
+  #     # @admin_user.valid_roles.should include(:guest, :admin)
+  #   end
+  # 
+  #   it "should be true that the User class has a valid role of :guest" do      
+  #     User.valid_roles.should include(:guest, :admin)
+  #   end
+  # end
+  # 
+  # describe '#valid_roles?' do
+  #   it "should be true that the admin user has a valid role of :guest" do      
+  #     @admin_user.valid_roles?(:guest, :admin).should be_true
+  #   end
+  # 
+  #   it "should be true that the User class has a valid role of :guest" do      
+  #     User.valid_roles?(:guest, :admin).should be_true
+  #   end
+  # end  
+  # 
+  # describe '#has_role?' do     
+  #   it "should have admin user role to :admin and not to :user" do            
+  #     @admin_user.has_role?(:user).should be_false
+  #     @admin_user.has_role?(:admin).should be_true
+  #   end
+  # 
+  #   it "should be true that guest user has role :guest and not :admin" do      
+  #     puts "Guest user: #{@guest_user.roles_list}"
+  #     @guest_user.has_role?(:guest).should be_true    
+  #     @guest_user.has_role?(:admin).should be_false
+  #   end
+  # end  
+  # 
+  # describe '#has?' do    
+  #   it "should be true that the admin_user has the :admin role" do      
+  #     @admin_user.has?(:admin).should be_true      
+  #   end
+  # 
+  #   it "should NOT be true that the admin_user has the :admin role" do      
+  #     @guest_user.has?(:admin).should be_false
+  #   end
+  # end
+  # 
+  # describe '#has_roles?' do
+  #   it "should be true that the admin_user has the roles :admin" do      
+  #     # @admin_user.has_roles?(:admin).should be_true
+  #   end
+  # 
+  #   it "should NOT be true that the user has the roles :admin" do
+  #     @guest_user.has_roles?(:admin).should be_false
+  #   end
+  # end 
+  #          
+  # describe '#roles_list' do
+  #   it "should be true that the first role of admin_user is the :admin role" do      
+  #     @admin_user.roles_list.should include(:admin)
+  #   end
+  # 
+  #   it "should be true that the first role of admin_user is the :user role" do            
+  #     case @normal_user.class.role_strategy.multiplicity
+  #     when :single
+  #       #if @normal_user.class.role_strategy.name == :admin_flag
+  #       @normal_user.roles_list.should include(:guest)
+  #       # else
+  #       #   @normal_user.roles_list.should include(:user)
+  #       #end
+  #     when :multi
+  #       puts "Norm: #{@normal_user.roles}"
+  #       @normal_user.roles_list.should include(:user, :guest)
+  #     end
+  #   end
+  # end 
+  # 
+  # describe '#roles' do
+  #   it "should be true that the roles of admin_user is an array with the role :admin" do      
+  #     roles = @admin_user.roles
+  #     if defined?(Role) && roles.kind_of?(Role)
+  #       roles.name.to_sym.should == :admin
+  #     elsif roles.kind_of? Array
+  #       if @normal_user.class.role_strategy.type == :complex
+  #         roles.first.name.to_sym.should == :admin
+  #       end
+  #       if @normal_user.class.role_strategy.name == :admin_flag
+  #         roles.first.should == true          
+  #       end
+  #     else       
+  #       roles.to_sym.should == :admin
+  #     end
+  #   end
+  # end 
+  # 
+  # describe '#admin?' do    
+  #   it "should be true that admin_user is in the :admin role" do      
+  #     @admin_user.admin?.should be_true
+  #   end
+  # 
+  #   it "should NOT be true that the user is in the :admin role" do      
+  #     @guest_user.admin?.should be_false
+  #   end
+  # end 
+  # 
+  # describe '#is?' do          
+  #   it "should be true that admin_user is in the :admin role" do      
+  #     @admin_user.is?(:admin).should be_true
+  #   end
+  # 
+  #   it "should NOT be true that the user is in the :admin role" do      
+  #     @guest_user.is?(:admin).should be_false
+  #   end
+  # end    
+  # 
+  # describe '#roles=' do
+  #   it "should set user role to :admin" do
+  #     @guest_user.roles = :admin      
+  #     @guest_user.has_role?(:admin).should be_true      
+  #     @guest_user.roles = :guest            
+  #   end    
+  # end 
+  # 
+  # describe '#exchange_roles' do
+  #   it "should exchange user role :user with role :admin" do
+  #     @guest_user.exchange_role :guest, :with => :admin      
+  #     @guest_user.has?(:guest).should be_false
+  #     @guest_user.has?(:admin).should be_true
+  #   end    
+  # 
+  #   it "should exchange user role :admin with roles :user and :guest" do
+  #     case @admin_user.class.role_strategy.multiplicity
+  #     when :single     
+  #       lambda { @admin_user.exchange_role :admin, :with => [:user, :guest] }.should raise_error(ArgumentError)
+  #     when :multi
+  #       @admin_user.exchange_role :admin, :with => [:user, :guest]
+  #       @admin_user.has_role?(:user).should be_true
+  #       @admin_user.has_role?(:guest).should be_true
+  #       @admin_user.has?(:admin).should be_false        
+  #     end
+  #   end    
+  # end 
+  # 
+  # describe '#remove_roles' do
+  #   it "should remove user role :admin using #remove_roles" do
+  #     @admin_user.remove_roles :admin
+  #     @admin_user.has_role?(:admin).should_not be_true
+  #   end    
+  # 
+  #   it "should remove user role :admin using #remove_role" do
+  #     @guest_user.add_role :admin
+  #     @guest_user.has_role?(:admin).should be_true
+  #     @guest_user.remove_role :admin
+  #     @guest_user.has_role?(:admin).should_not be_true
+  #   end  
+  # end
 end

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-use_roles_strategy :many_roles
 
 def api_migrate
   migrate('many_roles')

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-use_roles_strategy :many_roles
 
 def api_migrate
   migrate('many_roles')

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

@@ -1,11 +1,10 @@
 require 'spec_helper'
-use_roles_strategy :roles_mask
 
-class User < ActiveRecord::Base    
+class User < ActiveRecord::Base
   include Roles::ActiveRecord
   
   strategy :roles_mask, :default
-  valid_roles_are :admin, :guest, :user   
+  valid_roles_are :admin, :guest, :user
 end
 
 def api_migrate

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

@@ -1,5 +1,4 @@
 require 'spec_helper'
-use_roles_strategy :admin_flag
 
 class User < ActiveRecord::Base    
   include Roles::ActiveRecord 

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

@@ -1,7 +1,5 @@
 require 'spec_helper' 
 
-#use_roles_strategy :one_role
-
 def api_fixture
   load 'fixtures/one_role_setup.rb'
 end

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

@@ -1,5 +1,4 @@
 require 'spec_helper' 
-use_roles_strategy :one_role
 
 def api_fixture
   load 'fixtures/one_role_setup_unique_check.rb'

data/spec/roles_active_record/strategy/user_setup.rb

@@ -1,20 +1,15 @@
 def default_user_setup
   @guest_user = User.create(:name => 'Guest user')  
   @guest_user.add_roles :guest
-  # @guest_user.roles = :guest
   @guest_user.save     
   
-  puts "Guest roles: #{@guest_user.roles_list}"
-  
   @normal_user = User.create(:name => 'Normal user')
   @normal_user.roles = :guest, :user
   @normal_user.save  
   
-  puts "Normal roles: #{@normal_user.roles_list}, #{@normal_user.inspect}"
-  
   @admin_user = User.create(:name => 'Admin user')
   @admin_user.roles = :admin            
   @admin_user.save
   
-  puts "Admin roles: #{@admin_user.roles_list}, #{@admin_user.inspect}"  
+  puts "Admin roles: #{@admin_user.roles_list}, #{@admin_user.inspect}"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Kristian Mandrup
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-25 00:00:00 +01:00
+date: 2010-12-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -376,17 +376,6 @@ files:
 - lib/views/_multi_role_selector.erb.html
 - lib/views/_single_role_selector.erb.html
 - roles_active_record.gemspec
-- sandbox/Rakefile
-- sandbox/add_role_to_users_migration.erb
-- sandbox/create_roles_migration.erb
-- sandbox/create_user_roles_migration.erb
-- sandbox/database.log
-- sandbox/database.yml
-- sandbox/development.sqlite3
-- sandbox/migrate/201002508_create_roles.rb
-- sandbox/migrate/20102507_create_users.rb
-- sandbox/model_base.rb
-- sandbox/test.rb
 - spec/db/database.yml
 - spec/fixtures/many_roles_setup.rb
 - spec/fixtures/many_roles_setup_unique_check.rb

data/sandbox/Rakefile

@@ -1,16 +0,0 @@
-require 'active_record'
-require 'yaml'
-require 'logger'
-
-task :default => :migrate
-
-desc "Migrate the database through scripts in db/migrate. Target specific version with VERSION=x"
-task :migrate => :environment do 
-  folder = File.dirname(__FILE__) + '/migrate'
-  ActiveRecord::Migrator.migrate(folder, ENV["VERSION"] ? ENV["VERSION"].to_i : nil)
-end
-
-task :environment do
-  ActiveRecord::Base.establish_connection(YAML::load(File.open('database.yml')))
-  ActiveRecord::Base.logger = Logger.new(File.open('database.log', 'a'))
-end

data/sandbox/add_role_to_users_migration.erb

@@ -1,13 +0,0 @@
-class AddRoleToUsers < ActiveRecord::Migration
-  def self.up           
-    change_table :<%= table_name %> do |t|
-      t.integer :role_id
-    end
-  end
-
-  def self.down
-    change_table :<%= table_name %> do |t|
-      t.remove :role_id
-    end
-  end
-end

data/sandbox/create_roles_migration.erb

@@ -1,12 +0,0 @@
-class CreateRoles < ActiveRecord::Migration
-  def self.up
-    create_table :roles do |t|
-      t.string  :name
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :roles
-  end
-end

data/sandbox/create_user_roles_migration.erb

@@ -1,13 +0,0 @@
-class CreateUserRoles < ActiveRecord::Migration
-  def self.up
-    create_table :<%= table_name.singularize %>_roles do |t|
-      t.integer :<%= table_name.singularize %>_id
-      t.integer :role_id
-      t.timestamps
-    end
-  end
-
-  def self.down
-    drop_table :<%= table_name.singularize %>_roles
-  end
-end

data/sandbox/database.log

@@ -1,47 +0,0 @@
-D, [2010-08-03T11:17:25.097372 #5468] DEBUG -- :   SQL (0.3ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T11:17:25.097614 #5468] DEBUG -- :   SQL (0.1ms)  select sqlite_version(*)
-D, [2010-08-03T11:17:25.099557 #5468] DEBUG -- :   SQL (1.7ms)  CREATE TABLE "schema_migrations" ("version" varchar(255) NOT NULL) 
-D, [2010-08-03T11:17:25.099704 #5468] DEBUG -- :   SQL (0.0ms)  PRAGMA index_list("schema_migrations")
-D, [2010-08-03T11:17:25.101503 #5468] DEBUG -- :   SQL (1.7ms)  CREATE UNIQUE INDEX "unique_schema_migrations" ON "schema_migrations" ("version")
-D, [2010-08-03T11:17:25.101691 #5468] DEBUG -- :   SQL (0.1ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T11:18:24.658917 #5733] DEBUG -- :   SQL (0.8ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T11:19:32.203267 #5997] DEBUG -- :   SQL (0.4ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T11:21:50.864071 #6613] DEBUG -- :   SQL (0.4ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T11:21:50.866101 #6613] DEBUG -- :   SQL (0.1ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T11:21:50.867280 #6613] DEBUG -- :   SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
-I, [2010-08-03T11:21:50.867334 #6613]  INFO -- : Migrating to CreateUsers (20102507)
-D, [2010-08-03T11:21:50.867474 #6613] DEBUG -- :   SQL (0.0ms)  select sqlite_version(*)
-D, [2010-08-03T11:21:50.870727 #6613] DEBUG -- :   SQL (0.5ms)  CREATE TABLE "users" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL) 
-D, [2010-08-03T11:21:50.900844 #6613] DEBUG -- :   SQL (0.2ms)  INSERT INTO "schema_migrations" ("version") VALUES ('20102507')
-D, [2010-08-03T14:16:49.368569 #54191] DEBUG -- :   SQL (0.4ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T14:16:49.387225 #54191] DEBUG -- :   SQL (0.2ms)   SELECT name
- FROM sqlite_master
- WHERE type = 'table' AND NOT name = 'sqlite_sequence'
-
-D, [2010-08-03T14:16:49.388472 #54191] DEBUG -- :   SQL (0.1ms)  SELECT "schema_migrations"."version" FROM "schema_migrations"
-I, [2010-08-03T14:16:49.388536 #54191]  INFO -- : Migrating to CreateUsers (20102507)
-I, [2010-08-03T14:16:49.388570 #54191]  INFO -- : Migrating to CreateRoles (201002508)
-D, [2010-08-03T14:16:49.388708 #54191] DEBUG -- :   SQL (0.1ms)  select sqlite_version(*)
-D, [2010-08-03T14:16:49.406721 #54191] DEBUG -- :   SQL (0.4ms)  CREATE TABLE "roles" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "name" varchar(255) NOT NULL) 
-D, [2010-08-03T14:16:49.427264 #54191] DEBUG -- :   SQL (13.7ms)  INSERT INTO "schema_migrations" ("version") VALUES ('201002508')

data/sandbox/database.yml

@@ -1,4 +0,0 @@
-adapter: sqlite3
-database: development.sqlite3
-pool: 5
-timeout: 5000

data/sandbox/migrate/201002508_create_roles.rb

@@ -1,11 +0,0 @@
-class CreateRoles < ActiveRecord::Migration
-  def self.up
-    create_table :roles do |t|
-      t.column :name, :string, :null => false
-    end
-  end
-
-  def self.down
-    drop_table :roles
-  end
-end

data/sandbox/migrate/20102507_create_users.rb

@@ -1,11 +0,0 @@
-class CreateUsers < ActiveRecord::Migration
-  def self.up
-    create_table :users do |t|
-      t.column :name, :string, :null => false
-    end
-  end
-
-  def self.down
-    drop_table :users
-  end
-end

data/sandbox/model_base.rb

@@ -1,46 +0,0 @@
-require 'require_all'
-require 'active_support/inflector'
-require_all File.dirname(__FILE__) + '/strategies'
-
- 
-
-module RoleModels::ActiveRecord
-  include RoleModels::Base
-  orm_name :active_record
-end
-
- 
-module ActiveRecord
-  class Base
-    include RoleModels::ActiveRecord
-  end
-end
-
-
-class User
-  include RoleModels::Generic
-  
-  attr_accessor :roles_mask
-  role_strategy :roles_mask
-end
-
-class User
-  include RoleModels::Generic::RolesMask
-  attr_accessor :roles_mask
-end
-
-class User < ActiveRecord::Base
-  role_strategy :roles_mask
-end
-
-class User
-  include MongoMapper::Document
-  
-  role_strategy :roles_mask
-end
-
-class User
-  include Mongoid::Document
-  
-  role_strategy :roles_mask
-end

data/sandbox/test.rb

@@ -1,13 +0,0 @@
-require 'active_record'
-require 'yaml'
-require 'logger'
-path = File.dirname(__FILE__) + '/database.yml'
-dbfile = File.open(path)
-dbconfig = YAML::load(dbfile)
-ActiveRecord::Base.establish_connection(dbconfig)
-ActiveRecord::Base.logger = Logger.new(STDERR)
-
-class User < ActiveRecord::Base
-end
-
-puts User.count