rolify 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ecd709c2e7e50d751a0161d8f0ab5b02ee5fd1aa
-  data.tar.gz: f0454a8410eba30cf7aff44ee27ffc70ee999182
+  metadata.gz: 8b81efc86ee3d4c660521e8b8cb7d1a5045b2ce7
+  data.tar.gz: 84f19deb5072b9d46dcade6c8d5db085dd8cfb60
 SHA512:
-  metadata.gz: 350c0f03b4d1a7764fee723122aad166d38728dd0ebeed8b39b6cd1523f03bfeb3cc5ef40b813b8d37e84ab28a37088f59fabac7cf3271c34badc3910b77762b
-  data.tar.gz: dbfcaebac05d8b0dc0d5cdca10f847d84080e28ef08b2473c759cf7cc1eba4bcae80eea2bf77cc0cec3f180a3e43f04b029247b2d894fb68f34e2fed2f8dc3d2
+  metadata.gz: d0209a0003ff41826654b23c1ebd6eeb556aef5d8e6554dd86a63362e82a69cc624abdc903063d65f4ab706a42a4c908cb52662c6db9cec1a8a38725f4274afe
+  data.tar.gz: 8aee6f2b0fa61dfe9c04aa42c2a496b7b907cb74f44b4c542a6b0587f46686085f5a30457e4168ba1485ed24eb3dd089e17e99a66d86da21e8c724767a2bf5d1

data/.travis.yml

@@ -1,12 +1,6 @@
 language: ruby
 sudo: false
 
-rvm:
-  - 2.2.3
-  - 2.2.2
-  - 2.1.2
-  - 2.0.0
-
 before_install:
   - gem update --system
   - gem install bundler
@@ -14,11 +8,80 @@ before_install:
 
 script: bundle exec rake
 
-env:
-  - ADAPTER=active_record
-  - ADAPTER=mongoid MONGOID_VERSION=3
-  - ADAPTER=mongoid MONGOID_VERSION=4
-  - ADAPTER=mongoid MONGOID_VERSION=5
+matrix:
+  include:
+    - rvm: 2.3.0
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.2.4
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.1.8
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_3.gemfile
+      env: ADAPTER=active_record
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.2.4
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.1.8
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.0.0
+      gemfile: gemfiles/activerecord_4.gemfile
+      env: ADAPTER=active_record
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/activerecord_5.gemfile
+      env: ADAPTER=active_record
+    - rvm: 2.2.4
+      gemfile: gemfiles/activerecord_5.gemfile
+      env: ADAPTER=active_record
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.2.4
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.1.8
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.0.0
+      gemfile: gemfiles/mongoid_3.gemfile
+      env: ADAPTER=mongoid
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.2.4
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.1.8
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.0.0
+      gemfile: gemfiles/mongoid_4.gemfile
+      env: ADAPTER=mongoid
+
+    - rvm: 2.3.0
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.2.4
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.1.8
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+    - rvm: 2.0.0
+      gemfile: gemfiles/mongoid_5.gemfile
+      env: ADAPTER=mongoid
+
 
 services: mongodb
 

data/Appraisals

@@ -0,0 +1,41 @@
+appraise 'mongoid-3' do
+  gem "mongoid", "~> 3"
+  gem "bson_ext", :platform => "ruby"
+end
+
+appraise 'mongoid-4' do
+  gem "mongoid", "~> 4"
+  gem "bson_ext", :platform => "ruby"
+end
+
+appraise 'mongoid-5' do
+  gem "mongoid", "~> 5"
+  gem "bson_ext", :platform => "ruby"
+end
+
+appraise 'activerecord-3' do
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", ">= 3.2.0", :require => "active_record"
+end
+
+appraise 'activerecord-4' do
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", ">= 4.2.5", :require => "active_record"
+end
+
+appraise 'activerecord-5' do
+  gem "sqlite3", :platform => "ruby"
+  gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
+
+  # Ammeter dependencies:
+  gem "actionpack", ">= 5.0.0.beta2"
+  gem "activemodel", ">= 5.0.0.beta2"
+  gem "railties", ">= 5.0.0.beta2"
+
+  gem 'rspec-rails'       , github: 'rspec/rspec-rails'
+  gem 'rspec-core'        , github: 'rspec/rspec-core'
+  gem 'rspec-expectations', github: 'rspec/rspec-expectations'
+  gem 'rspec-mocks'       , github: 'rspec/rspec-mocks'
+  gem 'rspec-support'     , github: 'rspec/rspec-support'
+
+end

data/CHANGELOG.rdoc

@@ -1,3 +1,9 @@
+= 5.1.0 (Mar 19, 2016)
+* Rails 5 Support (thanks @lorefnon)
+* Fix user handling in generator (thanks @lorefnon)
+* Fix quoting issues (thanks @lorefnon)
+* Improvements to dynamic module loading (thanks to @DmitryKK)
+
 = 5.0.0 (Nov 17, 2015)
 * Fix migration warning showing when it shouldn't
 * Add role lazy-loading

data/CONTRIBUTORS

@@ -4,3 +4,5 @@ Joel Azemar (@joel)
 Alex Klim (@AlexKlim)
 Mauro George (@MauroGeorge)
 Cheri Allen(@cherimarie)
+Gaurab Paul (@lorefnon)
+Dmitry Krakosevich (@DmitryKK)

data/Gemfile

@@ -1,25 +1,7 @@
 source "https://rubygems.org"
 
 group :test do
-  case ENV["ADAPTER"]
-  when nil, "active_record"
-    gem "activerecord-jdbcsqlite3-adapter", ">= 1.3.0.rc", :platform => "jruby"
-    gem "sqlite3", :platform => "ruby"
-    gem "activerecord", ">= 3.2.0", :require => "active_record"
-  when "mongoid"
-    case ENV["MONGOID_VERSION"]
-    when nil, '5'
-      gem "mongoid", "~> 5"
-    when '4'
-      gem "mongoid", "~> 4"
-    when '3'
-      gem "mongoid", "~> 3"
-    end
-    gem "bson_ext", :platform => "ruby"
-  else
-    raise "Unknown model adapter: #{ENV["ADAPTER"]}"
-  end
-
+  gem 'appraisal'
   gem 'coveralls', :require => false
   gem 'its'
   gem 'byebug'

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Florent Monbillard
+Copyright (c) 2016 Florent Monbillard
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -44,14 +44,14 @@ rails g rolify Role User
 rails g rolify:role Role User
 ```
 
-Role and User classes are the default. You can specify any Role class name you want. This is completly a new file so any name can do the job.
+Role and User classes are the default. You can specify any Role class name you want. This is a completely new file so any name will do the job.
 For the User class name, you would probably use the one provided by your authentication solution. rolify just adds some class methods in an existing User class.
 
 If you want to use Mongoid instead of ActiveRecord, just add `--orm=mongoid` argument, and skip to step #3
 
 ### 2. Run the migration (only required when using ActiveRecord)
 
-Let's migrate !
+Let's migrate!
 
 ```
 rake db:migrate
@@ -100,21 +100,21 @@ user = User.find(1)
 user.add_role :admin
 ```
 
-To define a role scoped to a resource instance
+To define a role scoped to a resource instance:
 
 ```ruby
 user = User.find(2)
 user.add_role :moderator, Forum.first
 ```
 
-To define a role scoped to a resource class
+To define a role scoped to a resource class:
 
 ```ruby
 user = User.find(3)
 user.add_role :moderator, Forum
 ```
 
-That's it !
+That's it!
 
 ### 5. Role queries
 
@@ -171,36 +171,36 @@ Starting from rolify 3.0, you can search roles on instance level or class level
 ```ruby
 forum = Forum.first
 forum.roles
-# => [ list of roles that are only binded to forum instance ]
+# => [ list of roles that are only bound to forum instance ]
 forum.applied_roles
-# => [ list of roles binded to forum instance and to the Forum class ]
+# => [ list of roles bound to forum instance and to the Forum class ]
 ```
 
 #### Class level
 
 ```ruby
 Forum.with_role(:admin)
-# => [ list of Forum instances that has role "admin" binded to it ]
+# => [ list of Forum instances that have role "admin" bound to them ]
 Forum.with_role(:admin, current_user)
-# => [ list of Forum instances that has role "admin" binded to it and belongs to current_user roles ]
+# => [ list of Forum instances that have role "admin" bound to them and belong 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 ]
+# => [ list of Forum instances that have role "admin" or "user" bound to them and belong to current_user roles ]
 
 User.with_any_role(:user, :admin)
