rolify 3.0.0 → 3.1.0

data/spec/rolify/shared_contexts.rb

@@ -11,13 +11,13 @@ shared_context "global role", :scope => :global do
   def load_roles
     role_class.destroy_all
     admin.roles = []
-    admin.has_role "admin"
-    admin.has_role "staff"
-    admin.has_role "manager", Group
-    admin.has_role "player", Forum
-    admin.has_role "moderator", Forum.last
-    admin.has_role "moderator", Group.last
-    admin.has_role "anonymous", Forum.first
+    admin.add_role :admin
+    admin.add_role :staff
+    admin.add_role :manager, Group
+    admin.add_role :player, Forum
+    admin.add_role :moderator, Forum.last
+    admin.add_role :moderator, Group.last
+    admin.add_role :anonymous, Forum.first
   end
 end
 
@@ -34,12 +34,12 @@ shared_context "class scoped role", :scope => :class do
   def load_roles
     role_class.destroy_all
     manager.roles = []
-    manager.has_role "manager", Forum
-    manager.has_role "player", Forum 
-    manager.has_role "warrior"
-    manager.has_role "moderator", Forum.last
-    manager.has_role "moderator", Group.last
-    manager.has_role "anonymous", Forum.first
+    manager.add_role :manager, Forum
+    manager.add_role :player, Forum 
+    manager.add_role :warrior
+    manager.add_role :moderator, Forum.last
+    manager.add_role :moderator, Group.last
+    manager.add_role :anonymous, Forum.first
   end
 end
 
@@ -56,10 +56,10 @@ shared_context "instance scoped role", :scope => :instance do
   def load_roles
     role_class.destroy_all
     moderator.roles = []
-    moderator.has_role "moderator", Forum.first
-    moderator.has_role "anonymous", Forum.last
-    moderator.has_role "visitor", Forum
-    moderator.has_role "soldier"
+    moderator.add_role :moderator, Forum.first
+    moderator.add_role :anonymous, Forum.last
+    moderator.add_role :visitor, Forum
+    moderator.add_role :soldier
   end
 end
 

data/spec/rolify/shared_examples/{shared_examples_for_has_role_setter.rb → shared_examples_for_add_role.rb}

@@ -1,12 +1,12 @@
-shared_examples_for "#has_role_examples" do |param_name, param_method|
+shared_examples_for "#add_role_examples" do |param_name, param_method|
   context "using #{param_name} as parameter" do
     context "with a global role", :scope => :global do
       it "should add the role to the user" do
-        expect { subject.has_role "root".send(param_method) }.to change{ subject.roles.count }.by(1)
+        expect { subject.add_role "root".send(param_method) }.to change { subject.roles.count }.by(1)
       end
 
       it "should create a role to the roles table" do
-        expect { subject.has_role "moderator".send(param_method) }.to change{ role_class.count }.by(1)
+        expect { subject.add_role "moderator".send(param_method) }.to change { role_class.count }.by(1)
       end
 
       context "considering a new global role" do
@@ -19,24 +19,24 @@ shared_examples_for "#has_role_examples" do |param_name, param_method|
 
       context "should not create another role" do
         it "if the role was already assigned to the user" do
-          subject.has_role "manager".send(param_method)
-          expect { subject.has_role "manager".send(param_method) }.not_to change{ subject.roles.size }
+          subject.add_role "manager".send(param_method)
+          expect { subject.add_role "manager".send(param_method) }.not_to change { subject.roles.size }
         end
 
         it "if the role already exists in the db" do
           role_class.create :name => "god"
-          expect { subject.has_role "god".send(param_method) }.not_to change{ role_class.count }
+          expect { subject.add_role "god".send(param_method) }.not_to change { role_class.count }
         end
       end
     end
 
     context "with a class scoped role", :scope => :class do
       it "should add the role to the user" do
-        expect { subject.has_role "supervisor".send(param_method), Forum }.to change{ subject.roles.count }.by(1)
+        expect { subject.add_role "supervisor".send(param_method), Forum }.to change { subject.roles.count }.by(1)
       end
 
       it "should create a role in the roles table" do
