rolify 4.1.1 → 6.0.0

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/shared_examples/shared_examples_for_has_role.rb

@@ -3,10 +3,16 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
     context "with a global role", :scope => :global do
       it { subject.has_role?("admin".send(param_method)).should be_truthy }
 
+      it { subject.has_cached_role?("admin".send(param_method)).should be_truthy }
+
       context "on resource request" do
         it { subject.has_role?("admin".send(param_method), Forum.first).should be_truthy }
         it { subject.has_role?("admin".send(param_method), Forum).should be_truthy }
         it { subject.has_role?("admin".send(param_method), :any).should be_truthy }
+
+        it { subject.has_cached_role?("admin".send(param_method), Forum.first).should be_truthy }
+        it { subject.has_cached_role?("admin".send(param_method), Forum).should be_truthy }
+        it { subject.has_cached_role?("admin".send(param_method), :any).should be_truthy }
       end
 
       context "with another global role" do
@@ -14,19 +20,29 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
         it { subject.has_role?("global".send(param_method)).should be_falsey }
         it { subject.has_role?("global".send(param_method), :any).should be_falsey }
+
+        it { subject.has_cached_role?("global".send(param_method)).should be_falsey }
+        it { subject.has_cached_role?("global".send(param_method), :any).should be_falsey }
       end
 
       it "should not get an instance scoped role" do
         subject.has_role?("moderator".send(param_method), Group.first).should be_falsey
+
+        subject.has_cached_role?("moderator".send(param_method), Group.first).should be_falsey
       end
 
       it "should not get a class scoped role" do
         subject.has_role?("manager".send(param_method), Forum).should be_falsey
+
+        subject.has_cached_role?("manager".send(param_method), Forum).should be_falsey
       end
 
       context "using inexisting role" do
         it { subject.has_role?("dummy".send(param_method)).should be_falsey }
         it { subject.has_role?("dumber".send(param_method), Forum.first).should be_falsey }
+
+        it { subject.has_cached_role?("dummy".send(param_method)).should be_falsey }
+        it { subject.has_cached_role?("dumber".send(param_method), Forum.first).should be_falsey }
       end
     end
 
@@ -35,15 +51,23 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
         it { subject.has_role?("manager".send(param_method), Forum).should be_truthy }
         it { subject.has_role?("manager".send(param_method), Forum.first).should be_truthy }
         it { subject.has_role?("manager".send(param_method), :any).should be_truthy }
+
+        it { subject.has_cached_role?("manager".send(param_method), Forum).should be_truthy }
+        it { subject.has_cached_role?("manager".send(param_method), Forum.first).should be_truthy }
+        it { subject.has_cached_role?("manager".send(param_method), :any).should be_truthy }
       end
 
       it "should not get a scoped role when asking for a global" do
         subject.has_role?("manager".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("manager".send(param_method)).should be_falsey
       end
 
       it "should not get a global role" do
         role_class.create(:name => "admin")
         subject.has_role?("admin".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("admin".send(param_method)).should be_falsey
       end
 
       context "with another class scoped role" do
@@ -52,6 +76,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Forum).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Forum).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         end
 
         context "on another resource with the same name" do
@@ -59,6 +86,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("manager".send(param_method), Group).should be_falsey }
           it { subject.has_role?("manager".send(param_method), :any).should be_truthy }
+
+          it { subject.has_cached_role?("manager".send(param_method), Group).should be_falsey }
+          it { subject.has_cached_role?("manager".send(param_method), :any).should be_truthy }
         end
 
         context "on another resource with another name" do
@@ -66,12 +96,18 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("defenders".send(param_method), Group).should be_falsey }
           it { subject.has_role?("defenders".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("defenders".send(param_method), Group).should be_falsey }
+          it { subject.has_cached_role?("defenders".send(param_method), :any).should be_falsey }
         end
       end
 
       context "using inexisting role" do
         it { subject.has_role?("dummy".send(param_method), Forum).should be_falsey }
         it { subject.has_role?("dumber".send(param_method)).should be_falsey }
+
+        it { subject.has_cached_role?("dummy".send(param_method), Forum).should be_falsey }
+        it { subject.has_cached_role?("dumber".send(param_method)).should be_falsey }
       end
     end
 
@@ -84,19 +120,33 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
           m.add_role("moderator", Forum.first)
           m.has_role?("moderator".send(param_method), :any).should be_truthy
         }
+
+        it { subject.has_cached_role?("moderator".send(param_method), Forum.first).should be_truthy }
+        it { subject.has_cached_role?("moderator".send(param_method), :any).should be_truthy }
+        it {
+          m = subject.class.new
+          m.add_role("moderator", Forum.first)
+          m.has_cached_role?("moderator".send(param_method), :any).should be_truthy
+        }
       end
 
       it "should not get an instance scoped role when asking for a global" do
         subject.has_role?("moderator".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("moderator".send(param_method)).should be_falsey
       end
 
       it "should not get an instance scoped role when asking for a class scoped" do 
         subject.has_role?("moderator".send(param_method), Forum).should be_falsey
+
+        subject.has_cached_role?("moderator".send(param_method), Forum).should be_falsey
       end
 
       it "should not get a global role" do
         role_class.create(:name => "admin")
         subject.has_role?("admin".send(param_method)).should be_falsey
+
+        subject.has_cached_role?("admin".send(param_method)).should be_falsey
       end
 
       context "with another instance scoped role" do
@@ -105,6 +155,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Forum.first).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Forum.first).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         end
 
         context "on another resource of the same type but with the same role name" do
@@ -112,6 +165,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("moderator".send(param_method), Forum.last).should be_falsey }
           it { subject.has_role?("moderator".send(param_method), :any).should be_truthy }
+
+          it { subject.has_cached_role?("moderator".send(param_method), Forum.last).should be_falsey }
+          it { subject.has_cached_role?("moderator".send(param_method), :any).should be_truthy }
         end
 
         context "on another resource of different type but with the same role name" do
@@ -119,6 +175,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("moderator".send(param_method), Group.last).should be_falsey }
           it { subject.has_role?("moderator".send(param_method), :any).should be_truthy }
+
+          it { subject.has_cached_role?("moderator".send(param_method), Group.last).should be_falsey }
+          it { subject.has_cached_role?("moderator".send(param_method), :any).should be_truthy }
         end
 
         context "on another resource of the same type and with another role name" do
@@ -126,6 +185,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Forum.last).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Forum.last).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         end
 
         context "on another resource of different type and with another role name" do
@@ -133,6 +195,9 @@ shared_examples_for "#has_role?_examples" do |param_name, param_method|
 
           it { subject.has_role?("member".send(param_method), Group.first).should be_falsey }
           it { subject.has_role?("member".send(param_method), :any).should be_falsey }
+
+          it { subject.has_cached_role?("member".send(param_method), Group.first).should be_falsey }
+          it { subject.has_cached_role?("member".send(param_method), :any).should be_falsey }
         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/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