uc3-dmp-rds 0.0.25 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd42f3d5944c5a82f29f7280dcb79808fcc6201c857957e6997c5187eda3d34a
-  data.tar.gz: dd9efa204770d794fa9e3e62933ae99d67fb922a1d4ba981fb18747557545178
+  metadata.gz: e1afa5b7e4b77fa8dd40dbd518c9b638a99a2be5f7b79853815d355c84110459
+  data.tar.gz: 4603ab903dcab47f48526bc10881680dc495a950b56b2e78fc1bffe0aa7403bf
 SHA512:
-  metadata.gz: e6d618ef509262e41e4c3ac3b70d35bad8e56c32ca44fc69a804706822cb129d875e4f4bb3f4c4f554be5c167172edc1ace7ded63ade31f39c3ac87f26dbdafb
-  data.tar.gz: 1b037b248507347285533d8a3a9831ad25f3fcd6b20742b6d7596844d40dfeb3834273bb9a630e843f2a025815ec9b3aa603a9ef95681b66fe95cac83bcda613
+  metadata.gz: 21afbff738168bf4ae214dd797e35bf5267bc7e24df33bb3df91e2f48f2b36a6107894030b5b6718d769f49f65a88501359593bc70c339f0a8579d0c26ab6038
+  data.tar.gz: 066fed2c4517721ca649699f1c2f868bf344d4ad86cb67ff6fb8ad7f4da458c1006a97b006d012b4248657bfc2eec3fa5ed89402ebf20646559fc4968984069e

data/lib/uc3-dmp-rds/adapter.rb

@@ -2,7 +2,7 @@
 
 require 'active_record'
 require 'active_record_simple_execute'
-require 'mysql2'
+require 'trilogy'
 
 module Uc3DmpRds
   # Error from the Rds Adapter
@@ -32,12 +32,12 @@ module Uc3DmpRds
                                                        password.nil? || password.to_s.strip.empty?
 
         connection = ActiveRecord::Base.establish_connection(
-          adapter: 'mysql2',
+          adapter: 'trilogy',
           host: ENV.fetch('DATABASE_HOST', nil),
           port: ENV.fetch('DATABASE_PORT', nil),
           database: ENV.fetch('DATABASE_NAME', nil),
-          username: username,
-          password: password,
+          username:,
+          password:,
           encoding: 'utf8mb4'
         )
         !connection.nil?
@@ -50,7 +50,7 @@ module Uc3DmpRds
       def execute_query(sql:, **params)
         return [] unless sql.is_a?(String) && !sql.strip.empty? && (params.nil? || params.is_a?(Hash))
         # Verify that all of the kewords are accounted for and that values were supplied
-        raise AdapterError, MSG_KEYWORDS_INVALID unless _verify_params(sql: sql, params: params)
+        raise AdapterError, MSG_KEYWORDS_INVALID unless _verify_params(sql:, params:)
 
         ActiveRecord::Base.simple_execute(sql, params)
       rescue StandardError => e

data/lib/uc3-dmp-rds/authenticator.rb

@@ -20,13 +20,13 @@ module Uc3DmpRds
       def authenticate(token:)
         raise AuthenticatorError, MSG_INVALID_TOKEN if token.nil? || token.to_s.strip.empty?
 
-        users = _query_user(token: token)
+        users = _query_user(token:)
         raise AuthenticatorError, MSG_INVALID_TOKEN unless users.is_a?(Array) && users.any?
 
         user = users.first
         raise AuthenticatorError, MSG_INACTIVE_USER unless user['active']
 
-        _serialize_user(user: user)
+        _serialize_user(user:)
       end
 
       private
@@ -50,10 +50,11 @@ module Uc3DmpRds
               AND i.identifier_scheme_id IN (SELECT sch.id FROM identifier_schemes sch WHERE sch.name = 'orcid')
           WHERE users.api_token = :token
         SQL
-        users = ActiveRecord::Base.simple_execute(sql, token: token.to_s.strip)
+        ActiveRecord::Base.simple_execute(sql, token: token.to_s.strip)
       end
 
       # Convert the ActiveRecord query results into a JSON object
+      # rubocop:disable Metrics/AbcSize
       def _serialize_user(user:)
         return {} if user.nil? || user['email'].nil?
 
@@ -72,6 +73,7 @@ module Uc3DmpRds
         hash[:affiliation][:affiliation_id] = { type: 'ror', identifier: user['ror_id'] } unless user['ror_id'].nil?
         JSON.parse(hash.to_json)
       end
+      # rubocop:enable Metrics/AbcSize
     end
   end
 end

data/lib/uc3-dmp-rds/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Uc3DmpRds
-  VERSION = '0.0.25'
+  VERSION = '0.0.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: uc3-dmp-rds
 version: !ruby/object:Gem::Version
-  version: 0.0.25
+  version: 0.0.27
 platform: ruby
 authors:
 - Brian Riley
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-05 00:00:00.000000000 Z
+date: 2024-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_record_simple_execute
@@ -139,7 +139,7 @@ licenses:
 - MIT
 metadata:
   rubygems_mfa_required: 'false'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +147,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.7'
+      version: '3.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.4.22
+signing_key:
 specification_version: 4
 summary: DMPTool gem that provides general support for accessing MySQL DB hosted on
   AWS RDS