rolify 5.1.0 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b81efc86ee3d4c660521e8b8cb7d1a5045b2ce7
-  data.tar.gz: 84f19deb5072b9d46dcade6c8d5db085dd8cfb60
+  metadata.gz: fd31510680fda8c2bbb43eb49688f9d169d99780
+  data.tar.gz: bc4fd8fd415cc8c45b333c116f75c83a074c77e0
 SHA512:
-  metadata.gz: d0209a0003ff41826654b23c1ebd6eeb556aef5d8e6554dd86a63362e82a69cc624abdc903063d65f4ab706a42a4c908cb52662c6db9cec1a8a38725f4274afe
-  data.tar.gz: 8aee6f2b0fa61dfe9c04aa42c2a496b7b907cb74f44b4c542a6b0587f46686085f5a30457e4168ba1485ed24eb3dd089e17e99a66d86da21e8c724767a2bf5d1
+  metadata.gz: ca50a30cd8d60796b6be7d21b26d8bfc6841627623592899f778e56e144c75ff607d7b2263e691452e2613d3fe6f8cf950841fb52b6cf132feb033ad4dce8f71
+  data.tar.gz: 2d914c23c63900d12eded794a0b1ced812d0815987b42c31c9d83c784f4f7fcfbcb992efad429f533b2b2dc31e2da5d6bb39ba7d8063fc8e5170fd6f759ca6a8

data/.travis.yml

@@ -8,6 +8,9 @@ before_install:
 
 script: bundle exec rake
 
+after_success:
+  - bundle exec codeclimate-test-reporter
+
 matrix:
   include:
     - rvm: 2.3.0

data/Appraisals

@@ -15,12 +15,12 @@ end
 
 appraise 'activerecord-3' do
   gem "sqlite3", :platform => "ruby"
-  gem "activerecord", ">= 3.2.0", :require => "active_record"
+  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"
+  gem "activerecord", "~> 4.2.5", :require => "active_record"
 end
 
 appraise 'activerecord-5' do

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+= 5.2.0 (Dec 14, 2017)
+* Fix regression in generator around belongs_to options compatibility
+* Update version of database_cleaner
+* Update initializer.rb to include the remove_role_if_empty option and description
+* Allow inverse_of option on rolify method
+* Fix the code-climate-reporter issue that's causing travis to fail
+* Remove a separate index for the name column
+* Fix migration generator for AR 5.x
+* Fixed ambiguous column error
+
 = 5.1.0 (Mar 19, 2016)
 * Rails 5 Support (thanks @lorefnon)
 * Fix user handling in generator (thanks @lorefnon)

data/CONTRIBUTORS

@@ -6,3 +6,12 @@ Mauro George (@MauroGeorge)
 Cheri Allen(@cherimarie)
 Gaurab Paul (@lorefnon)
 Dmitry Krakosevich (@DmitryKK)
+Michael Watts (@mikwat)
+Derek Ethier (@ethier)
+Michael (@mibamur)
+Undo1 (@Undo1)
+Hitabis Engineering (@Hitabis)
+Sergey Alekseev (@sergey-alekseev)
+Sankalp Kulshreshtha (@sankalpk)
+Kirill Sevastyanenko (@kirillseva)
+Denis Shevchenko (@SimplySorc)

data/Gemfile

@@ -7,7 +7,7 @@ group :test do
   gem 'byebug'
   gem 'pry-byebug'
   gem 'test-unit' # Implicitly loaded by ammeter
-  gem 'database_cleaner'
+  gem 'database_cleaner', '~> 1.6.2'
   gem 'codeclimate-test-reporter', :require => nil
 end
 

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2016 Florent Monbillard
+Copyright (c) 2017 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

@@ -5,11 +5,11 @@ Very simple Roles library without any authorization enforcement supporting scope
 Let's see an example:
 
 ```ruby
-user.has_role?(:moderator, Forum.first)
+user.has_role?(:moderator, @forum)
 => 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> ([CanCanCan](https://github.com/CanCanCommunity/cancancan), [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), [Pundit](https://github.com/elabs/pundit))
 
 <span style="color: red"><strong>*</strong></span>: authorization gem that doesn't provide a role class
 
@@ -22,7 +22,7 @@ This library can be easily integrated with any authentication gem ([devise](http
 
 ## Installation
 
-Add this to your Gemfile and run the +bundle+ command.
+Add this to your Gemfile and run the `bundle` command.
 
 ```ruby
 gem "rolify"
