activeinteractor 2.0.0.alpha.4.0.3 → 2.0.0.alpha.4.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a5bb6ce4f039c83c87fa2c01a29aaad3cdc276c1a48b0a433e699b627f5aaae
-  data.tar.gz: f45cfc0cbe14665aff305a9b0ede036b64a447c3d585e5eafa0896bbbc1e7494
+  metadata.gz: a5c6408bdcf2d87a8fcb5fd4eb31a6a65c39daa5a142e2dbea309decc731d472
+  data.tar.gz: 05d8bf464f5d1c2f55de64357e04d894905277da9a5fc96f44a987eef880cdaa
 SHA512:
-  metadata.gz: ef7083fa64b332bd655a8f11522626c073c1c24f54e74005c6ab6a2072bd497129ba2a4419ac58b38816c170661b682f5b7032f35889e4243663c6bcc874ea44
-  data.tar.gz: f8528ce1dd53b532450c280d2e87ef97980f19571ba978c7f109583ea7934978a3b7b280ab10c01c1d89ab2b6baae436109b9b23e9fa041b6bfa56f40169fcee
+  metadata.gz: 0d5f4e51c89e4ba941d3a4b4e0c5f62a2dc99188ff95aaa7645025347bce14833c3aaeca7739faf6eb3bc0370f19c108ccee2b2a7b8aafdbc1a64f3875afc3f9
+  data.tar.gz: f3ee81c83b88e54469ded7ba7df55e9ba711f7c3bd1ceff398ecbb215615bea850cd18eaec9bd6c79b39a52f8036f4c2073e6b1431e255cd54364fd19e3c0806

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

@@ -18,7 +18,7 @@ module ActiveInteractor
         protected
 
         def attribute_set
-          @attribute_set ||= AttributeSet.new(self)
+          @attribute_set ||= AttributeSet.new
         end
       end
 
@@ -57,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)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.4.0.3
+  version: 2.0.0.alpha.4.0.4
 platform: ruby
 authors:
 - Aaron Allen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-02-07 00:00:00.000000000 Z
+date: 2024-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -88,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.3/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.3
-  documentation_uri: https://activeinteractor.org/api/activeinteractor/v2.0.0-alpha.4.0.3
+  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: