motor-admin 0.4.23 → 0.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fa8f8bf8e08d5de91571f6ccd67b723a0f5fc131f8447de20e71087879f9eb5c
-  data.tar.gz: 80d865f7f20b76f1a15dad48e241de65f174a24bbb35fcd70a0a7c93d8c0bbbc
+  metadata.gz: 348ae639231cccca61f74fd3f92c913ac2d63778807e67ad264f43e6be2afa01
+  data.tar.gz: 9f7568df6897b21182d70da600d764a74d806a24affb7764872ef00eb6b345e4
 SHA512:
-  metadata.gz: d5f9f50c225d0a12840dbbc2f65e0c99ba5f147cdf8cbc9e5f8f1f9c2aaf253eb11562fdc6d23ba04904d22bf51adc857b626b06530330a381e65fb6cbab0d40
-  data.tar.gz: 1b2ffb087aa375a5e57355d2b332b1efbc5dc04e982e3f8bdfd48c9b3ea88282654b8c77590121fa594ddb332b8dca49bf58356d6a3328523ff2426267178193
+  metadata.gz: 42982ac002c2d2ba6d34c42d9ca3b734a8fb8ec2f2b4077408696530c5dcb2d8e0589dc016300b088a4d645452ca9e489c08382f67ebf0f825e7848c2136538a
+  data.tar.gz: 1ed7b6047594f336ddeba7e90348289325d03a3d61c5903174fbca5841c7c4453940ffbbbd2ac01c3f6b2548f6c52c7f3c917a2729f4f8e97d2c19df4cd39d83

data/app/controllers/motor/auth_tokens_controller.rb

@@ -28,7 +28,7 @@ module Motor
 
     def respond_with_generic_jwt
       payload = { uid: current_user.id, exp: GENERIC_TOKEN_TTL.from_now.to_i }
-      token = JWT.encode(payload, Rails.application.secrets.secret_key_base)
+      token = JWT.encode(payload, Rails.application.credentials.secret_key_base)
 
       render json: { token: token }
     end

data/app/controllers/motor/data_controller.rb

@@ -55,6 +55,8 @@ module Motor
     def destroy
       if @resource.respond_to?(:deleted_at)
         @resource.update(deleted_at: Time.current)
+      elsif @resource.respond_to?(:archived_at)
+        @resource.update(archived_at: Time.current)
       else
         @resource.destroy!
       end

data/app/controllers/motor/run_api_requests_controller.rb

@@ -46,7 +46,7 @@ module Motor
 
       payload = { uid: current_user.id, email: current_user.email, exp: JWT_TTL.from_now.to_i }
 
-      JWT.encode(payload, Rails.application.secrets.secret_key_base)
+      JWT.encode(payload, Rails.application.credentials.secret_key_base)
     end
 
     def request_params

data/app/controllers/motor/run_graphql_requests_controller.rb

@@ -38,7 +38,7 @@ module Motor
 
       payload = { uid: current_user.id, email: current_user.email, exp: JWT_TTL.from_now.to_i }
 
-      JWT.encode(payload, Rails.application.secrets.secret_key_base)
+      JWT.encode(payload, Rails.application.credentials.secret_key_base)
     end
 
     def request_params

data/app/models/motor/api_config.rb

@@ -7,11 +7,11 @@ module Motor
     attribute :preferences, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
     attribute :credentials, default: -> { ActiveSupport::HashWithIndifferentAccess.new }
 
-    serialize :credentials, Motor::HashSerializer
-
     if Rails.version.to_f >= 7.1
+      serialize :credentials, coder: Motor::HashSerializer
       serialize :preferences, coder: Motor::HashSerializer
     else
+      serialize :credentials, Motor::HashSerializer
       serialize :preferences, Motor::HashSerializer
     end
 

data/lib/motor/queries/run_query.rb

@@ -61,27 +61,18 @@ module Motor
       # @param filters [Hash]
       # @return [ActiveRecord::Result]
       def execute_query(query, limit, variables_hash, filters)
-        result = nil
-
         connection_class = fetch_connection_class(query)
 
         statement = prepare_sql_statement(connection_class, query, limit, variables_hash, filters)
 
-        connection_class.transaction do
-          result =
-            case connection_class.connection.class.name
-            when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
-              PostgresqlExecQuery.call(connection_class.connection, statement)
-            else
-              statement = normalize_statement_for_sql(statement)
-
-              connection_class.connection.exec_query(*statement)
-            end
+        case connection_class.connection.class.name
+        when 'ActiveRecord::ConnectionAdapters::PostgreSQLAdapter'
+          PostgresqlExecQuery.call(connection_class.connection, statement)
+        else
+          statement = normalize_statement_for_sql(statement)
 
-          raise ActiveRecord::Rollback
+          connection_class.connection.exec_query(*statement)
         end
-
-        result
       end
 
       def validate_query!(sql)

data/lib/motor/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Motor
-  VERSION = '0.4.23'
+  VERSION = '0.4.25'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: motor-admin
 version: !ruby/object:Gem::Version
-  version: 0.4.23
+  version: 0.4.25
 platform: ruby
 authors:
 - Pete Matsyburka
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-08 00:00:00.000000000 Z
+date: 2023-12-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ar_lazy_preload