cancannible 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8ba63fd7b6b80a32a3bc93fbbe43845439c1eaffa9661e35510dbeff487af673
-  data.tar.gz: fdf8f225705b0e0fa9ea469674d62ce22b5340f48cb23fb94a2b8501112417cf
+  metadata.gz: ecb16c35b4fdf331771322c61a13d78d34e6e75eb97b26b06e8745ec0bf86ff4
+  data.tar.gz: 88d347b2f3dccf1e8fa6c38413676d38d89e7ad654ef425e70da5de5dce79592
 SHA512:
-  metadata.gz: f9068c6dce19852c747512ddafa0a29461586128d67408bc5c53f07e029e8273d0cb343acb4400dcfd180afd6596202837fac699838f62d6e252a56dd35f99df
-  data.tar.gz: e5ec5d5accb0e40139dbeee9b6bc211d3652688c7ffb17c1788c86cea455c626914b233d4eb52de2786993989df8018d38ddfb07bef5bedb2f04484d43f62054
+  metadata.gz: 5e418c7689141e1967e44d011da10579dd6d1439bab2043ec5d71088a7f7f916be8496aa8dcf04c9c65bc70367980e32206e8c7029da2ccfb3fc52d7bc338b20
+  data.tar.gz: 481bdcff9e0e8501070e4c0ca1e0d4400e65708608bdcfaa6a7fd551d5783849eba6808bda6fe3e97c3df18c12b6c04764363bc1cb25e623e06803b67aeb0301

data/.gitignore

@@ -22,3 +22,4 @@ tmp
 mkmf.log
 .rvm*
 .ruby*
+.byebug_history

data/Rakefile

@@ -7,5 +7,5 @@ task :default => :spec
 
 desc "Open an irb session preloaded with this library"
 task :console do
-  sh "irb -rubygems -I lib -r cancannible.rb"
-end
+  sh "irb -I lib -r cancannible.rb"
+end

data/lib/cancannible/grantee.rb

@@ -51,12 +51,9 @@ module Cancannible::Grantee
       nil
     elsif Cancannible.get_cached_abilities.respond_to?(:call)
       result = Cancannible.get_cached_abilities.call(self)
-      if result
-        # performs a crude compatibility check
-        rules_size = result.send(:rules).size rescue nil
-        rules_index_size = (result.instance_variable_get(:@rules_index) || []).size
-        result if !rules_size.nil? && rules_index_size == rules_size
-      end
+      # performs a crude compatibility check: cancan rules won't have a @rules_index
+      # (neither will an empty ability object, but we ignore this case)
+      result unless result && !result.instance_variable_defined?(:@rules_index)
     end
     return @abilities if @abilities
 

data/lib/cancannible/version.rb

@@ -1,3 +1,3 @@
 module Cancannible
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/lib/cancannible.rb

@@ -1,6 +1,6 @@
 require 'active_support'
 require 'active_support/core_ext'
-require 'cancan'
+require 'cancancan'
 
 require 'cancannible/version'
 require 'cancannible/config'

data/spec/unit/cached_abilities_spec.rb

@@ -40,7 +40,7 @@ describe Cancannible do
     context "when store_cached_abilities provided" do
       before do
         @stored = nil
-        Cancannible.store_cached_abilities = proc { |grantee, ability| @stored = { grantee_id: grantee.id, ability: ability } }
+        Cancannible.store_cached_abilities = proc { |grantee, ability| @stored = { grantee_id: grantee.id, ability: cached_object } }
       end
       it "stores the cached object" do
         expect { subject }.to change { @stored }.from(nil)
@@ -53,28 +53,26 @@ describe Cancannible do
       before do
         @stored = nil
         @store = 0
-        Cancannible.get_cached_abilities = proc { |grantee| @stored[:ability] if @stored }
+        Cancannible.get_cached_abilities = proc { |grantee| @stored && cached_object }
         Cancannible.store_cached_abilities = proc { |grantee, ability| @store += 1 ; @stored = { grantee_id: grantee.id, ability: ability } }
       end
       it "stores the cached object on the first call" do
         expect { subject }.to change { @stored }.from(nil)
         expect(@store).to eql(1)
-        expect(@stored[:grantee_id]).to eql(grantee.id)
-        expect(@stored[:ability]).to be_an(Ability)
+        expect(grantee.abilities.instance_variable_get(:@rules).size).to eql(1)
+        expect(grantee.abilities.instance_variable_get(:@rules_index).size).to eql(1)
       end
       it "returns the cached object on the second call" do
         expect { subject }.to change { @stored }.from(nil)
         expect(@store).to eql(1)
         expect { grantee.abilities }.to_not change { @store }
         expect(grantee.abilities).to be_an(Ability)
-        expect(@stored[:grantee_id]).to eql(grantee.id)
       end
       it "should re-cache object on the second call if refresh requested" do
         expect { subject }.to change { @stored }.from(nil)
         expect(@store).to eql(1)
         expect { grantee.abilities(true) }.to change { @store }.from(1).to(2)
         expect(grantee.abilities).to be_an(Ability)
-        expect(@stored[:grantee_id]).to eql(grantee.id)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cancannible
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Paul Gallagher
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-01 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport