gl_command 1.1.0 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0e88d785a51d72653d8691d86236df3791dadaa84b46a548895e045509e1428
-  data.tar.gz: 582d39e38c74b40ac251dd91071fe602a8860f6ecda15a7ece244e21541352d1
+  metadata.gz: 72008b456b363007dc64f9701fb5e9241248527475df1900f8026d1f4fa1d63f
+  data.tar.gz: 368147f6acc900a820233283538ac7bcdb10c75ce0af3803076da9d87f919151
 SHA512:
-  metadata.gz: e8758b174cdf1f76a4b35d466876a8fbaa848f2546628ea777e7db594a1221a3ca9db2c31f0be77a6d58c62a739f62294e23e63050ed76bd48ca85fcbbfcdb0b
-  data.tar.gz: ed20e53cb69da3c59f2919e7f89c505d2470a9fa44138fdd9334c12c6bebcb1c89dd34a9598b9f33a0c0a29ea875fefa7f10c89e16a2d0cfe07fb1bcb133c392
+  metadata.gz: 6ec728362eb5515db172717065350598ab7c1c636519a62e61c7c6e18b4a3cae724eff2feaa5845167f05f4c45d43d008a9df664bdb2c04c4ed427d1884765c3
+  data.tar.gz: 4314e4fb784d4c275585ba3952024189c76504a53a5d372b7239c4616ea08c5728237fd0bb6800acf23068189059be2de777e6b1d95063e6a68379a8eef5dc58

data/lib/gl_command/callable.rb

@@ -35,9 +35,13 @@ module GLCommand
         call(*posargs, **args.merge(raise_errors: true))
       end
 
-      def build_context(raise_errors: false, skip_unknown_parameters: false,
+      # error can be passed to build context, useful for stubbing in tests
+      def build_context(raise_errors: false, skip_unknown_parameters: false, error: nil,
                         **arguments_and_returns)
-        context_class.new(self, raise_errors:, skip_unknown_parameters:, **arguments_and_returns)
+        new_context = context_class.new(self, raise_errors:, skip_unknown_parameters:,
+                                              **arguments_and_returns)
+        new_context.error = error if error.present?
+        new_context
       end
 
       def requires(*attributes, **strong_attributes)

data/lib/gl_command/context.rb

@@ -25,7 +25,11 @@ module GLCommand
     attr_reader :klass, :error
     attr_writer :full_error_message
 
-    delegate :errors, to: :@callable, allow_nil: true
+    # If someone calls #errors, they expect to get the errors! Include the non-validation error, if it exists
+    def errors
+      current_errors&.add(:base, "Command Error: #{full_error_message}") if add_command_error?
+      current_errors
+    end
 
     def chain?
       false
@@ -48,7 +52,7 @@ module GLCommand
     end
 
     def failure?
-      @failure || errors.present? || @full_error_message.present? || false
+      @failure || current_errors.present? || @full_error_message.present? || false
     end
 
     def success?
@@ -103,7 +107,7 @@ module GLCommand
             passed_error.is_a?(ActiveRecord::RecordInvalid) && defined?(passed_error.record.errors)
           # Return a new error if it's an error (rather than the class)
           passed_error.is_a?(Class) ? passed_error.new(@full_error_message) : passed_error
-        elsif errors.present? # check for validation errors
+        elsif current_errors.present? # check for validation errors
           # Assign ActiveRecord::RecordInvalid if validatable error
           ActiveRecord::RecordInvalid.new(@callable)
         else
@@ -123,6 +127,20 @@ module GLCommand
 
     private
 
+    def current_errors
+      @callable&.errors
+    end
+
+    def add_command_error?
+      return false if @error.blank?
+
+      return true if current_errors.blank?
+
+      # Add command error unless the existing error is a validation error or there's already a command error
+      @error&.class != ActiveRecord::RecordInvalid &&
+        current_errors.full_messages.none? { |err| err.start_with?('Command Error: ') }
+    end
+
     def exception?(passed_error)
       passed_error.is_a?(Exception) ||
         (passed_error.respond_to?(:ancestors) && passed_error.ancestors.include?(Exception))
@@ -136,7 +154,7 @@ module GLCommand
     def merge_errors(new_errors)
       # When merging the errors, don't add duplicate errors
       new_errors.each do |new_error|
-        errors.import(new_error) unless errors&.full_messages&.include?(new_error.full_message)
+        current_errors.import(new_error) unless current_errors&.full_messages&.include?(new_error.full_message)
       end
     end
 

data/lib/gl_command/version.rb

@@ -1,3 +1,3 @@
 module GLCommand
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gl_command
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.2
 platform: ruby
 authors:
 - Give Lively
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord