rolify 3.4.1 → 3.5.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: cf5b355e4195b739b029a8567fd142b8e35bb12d
+  data.tar.gz: 9e9ed19d10b9eb0d41b1319602b69ded63bb16d6
+SHA512:
+  metadata.gz: f1d687a86a7050e389650808e2abb072e1c7aa4387d4a4d6465e9c57091198f196a0dc2b84a1d2e5c0ebbf95db14c8212ee19597f353bac5b803f6331310c34f
+  data.tar.gz: 3a7cc52b331ad63e658a9027385efc5bb60266112633d2d6e01d3146b6b01112e8c7e02489d2ac551da275e5e3187c0821da5f6283f1e6baf292cca7422af1ae

data/.travis.yml

@@ -11,6 +11,9 @@ env:
 
 services: mongodb
 
+addons:
+  code_climate:
+    repo_token: 6bd8d374b120a5449b9a4b7dfda40cc0609dbade48a1b6655f04a9bc8de3a3ee
 # language: ruby
 #
 # rvm:

data/CHANGELOG.rdoc

@@ -1,4 +1,11 @@
-= 3.4.1 (Sep 07, 2014)
+= 3.5.0 (Jan 08, 2015)
+* Removed `has_role` method alias for `add_role`
+* Fixed regression in caching system
+* Fix deprecation warning about timestamp on specs
+* Copy Kernel#capture helper from Rails
+* Add validation on Role.resource_type
+
+= 3.4.1 (Sep 08, 2014)
 * Fixed issue with migrations being generated without a file extension.
 * Updated spec tests to work with Travis CI on Ruby up to 2.1.2 and Rails 4.1.x
 * Made it possible for inheritance of resources.

data/CONTRIBUTORS

@@ -0,0 +1,5 @@
+Florent Monbillard (@EppO) - Original Author
+Wellington Cordeiro (@wldcordeiro)
+Joel Azemar (@joel)
+Alex Klim (@AlexKlim)
+Mauro George (@MauroGeorge)

data/Gemfile

@@ -16,6 +16,7 @@ group :test do
   gem 'coveralls', :require => false
   gem 'its'
   gem 'pry'