-        expect { subject.has_role "moderator".send(param_method), Forum }.to change{ role_class.count }.by(1)
+        expect { subject.add_role "moderator".send(param_method), Forum }.to change { role_class.count }.by(1)
       end
 
       context "considering a new class scoped role" do
@@ -49,24 +49,24 @@ shared_examples_for "#has_role_examples" do |param_name, param_method|
 
       context "should not create another role" do
         it "if the role was already assigned to the user" do
-          subject.has_role "warrior".send(param_method), Forum
-          expect { subject.has_role "warrior".send(param_method), Forum }.not_to change{ subject.roles.size }
+          subject.add_role "warrior".send(param_method), Forum
+          expect { subject.add_role "warrior".send(param_method), Forum }.not_to change { subject.roles.size }
         end
 
         it "if already existing in the database" do
           role_class.create :name => "hacker", :resource_type => "Forum"
-          expect { subject.has_role "hacker".send(param_method), Forum }.not_to change{ role_class.count }
+          expect { subject.add_role "hacker".send(param_method), Forum }.not_to change { role_class.count }
         end
       end
     end
 
     context "with an instance scoped role", :scope => :instance do
       it "should add the role to the user" do
-        expect { subject.has_role "visitor".send(param_method), Forum.last }.to change{ subject.roles.size }.by(1)
+        expect { subject.add_role "visitor".send(param_method), Forum.last }.to change { subject.roles.size }.by(1)
       end
 
       it "should create a role in the roles table" do
-        expect { subject.has_role "member".send(param_method), Forum.last }.to change{ role_class.count }.by(1)
+        expect { subject.add_role "member".send(param_method), Forum.last }.to change { role_class.count }.by(1)
       end
 
       context "considering a new class scoped role" do
@@ -78,13 +78,13 @@ shared_examples_for "#has_role_examples" do |param_name, param_method|
 
       context "should not create another role" do
         it "if the role was already assigned to the user" do
-          subject.has_role "anonymous".send(param_method), Forum.first
-          expect { subject.has_role "anonymous".send(param_method), Forum.first }.not_to change{ subject.roles.size }
+          subject.add_role "anonymous".send(param_method), Forum.first
+          expect { subject.add_role "anonymous".send(param_method), Forum.first }.not_to change { subject.roles.size }
         end
 
         it "if already existing in the database" do
           role_class.create :name => "ghost", :resource_type => "Forum", :resource_id => Forum.first.id
-          expect { subject.has_role "ghost".send(param_method), Forum.first }.not_to change{ role_class.count }
+          expect { subject.add_role "ghost".send(param_method), Forum.first }.not_to change { role_class.count }
         end
       end
     end

data/spec/rolify/shared_examples/shared_examples_for_dynamic.rb

@@ -10,8 +10,8 @@ shared_examples_for Rolify::Dynamic do
   context "using a global role" do
     subject do 
       admin = user_class.first
-      admin.has_role "admin"
-      admin.has_role "moderator", Forum.first
+      admin.add_role :admin
+      admin.add_role :moderator, Forum.first
       admin
     end
 
@@ -27,7 +27,7 @@ shared_examples_for Rolify::Dynamic do
   context "using a resource scoped role" do
     subject do 
       moderator = user_class.where(:login => "moderator").first
-      moderator.has_role "moderator", Forum.first
+      moderator.add_role :moderator, Forum.first
       moderator
     end
     
@@ -49,7 +49,7 @@ shared_examples_for Rolify::Dynamic do
   context "using a class scoped role" do
     subject do 
       manager = user_class.where(:login => "god").first
-      manager.has_role "manager", Forum
+      manager.add_role :manager, Forum
       manager
     end
     
@@ -77,7 +77,7 @@ shared_examples_for Rolify::Dynamic do
     context "using a global role" do
       before(:all) do
         other_guy = user_class.last
-        other_guy.has_role "superman"
+        other_guy.add_role :superman
       end
   
       it { should respond_to(:is_superman?).with(0).arguments }
@@ -90,7 +90,7 @@ shared_examples_for Rolify::Dynamic do
     context "using a resource scope role" do
       before(:all) do
         other_guy = user_class.last
-        other_guy.has_role("batman", Forum.first)
+        other_guy.add_role :batman, Forum.first
       end
       
       it { should respond_to(:is_batman?).with(0).arguments }

data/spec/rolify/shared_examples/shared_examples_for_has_any_role.rb

@@ -2,7 +2,7 @@ shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
   context "using #{param_name} as parameter" do
     context "with a global role", :scope => :global do
       before(:all) do
-        subject.has_role "staff".send(param_method)
+        subject.add_role "staff".send(param_method)
       end
       
       it { subject.has_any_role?("staff".send(param_method)).should be_true }
@@ -21,8 +21,8 @@ shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
     
     context "with a class scoped role", :scope => :class do
       before(:all) do
-        subject.has_role "player".send(param_method), Forum
-        subject.has_role "superhero".send(param_method)
+        subject.add_role "player".send(param_method), Forum
+        subject.add_role "superhero".send(param_method)
       end
       
       it { subject.has_any_role?({ :name => "player".send(param_method), :resource => Forum }).should be_true }
@@ -41,9 +41,9 @@ shared_examples_for "#has_any_role?_examples" do |param_name, param_method|
     
     context "with a instance scoped role", :scope => :instance do
       before(:all) do
-        subject.has_role "visitor".send(param_method), Forum.last
-        subject.has_role "leader", Group
-        subject.has_role "warrior"
+        subject.add_role "visitor".send(param_method), Forum.last
+        subject.add_role "leader", Group
+        subject.add_role "warrior"
       end
       
       it { subject.has_any_role?({ :name => "visitor", :resource => Forum.last }).should be_true }

data/spec/rolify/shared_examples/{shared_examples_for_has_no_role.rb → shared_examples_for_remove_role.rb}

@@ -1,8 +1,8 @@
-shared_examples_for "#has_no_role_examples" do |param_name, param_method|
+shared_examples_for "#remove_role_examples" do |param_name, param_method|
   context "using #{param_name} as parameter" do
     context "removing a global role", :scope => :global do
       context "being a global role of the user" do
-        it { expect { subject.has_no_role("admin".send(param_method)) }.to change{ subject.roles.size }.by(-1) }
+        it { expect { subject.remove_role("admin".send(param_method)) }.to change { subject.roles.size }.by(-1) }
         
         it { subject.has_role?("admin".send(param_method)).should be_false }
         it { subject.has_role?("staff".send(param_method)).should be_true }
@@ -13,7 +13,7 @@ shared_examples_for "#has_no_role_examples" do |param_name, param_method|
       end
       
       context "being a class scoped role to the user" do
-        it { expect { subject.has_no_role("manager") }.to change{ subject.roles.size }.by(-1) }
+        it { expect { subject.remove_role("manager".send(param_method)) }.to change { subject.roles.size }.by(-1) }
         
         it { subject.has_role?("admin".send(param_method)).should be_false }
         it { subject.has_role?("staff".send(param_method)).should be_true }
@@ -24,7 +24,7 @@ shared_examples_for "#has_no_role_examples" do |param_name, param_method|
       end
       
       context "being instance scoped roles to the user" do
-        it { expect { subject.has_no_role("moderator") }.to change{ subject.roles.size }.by(-2) }
+        it { expect { subject.remove_role("moderator".send(param_method)) }.to change { subject.roles.size }.by(-2) }
         
         it { subject.has_role?("admin".send(param_method)).should be_false }
         it { subject.has_role?("staff".send(param_method)).should be_true }
@@ -35,17 +35,41 @@ shared_examples_for "#has_no_role_examples" do |param_name, param_method|
       end
       
       context "not being a role of the user" do
-        it { expect { subject.has_no_role("superhero") }.not_to change{ subject.roles.size } }
+        it { expect { subject.remove_role("superhero".send(param_method)) }.not_to change { subject.roles.size } }
+      end
+      
+      context "used by another user" do
+        before do
+          user = user_class.last
+          user.add_role "staff".send(param_method)
+        end
+        
+        it { expect { subject.remove_role("staff".send(param_method)) }.not_to change { role_class.count } }
+        
+        it { subject.has_role?("admin".send(param_method)).should be_false }
+        it { subject.has_role?("staff".send(param_method)).should be_false }
+        it { subject.has_role?("manager".send(param_method), Group).should be_false }
+        it { subject.has_role?("moderator".send(param_method), Forum.last).should be_false }
+        it { subject.has_role?("moderator".send(param_method), Group.last).should be_false }
+        it { subject.has_role?("anonymous".send(param_method), Forum.first).should be_true }
+      end
+
+      context "not used by anyone else" do
+        before do
+          subject.add_role "nobody".send(param_method)
+        end
+
+        it { expect { subject.remove_role("nobody".send(param_method)) }.to change { role_class.count }.by(-1) }
       end
     end
 
     context "removing a class scoped role", :scope => :class do
       context "being a global role of the user" do
-        it { expect { subject.has_no_role("warrior", Forum) }.not_to change{ subject.roles.size } }
+        it { expect { subject.remove_role("warrior".send(param_method), Forum) }.not_to change{ subject.roles.size } }
       end
       
       context "being a class scoped role to the user" do
-        it { expect { subject.has_no_role("manager", Forum) }.to change{ subject.roles.size }.by(-1) }
+        it { expect { subject.remove_role("manager".send(param_method), Forum) }.to change{ subject.roles.size }.by(-1) }
         
         it { subject.has_role?("warrior").should be_true }
         it { subject.has_role?("manager", Forum).should be_false }
@@ -56,7 +80,7 @@ shared_examples_for "#has_no_role_examples" do |param_name, param_method|
       end
       
       context "being instance scoped role to the user" do
-        it { expect { subject.has_no_role("moderator", Forum) }.to change{ subject.roles.size }.by(-1) }
+        it { expect { subject.remove_role("moderator".send(param_method), Forum) }.to change { subject.roles.size }.by(-1) }
         
         it { subject.has_role?("warrior").should be_true }
         it { subject.has_role?("manager", Forum).should be_false }
@@ -67,21 +91,21 @@ shared_examples_for "#has_no_role_examples" do |param_name, param_method|
       end
       
       context "not being a role of the user" do
-        it { expect { subject.has_no_role("manager", Group) }.not_to change{ subject.roles.size } }
+        it { expect { subject.remove_role("manager".send(param_method), Group) }.not_to change { subject.roles.size } }
       end
     end
 
     context "removing a instance scoped role", :scope => :instance do
       context "being a global role of the user" do
-        it { expect { subject.has_no_role("soldier", Group.first) }.not_to change{ subject.roles.size } }
+        it { expect { subject.remove_role("soldier".send(param_method), Group.first) }.not_to change { subject.roles.size } }
       end
       
       context "being a class scoped role to the user" do
-        it { expect { subject.has_no_role("visitor", Forum.first) }.not_to change{ subject.roles.size } }
+        it { expect { subject.remove_role("visitor".send(param_method), Forum.first) }.not_to change { subject.roles.size } }
       end
       
       context "being instance scoped role to the user" do
-        it { expect { subject.has_no_role("moderator", Forum.first) }.to change{ subject.roles.size }.by(-1) }
+        it { expect { subject.remove_role("moderator".send(param_method), Forum.first) }.to change { subject.roles.size }.by(-1) }
         
         it { subject.has_role?("soldier").should be_true }
         it { subject.has_role?("visitor", Forum).should be_true }
@@ -90,7 +114,7 @@ shared_examples_for "#has_no_role_examples" do |param_name, param_method|
       end
       
       context "not being a role of the user" do
-        it { expect { subject.has_no_role("anonymous", Forum.first) }.not_to change{ subject.roles.size } }
+        it { expect { subject.remove_role("anonymous".send(param_method), Forum.first) }.not_to change { subject.roles.size } }
       end
     end
   end

data/spec/rolify/shared_examples/shared_examples_for_roles.rb

@@ -1,9 +1,9 @@
 require "rolify/shared_contexts"