@@ -32,7 +32,9 @@ gem "rolify"
 
 ### 1. Generate Role Model
 
-First, create your Role model and migration file using this generator:
+First, use the generator to setup Rolify. Role and User class are the default names. However, you can specify any class name you want. For the User class name, you would probably use the one provided by your authentication solution.
+
+If you want to use Mongoid instead of ActiveRecord, just add `--orm=mongoid` argument, and skip to step #3.
 
 ```
 rails g rolify Role User
@@ -44,10 +46,7 @@ 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 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
+The generator will create your Role model, add a migration file, and update your User class with new class methods. 
 
 ### 2. Run the migration (only required when using ActiveRecord)
 
@@ -80,6 +79,8 @@ The `rolify` method accepts the following callback options:
 
 Mongoid callbacks are also supported and works the same way.
 
+The `rolify` method also accepts the `inverse_of` option if you need to disambiguate the relationship.
+
 ### 3.2 Configure your resource models
 
 In the resource models you want to apply roles on, just add ``resourcify`` method.
@@ -91,6 +92,18 @@ class Forum < ActiveRecord::Base
 end
 ```
 
+### 3.3 Assign default role
+
+```ruby
+class User < ActiveRecord::Base
+  after_create :assign_default_role
+
+  def assign_default_role
+    self.add_role(:newuser) if self.roles.blank?
+  end
+end
+```
+
 ### 4. Add a role to a user
 
 To define a global role:
@@ -114,6 +127,12 @@ user = User.find(3)
 user.add_role :moderator, Forum
 ```
 
+Remove role:
+```ruby
+user = User.find(3)
+user.remove_role :moderator
+```
+
 That's it!
 
 ### 5. Role queries
@@ -181,6 +200,8 @@ forum.applied_roles
 ```ruby
 Forum.with_role(:admin)
 # => [ list of Forum instances that have role "admin" bound to them ]
+Forum.without_role(:admin)
+# => [ list of Forum instances that do NOT have role "admin" bound to them ]
 Forum.with_role(:admin, current_user)
 # => [ list of Forum instances that have role "admin" bound to them and belong to current_user roles ]
 Forum.with_roles([:admin, :user], current_user)

data/gemfiles/activerecord_3.gemfile

@@ -2,18 +2,18 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platform => "ruby"
-gem "activerecord", ">= 3.2.0", :require => "active_record"
+gem "sqlite3", platform: "ruby"
+gem "activerecord", "~> 3.2.0", require: "active_record"
 
 group :test do
   gem "appraisal"
-  gem "coveralls", :require => false
+  gem "coveralls", require: false
   gem "its"
   gem "byebug"
   gem "pry-byebug"
   gem "test-unit"
-  gem "database_cleaner"
-  gem "codeclimate-test-reporter", :require => nil
+  gem "database_cleaner", "~> 1.6.2"
+  gem "codeclimate-test-reporter", require: nil
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activerecord_4.gemfile

@@ -2,18 +2,18 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platform => "ruby"
-gem "activerecord", ">= 4.2.5", :require => "active_record"
+gem "sqlite3", platform: "ruby"
+gem "activerecord", "~> 4.2.5", require: "active_record"
 
 group :test do
   gem "appraisal"
-  gem "coveralls", :require => false
+  gem "coveralls", require: false
   gem "its"
   gem "byebug"
   gem "pry-byebug"
   gem "test-unit"
-  gem "database_cleaner"
-  gem "codeclimate-test-reporter", :require => nil
+  gem "database_cleaner", "~> 1.6.2"
+  gem "codeclimate-test-reporter", require: nil
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/activerecord_5.gemfile

@@ -2,26 +2,26 @@
 
 source "https://rubygems.org"
 
-gem "sqlite3", :platform => "ruby"
-gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
+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"
+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 "coveralls", require: false
   gem "its"
   gem "byebug"
   gem "pry-byebug"
   gem "test-unit"
-  gem "database_cleaner"
-  gem "codeclimate-test-reporter", :require => nil
+  gem "database_cleaner", "~> 1.6.2"
+  gem "codeclimate-test-reporter", require: nil
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/mongoid_3.gemfile

@@ -3,17 +3,17 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 3"
-gem "bson_ext", :platform => "ruby"
+gem "bson_ext", platform: "ruby"
 
 group :test do
   gem "appraisal"
