gl_command 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 705c23dec5e3038e7a6b4d0736f58589b775edd30ee53056d2478b8361f9a3d6
-  data.tar.gz: a547c64df86a0f2a533ad43ea5f1ee0a1e2dfcc8fe27e6f1c85b4a018ad75b39
+  metadata.gz: d64529ae90558047a1a67fb4641fcbc6807f4bac0ef8b503945d2981dac33f80
+  data.tar.gz: 541c75d629f1ba4971ab7d6fd37ac4a1fdfee2f19cb6256477d4857408fb64ce
 SHA512:
-  metadata.gz: b13e47c074cc18aeeb50cd0e874c088cd7c0091b52fc5d705b4b5b79ddbb18fa1b3d12b596bf2febd85264a1fe5f9e933fa0893444b21369a4a8cc4a3a33c64f
-  data.tar.gz: 25ac2f9a597e199fef77ebcd08442937615b63102bd8e071d0aea68ede1a2e83da085e902022f54ed32a41ddcf474510e9be811f3dc37941b78f7a2498a0c383
+  metadata.gz: 7767272a19c79ed50bc21bcd5a94a04f8f16c26e509bdfc3b86937e8204dabf2d053ea2fc85919acc56de3a770fd35ff88490b2d101fdcf6e6a89a714c55176f
+  data.tar.gz: f4fd2347bedf5ccbd94c09e230bf760d16d0ec1f19a4ecada73416d7a4b0da52a7f79759f074c4a38f98cd783ce45a07dd84c46dd1f13b87685cfdec8d0e9c9e

data/lib/gl_command/callable.rb

@@ -202,6 +202,7 @@ module GLCommand
 
       chain_rollback if self.class.chain? # defined in GLCommand::Chainable
       rollback
+      instrument_command(:after_rollback)
     end
 
     # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity

data/lib/gl_command/context_inspect.rb

@@ -1,5 +1,9 @@
+# frozen_string_literal: true
+
 module GLCommand
   class ContextInspect
+    PERMITTED_OUTPUTS = %i[string hash].freeze
+
     class << self
       def error(error_obj)
         return '' if error_obj.blank?
@@ -7,35 +11,50 @@ module GLCommand
         error_obj.is_a?(Array) ? error_obj.uniq.join(', ') : error_obj.to_s
       end
 
-      def hash_params(hash)
-        hash.map do |key, value|
-          value_s =
-            if value.nil?
-              'nil'
-            elsif value.respond_to?(:to_sql)
-              object_param_as_sql(value)
-            elsif value.respond_to?(:uuid)
-              object_param_with_id(value, :uuid)
-            elsif value.respond_to?(:id)
-              object_param_with_id(value, :id)
-            else
-              value
-            end
-          "#{key}: #{value_s}"
-        end.join(', ')
+      def hash_params(hash, output: :string)
+        unless PERMITTED_OUTPUTS.include?(output)
+          raise "Unknown output type: #{output}, must be one of #{PERMITTED_OUTPUTS}"
+        end
+
+        result = hash.map { |key, value| output_for(key:, value:, output:) }
+        output == :string ? result.join(', ') : result.to_h
       end
 
       private
 
+      def output_for(key:, value:, output:)
+        value_s = if value.nil?
+                    'nil'
+                  elsif value.respond_to?(:to_sql)
+                    object_param_as_sql(value, output:)
+                  elsif value.respond_to?(:id)
+                    object_param_with_id(value, :id, output:)
+                  elsif value.respond_to?(:uuid)
+                    object_param_with_id(value, :uuid, output:)
+                  else
+                    value
+                  end
+
+        output == :string ? "#{key}: #{value_s}" : [key, value_s]
+      end
+
       # Active record objects can be really big - rather than rendering the whole object, just show the ID
-      def object_param_with_id(obj, key)
+      def object_param_with_id(obj, key, output:)
         obj_id = obj.send(key)
-        id_value = obj_id.is_a?(Integer) ? obj_id : "\"#{obj_id}\""
-        "#<#{obj.class.name} #{key}=#{id_value}>"
+        if output == :string
+          id_value = obj_id.is_a?(Integer) ? obj_id : "\"#{obj_id}\""
+          "#<#{obj.class.name} #{key}=#{id_value}>"
+        else
+          obj_id
+        end
       end
 
-      def object_param_as_sql(obj)
-        "#<#{obj.class.name} sql=\"#{obj.to_sql}\">"
+      def object_param_as_sql(obj, output:)
+        if output == :string
+          "#<#{obj.class.name} sql=\"#{obj.to_sql}\">"
+        else
+          obj.to_sql
+        end
       end
     end
   end

data/lib/gl_command/version.rb

@@ -1,3 +1,3 @@
 module GLCommand
-  VERSION = '1.2.0'.freeze
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gl_command
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Give Lively
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-04-01 00:00:00.000000000 Z
+date: 2025-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord