bullet_train-roles 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 95cb748cf7f1d4cb6b3ba9a28c6d7b3d7e8bab30cd1d76eb925e52ebc48741a7
-  data.tar.gz: 8d1a5d66b9febbae5985105932f9d4f751f0e806386bb6ec9b98ff73c240e3fc
+  metadata.gz: 4fafcbc375644791ab3480a2bee1e43f19074e3efa30809d4770a27e80d25634
+  data.tar.gz: fc145307e762f0abc11839dd2710c5b11ed2747a9b514f5a32d4707268d35a21
 SHA512:
-  metadata.gz: 9eed70dbba4e17e025885df2d7a1ce920afadfa1da90ad20194916c13d4cfeedd5f979efaf71c1609a4f9474b8b5783c31ef7477cfcd078227726a81252d8e09
-  data.tar.gz: 43c8ed5b1db7d28f49aa171cca36eb675f95eeb37542f7dcb264691c35f55aaf2c18109b35604f8f5add5ae2142f2eba9834bddfb5e38f51aa532a79fa0d20f3
+  metadata.gz: cf85bf3d3df4a12751b7ac55fedf7917ec2634956e7df9c2a4d8a43e65000ff36b8740f1f0974b97e6cba4929831ef54159035a4dd4f5504fa8ef359cab95ed6
+  data.tar.gz: e34a82313a0291b967222780dde2e60d7ab3c14131e97270c1c1dd5c20073758e3d9347d4046c56fcc26ece2581347438e82eded64e067a19ba9fe3fdd2e42e0

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    bullet_train-roles (0.1.7)
+    bullet_train-roles (0.1.8)
       active_hash
       activesupport
       cancancan
@@ -79,7 +79,7 @@ GEM
     ast (2.4.2)
     builder (3.2.4)
     byebug (11.1.3)
-    cancancan (3.3.0)
+    cancancan (3.4.0)
     concurrent-ruby (1.1.9)
     crass (1.0.6)
     erubi (1.10.0)

data/lib/bullet_train/roles/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Roles
-  VERSION = "0.1.7"
+  VERSION = "0.1.8"
 end

data/lib/models/role.rb

@@ -176,7 +176,7 @@ class Role < ActiveYaml::Base
       if @model == @parent
         return @condition = {id: @parent_ids}
       end
-      parent_association = possible_parent_associations.find { |association| @model.method_defined?(association) || @model.method_defined?("#{association}_id") }
+      parent_association = possible_parent_associations.find { |association| @model.reflect_on_association(association) || @intermediary_class&.reflect_on_association(association) }
       return nil unless parent_association.present?
       # If possible, use the team_id attribute because it saves us having to join all the way back to the source parent model
       # In some scenarios this may be quicker, or if the parent model is in a different database shard, it may not even
@@ -184,7 +184,7 @@ class Role < ActiveYaml::Base
       parent_with_id = "#{parent_association}_id"
       @condition = if @model.column_names.include?(parent_with_id)
         {parent_with_id.to_sym => @parent_ids}
-      elsif @intermediary.present? && @model.method_defined?(@intermediary) && @intermediary_class&.column_names&.include?(parent_with_id)
+      elsif @intermediary.present? && @model.reflect_on_association(@intermediary)
         {@intermediary.to_sym => {parent_with_id.to_sym => @parent_ids}}
       else
         {parent_association => {id: @parent_ids}}

data/lib/roles/user.rb

@@ -9,12 +9,16 @@ module Roles
     included do
       def parent_ids_for(role, through, parent)
         parent_id_column = "#{parent}_id"
-        # key = "#{role.key}_#{through}_#{parent_id_column}s"
+        key = "#{role.key}_#{through}_#{parent_id_column}s"
+
+        @_parent_ids_for_cache ||= {}
+        return @_parent_ids_for_cache[key] if @_parent_ids_for_cache[key]
+
         # TODO Maybe we should make ability caching a default feature of the gem?
         # If we do that, we would just make it check whether `ability_cache` exists.
         # return ability_cache[key] if ability_cache && ability_cache[key]
         role = nil if role.default?
-        send(through).with_role(role).distinct.pluck(parent_id_column)
+        @_parent_ids_for_cache[key] = send(through).with_role(role).distinct.pluck(parent_id_column)
         # TODO Maybe we should make ability caching a default feature of the gem?
         # current_cache = ability_cache || {}
         # current_cache[key] = value

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-roles
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Prabin Poudel
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-07-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug
@@ -215,7 +215,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Yaml-backed ApplicationHash for CanCan Roles