-  gem "coveralls", :require => false
+  gem "coveralls", require: false
   gem "its"
   gem "byebug"
   gem "pry-byebug"
   gem "test-unit"
-  gem "database_cleaner"
-  gem "codeclimate-test-reporter", :require => nil
+  gem "database_cleaner", "~> 1.6.2"
+  gem "codeclimate-test-reporter", require: nil
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/mongoid_4.gemfile

@@ -3,17 +3,17 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 4"
-gem "bson_ext", :platform => "ruby"
+gem "bson_ext", platform: "ruby"
 
 group :test do
   gem "appraisal"
-  gem "coveralls", :require => false
+  gem "coveralls", require: false
   gem "its"
   gem "byebug"
   gem "pry-byebug"
   gem "test-unit"
-  gem "database_cleaner"
-  gem "codeclimate-test-reporter", :require => nil
+  gem "database_cleaner", "~> 1.6.2"
+  gem "codeclimate-test-reporter", require: nil
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/gemfiles/mongoid_5.gemfile

@@ -3,17 +3,17 @@
 source "https://rubygems.org"
 
 gem "mongoid", "~> 5"
-gem "bson_ext", :platform => "ruby"
+gem "bson_ext", platform: "ruby"
 
 group :test do
   gem "appraisal"
-  gem "coveralls", :require => false
+  gem "coveralls", require: false
   gem "its"
   gem "byebug"
   gem "pry-byebug"
   gem "test-unit"
-  gem "database_cleaner"
-  gem "codeclimate-test-reporter", :require => nil
+  gem "database_cleaner", "~> 1.6.2"
+  gem "codeclimate-test-reporter", require: nil
 end
 
-gemspec :path => "../"
+gemspec path: "../"

data/lib/generators/active_record/rolify_generator.rb

@@ -1,5 +1,6 @@
 require 'rails/generators/active_record'
 require 'active_support/core_ext'
+require 'erb'
 
 module ActiveRecord
   module Generators
@@ -34,7 +35,7 @@ module ActiveRecord
       end
 
       def copy_rolify_migration
-        migration_template "migration.rb", "db/migrate/rolify_create_#{table_name}.rb"
+        migration_template "migration.rb", "db/migrate/rolify_create_#{table_name}.rb", migration_version: migration_version
       end
 
       private
@@ -56,20 +57,7 @@ module ActiveRecord
       end
 
       def model_content
-        content = <<RUBY
-  has_and_belongs_to_many :%{user_cname}, :join_table => :%{join_table}
-
-  belongs_to :resource,
-             :polymorphic => true,
-             :optional => true
-
-  validates :resource_type,
-            :inclusion => { :in => Rolify.resource_types },
-            :allow_nil => true
-
-  scopify
-RUBY
-        content % { :user_cname => user_class.table_name, :join_table => "#{user_cname.constantize.table_name}_#{table_name}"}
+        ERB.new(File.read(File.join(__dir__, 'templates/model.rb'))).result(binding)
       end
 
       def user_class
@@ -94,6 +82,16 @@ Please ensure that this model exists and is not mis-spelled and re-run the gener
 MSG
       end
 
+      def rails5?
+        Rails.version.start_with? '5'
+      end
+
+      def migration_version
+        if rails5?
+          "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
+
     end
   end
 end

data/lib/generators/active_record/templates/migration.rb

@@ -1,4 +1,4 @@
-class RolifyCreate<%= table_name.camelize %> < ActiveRecord::Migration
+class RolifyCreate<%= table_name.camelize %> < ActiveRecord::Migration<%= migration_version %>
   def change
     create_table(:<%= table_name %>) do |t|
       t.string :name
@@ -11,8 +11,7 @@ class RolifyCreate<%= table_name.camelize %> < ActiveRecord::Migration
       t.references :<%= user_reference %>
       t.references :<%= role_reference %>
     end
-
-    add_index(:<%= table_name %>, :name)
+    <% if ActiveRecord::Base.connection.class.to_s.demodulize != 'PostgreSQLAdapter' %><%= "\n    " %>add_index(:<%= table_name %>, :name)<% end %>
     add_index(:<%= table_name %>, [ :name, :resource_type, :resource_id ])
     add_index(:<%= join_table %>, [ :<%= user_reference %>_id, :<%= role_reference %>_id ])
   end

