rolify 5.2.0 → 6.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: fd31510680fda8c2bbb43eb49688f9d169d99780
-  data.tar.gz: bc4fd8fd415cc8c45b333c116f75c83a074c77e0
+SHA256:
+  metadata.gz: 39183b0e66a9dfdbe636059ec28145106f14347129676c334598ff4f330edfc0
+  data.tar.gz: 686c5b98efcc79e84b104cca586053b920032cbc0bf7978baa0b1caa04e021bb
 SHA512:
-  metadata.gz: ca50a30cd8d60796b6be7d21b26d8bfc6841627623592899f778e56e144c75ff607d7b2263e691452e2613d3fe6f8cf950841fb52b6cf132feb033ad4dce8f71
-  data.tar.gz: 2d914c23c63900d12eded794a0b1ced812d0815987b42c31c9d83c784f4f7fcfbcb992efad429f533b2b2dc31e2da5d6bb39ba7d8063fc8e5170fd6f759ca6a8
+  metadata.gz: a24f0ef337c8c5d1b9381e30020ba18c790193f4b00085cbd2581f25d6322d5ffeee099a22a43b4b4c86de66a2774364f799426ae71ed331027d5e565a06be72
+  data.tar.gz: b1d55761a7a5df75a9c1f462ca04232c44e81adcc180ece7232386f0c6f4dff0441cc463e674075c5906fc3c3ddcc71922dd20cf2129eecff099fa604db56b94

data/.github/workflows/activerecord.yml

@@ -0,0 +1,27 @@
+name: activerecord
+on: [push]
+jobs:
+  ubuntu:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    strategy:
+      matrix:
+        gemfile: [activerecord_4, activerecord_5, activerecord_6]
+        ruby: [2.5.7, 2.6.5, 2.7.2]
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      ADAPTER: active_record
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: sudo apt-get install -y libsqlite3-dev
+      - run: gem update --system
+      - run: gem install bundler
+      - run: gem --version
+      - run: bundle install
+      - name: Run Tests
+        run: |
+          bundle exec rake

data/.github/workflows/mongoid.yml

@@ -0,0 +1,32 @@
+name: mongoid
+on: [push]
+jobs:
+  ubuntu:
+    runs-on: ubuntu-latest
+    continue-on-error: true
+    services:
+      mongodb:
+        image: mongo:3.4.23
+        ports:
+          - 27017:27017
+    strategy:
+      matrix:
+        gemfile: [mongoid_5]
+        ruby: [2.5.7, 2.6.5, 2.7.2]
+    env:
+      BUNDLE_GEMFILE: gemfiles/${{ matrix.gemfile }}.gemfile
+      ADAPTER: mongoid
+    steps:
+      - uses: actions/checkout@v2
+      - name: Setup ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+      - run: sudo apt-get install -y libsqlite3-dev
+      - run: gem update --system
+      - run: gem install bundler
+      - run: gem --version
+      - run: bundle install
+      - name: Run Tests
+        run: |
+          bundle exec rake

data/.hakiri.yml

@@ -0,0 +1 @@
+dependency_source: gemspec_file

data/Appraisals

@@ -1,41 +1,42 @@
-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"
+  gem "bson_ext", "1.5.1"
+  gem 'bigdecimal', '1.4.2'
 end
 
-appraise 'activerecord-3' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", "~> 3.2.0", :require => "active_record"
+appraise 'mongoid-6' do
+  gem "mongoid", "~> 6"
+  gem "bson_ext", "1.5.1"
+end
+
+appraise 'mongoid-7' do
+  gem "mongoid", "~> 7"
+  gem "bson_ext", "1.5.1"
+  gem "railties", "5.2.4.1"
 end
 
 appraise 'activerecord-4' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", "~> 4.2.5", :require => "active_record"
+  gem "sqlite3", "~> 1.3.6"
+  gem "activerecord", "~> 4.2.11", :require => "active_record"
+  gem 'bigdecimal', '1.4.2'
 end
 
 appraise 'activerecord-5' do
-  gem "sqlite3", :platform => "ruby"
-  gem "activerecord", ">= 5.0.0.beta", :require => "active_record"
+  gem "sqlite3", "~> 1.3.6"
+  gem "activerecord", "~> 5.2.4", :require => "active_record"
 
   # Ammeter dependencies:
