bullet_train-roles 1.6.3 → 1.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 47ba21bea0237fc4ef1fa42414176181a7375483d249bf2bb4e0e13430b6c2bc
-  data.tar.gz: e9fb6b126f16362c9d78e4cce7cb8b2f08631858290eba7b2e4d0757f899ad59
+  metadata.gz: 218cab3b26350bfc3242817b030b823d80e8a20f894033b9e8f531058646249b
+  data.tar.gz: 794ab4abea940bc882d763f21be8af00f9b092345a1fe41caee95f6bbb057577
 SHA512:
-  metadata.gz: 8af63fe11ffa8dfddf5ca19e19cca5fb2f116e4155f65904a8bcc3e0e1ab32a78ec6394a03c787cbe672af233bd8f5e0fab2d222e28aa957756f2455e0be1366
-  data.tar.gz: 6febf8c16148c13bd4558ecb091032df2b1da9bc72765608ad1ad1a3bc768b54138309f2faf4f903d1634663808628e5e79ae648a6f5599c364e9b2b8799df79
+  metadata.gz: 418bec644624ad4c66ba1cd0fb4c75cb42acd9345e4c4c5ef5ce6b22f23419ddef0f16a74631089dee01a97e1be3b9569391e4eba0a7ef60369aaa292a72a312
+  data.tar.gz: ae800a517c7702d4697f8a27d5efaa0d53b7f4fcecb4c696bb7409d056941b04a29dbeff6a025873d5745d82cb5b1dd7e692fee144d7380a1de1fcfb0c364a92

data/Gemfile.lock

@@ -9,7 +9,7 @@ GIT
 PATH
   remote: .
   specs:
-    bullet_train-roles (1.6.3)
+    bullet_train-roles (1.6.5)
       active_hash
       activesupport
       cancancan

data/lib/bullet_train/roles/version.rb

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

data/lib/generators/bullet_train/roles/install/install_generator.rb

@@ -47,7 +47,7 @@ module BulletTrain
       end
 
       def db_adapter
-        allowed_adapter_types = %w[mysql mysql2 sqlite postgresql]
+        allowed_adapter_types = %w[mysql mysql2 sqlite postgresql trilogy]
 
         adapter_name = ActiveRecord::Base.connection.adapter_name.downcase
 

data/lib/roles/support.rb

@@ -40,7 +40,7 @@ module Roles
       # For example, if you do with_roles(editor) it will return admin users if the admin role includes the editor role
       def self.with_roles(roles)
         # Mysql and postgres have different syntax for searching json or jsonb columns so we need different queries depending on the database
-        ActiveRecord::Base.connection.adapter_name.downcase.include?("mysql") ? with_roles_mysql(roles) : with_roles_postgres(roles)
+        mysql? ? with_roles_mysql(roles) : with_roles_postgres(roles)
       end
 
       def self.with_roles_mysql(roles)
@@ -56,6 +56,10 @@ module Roles
         where("#{table_name}.role_ids ?| array[:keys]", keys: roles.map(&:key_plus_included_by_keys).flatten.uniq.map(&:to_s))
       end
 
+      def self.mysql?
+        ["mysql", "trilogy"].any? { |adapter| ActiveRecord::Base.connection.adapter_name.downcase.include?(adapter) }
+      end
+
       def validate_roles
         self.role_ids = role_ids&.select(&:present?) || []
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bullet_train-roles
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: 1.6.5
 platform: ruby
 authors:
 - Prabin Poudel
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-13 00:00:00.000000000 Z
+date: 2023-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: byebug