feat(has_j_send_status_and_attributes): link result to status, data, …

…message, code
marian13 · May 1, 2023 · dd87723 · dd87723
1 parent 9ea2d27
commit dd87723
Show file tree

Hide file tree

Showing 19 changed files with 348 additions and 155 deletions.
diff --git a/lib/convenient_service/configs/minimal.rb b/lib/convenient_service/configs/minimal.rb
@@ -96,6 +96,7 @@ class self::Result
             use Plugins::Result::HasInspect::Concern
 
             use Plugins::Common::HasConstructor::Concern
+            use Plugins::Common::HasConstructorWithoutInitialize::Concern
 
             use Plugins::Result::HasJSendStatusAndAttributes::Concern
           end

diff --git a/lib/convenient_service/rspec/matchers/custom/results/base.rb b/lib/convenient_service/rspec/matchers/custom/results/base.rb
@@ -36,13 +36,13 @@ def matches?(result)
               ##
               # IMPORTANT: Result status is NOT marked as checked intentionally, since it is a mutable operation.
               #
-              rules << ->(result) { result.status.in?(statuses) }
+              rules << ->(result) { result.status.in?(statuses.map { |status| result.class.status(value: status, result: result) }) }
 
               rules << ->(result) { result.service.instance_of?(service_class) } if used_of_service?
               rules << ->(result) { Commands::MatchResultStep.call(result: result, step: step) } if used_of_step?
-              rules << ->(result) { result.unsafe_data == data } if used_data?
-              rules << ->(result) { result.unsafe_message == message } if used_message?
-              rules << ->(result) { result.unsafe_code == code } if used_code?
+              rules << ->(result) { result.unsafe_data == result.class.data(value: data, result: result) } if used_data?
+              rules << ->(result) { result.unsafe_message == result.class.message(value: message, result: result) } if used_message?
+              rules << ->(result) { result.unsafe_code == result.class.code(value: code, result: result) } if used_code?
 
               condition = Utils::Proc.conjunct(rules)
 

diff --git a/...tities/result/plugins/has_j_send_status_and_attributes/commands/cast_j_send_attributes.rb b/...tities/result/plugins/has_j_send_status_and_attributes/commands/cast_j_send_attributes.rb
@@ -40,6 +40,8 @@ def call
                       Structs::JSendAttributes.new(service: service, status: status, data: data, message: message, code: code)
                     end
 
+                    private
+
                     ##
                     # @return [Object]
                     #
@@ -52,31 +54,31 @@ def service
                     # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
                     #
                     def status
-                      @status ||= result.class.status_class.cast!(kwargs[:status])
+                      @status ||= result.class.status(value: kwargs[:status], result: result)
                     end
 
                     ##
                     # @return [ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Entities::Data]
                     # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
                     #
                     def data
-                      @data ||= result.class.data_class.cast!(kwargs[:data])
+                      @data ||= result.class.data(value: kwargs[:data], result: result)
                     end
 
                     ##
                     # @return [ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Entities::Message]
                     # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
                     #
                     def message
-                      @message ||= result.class.message_class.cast!(kwargs[:message])
+                      @message ||= result.class.message(value: kwargs[:message], result: result)
                     end
 
                     ##
                     # @return [ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Entities::Code]
                     # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
                     #
                     def code
-                      @code ||= result.class.code_class.cast!(kwargs[:code])
+                      @code ||= result.class.code(value: kwargs[:code], result: result)
                     end
                   end
                 end

diff --git a/..._result/entities/result/plugins/has_j_send_status_and_attributes/concern/class_methods.rb b/..._result/entities/result/plugins/has_j_send_status_and_attributes/concern/class_methods.rb
@@ -10,6 +10,46 @@ module Plugins
               module HasJSendStatusAndAttributes
                 module Concern
                   module ClassMethods
+                    ##
+                    # @param value [Object] Can be any type.
+                    # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result].
+                    # @return [ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Entities::Code]
+                    # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
+                    #
+                    def code(value:, result: create_without_initialize)
+                      code_class.cast!(value).copy(overrides: {kwargs: {result: result}})
+                    end
+
+                    ##
+                    # @param value [Object] Can be any type.
+                    # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result].
+                    # @return [ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Entities::Data]
+                    # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
+                    #
+                    def data(value:, result: create_without_initialize)
+                      data_class.cast!(value).copy(overrides: {kwargs: {result: result}})
+                    end
+
+                    ##
+                    # @param value [Object] Can be any type.
+                    # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result].
+                    # @return [ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Entities::Message]
+                    # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
+                    #
+                    def message(value:, result: create_without_initialize)
+                      message_class.cast!(value).copy(overrides: {kwargs: {result: result}})
+                    end
+
+                    ##
+                    # @param value [Object] Can be any type.
+                    # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result].
+                    # @return [ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Entities::Status]
+                    # @raise [ConvenientService::Support::Castable::Errors::FailedToCast]
+                    #
+                    def status(value:, result: create_without_initialize)
+                      status_class.cast!(value).copy(overrides: {kwargs: {result: result}})
+                    end
+
                     ##
                     # @api private
                     # @return [Class]

diff --git a/...result/plugins/has_j_send_status_and_attributes/entities/code/concern/instance_methods.rb b/...result/plugins/has_j_send_status_and_attributes/entities/code/concern/instance_methods.rb
@@ -12,30 +12,48 @@ module Entities
                   class Code
                     module Concern
                       module InstanceMethods
+                        include Support::Copyable
+
                         ##
                         # @!attribute [r] value
                         #   @return [Symbol]
                         #
                         attr_reader :value
 
+                        ##
+                        # @!attribute [r] result
+                        #   @return [ConvenientService::Service::Plugins::HasResult::Entities::Result]
+                        #
+                        attr_reader :result
+
                         ##
                         # @param value [Symbol]
+                        # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result]
                         # @return [void]
                         #
-                        def initialize(value:)
+                        def initialize(value:, result: nil)
                           @value = value
+                          @result = result
                         end
 
                         ##
                         # @param other [Object] Can be any type.
                         # @return [Boolean, nil]
                         #
                         def ==(other)
-                          casted = cast(other)
+                          return unless other.instance_of?(self.class)
 
-                          return unless casted
+                          return false if result.class != other.result.class
+                          return false if value != other.value
 
-                          value == casted.value
+                          true
+                        end
+
+                        ##
+                        # @return [Hash]
+                        #
+                        def to_kwargs
+                          @to_kwargs ||= {value: value, result: result}
                         end
 
                         ##

diff --git a/...result/plugins/has_j_send_status_and_attributes/entities/data/concern/instance_methods.rb b/...result/plugins/has_j_send_status_and_attributes/entities/data/concern/instance_methods.rb
@@ -12,14 +12,23 @@ module Entities
                   class Data
                     module Concern
                       module InstanceMethods
+                        include Support::Copyable
+
                         ##
                         # @!attribute [r] value
                         #   @return [Hash]
                         #
                         attr_reader :value
 
+                        ##
+                        # @!attribute [r] result
+                        #   @return [ConvenientService::Service::Plugins::HasResult::Entities::Result]
+                        #
+                        attr_reader :result
+
                         ##
                         # @param value [Hash]
+                        # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result]
                         # @return [void]
                         #
                         # @internal
@@ -34,8 +43,9 @@ module InstanceMethods
                         #   - https://github.com/rails/rails/issues/22681
                         #   - https://api.rubyonrails.org/classes/ActiveSupport/OrderedOptions.html
                         #
-                        def initialize(value:)
+                        def initialize(value:, result: nil)
                           @value = value
+                          @result = result
                         end
 
                         ##
@@ -51,11 +61,12 @@ def has_attribute?(key)
                         # @return [Boolean, nil]
                         #
                         def ==(other)
-                          casted = cast(other)
+                          return unless other.instance_of?(self.class)
 
-                          return unless casted
+                          return false if result.class != other.result.class
+                          return false if value != other.value
 
-                          value == casted.value
+                          true
                         end
 
                         ##
@@ -67,6 +78,13 @@ def [](key)
                           value.fetch(key.to_sym) { raise Errors::NotExistingAttribute.new(attribute: key) }
                         end
 
+                        ##
+                        # @return [Hash]
+                        #
+                        def to_kwargs
+                          @to_kwargs ||= {value: value, result: result}
+                        end
+
                         ##
                         # @return [Hash]
                         #

diff --git a/...ult/plugins/has_j_send_status_and_attributes/entities/message/concern/instance_methods.rb b/...ult/plugins/has_j_send_status_and_attributes/entities/message/concern/instance_methods.rb
@@ -12,30 +12,48 @@ module Entities
                   class Message
                     module Concern
                       module InstanceMethods
+                        include Support::Copyable
+
                         ##
                         # @!attribute [r] value
                         #   @return [String]
                         #
                         attr_reader :value
 
+                        ##
+                        # @!attribute [r] result
+                        #   @return [ConvenientService::Service::Plugins::HasResult::Entities::Result]
+                        #
+                        attr_reader :result
+
                         ##
                         # @param value [String]
+                        # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result]
                         # @return [void]
                         #
-                        def initialize(value:)
+                        def initialize(value:, result: nil)
                           @value = value
+                          @result = result
                         end
 
                         ##
                         # @param other [Object] Can be any type.
                         # @return [Boolean, nil]
                         #
                         def ==(other)
-                          casted = cast(other)
+                          return unless other.instance_of?(self.class)
 
-                          return unless casted
+                          return false if result.class != other.result.class
+                          return false if value != other.value
 
-                          value == casted.value
+                          true
+                        end
+
+                        ##
+                        # @return [Hash]
+                        #
+                        def to_kwargs
+                          @to_kwargs ||= {value: value, result: result}
                         end
 
                         ##

diff --git a/...sult/plugins/has_j_send_status_and_attributes/entities/status/concern/instance_methods.rb b/...sult/plugins/has_j_send_status_and_attributes/entities/status/concern/instance_methods.rb
@@ -12,30 +12,41 @@ module Entities
                   class Status
                     module Concern
                       module InstanceMethods
+                        include Support::Copyable
+
                         ##
                         # @!attribute [r] value
                         #   @return [String]
                         #
                         attr_reader :value
 
+                        ##
+                        # @!attribute [r] result
+                        #   @return [ConvenientService::Service::Plugins::HasResult::Entities::Result]
+                        #
+                        attr_reader :result
+
                         ##
                         # @param value [String]
+                        # @param result [ConvenientService::Service::Plugins::HasResult::Entities::Result]
                         # @return [void]
                         #
-                        def initialize(value:)
+                        def initialize(value:, result: nil)
                           @value = value
+                          @result = result
                         end
 
                         ##
                         # @param other [Object] Can be any type.
                         # @return [Boolean, nil]
                         #
                         def ==(other)
-                          casted = cast(other)
+                          return unless other.instance_of?(self.class)
 
-                          return unless casted
+                          return false if result.class != other.result.class
+                          return false if value != other.value
 
-                          value == casted.value
+                          true
                         end
 
                         ##
@@ -88,6 +99,13 @@ def in?(statuses)
                           statuses.any? { |status| self == status }
                         end
 
+                        ##
+                        # @return [Hash]
+                        #
+                        def to_kwargs
+                          @to_kwargs ||= {value: value, result: result}
+                        end
+
                         ##
                         # @return [String]
                         #

diff --git a/spec/lib/convenient_service/configs/minimal_spec.rb b/spec/lib/convenient_service/configs/minimal_spec.rb
@@ -175,6 +175,7 @@
                 ConvenientService::Common::Plugins::HasInternals::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasInspect::Concern,
                 ConvenientService::Common::Plugins::HasConstructor::Concern,
+                ConvenientService::Common::Plugins::HasConstructorWithoutInitialize::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Concern
               ]
             end

diff --git a/spec/lib/convenient_service/configs/standard_spec.rb b/spec/lib/convenient_service/configs/standard_spec.rb
@@ -200,6 +200,7 @@
                 ConvenientService::Common::Plugins::HasInternals::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasInspect::Concern,
                 ConvenientService::Common::Plugins::HasConstructor::Concern,
+                ConvenientService::Common::Plugins::HasConstructorWithoutInitialize::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Concern,
                 ConvenientService::Common::Plugins::HasResultDuckShortSyntax::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::CanRecalculateResult::Concern,

diff --git a/spec/lib/convenient_service/examples/dry/gemfile/dry_service/config_spec.rb b/spec/lib/convenient_service/examples/dry/gemfile/dry_service/config_spec.rb
@@ -204,6 +204,7 @@
                 ConvenientService::Common::Plugins::HasInternals::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasInspect::Concern,
                 ConvenientService::Common::Plugins::HasConstructor::Concern,
+                ConvenientService::Common::Plugins::HasConstructorWithoutInitialize::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Concern,
                 ConvenientService::Common::Plugins::HasResultDuckShortSyntax::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::CanRecalculateResult::Concern,

diff --git a/spec/lib/convenient_service/examples/rails/gemfile/rails_service/config_spec.rb b/spec/lib/convenient_service/examples/rails/gemfile/rails_service/config_spec.rb
@@ -206,6 +206,7 @@
                 ConvenientService::Common::Plugins::HasInternals::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasInspect::Concern,
                 ConvenientService::Common::Plugins::HasConstructor::Concern,
+                ConvenientService::Common::Plugins::HasConstructorWithoutInitialize::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::HasJSendStatusAndAttributes::Concern,
                 ConvenientService::Common::Plugins::HasResultDuckShortSyntax::Concern,
                 ConvenientService::Service::Plugins::HasResult::Entities::Result::Plugins::CanRecalculateResult::Concern,