-  gem "actionpack", ">= 5.0.0.beta2"
-  gem "activemodel", ">= 5.0.0.beta2"
-  gem "railties", ">= 5.0.0.beta2"
+  gem "actionpack", "~> 5.2.4"
+  gem "activemodel", "~> 5.2.4"
+  gem "railties", "~> 5.2.4"
+end
 
-  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'
+appraise 'activerecord-6' do
+  gem "sqlite3", "~> 1.4", :platform => "ruby"
+  gem "activerecord", ">= 6.0.0", :require => "active_record"
 
+  # Ammeter dependencies:
+  gem "actionpack", ">= 6.0.0"
+  gem "activemodel", ">= 6.0.0"
+  gem "railties", ">= 6.0.0"
 end

data/CHANGELOG.rdoc

@@ -1,3 +1,24 @@
+= 6.0.0 (April 2, 2021)
+
+Breaking changes:
+
+* Support strict <tt>with_role</tt> queries. Note this changes behaviour of with_role when running in strict mode to behave as previously documented. #543 describes the behaviour change.
+* Dropped support for Ruby 2.3 and 2.4
+
+Improvements:
+
+* Updated ActiveRecord adapters implementation of <tt>in</tt> to utilise a subquery instead of two queries
+
+= 5.3.0 (June 1, 2020)
+
+5.3.0 will be the last version to support Ruby < 2.5 and Rails < 5.2. Support for these will be dropped in the next major release.
+
+* Fix deprecation warning in Ruby 2.7
+* Add Rails 6 support to migration generator
+* Significant ActiveRecord performance improvements to <tt>add_role</tt> and <tt>without_role</tt>
+* Mongoid fix and performance improvement and to <tt>roles_name</tt>
+* Make it safe to call <tt>Thing.with_role(:admin, user)</tt> with new record
+
 = 5.2.0 (Dec 14, 2017)
 * Fix regression in generator around belongs_to options compatibility
 * Update version of database_cleaner
@@ -126,7 +147,7 @@
 * fixed a backward incompatible change introduced in Rails 3.2 release (<tt>find_or_create_by_* generated methods</tt>)
 
 = 2.2 (Jan 18, 2012)
-* fixed a bug in the initializer file regarding dynamic shortcuts 
+* fixed a bug in the initializer file regarding dynamic shortcuts
 
 = 2.1 (Nov 30, 2011)
 * added syntactic sugar: <tt>grant</tt> and <tt>revoke</tt> are aliases for <tt>has_role</tt> and <tt>has_no_role</tt>
@@ -167,8 +188,8 @@
 
 = 1.0 (Aug 25, 2011)
 * added a new parameter to disable dynamic shortcut methods due to potential incompatibility with other gems using method_missing with the same pattern
-  * add <tt>Rolify.dynamic_shortcuts = false</tt> in the initializer file or 
-  * use the generator command with a third parameter: 
+  * add <tt>Rolify.dynamic_shortcuts = false</tt> in the initializer file or
+  * use the generator command with a third parameter:
     * <tt>rails g rolify:role Role User false</tt>
 * removed the railtie as it created more problems than it solved
 * code refactoring to do some speed improvements and code clean up
@@ -177,16 +198,16 @@
 * rolify is now on travis-ci to monitor build status
 
 = 0.7 (June 20, 2011)
-* added a method_missing to catch newly created role outside the current ruby process (i.e. dynamic shortcut methods are not defined within this process) 
-  * dynamic shortcut is created on the fly in the method_missing to avoid extra method_missing for the same dynamic shortcut 
-  * check if the role actually exists in the database before defining the new method 
+* added a method_missing to catch newly created role outside the current ruby process (i.e. dynamic shortcut methods are not defined within this process)
+  * dynamic shortcut is created on the fly in the method_missing to avoid extra method_missing for the same dynamic shortcut
+  * check if the role actually exists in the database before defining the new method
   * first call is slower due to method_missing but next calls are fast
   * avoid strange bugs when spawning many ruby processes as the dynamic shortcut methods were only defined in the process that used the <tt>has_role</tt> command
 
 = 0.6 (June 19, 2011)
 * custom User and Role class names support
   * can now use other class names for Role and User classes
-  * fixed generators and templates 
+  * fixed generators and templates
   * join table is explicitly set to avoid alphabetical order issue
 * created a new railtie to load the dynamic shortcuts at startup
 
@@ -208,7 +229,7 @@
   * Trying to remove a role scoped to a resource whereas the user has a global role won't remove it
 
 = v0.3 (June 06, 2011)
-* multiple roles check: 
+* multiple roles check:
   * <tt>has_all_roles?</tt> returns true if the user has ALL the roles in arguments
   * <tt>has_any_role?</tt> returns true if the user has ANY the roles in arguments
 

data/Gemfile

@@ -1,14 +1,15 @@
 source "https://rubygems.org"
 
 group :test do
-  gem 'appraisal'
-  gem 'coveralls', :require => false
+  gem 'codeclimate-test-reporter', require: nil
+  gem 'coveralls', require: false
+  gem 'database_cleaner', '~> 1.6.2'
   gem 'its'
+  gem 'test-unit' # Implicitly loaded by ammeter
+
   gem 'byebug'
+  gem 'pry'
   gem 'pry-byebug'
-  gem 'test-unit' # Implicitly loaded by ammeter
-  gem 'database_cleaner', '~> 1.6.2'
-  gem 'codeclimate-test-reporter', :require => nil
 end
 
 gemspec

data/README.md

@@ -1,4 +1,4 @@
-# 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://coveralls.io/repos/RolifyCommunity/rolify/badge.svg?branch=master&service=github)](https://coveralls.io/github/RolifyCommunity/rolify?branch=master)
+# rolify [![Gem Version](https://badge.fury.io/rb/rolify.svg)](http://badge.fury.io/rb/rolify) [![build status](https://travis-ci.org/RolifyCommunity/rolify.svg)](http://travis-ci.org/RolifyCommunity/rolify) [![Code Climate](https://codeclimate.com/github/RolifyCommunity/rolify.svg)](https://codeclimate.com/github/RolifyCommunity/rolify) [![Coverage Status](https://coveralls.io/repos/RolifyCommunity/rolify/badge.svg?branch=master&service=github)](https://coveralls.io/github/RolifyCommunity/rolify?branch=master)
 
 Very simple Roles library without any authorization enforcement supporting scope on resource object.
 
@@ -15,9 +15,9 @@ This library can be easily integrated with any authentication gem ([devise](http
 
 ## Requirements
 
-* Rails >= 3.2
-* ActiveRecord >= 3.2 <b>or</b> Mongoid >= 3.1
-* supports ruby 2.0/1.9.3, JRuby 1.6.0+ (in 1.9 mode) and Rubinius 2.0.0dev (in 1.9 mode)
+* Rails >= 4.2
+* ActiveRecord >= 4.2 <b>or</b> Mongoid >= 4.0
+* supports ruby 2.2+, JRuby 1.6.0+ (in 1.9 mode) and Rubinius 2.0.0dev (in 1.9 mode)
 * support of ruby 1.8 has been dropped due to Mongoid >=3.0 that only supports 1.9 new hash syntax
 
 ## Installation
@@ -46,7 +46,7 @@ rails g rolify Role User
 rails g rolify:role Role User
 ```
 
-The generator will create your Role model, add a migration file, and update your User class with new class methods. 
+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)
 
@@ -181,6 +181,17 @@ user.has_role? :moderator, Forum.last
 => true
 ```
 
+To check if a user has the exact role scoped to a resource class:
+
+```ruby
+user = User.find(5)
+user.add_role :moderator # sets a global role
+user.has_role? :moderator, Forum.first
+=> true
+user.has_strict_role? :moderator, Forum.last
+=> false
+```
+
 ### 6. Resource roles querying
 
 Starting from rolify 3.0, you can search roles on instance level or class level resources.

data/Rakefile

@@ -1,6 +1,7 @@
 require 'bundler'
 require 'rspec/core/rake_task'
 require 'coveralls/rake/task'
+require 'appraisal'
 
 Bundler::GemHelper.install_tasks
 
@@ -14,7 +15,7 @@ RSpec::Core::RakeTask.new(:rolify) do |task|
   task.pattern = 'spec/rolify/**/*_spec.rb'
 end
 
-if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
+if !ENV["APPRAISAL_INITIALIZED"] && !ENV["CI"]
   task :default => :appraisal
 else
   task :default => [ :spec, 'coveralls:push' ]

data/gemfiles/activerecord_4.gemfile

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

data/gemfiles/activerecord_5.gemfile

@@ -2,26 +2,21 @@
 
 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"
+gem "sqlite3", "~> 1.3.6"
+gem "activerecord", "~> 5.2.4", require: "active_record"
+gem "actionpack", "~> 5.2.4"
+gem "activemodel", "~> 5.2.4"
+gem "railties", "~> 5.2.4"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   gem "its"
+  gem "test-unit"
   gem "byebug"
+  gem "pry"
   gem "pry-byebug"
-  gem "test-unit"
-  gem "database_cleaner", "~> 1.6.2"
-  gem "codeclimate-test-reporter", require: nil
 end
 
 gemspec path: "../"

data/gemfiles/{activerecord_3.gemfile → activerecord_6.gemfile}

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

data/gemfiles/mongoid_5.gemfile

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

data/gemfiles/{mongoid_3.gemfile → mongoid_6.gemfile}

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

data/gemfiles/{mongoid_4.gemfile → mongoid_7.gemfile}

@@ -2,18 +2,19 @@
 
 source "https://rubygems.org"
 
-gem "mongoid", "~> 4"
-gem "bson_ext", platform: "ruby"
+gem "mongoid", "~> 7"
+gem "bson_ext", "1.5.1"
+gem "railties", "5.2.4.1"
 
 group :test do
-  gem "appraisal"
+  gem "codeclimate-test-reporter", require: nil
   gem "coveralls", require: false
+  gem "database_cleaner", "~> 1.6.2"
   gem "its"
+  gem "test-unit"
   gem "byebug"
+  gem "pry"
   gem "pry-byebug"
-  gem "test-unit"
-  gem "database_cleaner", "~> 1.6.2"
-  gem "codeclimate-test-reporter", require: nil
 end
 
 gemspec path: "../"

data/lib/generators/active_record/rolify_generator.rb

@@ -82,12 +82,12 @@ 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'
+      def versioned_migrations?
+        Rails::VERSION::MAJOR >= 5
       end
 
       def migration_version
-        if rails5?
+        if versioned_migrations?
           "[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
         end
       end

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

@@ -1,16 +1,15 @@
-has_and_belongs_to_many :<%= user_class.table_name %>, :join_table => :<%= join_table %>
+  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 %>
 
-<% 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
 
-validates :resource_type,
-          :inclusion => { :in => Rolify.resource_types },
-          :allow_nil => true
-
-scopify
+  scopify

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

@@ -40,7 +40,7 @@ module Rolify
 
       def all_except(resource, excluded_obj)
         prime_key = resource.primary_key.to_sym
-        resource.where(prime_key => (resource.all - excluded_obj).map(&prime_key))
+        resource.where.not(prime_key => excluded_obj.pluck(prime_key))
       end
 
       private

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

@@ -9,14 +9,20 @@ 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])
+        wrap_conditions = relation.name != role_class.name
+
+        conditions = if args[:resource].is_a?(Class)
+                       {:resource_type => args[:resource].to_s, :resource_id => nil }
+                     elsif args[:resource].present?
+                       {:resource_type => args[:resource].class.name, :resource_id => args[:resource].id}
+                     else
+                       {}
+                     end
+
+        conditions.merge!(:name => args[:name])
+        conditions = wrap_conditions ? { role_table => conditions } : conditions
+
+        relation.where(conditions)
       end
 
       def find_cached(relation, args)
@@ -46,7 +52,7 @@ module Rolify
       end
 
       def add(relation, role)
-        relation.role_ids |= [role.id]
+        relation.roles << role unless relation.roles.include?(role)
       end
 
       def remove(relation, role_name, resource = nil)
@@ -67,20 +73,14 @@ module Rolify
         relation.where("#{column} IS NOT NULL")
       end
 
-      def scope(relation, conditions)
-        if Rails.version < "4.0"
-          query = relation.scoped
-        else
-          query = relation.all
-        end
-        query = query.joins(:roles)
-        query = where(query, conditions)
+      def scope(relation, conditions, strict)
+        query = relation.joins(:roles)
+        query = strict ? where_strict(query, conditions) : where(query, conditions)
         query
       end
 
       def all_except(user, excluded_obj)
-        prime_key = user.primary_key.to_sym
-        user.where(prime_key => (user.all - excluded_obj).map(&prime_key))
+        user.where.not(user.primary_key => excluded_obj)
       end
 
       private

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

@@ -9,14 +9,20 @@ 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])
+        wrap_conditions = relation.name != role_class.name
+
+        conditions = if args[:resource].is_a?(Class)
+                       {:resource_type => args[:resource].to_s, :resource_id => nil }
+                     elsif args[:resource].present?
+                       {:resource_type => args[:resource].class.name, :resource_id => args[:resource].id}
+                     else
+                       {}
+                     end
+
+        conditions.merge!(:name => args[:name])
+        conditions = wrap_conditions ? { role_table => conditions } : conditions
+
+        relation.where(conditions)
       end
 
       def find_cached(relation, args)
@@ -84,8 +90,9 @@ module Rolify
         relation.where(column.to_sym.ne => nil)
       end
 
-      def scope(relation, conditions)
-        roles = where(role_class, conditions).map { |role| role.id }
+      def scope(relation, conditions, strict)
+        query = strict ? where_strict(role_class, conditions) : where(role_class, conditions)
+        roles = query.map { |role| role.id }
         return [] if roles.size.zero?
         query = relation.any_in(:role_ids => roles)
         query

data/lib/rolify/finders.rb

@@ -1,7 +1,12 @@
 module Rolify
   module Finders
     def with_role(role_name, resource = nil)
-      self.adapter.scope(self, :name => role_name, :resource => resource)
+      strict = self.strict_rolify and resource and resource != :any
+      self.adapter.scope(
+        self,
+        { :name => role_name, :resource => resource },
+        strict
+      )
     end
 
     def without_role(role_name, resource = nil)

data/lib/rolify/resource.rb

@@ -11,7 +11,7 @@ module Rolify
 
       def with_role(role_name, user = nil)
         if role_name.is_a? Array
-          role_name.map!(&:to_s)
+          role_name = role_name.map(&:to_s)
         else
           role_name = role_name.to_s
         end

data/lib/rolify/role.rb

@@ -86,7 +86,7 @@ module Rolify
     deprecate :has_no_role, :remove_role
 
     def roles_name
-      self.roles.select(:name).map { |r| r.name }
+      self.roles.pluck(:name)
     end
 
     def method_missing(method, *args, &block)

data/lib/rolify/version.rb

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

data/lib/rolify.rb

@@ -27,7 +27,7 @@ module Rolify
     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, :inverse_of ].include? k.to_sym })
 
-    has_and_belongs_to_many :roles, rolify_options
+    has_and_belongs_to_many :roles, **rolify_options
 
     self.adapter = Rolify::Adapter::Base.create("role_adapter", self.role_cname, self.name)
 
@@ -48,7 +48,7 @@ module Rolify
     self.role_cname = options[:role_cname]
     self.role_table_name = self.role_cname.tableize.gsub(/\//, "_")
 
-    has_many association_name, resourcify_options
+    has_many association_name, **resourcify_options
 
     self.resource_adapter = Rolify::Adapter::Base.create("resource_adapter", self.role_cname, self.name)
     @@resource_types << self.name

data/rolify.gemspec

@@ -9,7 +9,6 @@ Gem::Specification.new do |s|
   s.version     = Rolify::VERSION
   s.platform    = Gem::Platform::RUBY
   s.homepage    = 'https://github.com/RolifyCommunity/rolify'
-  s.rubyforge_project = s.name
 
   s.license     = 'MIT'
 
@@ -27,8 +26,11 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ['lib']
 
+  s.required_ruby_version = '>= 2.5'
+
   s.add_development_dependency 'ammeter',     '~> 1.1' # Spec generator
-  s.add_development_dependency 'bundler',     '~> 1.10' # packaging feature
-  s.add_development_dependency 'rake',        '~> 10.4' # Tasks manager
-  s.add_development_dependency 'rspec-rails', '~> 3.4'
+  s.add_development_dependency 'appraisal',   '~> 2.0'
+  s.add_development_dependency 'bundler',     '~> 2.0' # packaging feature
+  s.add_development_dependency 'rake',        '~> 12.3' # Tasks manager
+  s.add_development_dependency 'rspec-rails', '~> 3.8'
 end

data/spec/generators/rolify/rolify_activerecord_generator_spec.rb

@@ -71,6 +71,7 @@ describe Rolify::Generators::RolifyGenerator, :if => ENV['ADAPTER'] == 'active_r
       it { should contain "validates :resource_type,\n"
                           "          :inclusion => { :in => Rolify.resource_types },\n"
                           "          :allow_nil => true" }
+      it { should contain "scopify" }
     end
 
     describe 'app/models/user.rb' do
@@ -240,6 +241,13 @@ 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" }
+      it do
+        if Rails::VERSION::MAJOR < 5
+          should contain "< ActiveRecord::Migration"
+        else
+          should contain "< ActiveRecord::Migration[#{Rails::VERSION::MAJOR}.#{Rails::VERSION::MINOR}]"
+        end
+      end
 
       context 'mysql2' do
         let(:adapter) { 'Mysql2Adapter' }

data/spec/rolify/shared_examples/shared_examples_for_finders.rb

@@ -4,47 +4,65 @@ shared_examples_for :finders do |param_name, param_method|
       it { should respond_to(:with_role).with(1).argument }
       it { should respond_to(:with_role).with(2).arguments }
 
-      context "with a global role" do
-        it { subject.with_role("admin".send(param_method)).should eq([ root ]) }
-        it { subject.with_role("moderator".send(param_method)).should be_empty }
-        it { subject.with_role("visitor".send(param_method)).should be_empty }
-      end
-
-      context "with a class scoped role" do
-        context "on Forum class" do
-          it { subject.with_role("admin".send(param_method), Forum).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Forum).should eq([ modo ]) }
-          it { subject.with_role("visitor".send(param_method), Forum).should be_empty }
+      context "when resource setting: strict is set to false" do
+        context "with a global role" do
+          it { subject.with_role("admin".send(param_method)).should eq([ root ]) }
+          it { subject.with_role("moderator".send(param_method)).should be_empty }
+          it { subject.with_role("visitor".send(param_method)).should be_empty }
         end
 
-        context "on Group class" do
-          it { subject.with_role("admin".send(param_method), Group).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Group).should eq([ root ]) }
-          it { subject.with_role("visitor".send(param_method), Group).should be_empty }
+        context "with a class scoped role" do
+          context "on Forum class" do
+            it { subject.with_role("admin".send(param_method), Forum).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Forum).should eq([ modo ]) }
+            it { subject.with_role("visitor".send(param_method), Forum).should be_empty }
+          end
+
+          context "on Group class" do
+            it { subject.with_role("admin".send(param_method), Group).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Group).should eq([ root ]) }
+            it { subject.with_role("visitor".send(param_method), Group).should be_empty }
+          end
         end
-      end
 
-      context "with an instance scoped role" do
-        context "on Forum.first instance" do
-          it { subject.with_role("admin".send(param_method), Forum.first).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Forum.first).should eq([ modo ]) }
-          it { subject.with_role("visitor".send(param_method), Forum.first).should be_empty }
+        context "with an instance scoped role" do
+          context "on Forum.first instance" do
+            it { subject.with_role("admin".send(param_method), Forum.first).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Forum.first).should eq([ modo ]) }
+            it { subject.with_role("visitor".send(param_method), Forum.first).should be_empty }
+          end
+
+          context "on Forum.last instance" do
+            it { subject.with_role("admin".send(param_method), Forum.last).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Forum.last).should eq([ modo ]) }
+            it { subject.with_role("visitor".send(param_method), Forum.last).should include(root, visitor) } # =~ doesn't pass using mongoid, don't know why...
+          end
+
+          context "on Group.first instance" do
+            it { subject.with_role("admin".send(param_method), Group.first).should eq([ root ]) }
+            it { subject.with_role("moderator".send(param_method), Group.first).should eq([ root ]) }
+            it { subject.with_role("visitor".send(param_method), Group.first).should eq([ modo ]) }
+          end
+
+          context "on Company.first_instance" do
+            it { subject.with_role("owner".send(param_method), Company.first).should eq([ owner ]) }
+          end
         end
+      end
 
-        context "on Forum.last instance" do
-          it { subject.with_role("admin".send(param_method), Forum.last).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Forum.last).should eq([ modo ]) }
-          it { subject.with_role("visitor".send(param_method), Forum.last).should include(root, visitor) } # =~ doesn't pass using mongoid, don't know why...
+      context "when resource setting: strict is set to true" do
+        before(:context) do
+          user_class.strict_rolify = true
         end
-
-        context "on Group.first instance" do
-          it { subject.with_role("admin".send(param_method), Group.first).should eq([ root ]) }
-          it { subject.with_role("moderator".send(param_method), Group.first).should eq([ root ]) }
-          it { subject.with_role("visitor".send(param_method), Group.first).should eq([ modo ]) }
+        after(:context) do
+          user_class.strict_rolify = false
         end
 
-        context "on Company.first_instance" do
-          it { subject.with_role("owner".send(param_method), Company.first).should eq([ owner ]) }
+        context "with an instance scoped role" do
+          context "on Forum.first instance" do
+            it { subject.with_role("admin".send(param_method), Forum.first).should be_empty }
+            it { subject.with_role("moderator".send(param_method), Forum.first).should be_empty }
+          end
         end
       end
     end

data/spec/rolify/utils_spec.rb

@@ -0,0 +1,19 @@
+require "spec_helper"
+
+describe Rolify::Utils do
+  class Harness
+    extend Rolify::Utils
+    define_method(:new_method) { |*_args| true }
+    deprecate :old_method, :new_method
+  end
+
+  let(:harness) { Harness.new }
+
+  context '#deprecate' do
+    it 'calls new method with same arguments' do
+      expect(harness).to receive(:warn).once
+      expect(harness).to receive(:new_method).once.with(1, 2, 3)
+      harness.old_method(1, 2, 3)
+    end
+  end
+end

data/spec/support/adapters/{mongoid_3.yml → mongoid_6.yml}

@@ -1,6 +1,6 @@
 test:
-  sessions:
+  clients:
     default:
       database: godfather
       hosts:
-        - localhost:27017
+        - localhost:27017

data/spec/support/adapters/{mongoid_4.yml → mongoid_7.yml}

@@ -1,6 +1,6 @@
 test:
-  sessions:
+  clients:
     default:
       database: godfather
       hosts:
-        - localhost:27017
+        - localhost:27017

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 6.0.0
 platform: ruby
 authors:
 - Florent Monbillard
 - Wellington Cordeiro
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-19 00:00:00.000000000 Z
+date: 2021-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -25,48 +25,62 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: appraisal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.4'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '3.8'
 description: Very simple Roles library without any authorization enforcement supporting
   scope on resource objects (instance or class). Supports ActiveRecord and Mongoid
   ORMs.
@@ -77,8 +91,10 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/activerecord.yml"
+- ".github/workflows/mongoid.yml"
 - ".gitignore"
-- ".travis.yml"
+- ".hakiri.yml"
 - Appraisals
 - CHANGELOG.rdoc
 - CONTRIBUTORS
@@ -87,15 +103,12 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.rdoc
-- 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/activerecord_6.gemfile
 - gemfiles/mongoid_5.gemfile
+- gemfiles/mongoid_6.gemfile
+- gemfiles/mongoid_7.gemfile
 - lib/generators/active_record/rolify_generator.rb
 - lib/generators/active_record/templates/README
 - lib/generators/active_record/templates/migration.rb
@@ -153,12 +166,13 @@ files:
 - spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_scopes.rb
+- spec/rolify/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
-- spec/support/adapters/mongoid_3.yml
-- spec/support/adapters/mongoid_4.yml
 - spec/support/adapters/mongoid_5.yml
+- spec/support/adapters/mongoid_6.yml
+- spec/support/adapters/mongoid_7.yml
 - spec/support/adapters/utils/active_record.rb
 - spec/support/adapters/utils/mongoid.rb
 - spec/support/data.rb
@@ -168,7 +182,7 @@ homepage: https://github.com/RolifyCommunity/rolify
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -176,16 +190,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rolify
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.2.15
+signing_key:
 specification_version: 4
 summary: Roles library with resource scoping
 test_files:
@@ -216,12 +229,13 @@ test_files:
 - spec/rolify/shared_examples/shared_examples_for_remove_role.rb
 - spec/rolify/shared_examples/shared_examples_for_roles.rb
 - spec/rolify/shared_examples/shared_examples_for_scopes.rb
+- spec/rolify/utils_spec.rb
 - spec/spec_helper.rb
 - spec/support/adapters/active_record.rb
 - spec/support/adapters/mongoid.rb
-- spec/support/adapters/mongoid_3.yml
-- spec/support/adapters/mongoid_4.yml
 - spec/support/adapters/mongoid_5.yml
+- spec/support/adapters/mongoid_6.yml
+- spec/support/adapters/mongoid_7.yml
 - spec/support/adapters/utils/active_record.rb
 - spec/support/adapters/utils/mongoid.rb
 - spec/support/data.rb

data/.travis.yml

@@ -1,93 +0,0 @@
-language: ruby
-sudo: false
-
-before_install:
-  - gem update --system
-  - gem install bundler
-  - gem --version
-
-script: bundle exec rake
-
-after_success:
-  - bundle exec codeclimate-test-reporter
-
-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
-
-addons:
-  code_climate:
-    repo_token: 6bd8d374b120a5449b9a4b7dfda40cc0609dbade48a1b6655f04a9bc8de3a3ee

data/gemfiles/Gemfile.rails-3.2

@@ -1,27 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'psych'
-  gem 'rubinius-coverage', '~> 2.0'
-end
-
-group :test do
-  gem 'railties', '~> 3.2', '< 4.0'
-  case ENV['ADAPTER']
-  when nil, 'active_record'
-    gem 'activerecord-jdbcsqlite3-adapter', '>= 1.3.0.rc', :platform => 'jruby'
-    #Fix sqlite3 version for rbx until rubinus is updated
-    #https://github.com/travis-ci/travis-ci/issues/2006
-    gem 'sqlite3', '1.3.8', :platform => 'ruby'
-    gem 'activerecord', '~> 3.2.0', :require => 'active_record'
-  when 'mongoid'
-    gem 'mongoid', '>= 3.1'
-    gem 'bson_ext', :platform => 'ruby'
-  else
-    raise "Unknown model adapter: #{ENV['ADAPTER']}"
-  end
-
-  gem 'coveralls', :require => false
-end
-
-gemspec :path => '../'

data/gemfiles/Gemfile.rails-4.0

@@ -1,33 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'psych'
-  gem 'rubinius-coverage', '~> 2.0'
-end
-
-group :test do
-  gem 'railties', '~> 4.0.1', '< 4.1'
-  gem 'ammeter'
-  gem 'rake'
-  gem 'rspec'
-  gem 'its'
-  gem 'rspec-rails'
-  gem 'fuubar'
-  gem 'bundler'
-
-  gem 'coveralls', :require => false
-
-  case ENV['ADAPTER']
-  when nil, 'active_record'
-    gem 'activerecord', '~> 4.0.1', :require => 'active_record'
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.5', :platform => 'jruby'
-    #Fix sqlite3 version for rbx until rubinus is updated
-    #https://github.com/travis-ci/travis-ci/issues/2006
-    gem 'sqlite3', '1.3.8', :platform => 'ruby'
-  when 'mongoid'
-    gem 'mongoid', github: 'mongoid/mongoid'
-    gem 'bson_ext', :platform => 'ruby'
-  else
-    raise "Unknown model adapter: #{ENV['ADAPTER']}"
-  end
-end

data/gemfiles/Gemfile.rails-4.1

@@ -1,37 +0,0 @@
-source 'https://rubygems.org'
-
-platforms :rbx do
-  gem 'psych'
-  gem 'rubinius-coverage', '~> 2.0'
-end
-
-group :test do
-  gem 'rails', github: 'rails/rails', branch: '4-1-stable'
-  # There is currently an active record bug in Rails 4.1.0, this is a workaround until 4.1.1 is released
-  # See https://github.com/rails/rails/issues/13648
-  # Without this patch, Resource.with_role(:role, User.first).count throws an SQL syntax exception
-  #gem 'railties', '~> 4.1.0'
-  gem 'ammeter'
-  gem 'rake'
-  gem 'rspec'
-  gem 'its'
-  gem 'rspec-rails'
-  gem 'fuubar'
-  gem 'bundler'
-
-  gem 'coveralls', :require => false
-
-  case ENV['ADAPTER']
-  when nil, 'active_record'
-    gem 'activerecord', '~> 4.1.0', :require => 'active_record'
-    gem 'activerecord-jdbcsqlite3-adapter', '~> 1.3.5', :platform => 'jruby'
-    #Fix sqlite3 version for rbx until rubinus is updated
-    #https://github.com/travis-ci/travis-ci/issues/2006
-    gem 'sqlite3', '1.3.8', :platform => 'ruby'
-  when 'mongoid'
-    gem 'mongoid', github: 'mongoid/mongoid'
-    gem 'bson_ext', :platform => 'ruby'
-  else
-    raise "Unknown model adapter: #{ENV['ADAPTER']}"
-  end
-end