-require "rolify/shared_examples/shared_examples_for_has_role_setter"
-require "rolify/shared_examples/shared_examples_for_has_role_getter"
+require "rolify/shared_examples/shared_examples_for_add_role"
+require "rolify/shared_examples/shared_examples_for_has_role"
 require "rolify/shared_examples/shared_examples_for_has_all_roles"
 require "rolify/shared_examples/shared_examples_for_has_any_role"
-require "rolify/shared_examples/shared_examples_for_has_no_role"
+require "rolify/shared_examples/shared_examples_for_remove_role"
 
 
 shared_examples_for Rolify::Role do
@@ -19,8 +19,8 @@ shared_examples_for Rolify::Role do
   context "in a Instance level" do 
     before(:all) do
       admin = user_class.first
-      admin.has_role "admin"
-      admin.has_role "moderator", Forum.first
+      admin.add_role :admin
+      admin.add_role :moderator, Forum.first
       admin
     end
 
@@ -28,12 +28,11 @@ shared_examples_for Rolify::Role do
       user_class.first
     end
 
-    it { should respond_to(:has_role).with(1).arguments }
-    it { should respond_to(:has_role).with(2).arguments }
-
-    it { should respond_to(:grant).with(1).arguments }
-    it { should respond_to(:grant).with(2).arguments }
-
+    [ :has_role, :grant, :add_role ].each do |method_alias|
+      it { should respond_to(method_alias.to_sym).with(1).arguments }
+      it { should respond_to(method_alias.to_sym).with(2).arguments }
+    end
+    
     it { should respond_to(:has_role?).with(1).arguments }
     it { should respond_to(:has_role?).with(2).arguments }
 
@@ -43,19 +42,18 @@ shared_examples_for Rolify::Role do
     it { should respond_to(:has_any_role?) }
     it { should respond_to(:has_any_role?) }
 
-    it { should respond_to(:has_no_role).with(1).arguments }
-    it { should respond_to(:has_no_role).with(2).arguments }
-
-    it { should respond_to(:revoke).with(1).arguments }
-    it { should respond_to(:revoke).with(2).arguments }
+    [ :has_no_role, :revoke, :remove_role ].each do |method_alias|
+      it { should respond_to(method_alias.to_sym).with(1).arguments }
+      it { should respond_to(method_alias.to_sym).with(2).arguments }
+    end
 
     it { should_not respond_to(:is_admin?) }
     it { should_not respond_to(:is_moderator_of?) }
   end
 
   describe "#has_role" do 
-    it_should_behave_like "#has_role_examples", "String", :to_s
-    it_should_behave_like "#has_role_examples", "Symbol", :to_sym
+    it_should_behave_like "#add_role_examples", "String", :to_s
+    it_should_behave_like "#add_role_examples", "Symbol", :to_sym
   end
 
   describe "#has_role?" do    
@@ -74,7 +72,7 @@ shared_examples_for Rolify::Role do
   end
   
   describe "#has_no_role" do
-    it_should_behave_like "#has_no_role_examples", "String", :to_s
-    it_should_behave_like "#has_no_role_examples", "Symbol", :to_sym
+    it_should_behave_like "#remove_role_examples", "String", :to_s
+    it_should_behave_like "#remove_role_examples", "Symbol", :to_sym
   end
 end

data/spec/spec_helper.rb

@@ -1,8 +1,4 @@
 require 'rubygems'
-require 'bundler/setup'
-
-require 'mongoid'
-Bundler.require(:default, :development, :test)
 require 'rolify'
 require 'ammeter/init'
 

data/spec/support/adapters/active_record.rb

@@ -1,3 +1,5 @@
+require 'active_record'
+
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.extend Rolify
 

data/spec/support/adapters/mongoid.rb

@@ -1,3 +1,5 @@
+require 'mongoid'
+
 Mongoid.configure do |config|
   config.master = Mongo::Connection.new.db("godfather")
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-02 00:00:00.000000000 Z
+date: 2012-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70312381195700 !ruby/object:Gem::Requirement
+  requirement: &70359244800420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312381195700
+  version_requirements: *70359244800420
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &70312381193740 !ruby/object:Gem::Requirement
+  requirement: &70359244799000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.1.0
   type: :development
   prerelease: false
-  version_requirements: *70312381193740
+  version_requirements: *70359244799000
 - !ruby/object:Gem::Dependency
   name: mongoid
