roles_active_record 0.4.1 → 0.4.2

data/VERSION

@@ -1 +1 @@
-0.4.1
+0.4.2

data/lib/roles_active_record/base.rb

@@ -38,8 +38,7 @@ module Roles::ActiveRecord
 
       # one_role reference
       if strategy_name == :one_role
-        puts "setup one_role"
-        instance_eval "belongs_to :one_role, :class_name => '#{@role_class_name}'"
+        self.belongs_to :one_role, :foreign_key => 'role_id', :class_name => @role_class_name.to_s
       end
       
       # many_roles references
@@ -67,8 +66,7 @@ module Roles::ActiveRecord
     end
 
     def default_role_class strategy_name
-      if defined? ::Role             
-        puts "require one_role"
+      if defined? ::Role
         require "roles_active_record/#{strategy_name}"
         return ::Role 
       end

data/roles_active_record.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.4.1"
+  s.version = "0.4.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kristian Mandrup"]

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/user_setup.rb

@@ -11,5 +11,5 @@ def default_user_setup
   @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}, #{Role.all}"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - Kristian Mandrup