data/lib/generators/active_record/templates/model.rb

@@ -0,0 +1,16 @@
+has_and_belongs_to_many :<%= user_class.table_name %>, :join_table => :<%= join_table %>
+
+<% if Rails::VERSION::MAJOR < 5 %>
+belongs_to :resource,
+           :polymorphic => true
+<% else %>
+belongs_to :resource,
+           :polymorphic => true,
+           :optional => true
+<% end %>
+
+validates :resource_type,
+          :inclusion => { :in => Rolify.resource_types },
+          :allow_nil => true
+
+scopify

data/lib/generators/rolify/templates/initializer.rb

@@ -4,4 +4,7 @@ Rolify.configure<%= "(\"#{class_name.camelize.to_s}\")" if class_name != "Role"
 
   # Dynamic shortcuts for User class (user.is_admin? like methods). Default is: false
   # config.use_dynamic_shortcuts
-end
+  
+  # Configuration to remove roles from database once the last resource is removed. Default is: true
+  # config.remove_role_if_empty = false
+end

data/lib/rolify.rb

@@ -25,7 +25,7 @@ module Rolify
 
     rolify_options = { :class_name => options[:role_cname].camelize }
     rolify_options.merge!({ :join_table => self.role_join_table_name }) if Rolify.orm == "active_record"
-    rolify_options.merge!(options.reject{ |k,v| ![ :before_add, :after_add, :before_remove, :after_remove ].include? k.to_sym })
+    rolify_options.merge!(options.reject{ |k,v| ![ :before_add, :after_add, :before_remove, :after_remove, :inverse_of ].include? k.to_sym })
 
     has_and_belongs_to_many :roles, rolify_options
 

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

@@ -27,7 +27,7 @@ module Rolify
 
       def in(relation, user, role_names)
         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)
+        relation.where("#{quote_table(role_class.table_name)}.#{quote_column(role_class.primary_key)} IN (?) AND ((#{quote_table(role_class.table_name)}.resource_id = #{quote_table(relation.table_name)}.#{quote_column(relation.primary_key)}) OR (#{quote_table(role_class.table_name)}.resource_id IS NULL))", roles)
       end
 
       def applied_roles(relation, children)

data/lib/rolify/version.rb

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

data/spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -8,6 +8,7 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
   destination File.expand_path("../../../../tmp", __FILE__)
   teardown :cleanup_destination_root
 
+  let(:adapter) { 'SQLite3Adapter' }
   before {
     prepare_destination
   }
