activeinteractor 2.0.0.alpha.2.2.0 → 2.0.0.alpha.2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e288a5c77ab45d9b0009db2a3d1a2997bd577207bb20f16386c8aa29be50f454
-  data.tar.gz: 6e045fd1af8f93d2f22aeed4d96ddb44ac93f83cce65ea9237da3e2de3d167db
+  metadata.gz: e8af4270754db50c59e2c28fd5877446d12e1d15617ff8ce2dc67b97a0a95830
+  data.tar.gz: 43d1b328973b54ef6623db8e216a2d5a6d84098582ccb674e998ae181b88171a
 SHA512:
-  metadata.gz: e22e0efcf6e53c4c70cf1b30e7871b17de7ebf13933779b989b40119ce3628eab3ade0228f1f3bbf96e7976440661cb0d4b8ec8d09f7af64d56074bf15e47ed1
-  data.tar.gz: 7cef976acbe9bfd3ef6a9e7d24237587d4a51220b5c08b8595cdfa4522ae6e84aba8903c6ab5fadb97d1529529fb216a00eab92adc171cc3c997eb0f05c7cdda
+  metadata.gz: 5a9e727d815c173b8be85a47cf65110a48e5e3e65bf370764a29d12060f5da85e2b4a444f35e87c15e4c328795834f3e315a351993deb46fad1d8e7432b78a06
+  data.tar.gz: 655d2a8362d581afb7074b8b00abbd97e496071bb5ce373dd4f475c04e881dc5a8406d4ecd95d7921c29d5e2346aaac7b6f532f54a2c7b31223f5dee38a4ab9f

data/lib/active_interactor/base.rb

@@ -2,6 +2,8 @@
 
 module ActiveInteractor
   class Base
+    include Type::HasTypes
+
     class << self
       delegate :argument, :argument_names, :arguments, to: :input_context_class
       delegate :returns, :field_names, :fields, to: :output_context_class

data/lib/active_interactor/context/attribute.rb

@@ -34,13 +34,38 @@ module ActiveInteractor
       end
 
       def validate!
+        validate_presence! && validate_type!
+      end
+
+      def value
+        @user_provided_value || default_value
+      end
+
+      private
+
+      def type_is_a_active_interactor_type?
+        type.is_a?(ActiveInteractor::Type::Base) || type.superclass == ActiveInteractor::Type::Base
+      end
+
+      def validate_presence!
         return true unless required? && value.nil?
 
         error_messages << :blank
       end
 
-      def value
-        @user_provided_value || default_value
+      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
+
+        error_messages << :invalid
       end
     end
   end

data/lib/active_interactor/context/attribute_assignment.rb

@@ -5,6 +5,14 @@ module ActiveInteractor
     module AttributeAssignment
       extend ActiveSupport::Concern
 
+      def initialize(attributes = {})
+        attribute_set.attributes.each do |attribute|
+          next unless attributes.with_indifferent_access.key?(attribute.name)
+
+          assign_attribute_value(attribute.name, attributes.with_indifferent_access[attribute.name])
+        end
+      end
+
       def [](attribute_name)
         read_attribute_value(attribute_name)
       end

data/lib/active_interactor/context/base.rb

@@ -7,16 +7,11 @@ module ActiveInteractor
       include HasActiveModelErrors
       include AttributeRegistration
       include AttributeAssignment
-
-      attr_reader :errors
+      include Type::HasTypes
 
       def initialize(attributes = {})
+        super
         @errors = ActiveModel::Errors.new(self)
-        attribute_set.attributes.each do |attribute|
-          next unless attributes.with_indifferent_access.key?(attribute.name)
-
-          assign_attribute_value(attribute.name, attributes.with_indifferent_access[attribute.name])
-        end
       end
 
       def validate!

data/lib/active_interactor/has_active_model_errors.rb

@@ -4,12 +4,14 @@ module ActiveInteractor
   module HasActiveModelErrors
     extend ActiveSupport::Concern
 
+    attr_reader :errors
+
     module ClassMethods
-      def self.human_attribute_name(attribute, _options = {})
+      def human_attribute_name(attribute, _options = {})
         attribute.respond_to?(:to_s) ? attribute.to_s.humanize : attribute
       end
 
-      def self.lookup_ancestors
+      def lookup_ancestors
         [self]
       end
     end
@@ -17,8 +19,6 @@ module ActiveInteractor
     included do
       extend ActiveModel::Naming
       extend ClassMethods
-
-      attr_reader :errors
     end
 
     def read_attribute_for_validation(attribute_name)

data/lib/active_interactor/result.rb

@@ -13,7 +13,7 @@ module ActiveInteractor
       failed_at_output: 3
     }.freeze
 
