activeinteractor 2.0.0.alpha.4.0.2 → 2.0.0.alpha.4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 49a99115eedcdbf3c20a4f9ae7a2689666a112c18242e8df780a1640ec4cbab6
-  data.tar.gz: f44209f8fcba17ddd81add053d38754fee6103b0d3322b8cad78a4835ecfbd82
+  metadata.gz: a5c6408bdcf2d87a8fcb5fd4eb31a6a65c39daa5a142e2dbea309decc731d472
+  data.tar.gz: 05d8bf464f5d1c2f55de64357e04d894905277da9a5fc96f44a987eef880cdaa
 SHA512:
-  metadata.gz: 19c71ea32681cce8f34838887e07f04d6cac8fa73a20506c52a269faf92c1613446da878fa5e95de3bab57860d1428242da24e68abb3890003a9db0e8a00155d
-  data.tar.gz: 4379d708f16448046d760f85d3ab30643c380a9be12726e160e9540e20163da2692a1e813c6e439f479954e67aa923f42617e19c8791161244514429cbfa19a5
+  metadata.gz: 0d5f4e51c89e4ba941d3a4b4e0c5f62a2dc99188ff95aaa7645025347bce14833c3aaeca7739faf6eb3bc0370f19c108ccee2b2a7b8aafdbc1a64f3875afc3f9
+  data.tar.gz: f3ee81c83b88e54469ded7ba7df55e9ba711f7c3bd1ceff398ecbb215615bea850cd18eaec9bd6c79b39a52f8036f4c2073e6b1431e255cd54364fd19e3c0806

data/CHANGELOG.md

@@ -27,7 +27,7 @@ and this project adheres to [Semantic Versioning].
 
 ## [v1.2.0] - 2022-09-08
 
-
+### Added
 
 - `ActiveInteractor::Base.defer_after_callbacks_when_organized`
 - `ActiveInteractor::Organizer::Base.after_all_perform`

data/lib/active_interactor/context/attribute.rb

@@ -6,12 +6,11 @@ module ActiveInteractor
       NO_DEFAULT_VALUE = :__no_default_value__
       attr_reader :description, :error_messages, :name
 
-      def initialize(owner, name, type, description = nil, **options)
-        @owner = owner
+      def initialize(name, type, description = nil, **options)
+        parse_options(description, options)
+
         @name = name.to_sym
         @type_expression = type
-        @description = description || options[:description]
-        @options = { required: false, default: NO_DEFAULT_VALUE }.merge(options)
         @error_messages = []
       end
 
@@ -44,6 +43,19 @@ module ActiveInteractor
 
       private
 
+      def parse_options(description, options)
+        if description.is_a?(String)
+          @description = description
+          @options = { required: false, default: NO_DEFAULT_VALUE }.merge(options)
+        elsif description.is_a?(Hash)
+          @options = { required: false, default: NO_DEFAULT_VALUE }.merge(description)
+          @description = @options[:description]
+        elsif description.nil?
+          @description = nil
+          @options = { required: false, default: NO_DEFAULT_VALUE }.merge(options)
+        end
+      end
+
       def type_is_a_active_interactor_type?
         type.is_a?(ActiveInteractor::Type::Base) || type.superclass == ActiveInteractor::Type::Base
       end
@@ -55,19 +67,16 @@ module ActiveInteractor
       end
 
       def validate_type!
-        return true if value.nil?
-        return true if %i[any untyped].include?(type)
-
-        if type_is_a_active_interactor_type?
-          return true if type.valid?(value)
-
-          error_messages << :invalid
-        elsif value.is_a?(type)
-          return true
-        end
+        return true if value_nil_or_untyped?
+        return true if type_is_a_active_interactor_type? && type.valid?(value)
+        return true if value.is_a?(type)
 
         error_messages << :invalid
       end
+
+      def value_nil_or_untyped?
+        value.nil? || %i[any untyped].include?(type)
+      end
     end
   end
 end