-# => [ list of User instances that has role "admin" or "user" binded to it ]
+# => [ list of User instances that have role "admin" or "user" bound to them ]
 User.with_role(:site_admin, current_site)
 # => [ list of User instances that have a scoped role of "site_admin" to a site instance ]
 User.with_role(:site_admin, :any)
 # => [ list of User instances that have a scoped role of "site_admin" for any site instances ]
 User.with_all_roles(:site_admin, :admin)
-# => [ list of User instances that have a role of "site_admin" and a role of "admin" binded to it ]
+# => [ list of User instances that have a role of "site_admin" and a role of "admin" bound to it ]
 
 Forum.find_roles
-# => [ list of roles that binded to any Forum instance or to the Forum class ]
+# => [ list of roles that are bound to any Forum instance or to the Forum class ]
 Forum.find_roles(:admin)
-# => [ list of roles that binded to any Forum instance or to the Forum class with "admin" as a role name ]
+# => [ list of roles that are bound to any Forum instance or to the Forum class, with "admin" as a role name ]
 Forum.find_roles(:admin, current_user)
-# => [ list of roles that binded to any Forum instance or to the Forum class with "admin" as a role name and belongs to current_user roles ]
+# => [ list of roles that are bound to any Forum instance, or to the Forum class with "admin" as a role name, and belongs to current_user ]
 ```
 
 ### Strict Mode

data/Rakefile

@@ -14,7 +14,11 @@ RSpec::Core::RakeTask.new(:rolify) do |task|
   task.pattern = 'spec/rolify/**/*_spec.rb'
 end
 
-task :default => [ :spec, 'coveralls:push' ]
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+  task :default => :appraisal
+else
+  task :default => [ :spec, 'coveralls:push' ]
+end
 
 desc 'Run all specs'
 task 'spec' do

data/gemfiles/activerecord_3.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform => "ruby"
+gem "activerecord", ">= 3.2.0", :require => "active_record"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

data/gemfiles/activerecord_4.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform => "ruby"
+gem "activerecord", ">= 4.2.5", :require => "active_record"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

data/gemfiles/activerecord_5.gemfile

@@ -0,0 +1,27 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "sqlite3", :platform => "ruby"
+gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
+gem "actionpack", ">= 5.0.0.beta2"
+gem "activemodel", ">= 5.0.0.beta2"
+gem "railties", ">= 5.0.0.beta2"
+gem "rspec-rails", :github => "rspec/rspec-rails"
+gem "rspec-core", :github => "rspec/rspec-core"
+gem "rspec-expectations", :github => "rspec/rspec-expectations"
+gem "rspec-mocks", :github => "rspec/rspec-mocks"
+gem "rspec-support", :github => "rspec/rspec-support"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

data/gemfiles/mongoid_3.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 3"
+gem "bson_ext", :platform => "ruby"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

data/gemfiles/mongoid_4.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 4"
+gem "bson_ext", :platform => "ruby"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

data/gemfiles/mongoid_5.gemfile

@@ -0,0 +1,19 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "mongoid", "~> 5"
+gem "bson_ext", :platform => "ruby"
+
+group :test do
+  gem "appraisal"
+  gem "coveralls", :require => false
+  gem "its"
+  gem "byebug"
+  gem "pry-byebug"
+  gem "test-unit"
+  gem "database_cleaner"
+  gem "codeclimate-test-reporter", :require => nil
+end
+
+gemspec :path => "../"

data/lib/generators/active_record/rolify_generator.rb

@@ -8,6 +8,13 @@ module ActiveRecord
 
       argument :user_cname, :type => :string, :default => "User", :banner => "User"
 
+      def ensure_user_class_defined
+        unless user_class_defined?
+          prompt_missing_user
+          abort
+        end
+      end
+
       def generate_model
         invoke "active_record:model", [ name ], :migration => false
       end
@@ -22,6 +29,7 @@ module ActiveRecord
             require "#{ENGINE_ROOT}/app/models/#{user_cname.downcase}.rb"
           end
         end
+
         inject_into_class(model_path, class_name, model_content)
       end
 
@@ -29,8 +37,10 @@ module ActiveRecord
         migration_template "migration.rb", "db/migrate/rolify_create_#{table_name}.rb"
       end
 
+      private
+
       def join_table
-        user_cname.constantize.table_name + "_" + table_name
+        user_class.table_name + "_" + table_name
       end
 
       def user_reference
@@ -48,7 +58,10 @@ module ActiveRecord
       def model_content
         content = <<RUBY
   has_and_belongs_to_many :%{user_cname}, :join_table => :%{join_table}
-  belongs_to :resource, :polymorphic => true
+
+  belongs_to :resource,
+             :polymorphic => true,
+             :optional => true
 
   validates :resource_type,
             :inclusion => { :in => Rolify.resource_types },
@@ -56,8 +69,31 @@ module ActiveRecord
 
   scopify
 RUBY
-        content % { :user_cname => user_cname.constantize.table_name, :join_table => "#{user_cname.constantize.table_name}_#{table_name}"}
+        content % { :user_cname => user_class.table_name, :join_table => "#{user_cname.constantize.table_name}_#{table_name}"}
+      end
+
+      def user_class
+        user_cname.constantize
+      end
+
+      def user_class_defined?
+        user_class
+        true
+      rescue NameError => ex
+        if ex.missing_name == user_cname
+          false
+        else
+          raise ex
+        end
       end
+
+      def prompt_missing_user
+        puts <<MSG
+Rolify expected a model named #{user_cname} to be defined but could not find one.
+Please ensure that this model exists and is not mis-spelled and re-run the generator.
+MSG
+      end
+
     end
   end
 end

data/lib/rolify.rb

@@ -30,7 +30,6 @@ module Rolify
     has_and_belongs_to_many :roles, rolify_options
 
     self.adapter = Rolify::Adapter::Base.create("role_adapter", self.role_cname, self.name)
-    load_dynamic_methods if Rolify.dynamic_shortcuts
 
     #use strict roles
     self.strict_rolify = true if options[:strict]

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

@@ -17,16 +17,17 @@ module Rolify
           str << ', ' unless klass == klasses.last
           str
         end
-        resources = relation.joins("INNER JOIN #{quote(roles_table)} ON #{quote(roles_table)}.resource_type IN (#{relations}) AND
-                                    (#{quote(roles_table)}.resource_id IS NULL OR #{quote(roles_table)}.resource_id = #{quote(relation.table_name)}.#{relation.primary_key})")
-        resources = resources.where("#{quote(roles_table)}.name IN (?) AND #{quote(roles_table)}.resource_type IN (?)", Array(role_name), klasses)
-        resources = resources.select("#{quote(relation.table_name)}.*")
+
+        resources = relation.joins("INNER JOIN #{quote_table(roles_table)} ON #{quote_table(roles_table)}.resource_type IN (#{relations}) AND
+                                    (#{quote_table(roles_table)}.resource_id IS NULL OR #{quote_table(roles_table)}.resource_id = #{quote_table(relation.table_name)}.#{quote_column(relation.primary_key)})")
+        resources = resources.where("#{quote_table(roles_table)}.name IN (?) AND #{quote_table(roles_table)}.resource_type IN (?)", Array(role_name), klasses)
+        resources = resources.select("#{quote_table(relation.table_name)}.*")
         resources
       end
 
       def in(relation, user, role_names)
-        roles = user.roles.where(:name => role_names).select("#{quote(role_class.table_name)}.#{role_class.primary_key}")
-        relation.where("#{quote(role_class.table_name)}.#{role_class.primary_key} IN (?) AND ((resource_id = #{quote(relation.table_name)}.#{relation.primary_key}) OR (resource_id IS NULL))", roles)
+        roles = user.roles.where(:name => role_names).select("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)}")
+        relation.where("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)} IN (?) AND ((resource_id = #{quote_table(relation.table_name)}.#{quote_column(relation.primary_key)}) OR (resource_id IS NULL))", roles)
       end
 
       def applied_roles(relation, children)
@@ -44,9 +45,14 @@ module Rolify
 
       private
 
-      def quote(column)
+      def quote_column(column)
         ActiveRecord::Base.connection.quote_column_name column
       end
+
+      def quote_table(table)
+        ActiveRecord::Base.connection.quote_table_name table
+      end
+
     end
   end
 end

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

@@ -9,6 +9,7 @@ module Rolify
       end
 
       def where_strict(relation, args)
+        return relation.where(:name => args[:name]) if args[:resource].blank?
         resource = if args[:resource].is_a?(Class)
                      {class: args[:resource].to_s, id: nil}
                    else

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

@@ -9,13 +9,14 @@ module Rolify
       end
 
       def where_strict(relation, args)
+        return relation.where(:name => args[:name]) if args[:resource].blank?
         resource = if args[:resource].is_a?(Class)
                      {class: args[:resource].to_s, id: nil}
                    else
                      {class: args[:resource].class.name, id: args[:resource].id}
                    end
 
-          relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
+        relation.where(:name => args[:name], :resource_type => resource[:class], :resource_id => resource[:id])
       end
 
       def find_cached(relation, args)

data/lib/rolify/dynamic.rb

@@ -2,29 +2,15 @@ require "rolify/configure"
 
 module Rolify
   module Dynamic
-    def load_dynamic_methods
-      if ENV['ADAPTER'] == 'active_record'
-        # supported Rails version >= 3.2 with AR should use find_each, since use of .all.each is deprecated
-        self.role_class.group("name, resource_type").includes(:resource).find_each do |r|
-          define_dynamic_method(r.name, r.resource)
-        end
-      else
-        # for compatibility with MongoidDB and older Rails AR - does not support polymorphic includes
-        self.role_class.all.each do |r|
-          define_dynamic_method(r.name, r.resource)
-        end
-      end
-    end
-
     def define_dynamic_method(role_name, resource)
       class_eval do 
         define_method("is_#{role_name}?".to_sym) do
           has_role?("#{role_name}")
-        end if !method_defined?("is_#{role_name}?".to_sym)
+        end if !method_defined?("is_#{role_name}?".to_sym) && self.adapter.where_strict(self.role_class, name: role_name).exists?
 
         define_method("is_#{role_name}_of?".to_sym) do |arg|
           has_role?("#{role_name}", arg)
-        end if !method_defined?("is_#{role_name}_of?".to_sym) && resource
+        end if !method_defined?("is_#{role_name}_of?".to_sym) && resource && self.adapter.where_strict(self.role_class, name: role_name, resource: resource).exists?
       end
     end
   end

data/lib/rolify/role.rb

@@ -94,7 +94,7 @@ module Rolify
         resource = args.first
         self.class.define_dynamic_method $1, resource
         return has_role?("#{$1}", resource)
-      end unless !Rolify.dynamic_shortcuts
+      end if Rolify.dynamic_shortcuts
       super
     end
 

data/lib/rolify/version.rb

@@ -1,3 +1,3 @@
 module Rolify
-  VERSION = "5.0.0"
+  VERSION = "5.1.0"
 end

data/spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -45,7 +45,10 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       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 "belongs_to :resource,\n"
+                          "           :polymorphic => true,\n"
+                          "           :optional => true"
+      }
       it { should contain "validates :resource_type,\n"
                           "          :inclusion => { :in => Rolify.resource_types },\n"
                           "          :allow_nil => true" }
@@ -93,7 +96,10 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       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" }
+      it { should contain "belongs_to :resource,\n"
+                          "           :polymorphic => true,\n"
+                          "           :optional => true"
+      }
     end
 
     describe 'app/models/admin_user.rb' do
@@ -145,7 +151,10 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       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" }
+      it { should contain "belongs_to :resource,\n"
+                          "           :polymorphic => true,\n"
+                          "           :optional => true"
+      }
     end
 
     describe 'app/models/admin/user.rb' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 5.0.0
+  version: 5.1.0
 platform: ruby
 authors:
 - Florent Monbillard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-18 00:00:00.000000000 Z
+date: 2016-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -79,6 +79,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.rdoc
 - CONTRIBUTORS
 - Gemfile
@@ -89,6 +90,12 @@ files:
 - gemfiles/Gemfile.rails-3.2
 - gemfiles/Gemfile.rails-4.0
 - gemfiles/Gemfile.rails-4.1
+- gemfiles/activerecord_3.gemfile
+- gemfiles/activerecord_4.gemfile
+- gemfiles/activerecord_5.gemfile
+- gemfiles/mongoid_3.gemfile
+- gemfiles/mongoid_4.gemfile
+- gemfiles/mongoid_5.gemfile
 - lib/generators/active_record/rolify_generator.rb
 - lib/generators/active_record/templates/README
 - lib/generators/active_record/templates/migration.rb