-    attr_reader :data, :errors
+    attr_reader :data
 
     class << self
       def success(data: {})

data/lib/active_interactor/type/base.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Type
+    class Base
+      def self.valid?(value); end
+    end
+  end
+end

data/lib/active_interactor/type/boolean.rb

@@ -0,0 +1,14 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Type
+    class Boolean < Base
+      TRUE_VALUES = [true, 1, '1', 't', 'T', 'true', 'TRUE', 'on', 'ON', 'yes', 'YES'].freeze
+      FALSE_VALUES = [false, 0, '0', 'f', 'F', 'false', 'FALSE', 'off', 'OFF', 'no', 'NO'].freeze
+
+      def self.valid?(value)
+        (TRUE_VALUES + FALSE_VALUES).include?(value)
+      end
+    end
+  end
+end

data/lib/active_interactor/type/has_types.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Type
+    module HasTypes
+      extend ActiveSupport::Concern
+
+      Boolean = ActiveInteractor::Type::Boolean
+
+      module ClassMethods
+        def any
+          :any
+        end
+
+        def list(type)
+          List.new(type)
+        end
+        alias array list
+
+        def union(*types)
+          Union.new(*types)
+        end
+
+        def untyped
+          :untyped
+        end
+      end
+
+      included do
+        extend ClassMethods
+      end
+    end
+  end
+end

data/lib/active_interactor/type/list.rb

@@ -0,0 +1,29 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Type
+    class List < Base
+      def initialize(type) # rubocop:disable Lint/MissingSuper
+        @type = type
+      end
+
+      def valid?(value)
+        return false unless value.is_a?(Array)
+
+        value.all? do |element|
+          element.nil? || element.is_a?(@type) || (@type.is_a?(ActiveInteractor::Type::Base) && @type.valid?(element))
+        end
+      end
+
+      private
+
+      def value_is_a_valid_active_interactor_type?(_type, value)
+        unless @type.is_a?(ActiveInteractor::Type::Base) || @type.superclass == ActiveInteractor::Type::Base
+          return false
+        end
+
+        @type.valid?(value)
+      end
+    end
+  end
+end

data/lib/active_interactor/type/union.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Type
+    class Union < Base
+      def initialize(*types) # rubocop:disable Lint/MissingSuper
+        @valid_types = types
+      end
+
+      def valid?(value)
+        return true if value.nil?
+
+        @valid_types.any? do |type|
+          value_is_a_valid_active_interactor_type?(type, value) || value.is_a?(type)
+        end
+      end
+
+      private
+
+      def value_is_a_valid_active_interactor_type?(type, value)
+        return false unless type.is_a?(ActiveInteractor::Type::Base) || type.superclass == ActiveInteractor::Type::Base
+
+        type.valid?(value)
+      end
+    end
+  end
+end

data/lib/active_interactor/type.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Type
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+    autoload :Boolean
+    autoload :HasTypes
+    autoload :List
+    autoload :Union
+  end
+end

data/lib/active_interactor.rb

@@ -13,4 +13,5 @@ module ActiveInteractor
   autoload :Context
   autoload :HasActiveModelErrors
   autoload :Result
+  autoload :Type
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.2.2.0
+  version: 2.0.0.alpha.2.3.1
 platform: ruby
 authors:
 - Aaron Allen
@@ -76,15 +76,21 @@ files:
 - lib/active_interactor/errors.rb
 - lib/active_interactor/has_active_model_errors.rb
 - lib/active_interactor/result.rb
+- lib/active_interactor/type.rb
+- lib/active_interactor/type/base.rb
+- lib/active_interactor/type/boolean.rb
+- lib/active_interactor/type/has_types.rb
+- lib/active_interactor/type/list.rb
+- lib/active_interactor/type/union.rb
 - sig/active_interactor.rbs
 homepage: https://github.com/activeinteractor/activeinteractor
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/activeinteractor/activeinteractor/issues
-  changelog_uri: https://github.com/activeinteractor/activeinteractor/blob/v2.0.0-alpha.2.2.0/CHANGELOG.md
+  changelog_uri: https://github.com/activeinteractor/activeinteractor/blob/v2.0.0-alpha.2.3.1/CHANGELOG.md
   homepage_uri: https://github.com/activeinteractor/activeinteractor
-  source_code_uri: https://github.com/activeinteractor/activeinteractor/tree/v2.0.0-alpha.2.2.0
+  source_code_uri: https://github.com/activeinteractor/activeinteractor/tree/v2.0.0-alpha.2.3.1
   wiki_uri: https://github.com/activeinteractor/activeinteractor/wiki
   rubygems_mfa_required: 'true'
 post_install_message:
@@ -102,7 +108,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.4.20
 signing_key:
 specification_version: 4
 summary: Ruby interactors with ActiveModel::Validations