@@ -20,6 +21,8 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
     before(:all) { arguments %w(Role) }
 
     before {
+      allow(ActiveRecord::Base).to receive_message_chain(
+        'connection.class.to_s.demodulize') { adapter }
       capture(:stdout) {
         generator.create_file "app/models/user.rb" do
           <<-RUBY
@@ -43,8 +46,24 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
     describe 'app/models/role.rb' do
       subject { file('app/models/role.rb') }
       it { should exist }
-      it { should contain "class Role < ActiveRecord::Base" }
+      it do
+        if Rails::VERSION::MAJOR < 5
+          should contain "class Role < ActiveRecord::Base"
+        else
+          should contain "class Role < ApplicationRecord"
+        end
+      end
       it { should contain "has_and_belongs_to_many :users, :join_table => :users_roles" }
+      it do
+        if Rails::VERSION::MAJOR < 5
+          should contain "belongs_to :resource,\n"
+                          "           :polymorphic => true"
+        else
+          should contain "belongs_to :resource,\n"
+                          "           :polymorphic => true,\n"
+                          "           :optional => true"
+        end
+      end
       it { should contain "belongs_to :resource,\n"
                           "           :polymorphic => true,\n"
                           "           :optional => true"
@@ -65,6 +84,24 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should be_a_migration }
       it { should contain "create_table(:roles) do" }
       it { should contain "create_table(:users_roles, :id => false) do" }
+
+      context 'mysql2' do
+        let(:adapter) { 'Mysql2Adapter' }
+
+        it { expect(subject).to contain('add_index(:roles, :name)') }
+      end
+
+      context 'sqlite3' do
+        let(:adapter) { 'SQLite3Adapter' }
+
+        it { expect(subject).to contain('add_index(:roles, :name)') }
+      end
+
+      context 'pg' do
+        let(:adapter) { 'PostgreSQLAdapter' }
+
+        it { expect(subject).not_to contain('add_index(:roles, :name)') }
+      end
     end
   end
 
@@ -72,6 +109,8 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
     before(:all) { arguments %w(AdminRole AdminUser) }
 
     before {
+      allow(ActiveRecord::Base).to receive_message_chain(
+        'connection.class.to_s.demodulize') { adapter }
       capture(:stdout) {
         generator.create_file "app/models/admin_user.rb" do
           "class AdminUser < ActiveRecord::Base\nend"
@@ -94,7 +133,13 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       subject { file('app/models/admin_role.rb') }
 
       it { should exist }
-      it { should contain "class AdminRole < ActiveRecord::Base" }
+      it do
+        if Rails::VERSION::MAJOR < 5
+          should contain "class AdminRole < ActiveRecord::Base"
+        else
+          should contain "class AdminRole < ApplicationRecord"
+        end
+      end
       it { should contain "has_and_belongs_to_many :admin_users, :join_table => :admin_users_admin_roles" }
       it { should contain "belongs_to :resource,\n"
                           "           :polymorphic => true,\n"
@@ -114,6 +159,24 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should be_a_migration }
       it { should contain "create_table(:admin_roles)" }
       it { should contain "create_table(:admin_users_admin_roles, :id => false) do" }
+
+      context 'mysql2' do
+        let(:adapter) { 'Mysql2Adapter' }
+
+        it { expect(subject).to contain('add_index(:admin_roles, :name)') }
+      end
+
+      context 'sqlite3' do
+        let(:adapter) { 'SQLite3Adapter' }
+
+        it { expect(subject).to contain('add_index(:admin_roles, :name)') }
+      end
+
+      context 'pg' do
+        let(:adapter) { 'PostgreSQLAdapter' }
+
+        it { expect(subject).not_to contain('add_index(:admin_roles, :name)') }
+      end
     end
   end
 
@@ -121,6 +184,8 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
     before(:all) { arguments %w(Admin::Role Admin::User) }
 
     before {
+      allow(ActiveRecord::Base).to receive_message_chain(
+        'connection.class.to_s.demodulize') { adapter }
       capture(:stdout) {
         generator.create_file "app/models/admin/user.rb" do
           <<-RUBY
@@ -149,7 +214,13 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       subject { file('app/models/admin/role.rb') }
 
       it { should exist }
-      it { should contain "class Admin::Role < ActiveRecord::Base" }
+      it do
+        if Rails::VERSION::MAJOR < 5
+          should contain "class Admin::Role < ActiveRecord::Base"
+        else
+          should contain "class Admin::Role < ApplicationRecord"
+        end
+      end
       it { should contain "has_and_belongs_to_many :admin_users, :join_table => :admin_users_admin_roles" }
       it { should contain "belongs_to :resource,\n"
                           "           :polymorphic => true,\n"
@@ -169,6 +240,24 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should be_a_migration }
       it { should contain "create_table(:admin_roles)" }
       it { should contain "create_table(:admin_users_admin_roles, :id => false) do" }
+
+      context 'mysql2' do
+        let(:adapter) { 'Mysql2Adapter' }
+
+        it { expect(subject).to contain('add_index(:admin_roles, :name)') }
+      end
+
+      context 'sqlite3' do
+        let(:adapter) { 'SQLite3Adapter' }
+
+        it { expect(subject).to contain('add_index(:admin_roles, :name)') }
+      end
+
+      context 'pg' do
+        let(:adapter) { 'PostgreSQLAdapter' }
+
+        it { expect(subject).not_to contain('add_index(:admin_roles, :name)') }
+      end
     end
   end
 end

data/spec/spec_helper.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 5.1.0
+  version: 5.2.0
 platform: ruby
 authors:
 - Florent Monbillard
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-19 00:00:00.000000000 Z
+date: 2017-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -99,6 +99,7 @@ files:
 - lib/generators/active_record/rolify_generator.rb
 - lib/generators/active_record/templates/README
 - lib/generators/active_record/templates/migration.rb
+- lib/generators/active_record/templates/model.rb
 - lib/generators/mongoid/rolify_generator.rb
 - lib/generators/mongoid/templates/README-mongoid
 - lib/generators/rolify/rolify_generator.rb
@@ -183,7 +184,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rolify
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Roles library with resource scoping