data/lib/active_interactor/context/attribute_set.rb

@@ -3,15 +3,14 @@
 module ActiveInteractor
   module Context
     class AttributeSet
-      def initialize(owner, *attributes)
-        @owner = owner
+      def initialize(*attributes)
         @set = {}
         attributes.each { |attribute| @set[attribute.name] = attribute }
       end
 
       def add(*attribute_args)
         attribute_options = attribute_args.extract_options!
-        attribute = Attribute.new(@owner, *attribute_args, **attribute_options)
+        attribute = Attribute.new(*attribute_args, **attribute_options)
         @set[attribute.name] = attribute
       end
 

data/lib/active_interactor/context/base.rb

@@ -8,6 +8,8 @@ module ActiveInteractor
       include ActiveModel::Validations
       include Type::DeclerationMethods
 
+      validate :validate_attributes!
+
       class << self
         def method_defined?(method_name)
           attribute_set.attribute_names.include?(method_name.to_s.delete('=').to_sym) || super
@@ -16,7 +18,7 @@ module ActiveInteractor
         protected
 
         def attribute_set
-          @attribute_set ||= AttributeSet.new(self)
+          @attribute_set ||= AttributeSet.new
         end
       end
 
@@ -55,7 +57,7 @@ module ActiveInteractor
       end
 
       def attribute_set
-        @attribute_set ||= AttributeSet.new(self, *self.class.send(:attribute_set).attributes.map(&:dup))
+        @attribute_set ||= AttributeSet.new(*self.class.send(:attribute_set).attributes.map(&:dup))
       end
 
       def method_missing(method_name, *arguments)
@@ -78,6 +80,13 @@ module ActiveInteractor
 
         super
       end
+
+      def validate_attributes!
+        attribute_set.attributes.each do |attribute|
+          attribute.validate!
+          attribute.error_messages.each { |message| errors.add(attribute.name, message) }
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.4.0.2
+  version: 2.0.0.alpha.4.0.4
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-01-12 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -66,7 +66,6 @@ files:
 - lib/active_interactor/context.rb
 - lib/active_interactor/context/attribute.rb
 - lib/active_interactor/context/attribute_set.rb
-- lib/active_interactor/context/attribute_validation.rb
 - lib/active_interactor/context/base.rb
 - lib/active_interactor/context/input.rb
 - lib/active_interactor/context/output.rb
@@ -89,10 +88,10 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/activeinteractor/activeinteractor/issues
-  changelog_uri: https://github.com/activeinteractor/activeinteractor/blob/v2.0.0-alpha.4.0.2/CHANGELOG.md
+  changelog_uri: https://github.com/activeinteractor/activeinteractor/blob/v2.0.0-alpha.4.0.4/CHANGELOG.md
   homepage_uri: https://activeinteractor.org
-  source_code_uri: https://github.com/activeinteractor/activeinteractor/tree/v2.0.0-alpha.4.0.2
-  documentation_uri: https://activeinteractor.org/api/activeinteractor/v2.0.0-alpha.4.0.2
+  source_code_uri: https://github.com/activeinteractor/activeinteractor/tree/v2.0.0-alpha.4.0.4
+  documentation_uri: https://activeinteractor.org/api/activeinteractor/v2.0.0-alpha.4.0.4
   wiki_uri: https://github.com/activeinteractor/activeinteractor/wiki
   rubygems_mfa_required: 'true'
 post_install_message: 

data/lib/active_interactor/context/attribute_validation.rb

@@ -1,22 +0,0 @@
-# frozen_string_literal: true
-
-module ActiveInteractor
-  module Context
-    module AttributeValidation
-      extend ActiveSupport::Concern
-
-      included do
-        validate :validate_attributes!
-      end
-
-      protected
-
-      def validate_attributes!
-        attribute_set.attributes.each do |attribute|
-          attribute.validate!
-          attribute.error_messages.each { |message| errors.add(attribute.name, message) }
-        end
-      end
-    end
-  end
-end