rolify 0.3.0 → 0.4.0

data/CHANGELOG.rdoc

@@ -1,12 +1,18 @@
-# 0.3
+= v0.4
+* removing role support
+  * <tt>has_no_role</tt> removes a global role or a role scoped to a resource
+  * Please note that trying to remove a global role whereas the user a role with the same name on a resource will remove that scoped role
+  * Trying to remove a role scoped to a resource whereas the user has a global role won't remove it
+
+= v0.3
 * multiple roles check: 
-  * ``has_all_roles?`` returns true if the user has ALL the roles in arguments
-  * ``has_any_role?`` returns true if the user has ANY the roles in arguments
+  * <tt>has_all_roles?</tt> returns true if the user has ALL the roles in arguments
+  * <tt>has_any_role?</tt> returns true if the user has ANY the roles in arguments
 
-# 0.2
+= v0.2
 * fixed the generator to include the lib
 * fixed the migration file with missing polymorphic field
 * added some examples in documentation
 
-# 0.1
-* first release
+= v0.1
+* first release

data/README.rdoc

@@ -82,6 +82,8 @@ A global role overrides resource role request:
   user.has_role? "moderator", Forum.last
   => true
 
+Please see on {the wiki}[https://github.com/EppO/rolify/wiki/Usage] for all the available commands
+
 == Questions or Problems?
 
 If you have any issue or feature request with/for rolify, please add an {issue on GitHub}[https://github.com/EppO/rolify/issues] or fork the project and send a pull request.

data/lib/rolify/role.rb

@@ -1,13 +1,13 @@
 module Rolify
-  def has_role(role, resource = nil)
-    role = Role.find_or_create_by_name_and_resource_type_and_resource_id( :name => role, 
+  def has_role(role_name, resource = nil)
+    role = Role.find_or_create_by_name_and_resource_type_and_resource_id( :name => role_name, 
                                                                           :resource_type => (resource.class.name if resource), 
                                                                           :resource_id => (resource.id if resource))
     self.roles << role if !roles.include?(role)
   end
   
-  def has_role?(role, resource = nil)
-    query, values = build_query(role, resource)
+  def has_role?(role_name, resource = nil)
+    query, values = build_query(role_name, resource)
     self.roles.where(*query, *values).size > 0
   end
 
@@ -43,6 +43,13 @@ module Rolify
     self.roles.where([ conditions.join(' OR '), *values ]).size > 0
   end
   
+  def has_no_role(role_name, resource = nil)
+    role = Role.where( :name => role_name)
+    role = role.where( :resource_type => resource.class.name,
+                       :resource_id => resource.id) if resource
+    self.roles.delete(role) if role
+  end
+  
   def roles_name
     self.roles.select(:name).map { |r| r.name }
   end

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "0.3.0"
+  VERSION = "0.4.0"
 end

data/rolify.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |s|
   s.authors     = ["Florent Monbillard"]
   s.email       = ["f.monbillard@gmail.com"]
   s.homepage    = "https://github.com/EppO/rolify"
-  s.summary     = %q{Roles library with object scoping}
-  s.description = %q{Very simple Roles library without any authorization enforcement (built to use with cancan) supporting scope on object: user.is_moderator?(Forum.first) => # return false if user is moderator of another Forum }
+  s.summary     = %q{Roles library with resource scoping}
+  s.description = %q{Very simple Roles library without any authorization enforcement (built to use with cancan) supporting scope on resource: user.is_moderator?(Forum.first) => # return false if user is moderator of another Forum }
 
   s.rubyforge_project = s.name
 
@@ -21,4 +21,4 @@ Gem::Specification.new do |s|
   
   s.add_development_dependency "sqlite3"
   s.add_dependency "activerecord", "~> 3.1.0.rc1"
-end
+end

data/spec/rolify/role_spec.rb

@@ -25,6 +25,11 @@ describe Rolify do
       @admin.should respond_to(:has_any_role?)
       @admin.should respond_to(:has_any_role?)
     end
+    
+    it "should respond to has_no_role method" do
+      @admin.should respond_to(:has_no_role).with(1).arguments
+      @admin.should respond_to(:has_no_role).with(2).arguments
+    end
   end
 
   context "with a global role" do 
@@ -32,6 +37,7 @@ describe Rolify do
       @admin = User.first
       @admin.has_role "admin"
       @admin.has_role "staff"
+      @admin.has_role "moderator", Forum.first
     end
     
     it "should set a global role" do
@@ -80,12 +86,30 @@ describe Rolify do
       @admin.has_any_role?("admin", "moderator").should be(true)
       @admin.has_any_role?("dummy", "dumber").should be(false)
     end
+    
+    it "should remove a global role of a user" do 
+      expect { @admin.has_no_role("admin") }.to change{ @admin.roles.size }.by(-1)
+      @admin.has_role?("admin").should be(false)
+      @admin.has_role?("staff").should be(true)
+      @admin.has_role?("moderator", Forum.first).should be(true)
+    end
+    
+    it "should remove a scoped role of a user" do
+      expect { @admin.has_no_role("moderator") }.to change{ @admin.roles.size }.by(-1)
+      @admin.has_role?("staff").should be(true)
+      @admin.has_role?("moderator", Forum.first).should be(false)
+    end
+    
+    it "should not remove a another global role" do 
+      expect { @admin.has_no_role("global") }.not_to change{ @admin.roles.size }
+    end
   end
   
   context "with a scoped role" do
     before(:all) do
       @moderator = User.find(2)
       @moderator.has_role "moderator", Forum.first
+      @moderator.has_role "soldier"
     end
       
     it "should set a scoped role" do
@@ -140,6 +164,20 @@ describe Rolify do
       @moderator.has_any_role?( { :name => "dummy", :resource => Forum.first }, 
                                 { :name => "dumber", :resource => Forum.last }).should be(false)
     end
+    
+    it "should not remove a global role of a user" do 
+      expect { @moderator.has_no_role("soldier", Forum.first) }.not_to change{ @moderator.roles.size }
+    end
+    
+    it "should remove a scoped role of a user" do 
+      expect { @moderator.has_no_role("moderator", Forum.first) }.to change{ @moderator.roles.size }.by(-1)
+      @moderator.has_role?("moderator", Forum.first).should be(false)
+      @moderator.has_role?("soldier").should be(true)
+    end
+    
+    it "should not remove another scoped role" do
+      expect { @moderator.has_no_role("visitor", Forum.first) }.not_to change{ @moderator.roles.size }
+    end
   end
   
   context "with different roles" do 

data/spec/spec.opts

@@ -0,0 +1,2 @@
+--color
+--backtrace

metadata

@@ -2,7 +2,7 @@
 name: rolify
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Florent Monbillard
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-07 00:00:00 -04:00
-default_executable: 
+date: 2011-06-07 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: sqlite3
@@ -35,7 +34,7 @@ dependencies:
         version: 3.1.0.rc1
   type: :runtime
   version_requirements: *id002
-description: "Very simple Roles library without any authorization enforcement (built to use with cancan) supporting scope on object: user.is_moderator?(Forum.first) => # return false if user is moderator of another Forum "
+description: "Very simple Roles library without any authorization enforcement (built to use with cancan) supporting scope on resource: user.is_moderator?(Forum.first) => # return false if user is moderator of another Forum "
 email: 
 - f.monbillard@gmail.com
 executables: []
@@ -64,7 +63,6 @@ files:
 - spec/support/data.rb
 - spec/support/models.rb
 - spec/support/schema.rb
-has_rdoc: true
 homepage: https://github.com/EppO/rolify
 licenses: []
 
@@ -88,14 +86,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: rolify
-rubygems_version: 1.6.2
+rubygems_version: 1.7.2
 signing_key: 
 specification_version: 3
-summary: Roles library with object scoping
-test_files: 
-- spec/rolify/role_spec.rb
-- spec/spec.opts
-- spec/spec_helper.rb
-- spec/support/data.rb
-- spec/support/models.rb
-- spec/support/schema.rb
+summary: Roles library with resource scoping
+test_files: []
+