roles_active_record 0.4.6.3 → 0.4.6.4

data/VERSION

@@ -1 +1 @@
-0.4.6.3
+0.4.6.4

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

@@ -45,6 +45,7 @@ module RoleStrategy::ActiveRecord
       def set_empty_roles
         self.send("#{role_attribute}=", [])
       end
+      alias_method :set_empty_role, :set_empty_roles
     end
 
     extend Roles::Generic::User::Configuration

data/lib/roles_active_record/strategy/multi.rb

@@ -2,7 +2,9 @@ require 'roles_active_record/strategy/shared'
 
 module Roles::ActiveRecord
   module Strategy
-    module Multi     
+    module Multi
+      include Shared
+                 
       # assign multiple roles
       def roles=(*role_names)
         extracted_roles = extract_roles(role_names)

data/lib/roles_active_record/strategy/shared.rb

@@ -6,6 +6,18 @@ module Roles::ActiveRecord
       end
       alias_method :set_roles, :set_role
 
+      def remove_all_roles!
+        set_empty_role        
+      end
+
+      def has_no_roles?
+        get_role.empty?
+      end
+
+      def has_any_roles?
+        !has_no_roles?
+      end
+
       def get_role
         r = self.send(role_attribute)
       end

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

@@ -25,9 +25,11 @@ module RoleStrategy::ActiveRecord
     module Implementation
       include Roles::ActiveRecord::Strategy::Single
 
-      def set_role role
+      def set_role role 
+        # set_empty_role
         role = role.first if role.kind_of? Array
-        role.users << self
+        self.send("#{role_attribute}=", role)
+        # role.users << self
       end
       alias_method :set_roles, :set_role
 

data/roles_active_record.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{roles_active_record}
-  s.version = "0.4.6.3"
+  s.version = "0.4.6.4"
 
   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

@@ -21,7 +21,7 @@ describe "Roles for Active Record: #{api_name}" do
       end
     end
   end
-
+  
   describe '#in_any_role' do
     it "should return first user matching role" do        
       if User.respond_to? :in_roles
@@ -175,6 +175,13 @@ describe "Roles for Active Record: #{api_name}" do
       @guest_user.has_role?(:admin).should be_true      
       @guest_user.roles = :guest            
     end    
+    
+    context 'the guest user' do
+      it "should be valid after setting the roles" do
+        @guest_user.should be_valid 
+        lambda {@guest_user.save!}.should_not raise_error        
+      end
+    end    
   end 
   
   describe '#role=' do
@@ -182,16 +189,22 @@ describe "Roles for Active Record: #{api_name}" do
       @guest_user.role = :admin      
       @guest_user.has_role?(:admin).should be_true
       @guest_user.has_role?(:guest).should be_false
-      @guest_user.role = :guest            
+      @guest_user.role = :guest
       @guest_user.has_role?(:guest).should be_true
       @guest_user.has_role?(:admin).should be_false
       
-      u = User.new
+      u = User.new :name => 'kris'
       u.role = :admin
       u.has_role?(:admin).should be_true
     end    
-  end 
-  
+
+    context 'the guest user' do
+      it "should be valid after setting the role" do
+        @guest_user.should be_valid
+        lambda {@guest_user.save!}.should_not raise_error
+      end
+    end
+  end   
   
   describe '#exchange_roles' do
     it "should exchange user role :user with role :admin" do
@@ -211,6 +224,52 @@ describe "Roles for Active Record: #{api_name}" do
         @admin_user.has?(:admin).should be_false        
       end
     end    
+    
+    context 'the admin user' do
+      it "should be valid after setting the role" do
+        @admin_user.should be_valid
+        lambda {@admin_user.save!}.should_not raise_error
+      end
+    end    
+  end 
+
+  describe '#add_role' do
+    it "should add user role :admin and :guest using #add_roles" do
+      @empty_user.add_role :admin
+      @admin_user.has_roles?(:admin).should be_true
+    end    
+     
+    context 'the empty user' do
+      it "should be valid after setting the role" do
+        @empty_user.should be_valid
+      end 
+      
+      it "should be able to save the valid user and not raise an error" do
+        lambda {@empty_user.save!}.should_not raise_error
+      end
+    end        
+  end 
+
+  describe '#add_roles' do
+    it "should add user role :admin and :guest using #add_roles" do      
+      if @empty_user.class.role_strategy.multiplicity == :multi
+        @empty_user.remove_all_roles!
+        @empty_user.has_no_roles?.should be_true
+        @empty_user.has_any_roles?.should be_false
+        @empty_user.add_roles :admin, :guest
+        @empty_user.has_roles?(:admin, :guest).should be_true
+      end
+    end    
+     
+    context 'the empty user' do
+      it "should be valid after setting the role" do
+        @empty_user.should be_valid
+      end 
+      
+      it "should be able to save the valid user and not raise an error" do
+        lambda {@empty_user.save!}.should_not raise_error
+      end
+    end        
   end 
   
   describe '#remove_roles' do
@@ -225,5 +284,15 @@ describe "Roles for Active Record: #{api_name}" do
       @guest_user.remove_role :admin
       @guest_user.has_role?(:admin).should_not be_true
     end  
+    
+    context 'the guest user' do
+      it "should be valid after setting the role" do
+        @guest_user.should be_valid
+      end 
+      
+      it "should be able to save the valid user and not raise an error" do
+        lambda {@guest_user.save!}.should_not raise_error
+      end
+    end        
   end 
 end

data/spec/roles_active_record/strategy/user_setup.rb

@@ -1,4 +1,7 @@
 def default_user_setup
+  @empty_user = User.create(:name => 'Empty user')  
+  @empty_user.save     
+  
   @guest_user = User.create(:name => 'Guest user')  
   @guest_user.add_roles :guest
   @guest_user.save     

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 4
   - 6
-  - 3
-  version: 0.4.6.3
+  - 4
+  version: 0.4.6.4
 platform: ruby
 authors: 
 - Kristian Mandrup