+  gem 'codeclimate-test-reporter', :require => nil
 end
 
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# rolify [![Gem Version](https://badge.fury.io/rb/rolify.png)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/RolifyCommunity/rolify.png)](http://travis-ci.org/RolifyCommunity/rolify) [![dependency status](https://gemnasium.com/EppO/rolify.png)](https://gemnasium.com/EppO/rolify) [![Code Climate](https://codeclimate.com/github/EppO/rolify.png)](https://codeclimate.com/github/EppO/rolify) [![Coverage Status](https://coveralls.io/repos/EppO/rolify/badge.png?branch=master)](https://coveralls.io/r/EppO/rolify)
+# rolify [![Gem Version](https://badge.fury.io/rb/rolify.svg)](http://badge.fury.io/rb/rolify) [![build status](https://secure.travis-ci.org/RolifyCommunity/rolify.png)](http://travis-ci.org/RolifyCommunity/rolify) [![Dependency Status](https://gemnasium.com/RolifyCommunity/rolify.svg)](https://gemnasium.com/RolifyCommunity/rolify) [![Code Climate](https://codeclimate.com/github/RolifyCommunity/rolify.png)](https://codeclimate.com/github/RolifyCommunity/rolify) [![Coverage Status](https://img.shields.io/coveralls/RolifyCommunity/rolify.svg)](https://coveralls.io/r/RolifyCommunity/rolify?branch=master)
 
 
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
@@ -10,7 +10,7 @@ user.has_role?(:moderator, Forum.first)
 => false # if user is moderator of another Forum
 ```
 
-This library can be easily integrated with any authentication gem ([devise](https://github.com/plataformatec/devise), [Authlogic](https://github.com/binarylogic/authlogic), [Clearance](https://github.com/thoughtbot/clearance)) and authorization gem<span style="color: red"><strong>*</strong></span> ([CanCan](https://github.com/ryanb/cancan), [authority](https://github.com/nathanl/authority))
+This library can be easily integrated with any authentication gem ([devise](https://github.com/plataformatec/devise), [Authlogic](https://github.com/binarylogic/authlogic), [Clearance](https://github.com/thoughtbot/clearance)) and authorization gem<span style="color: red"><strong>*</strong></span> ([CanCanCan](https://github.com/CanCanCommunity/cancancan), [authority](https://github.com/nathanl/authority))
 
 <span style="color: red"><strong>*</strong></span>: authorization gem that doesn't provide a role class
 
@@ -184,6 +184,8 @@ Forum.with_role(:admin)
 # => [ list of Forum instances that has role "admin" binded to it ] 
 Forum.with_role(:admin, current_user)
 # => [ list of Forum instances that has role "admin" binded to it and belongs to current_user roles ]
+Forum.with_roles([:admin, :user], current_user)
+# => [ list of Forum instances that has role "admin" or "user" binded to it and belongs to current_user roles ]
 
 User.with_any_role(:user, :admin)
 # => [ list of User instances that has role "admin" or "user" binded to it ]
@@ -202,11 +204,11 @@ Forum.find_roles(:admin, current_user)
 
 ## Resources
 
-* [Wiki](https://github.com/EppO/rolify/wiki)
-* [Usage](https://github.com/EppO/rolify/wiki/Usage): all the available commands
-* [Tutorials](https://github.com/EppO/rolify/wiki#wiki-tutorials):  
-  * [How-To use rolify with Devise and CanCan](https://github.com/EppO/rolify/wiki/Tutorial)
-  * [Using rolify with Devise and Authority](https://github.com/EppO/rolify/wiki/Using-rolify-with-Devise-and-Authority)
+* [Wiki](https://github.com/RolifyCommunity/rolify/wiki)
+* [Usage](https://github.com/RolifyCommunity/rolify/wiki/Usage): all the available commands
+* [Tutorials](https://github.com/RolifyCommunity/rolify/wiki#wiki-tutorials):
+  * [How-To use rolify with Devise and CanCan](https://github.com/RolifyCommunity/rolify/wiki/Tutorial)
+  * [Using rolify with Devise and Authority](https://github.com/RolifyCommunity/rolify/wiki/Using-rolify-with-Devise-and-Authority)
   * [Step-by-step tutorial](http://railsapps.github.com/tutorial-rails-bootstrap-devise-cancan.html) provided by [RailsApps](http://railsapps.github.com/)
 
 ## Upgrade from previous versions
@@ -215,12 +217,12 @@ Please read the [upgrade instructions](UPGRADE.rdoc).
 
 ## Known issues
 
-* If you are using Mongoid and/or less-rails gem, please read [this](https://github.com/EppO/rolify/wiki/FAQ#when-i-start-rails-using-server-console-whatever-i-get-this-error)
+* If you are using Mongoid and/or less-rails gem, please read [this](https://github.com/RolifyCommunity/rolify/wiki/FAQ#when-i-start-rails-using-server-console-whatever-i-get-this-error)
 * Moped library (ruby driver for Mongodb used by Mongoid) doesn't support rubinius 2.2 yet (see https://github.com/mongoid/moped/issues/231)
-* If you use Rails 4 and Mongoid, use Mongoid ~> 4 (not released yet). rolify is fully tested with Rails 4 and Mongoid master branch
+* If you use Rails 4 and Mongoid, use Mongoid ~> 4. rolify is fully tested with Rails 4 and Mongoid 4.
 
 ## Questions or Problems?
 
-If you have any issue or feature request with/for rolify, please create an new [issue on GitHub](https://github.com/EppO/rolify/issues) **specifying the ruby runtime, rails and rolify versions you're using and the gems listed in your Gemfile**, or fork the project and send a pull request.
+If you have any issue or feature request with/for rolify, please create an new [issue on GitHub](https://github.com/RolifyCommunity/rolify/issues) **specifying the ruby runtime, rails and rolify versions you're using and the gems listed in your Gemfile**, or fork the project and send a pull request.
 
 To get the specs running you should call `bundle` and then `rake`. See the spec/README for more information.

data/circle.yml

@@ -0,0 +1,11 @@
+machine:
+  ruby:
+    version: 2.1.3
+  environment:
+    CODECLIMATE_REPO_TOKEN: 6bd8d374b120a5449b9a4b7dfda40cc0609dbade48a1b6655f04a9bc8de3a3ee
+    ADAPTER: active_record
+    ADAPTER: mongoid
+
+test:
+  override:
+    - bundle exec rake:spec_all

data/lib/generators/active_record/rolify_generator.rb

@@ -5,42 +5,44 @@ module ActiveRecord
   module Generators
     class RolifyGenerator < ActiveRecord::Generators::Base
       source_root File.expand_path("../templates", __FILE__)
-      
+
       argument :user_cname, :type => :string, :default => "User", :banner => "User"
-      
+
       def generate_model
         invoke "active_record:model", [ name ], :migration => false
       end
-      
+
       def inject_role_class
         inject_into_class(model_path, class_name, model_content)
       end
-      
+
       def copy_rolify_migration
         migration_template "migration.rb", "db/migrate/rolify_create_#{table_name}.rb"
       end
-      
+
       def join_table
         user_cname.constantize.table_name + "_" + table_name
       end
-      
+
       def user_reference
         user_cname.demodulize.underscore
       end
-      
+
       def role_reference
         class_name.demodulize.underscore
       end
-      
+
       def model_path
         File.join("app", "models", "#{file_path}.rb")
       end
-      
+
       def model_content
         content = <<RUBY
   has_and_belongs_to_many :%{user_cname}, :join_table => :%{join_table}
   belongs_to :resource, :polymorphic => true
-  
+
+  validates :resource_type, :inclusion => { :in => Rolify.resource_types }
+
   scopify
 RUBY
         content % { :user_cname => user_cname.constantize.table_name, :join_table => "#{user_cname.constantize.table_name}_#{table_name}"}

data/lib/generators/mongoid/rolify_generator.rb

@@ -5,34 +5,34 @@ module Mongoid
   module Generators
     class RolifyGenerator < Rails::Generators::NamedBase
       source_root File.expand_path("../templates", __FILE__)
-      
+
       argument :user_cname, :type => :string, :default => "User", :banner => "User"
-      
+
       def generate_model
         invoke "mongoid:model", [ name ]
       end
-      
+
       def inject_role_class
         inject_into_file(model_path, model_contents, :after => "include Mongoid::Document\n")
       end
-      
+
       def user_reference
         user_cname.demodulize.underscore
       end
-      
+
       def role_reference
         class_name.demodulize.underscore
       end
-      
+
       def model_path
         File.join("app", "models", "#{file_path}.rb")
       end
-      
+
       def model_contents
         content = <<RUBY
   has_and_belongs_to_many :%{user_cname}
   belongs_to :resource, :polymorphic => true
-  
+
   field :name, :type => String
 
   index({
@@ -41,11 +41,13 @@ module Mongoid
     :resource_id => 1
   },
   { :unique => true})
-  
+
+  validates :resource_type, :inclusion => { :in => Rolify.resource_types }
+
   scopify
 RUBY
         content % { :user_cname => user_cname.constantize.collection_name }
       end
     end
   end
-end
+end

data/lib/rolify.rb

@@ -10,6 +10,7 @@ module Rolify
   extend Configure
 
   attr_accessor :role_cname, :adapter, :role_join_table_name, :role_table_name
+  @@resource_types = []
 
   def rolify(options = {})
     include Role
@@ -49,6 +50,7 @@ module Rolify
     has_many association_name, resourcify_options
 
     self.adapter = Rolify::Adapter::Base.create("resource_adapter", self.role_cname, self.name)
+    @@resource_types << self.name
   end
 
   def scopify
@@ -60,4 +62,8 @@ module Rolify
     return self.superclass.role_class unless self.instance_variable_defined? '@role_cname'
     self.role_cname.constantize
   end
+
+  def self.resource_types
+    @@resource_types
+  end
 end

data/lib/rolify/adapters/active_record/role_adapter.rb

@@ -25,7 +25,7 @@ module Rolify
           relation.roles.delete(roles)
           roles.each do |role|
             role.destroy if role.send(ActiveSupport::Inflector.demodulize(user_class).tableize.to_sym).limit(1).empty?
-          end
+          end if Rolify.remove_role_if_empty
         end
         roles
       end

data/lib/rolify/adapters/mongoid/role_adapter.rb

@@ -9,8 +9,8 @@ module Rolify
       end
 
       def find_or_create_by(role_name, resource_type = nil, resource_id = nil)
-        self.role_class.find_or_create_by(:name => role_name, 
-                                          :resource_type => resource_type, 
+        self.role_class.find_or_create_by(:name => role_name,
+                                          :resource_type => resource_type,
                                           :resource_id => resource_id)
       end
 
@@ -24,7 +24,7 @@ module Rolify
         #roles.merge!({ :resource_id => resource.id }) if resource && !resource.is_a?(Class)
         #roles_to_remove = relation.roles.where(roles)
         #roles_to_remove.each do |role|
-        #  # Deletion in n-n relations is unreliable. Sometimes it works, sometimes not. 
+        #  # Deletion in n-n relations is unreliable. Sometimes it works, sometimes not.
         #  # So, this does not work all the time: `relation.roles.delete(role)`
         #  # @see http://stackoverflow.com/questions/9132596/rails3-mongoid-many-to-many-relation-and-delete-operation
         #  # We instead remove ids from the Role object and the relation object.
@@ -37,10 +37,12 @@ module Rolify
         cond[:resource_type] = (resource.is_a?(Class) ? resource.to_s : resource.class.name) if resource
         cond[:resource_id] = resource.id if resource && !resource.is_a?(Class)
         roles = relation.roles.where(cond)
-        roles.each do |role| 
+        roles.each do |role|
           relation.roles.delete(role)
           role.send(ActiveSupport::Inflector.demodulize(user_class).tableize.to_sym).delete(relation)
-          role.destroy if role.send(ActiveSupport::Inflector.demodulize(user_class).tableize.to_sym).empty? 
+          if Rolify.remove_role_if_empty && role.send(ActiveSupport::Inflector.demodulize(user_class).tableize.to_sym).empty?
+            role.destroy
+          end
         end if roles
         roles
       end
@@ -48,7 +50,7 @@ module Rolify
       def exists?(relation, column)
         relation.where(column.to_sym.ne => nil)
       end
-      
+
       def scope(relation, conditions)
         roles = where(role_class, conditions).map { |role| role.id }
         return [] if roles.size.zero?
@@ -86,4 +88,4 @@ module Rolify
       end
     end
   end
-end
+end

data/lib/rolify/configure.rb

@@ -2,7 +2,8 @@ module Rolify
   module Configure
     @@dynamic_shortcuts = false
     @@orm = "active_record"
-     
+    @@remove_role_if_empty = true
+
     def configure(*role_cnames)
       return if !sanity_check(role_cnames)
       yield self if block_given?
@@ -27,7 +28,7 @@ module Rolify
     def use_mongoid
       self.orm = "mongoid"
     end
-    
+
     def use_dynamic_shortcuts
       self.dynamic_shortcuts = true
     end
@@ -38,10 +39,20 @@ module Rolify
         config.orm = "active_record"
       end
     end
-    
+
+    def remove_role_if_empty=(is_remove)
+      @@remove_role_if_empty = is_remove
+    end
+
+    def remove_role_if_empty
+      @@remove_role_if_empty
+    end
+
     private
-    
+
     def sanity_check(role_cnames)
+      return true if "assets:precompile"==ARGV[0]
+
       role_cnames = [ "Role" ] if role_cnames.empty?
       role_cnames.each do |role_cname|
         role_class = role_cname.constantize
@@ -52,7 +63,7 @@ module Rolify
       end
       true
     end
-    
+
     def role_table_missing?(role_class)
       role_class.connected? && !role_class.table_exists?
     end

data/lib/rolify/role.rb

@@ -3,11 +3,11 @@ require "rolify/finders"
 module Rolify
   module Role
     extend Utils
-    
+
     def self.included(base)
       base.extend Finders
     end
-          
+
     def add_role(role_name, resource = nil)
       role = self.class.adapter.find_or_create_by(role_name.to_s,
                                                   (resource.is_a?(Class) ? resource.to_s : resource.class.name if resource),
@@ -20,20 +20,13 @@ module Rolify
       role
     end
     alias_method :grant, :add_role
-    deprecate :has_role, :add_role
 
     def has_role?(role_name, resource = nil)
-      @r_map ||= {}
-      role_n_resource = role_name.to_s + resource.to_s
-      @r_map[role_n_resource].nil? ? @r_map[role_n_resource] = has_role_helper(role_name, resource) : @r_map[role_n_resource]
-    end
-
-    def has_role_helper(role_name, resource = nil)
       if new_record?
-        self.roles.detect { |r| r.name == role_name.to_s && (r.resource == resource || resource.nil?) }.present?
+        self.roles.detect { |r| r.name.to_s == role_name.to_s && (r.resource == resource || resource.nil?) }
       else
-        self.class.adapter.where(self.roles, :name => role_name, :resource => resource).size > 0
-      end
+        self.class.adapter.where(self.roles, name: role_name, resource: resource)
+      end.present?
     end
 
     def has_all_roles?(*args)
@@ -56,7 +49,7 @@ module Rolify
         self.class.adapter.where(self.roles, *args).size > 0
       end
     end
-    
+
     def only_has_role?(role_name, resource = nil)
       return self.has_role?(role_name,resource) && self.roles.count == 1
     end
@@ -64,7 +57,7 @@ module Rolify
     def remove_role(role_name, resource = nil)
       self.class.adapter.remove(self, role_name.to_s, resource)
     end
-    
+
     alias_method :revoke, :remove_role
     deprecate :has_no_role, :remove_role
 

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "3.4.1"
+  VERSION = "3.5.0"
 end

data/rolify.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'rake',        '~> 10.3.2'
   s.add_development_dependency 'rspec',       '2.99.0'
   s.add_development_dependency 'rspec-rails', '2.99.0'
-  s.add_development_dependency 'bundler',     '~> 1.6.2'
+  s.add_development_dependency 'bundler',     '~> 1.7.0'
   s.add_development_dependency 'fuubar',      '~> 1.3.3'
 end

data/spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -7,11 +7,11 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
   # Tell the generator where to put its output (what it thinks of as Rails.root)
   destination File.expand_path("../../../../tmp", __FILE__)
   teardown :cleanup_destination_root
-  
-  before { 
+
+  before {
     prepare_destination
   }
-  
+
   def cleanup_destination_root
     FileUtils.rm_rf destination_root
   end
@@ -19,7 +19,7 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
   describe 'specifying only Role class name' do
     before(:all) { arguments %w(Role) }
 
-    before { 
+    before {
       capture(:stdout) {
         generator.create_file "app/models/user.rb" do
           <<-RUBY
@@ -29,9 +29,9 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
         end
       }
       require File.join(destination_root, "app/models/user.rb")
-      run_generator 
+      run_generator
     }
-    
+
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
       it { should exist }
@@ -39,23 +39,24 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should contain "# config.use_dynamic_shortcuts" }
       it { should contain "# config.use_mongoid" }
     end
-    
+
     describe 'app/models/role.rb' do
       subject { file('app/models/role.rb') }
       it { should exist }
       it { should contain "class Role < ActiveRecord::Base" }
       it { should contain "has_and_belongs_to_many :users, :join_table => :users_roles" }
       it { should contain "belongs_to :resource, :polymorphic => true" }
+      it { should contain "validates :resource_type, :inclusion => { :in => Rolify.resource_types }" }
     end
-    
+
     describe 'app/models/user.rb' do
       subject { file('app/models/user.rb') }
       it { should contain /class User < ActiveRecord::Base\n  rolify\n/ }
     end
-    
+
     describe 'migration file' do
       subject { migration_file('db/migrate/rolify_create_roles.rb') }
-      
+
       it { should be_a_migration }
       it { should contain "create_table(:roles) do" }
       it { should contain "create_table(:users_roles, :id => false) do" }
@@ -64,8 +65,8 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
 
   describe 'specifying User and Role class names' do
     before(:all) { arguments %w(AdminRole AdminUser) }
-    
-    before { 
+
+    before {
       capture(:stdout) {
         generator.create_file "app/models/admin_user.rb" do
           "class AdminUser < ActiveRecord::Base\nend"
@@ -74,44 +75,44 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       require File.join(destination_root, "app/models/admin_user.rb")
       run_generator
     }
-    
+
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
-      
+
       it { should exist }
       it { should contain "Rolify.configure(\"AdminRole\") do |config|"}
       it { should contain "# config.use_dynamic_shortcuts" }
       it { should contain "# config.use_mongoid" }
     end
-    
+
     describe 'app/models/admin_role.rb' do
       subject { file('app/models/admin_role.rb') }
-      
+
       it { should exist }
       it { should contain "class AdminRole < ActiveRecord::Base" }
       it { should contain "has_and_belongs_to_many :admin_users, :join_table => :admin_users_admin_roles" }
       it { should contain "belongs_to :resource, :polymorphic => true" }
     end
-    
+
     describe 'app/models/admin_user.rb' do
       subject { file('app/models/admin_user.rb') }
-      
+
       it { should contain /class AdminUser < ActiveRecord::Base\n  rolify :role_cname => 'AdminRole'\n/ }
     end
-    
+
     describe 'migration file' do
       subject { migration_file('db/migrate/rolify_create_admin_roles.rb') }
-      
+
       it { should be_a_migration }
       it { should contain "create_table(:admin_roles)" }
       it { should contain "create_table(:admin_users_admin_roles, :id => false) do" }
     end
   end
-  
+
   describe 'specifying namespaced User and Role class names' do
     before(:all) { arguments %w(Admin::Role Admin::User) }
-    
-    before { 
+
+    before {
       capture(:stdout) {
         generator.create_file "app/models/admin/user.rb" do
           <<-RUBY
@@ -126,34 +127,34 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       require File.join(destination_root, "app/models/admin/user.rb")
       run_generator
     }
-    
+
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
-      
+
       it { should exist }
       it { should contain "Rolify.configure(\"Admin::Role\") do |config|"}
       it { should contain "# config.use_dynamic_shortcuts" }
       it { should contain "# config.use_mongoid" }
     end
-    
+
     describe 'app/models/admin/role.rb' do
       subject { file('app/models/admin/role.rb') }
-      
+
       it { should exist }
       it { should contain "class Admin::Role < ActiveRecord::Base" }
       it { should contain "has_and_belongs_to_many :admin_users, :join_table => :admin_users_admin_roles" }
       it { should contain "belongs_to :resource, :polymorphic => true" }
     end
-    
+
     describe 'app/models/admin/user.rb' do
       subject { file('app/models/admin/user.rb') }
-      
+
       it { should contain /class User < ActiveRecord::Base\n  rolify :role_cname => 'Admin::Role'\n/ }
     end
-    
+
     describe 'migration file' do
       subject { migration_file('db/migrate/rolify_create_admin_roles.rb') }
-      
+
       it { should be_a_migration }
       it { should contain "create_table(:admin_roles)" }
       it { should contain "create_table(:admin_users_admin_roles, :id => false) do" }

data/spec/generators/rolify/rolify_mongoid_generator_spec.rb

@@ -7,19 +7,19 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'mongoid'
   # Tell the generator where to put its output (what it thinks of as Rails.root)
   destination File.expand_path("../../../../tmp", __FILE__)
   teardown :cleanup_destination_root
-  
-  before { 
+
+  before {
     prepare_destination
   }
-  
+
   def cleanup_destination_root
     FileUtils.rm_rf destination_root
   end
 
-  describe 'specifying ORM adapter' do 
+  describe 'specifying ORM adapter' do
     before(:all) { arguments [ "Role", "User", "--orm=mongoid" ] }
-    
-    before { 
+
+    before {
       capture(:stdout) {
         generator.create_file "app/models/user.rb" do
 <<-RUBY
@@ -34,7 +34,7 @@ RUBY
       require File.join(destination_root, "app/models/user.rb")
       run_generator
     }
-      
+
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
       it { should exist }
@@ -42,7 +42,7 @@ RUBY
       it { should_not contain "# config.use_mongoid" }
       it { should contain "# config.use_dynamic_shortcuts" }
     end
-    
+
     describe 'app/models/role.rb' do
       subject { file('app/models/role.rb') }
       it { should exist }
@@ -56,18 +56,19 @@ RUBY
                           "      { :resource_id => 1 }\n"
                           "    },\n"
                           "    { unique => true })"}
+      it { should contain "validates :resource_type, :inclusion => { :in => Rolify.resource_types }" }
     end
-    
+
     describe 'app/models/user.rb' do
       subject { file('app/models/user.rb') }
       it { should contain /class User\n  include Mongoid::Document\n  rolify\n/ }
     end
   end
-  
+
   describe 'specifying namespaced User and Role class names and ORM adapter' do
     before(:all) { arguments %w(Admin::Role Admin::User --orm=mongoid) }
-    
-    before { 
+
+    before {
       capture(:stdout) {
         generator.create_file "app/models/admin/user.rb" do
 <<-RUBY
@@ -82,29 +83,29 @@ RUBY
       require File.join(destination_root, "app/models/admin/user.rb")
       run_generator
     }
-    
+
     describe 'config/initializers/rolify.rb' do
       subject { file('config/initializers/rolify.rb') }
-      
+
       it { should exist }
       it { should contain "Rolify.configure(\"Admin::Role\") do |config|"}
       it { should contain "# config.use_dynamic_shortcuts" }
       it { should_not contain "# config.use_mongoid" }
     end
-    
+
     describe 'app/models/admin/role.rb' do
       subject { file('app/models/admin/role.rb') }
-      
+
       it { should exist }
       it { should contain "class Admin::Role" }
       it { should contain "has_and_belongs_to_many :admin_users" }
       it { should contain "belongs_to :resource, :polymorphic => true" }
     end
-    
+
     describe 'app/models/admin/user.rb' do
       subject { file('app/models/admin/user.rb') }
-      
+
       it { should contain /class User\n    include Mongoid::Document\n  rolify :role_cname => 'Admin::Role'\n/ }
     end
   end
-end
+end

data/spec/generators_helper.rb

@@ -4,6 +4,8 @@ require "bundler/setup"
 require 'rolify'
 require 'rolify/matchers'
 require 'rails'
+require_relative 'support/stream_helpers'
+include StreamHelpers
 
 require 'coveralls'
 Coveralls.wear_merged!
@@ -22,4 +24,4 @@ module TestApp
   end
 end
 
-require 'ammeter/init'
+require 'ammeter/init'

data/spec/rolify/resource_spec.rb

@@ -403,4 +403,12 @@ describe Rolify::Resource do
       its(:applied_roles) { should_not include(forum_role, godfather_role, sneaky_role, tourist_role) }
     end
   end
+
+  describe '.resource_types' do
+
+    it 'include all models that call resourcify' do
+      Rolify.resource_types.should include("HumanResource", "Forum", "Group",
+                                          "Team", "Organization")
+    end
+  end
 end

data/spec/rolify/role_spec.rb

@@ -12,9 +12,19 @@ describe Rolify do
   def role_class
     Role
   end
-  
+
   it_behaves_like Rolify::Role
   it_behaves_like "Role.scopes"
   it_behaves_like Rolify::Dynamic
   it_behaves_like "Rolify.callbacks"
+
+  context 'cache', pending: true do
+    let(:user) { User.first }
+    before { user.grant(:zombie) }
+    specify do
+      expect(user).to have_role(:zombie)
+      user.remove_role(:zombie)
+      expect(user).to_not have_role(:zombie)
+    end
+  end
 end

data/spec/rolify/shared_examples/shared_examples_for_roles.rb

@@ -29,7 +29,7 @@ shared_examples_for Rolify::Role do
 
     subject { user_class.first }
 
-    [ :has_role, :grant, :add_role ].each do |method_alias|
+    [ :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
@@ -51,11 +51,6 @@ shared_examples_for Rolify::Role do
     it { should_not respond_to(:is_admin?) }
     it { should_not respond_to(:is_moderator_of?) }
 
-    describe "#has_role" do
-      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
       it_should_behave_like "#has_role?_examples", "String", :to_s
       it_should_behave_like "#has_role?_examples", "Symbol", :to_sym

data/spec/spec_helper.rb

@@ -1,3 +1,6 @@
+require "codeclimate-test-reporter"
+CodeClimate::TestReporter.start
+
 require 'rubygems'
 require "bundler/setup"
 

data/spec/support/schema.rb

@@ -5,8 +5,8 @@ ActiveRecord::Schema.define do
     create_table(table) do |t|
     t.string :name
     t.references :resource, :polymorphic => true
-  
-    t.timestamps
+
+    t.timestamps null: false
     end
   end
 
@@ -20,17 +20,17 @@ ActiveRecord::Schema.define do
     t.references :user
     t.references :role
   end
-  
+
   create_table(:human_resources_roles, :id => false) do |t|
     t.references :human_resource
     t.references :role
   end
-  
+
   create_table(:customers_privileges, :id => false) do |t|
     t.references :customer
     t.references :privilege
   end
-  
+
   create_table(:moderators_rights, :id => false) do |t|
     t.references :moderator
     t.references :right
@@ -44,7 +44,7 @@ ActiveRecord::Schema.define do
     t.integer :parent_id
     t.string :name
   end
-  
+
   create_table(:teams, :id => false) do |t|
     t.primary_key :team_code
     t.string :name

data/spec/support/stream_helpers.rb

@@ -0,0 +1,18 @@
+module StreamHelpers
+  def capture(stream)
+    stream = stream.to_s
+    captured_stream = Tempfile.new(stream)
+    stream_io = eval("$#{stream}")
+    origin_stream = stream_io.dup
+    stream_io.reopen(captured_stream)
+
+    yield
+
+    stream_io.rewind
+    return captured_stream.read
+  ensure
+    captured_stream.close
+    captured_stream.unlink
+    stream_io.reopen(origin_stream)
+  end
+end

metadata

@@ -1,52 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 3.4.1
-  prerelease: 
+  version: 3.5.0
 platform: ruby
 authors:
 - Florent Monbillard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-08 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.1.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 10.3.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '='
       - !ruby/object:Gem::Version
@@ -78,33 +69,29 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.2
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: fuubar
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.3
 description: Very simple Roles library without any authorization enforcement supporting
@@ -116,14 +103,16 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG.rdoc
+- CONTRIBUTORS
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - UPGRADE.rdoc
+- circle.yml
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
 - gemfiles/Gemfile.rails-4.1
@@ -185,30 +174,30 @@ files:
 - spec/support/adapters/mongoid.yml
 - spec/support/data.rb
 - spec/support/schema.rb
+- spec/support/stream_helpers.rb
 homepage: http://eppo.github.com/rolify/
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 1.8.23
+rubygems_version: 2.2.2
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Roles library with resource scoping
 test_files:
 - spec/README.rdoc
@@ -240,3 +229,4 @@ test_files:
 - spec/support/adapters/mongoid.yml
 - spec/support/data.rb
 - spec/support/schema.rb
+- spec/support/stream_helpers.rb