-  requirement: &70312381191900 !ruby/object:Gem::Requirement
+  requirement: &70359244797140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '2.3'
   type: :development
   prerelease: false
-  version_requirements: *70312381191900
+  version_requirements: *70359244797140
 - !ruby/object:Gem::Dependency
   name: bson_ext
-  requirement: &70312381191220 !ruby/object:Gem::Requirement
+  requirement: &70359244794900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312381191220
+  version_requirements: *70359244794900
 - !ruby/object:Gem::Dependency
   name: ammeter
-  requirement: &70312381190320 !ruby/object:Gem::Requirement
+  requirement: &70359244792460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312381190320
+  version_requirements: *70359244792460
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70312381189180 !ruby/object:Gem::Requirement
+  requirement: &70359244791380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312381189180
+  version_requirements: *70359244791380
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70312381188380 !ruby/object:Gem::Requirement
+  requirement: &70359244788860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312381188380
+  version_requirements: *70359244788860
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70312381187520 !ruby/object:Gem::Requirement
+  requirement: &70359244786160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,9 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70312381187520
-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 '
+  version_requirements: *70359244786160
+description: Very simple Roles library without any authorization enforcement supporting
+  scope on resource objects (instance or class)
 email:
 - f.monbillard@gmail.com
 executables: []
@@ -113,7 +112,7 @@ files:
 - CHANGELOG.rdoc
 - Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - UPGRADE.rdoc
 - lib/generators/rolify/role/role_generator.rb
@@ -125,14 +124,17 @@ files:
 - lib/generators/rolify/role/templates/role-active_record.rb
 - lib/generators/rolify/role/templates/role-mongoid.rb
 - lib/rolify.rb
-- lib/rolify/adapters/active_record.rb
+- lib/rolify/adapters/active_record/resource_adapter.rb
+- lib/rolify/adapters/active_record/role_adapter.rb
 - lib/rolify/adapters/base.rb
-- lib/rolify/adapters/mongoid.rb
+- lib/rolify/adapters/mongoid/resource_adapter.rb
+- lib/rolify/adapters/mongoid/role_adapter.rb
 - lib/rolify/configure.rb
 - lib/rolify/dynamic.rb
 - lib/rolify/railtie.rb
 - lib/rolify/resource.rb
 - lib/rolify/role.rb
+- lib/rolify/utils.rb
 - lib/rolify/version.rb
 - rolify.gemspec
 - spec/generators/rolify/role/role_generator_spec.rb
@@ -141,12 +143,12 @@ files:
 - spec/rolify/resource_spec.rb
 - spec/rolify/role_spec.rb
 - spec/rolify/shared_contexts.rb
+- spec/rolify/shared_examples/shared_examples_for_add_role.rb
 - spec/rolify/shared_examples/shared_examples_for_dynamic.rb
 - spec/rolify/shared_examples/shared_examples_for_has_all_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_has_any_role.rb
-- spec/rolify/shared_examples/shared_examples_for_has_no_role.rb
-- spec/rolify/shared_examples/shared_examples_for_has_role_getter.rb
-- spec/rolify/shared_examples/shared_examples_for_has_role_setter.rb
+- spec/rolify/shared_examples/shared_examples_for_has_role.rb
+- spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
@@ -173,7 +175,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 1.8.16
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Roles library with resource scoping
@@ -184,12 +186,12 @@ test_files:
 - spec/rolify/resource_spec.rb
 - spec/rolify/role_spec.rb
 - spec/rolify/shared_contexts.rb
+- spec/rolify/shared_examples/shared_examples_for_add_role.rb
 - spec/rolify/shared_examples/shared_examples_for_dynamic.rb
 - spec/rolify/shared_examples/shared_examples_for_has_all_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_has_any_role.rb
-- spec/rolify/shared_examples/shared_examples_for_has_no_role.rb
-- spec/rolify/shared_examples/shared_examples_for_has_role_getter.rb
-- spec/rolify/shared_examples/shared_examples_for_has_role_setter.rb
+- spec/rolify/shared_examples/shared_examples_for_has_role.rb
+- spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb