rolify 4.1.0 → 5.3.0

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/spec_helper.rb

@@ -1,5 +1,5 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require "simplecov"
+SimpleCov.start
 
 require 'rubygems'
 require "bundler/setup"
@@ -11,6 +11,8 @@ begin
   require 'its'
 rescue LoadError
 end
+require 'database_cleaner'
+
 require 'coveralls'
 Coveralls.wear_merged!
 
@@ -19,10 +21,7 @@ ENV['ADAPTER'] ||= 'active_record'
 load File.dirname(__FILE__) + "/support/adapters/#{ENV['ADAPTER']}.rb"
 load File.dirname(__FILE__) + '/support/data.rb'
 
-begin
-  require 'pry'
-rescue LoadError
-end
+
 
 def reset_defaults
   Rolify.use_defaults
@@ -47,3 +46,17 @@ def silence_warnings(&block)
   $VERBOSE = warn_level
   result
 end
+
+RSpec.configure do |config|
+  config.expect_with(:rspec) { |c| c.syntax = [:should, :expect] }
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+    DatabaseCleaner.start
+  end
+
+  config.after(:suite) do |example|
+    DatabaseCleaner.clean
+  end
+
+end

data/spec/support/adapters/active_record.rb

@@ -1,7 +1,8 @@
-require 'active_record'
+load File.dirname(__FILE__) + '/utils/active_record.rb'
+
+extend_rspec_with_activerecord_specific_matchers
+establish_connection
 
-RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::MatchArray)
-ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
 ActiveRecord::Base.extend Rolify
 
 load File.dirname(__FILE__) + '/../schema.rb'

data/spec/support/adapters/mongoid.rb

@@ -1,6 +1,11 @@
-require 'mongoid'
+load File.dirname(__FILE__) + '/utils/mongoid.rb'
 
-Mongoid.load!("spec/support/adapters/mongoid.yml", :test)
+load_mongoid_config
+
+begin
+  Mongo::Logger.logger.level = ::Logger::FATAL
+rescue NameError
+end
 
 ::Mongoid::Document.module_eval do
   def self.included(base)
@@ -13,6 +18,8 @@ Rolify.use_mongoid
 # Standard user and role classes
 class User
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
+
   rolify
 
   field :login, :type => String
@@ -21,6 +28,7 @@ end
 # Standard user and role classes
 class StrictUser
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   rolify strict: true
 
   field :login, :type => String
@@ -48,6 +56,7 @@ end
 # Resourcifed and rolifed at the same time
 class HumanResource
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   resourcify :resources
   rolify
 
@@ -74,6 +83,7 @@ end
 # Custom role and class names
 class Customer
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   rolify :role_cname => "Privilege"
 
   field :login, :type => String
@@ -81,6 +91,7 @@ end
 
 class Privilege
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   has_and_belongs_to_many :customers
   belongs_to :resource, :polymorphic => true
   scopify
@@ -100,6 +111,7 @@ end
 module Admin
   class Moderator
     include Mongoid::Document
+    default_scope -> { order_by id: 'asc' }
     rolify :role_cname => "Admin::Right"
 
     field :login, :type => String
@@ -107,6 +119,7 @@ module Admin
 
   class Right
     include Mongoid::Document
+    default_scope -> { order_by id: 'asc' }
     has_and_belongs_to_many :moderators, :class_name => 'Admin::Moderator'
     belongs_to :resource, :polymorphic => true
     scopify
@@ -126,6 +139,7 @@ end
 # Resources classes
 class Forum
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :name, :type => String
@@ -133,6 +147,7 @@ end
 
 class Group
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :name, :type => String
@@ -145,6 +160,7 @@ end
 
 class Team
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
   #resourcify done during specs setup to be able to use custom user classes
 
   field :team_code, :type => Integer
@@ -153,6 +169,7 @@ end
 
 class Organization
   include Mongoid::Document
+  default_scope -> { order_by id: 'asc' }
 end
 
 class Company < Organization

data/spec/support/adapters/{mongoid.yml → mongoid_5.yml}

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

data/spec/support/adapters/mongoid_6.yml

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

data/spec/support/adapters/mongoid_7.yml

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

data/spec/support/adapters/utils/active_record.rb

@@ -0,0 +1,12 @@
+require 'active_record'
+
+def establish_connection
+  ActiveRecord::Base.establish_connection(
+    :adapter => "sqlite3",
+    :database => ":memory:"
+  )
+end
+
+def extend_rspec_with_activerecord_specific_matchers
+  RSpec::Matchers::BuiltIn::OperatorMatcher.register(ActiveRecord::Relation, '=~', RSpec::Matchers::BuiltIn::ContainExactly)
+end

data/spec/support/adapters/utils/mongoid.rb

@@ -0,0 +1,13 @@
+require 'mongoid'
+
+def mongoid_major_version
+  Mongoid::VERSION.split('.').first.to_i
+end
+
+def mongoid_config
+  "spec/support/adapters/mongoid_#{mongoid_major_version}.yml"
+end
+
+def load_mongoid_config
+  Mongoid.load!(mongoid_config, :test)
+end

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rolify
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 5.3.0
 platform: ruby
 authors:
 - Florent Monbillard
+- Wellington Cordeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2020-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ammeter
@@ -16,67 +17,70 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.1.2
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.12
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 10.4.2
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.99.0
+        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.
 email:
 - f.monbillard@gmail.com
+- wellington@wellingtoncordeiro.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hakiri.yml"
 - ".travis.yml"
+- Appraisals
 - CHANGELOG.rdoc
 - CONTRIBUTORS
 - Gemfile
@@ -84,12 +88,16 @@ files:
 - README.md
 - Rakefile
 - UPGRADE.rdoc
-- gemfiles/Gemfile.rails-3.2
-- gemfiles/Gemfile.rails-4.0
-- gemfiles/Gemfile.rails-4.1
+- gemfiles/activerecord_4.gemfile
+- gemfiles/activerecord_5.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
+- 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
@@ -117,6 +125,7 @@ files:
 - lib/rolify/version.rb
 - rolify.gemspec
 - spec/README.rdoc
+- spec/common_helper.rb
 - spec/generators/rolify/rolify_activerecord_generator_spec.rb
 - spec/generators/rolify/rolify_mongoid_generator_spec.rb
 - spec/generators_helper.rb
@@ -142,10 +151,15 @@ 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.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
 - spec/support/schema.rb
 - spec/support/stream_helpers.rb
@@ -161,20 +175,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rolify
-rubygems_version: 2.4.5
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Roles library with resource scoping
 test_files:
 - spec/README.rdoc
+- spec/common_helper.rb
 - spec/generators/rolify/rolify_activerecord_generator_spec.rb
 - spec/generators/rolify/rolify_mongoid_generator_spec.rb
 - spec/generators_helper.rb
@@ -200,10 +214,15 @@ 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.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
 - spec/support/schema.rb
 - spec/support/stream_helpers.rb

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