activeinteractor 2.0.0.alpha.2.3.1 → 2.0.0.alpha.2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e8af4270754db50c59e2c28fd5877446d12e1d15617ff8ce2dc67b97a0a95830
-  data.tar.gz: 43d1b328973b54ef6623db8e216a2d5a6d84098582ccb674e998ae181b88171a
+  metadata.gz: c7e53178ed391a9de1b1841a29f7655f66aa61e70d54e3a00df830550f71c70a
+  data.tar.gz: 462c26605e5db213de957fa7d6afd076849b500e93e4dc45f2ea0cc57a927ba5
 SHA512:
-  metadata.gz: 5a9e727d815c173b8be85a47cf65110a48e5e3e65bf370764a29d12060f5da85e2b4a444f35e87c15e4c328795834f3e315a351993deb46fad1d8e7432b78a06
-  data.tar.gz: 655d2a8362d581afb7074b8b00abbd97e496071bb5ce373dd4f475c04e881dc5a8406d4ecd95d7921c29d5e2346aaac7b6f532f54a2c7b31223f5dee38a4ab9f
+  metadata.gz: 278fbc63da4056d07904f48547e4ac40942e380194294d1836dbe866c665e16799e12e2fbcd1f47efc65ccfaab80bb84ce2c91e40ca53395e1648cd7d0cdcf9c
+  data.tar.gz: d35e2da1526d2b9f069227b72e048e2c55c38995dd539760b8338e8087afd487afe0257e45551b33921895781a16d04022d9c56cda2b8ef9294b0e95ec9d46de

data/lib/active_interactor/{has_active_model_errors.rb → active_model_error_methods.rb}

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 module ActiveInteractor
-  module HasActiveModelErrors
+  module ActiveModelErrorMethods
     extend ActiveSupport::Concern
 
     attr_reader :errors

data/lib/active_interactor/base.rb

@@ -1,112 +1,7 @@
 # frozen_string_literal: true
 
 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
-
-      def input_context_class
-        @input_context_class ||= const_set(:InputContext, Class.new(Context::Input))
-      end
-
-      def accepts_arguments_matching(set_input_context_class)
-        @input_context_class = set_input_context_class
-      end
-      alias input_context accepts_arguments_matching
-
-      def output_context_class
-        @output_context_class ||= const_set(:OutputContext, Class.new(Context::Output))
-      end
-
-      def perform!(input_context = {})
-        new(input_context).perform!
-      end
-
-      def perform(input_context = {})
-        perform!(input_context)
-      rescue Error => e
-        e.result
-      rescue StandardError => e
-        Result.failure(errors: e.message)
-      end
-
-      def returns_data_matching(set_output_context_class)
-        @output_context_class = set_output_context_class
-      end
-      alias output_context returns_data_matching
-
-      def runtime_context_class
-        @runtime_context_class ||= begin
-          context_class = const_set(:RuntimeContext, Class.new(Context::Runtime))
-          context_class.send(:attribute_set).merge(input_context_class.send(:attribute_set).attributes)
-          context_class.send(:attribute_set).merge(output_context_class.send(:attribute_set).attributes)
-          context_class
-        end
-      end
-    end
-
-    def initialize(input = {})
-      @raw_input = input.dup
-      validate_input_and_generate_runtime_context!
-    end
-
-    def perform!
-      with_notification(:perform) do |payload|
-        interact
-        generate_and_validate_output_context!
-        payload[:result] = Result.success(data: @output)
-      end
-    end
-
-    def perform
-      perform!
-    rescue Error => e
-      e.result
-    rescue StandardError => e
-      Result.failure(errors: e.message)
-    end
-
-    def interact; end
-    def rollback; end
-
-    protected
-
-    attr_accessor :context
-
-    def fail!(errors = {})
-      result = nil
-      with_notification(:rollback) do |payload|
-        rollback
-        result = Result.failure(data: parse_output!, errors: errors)
-        payload[:result] = result
-      end
-
-      raise Error, result
-    end
-
-    def generate_and_validate_output_context!
-      @output = self.class.output_context_class.new(context.attributes)
-      @output.validate!
-      return @output if @output.errors.empty?
-
-      raise Error, Result.failure(errors: @output.errors, status: Result::STATUS[:failed_at_output])
-    end
-
-    def validate_input_and_generate_runtime_context!
-      @input = self.class.input_context_class.new(@raw_input)
-      @input.validate!
-      return (@context = self.class.runtime_context_class.new(@raw_input)) if @input.errors.empty?
-
-      raise Error, Result.failure(errors: @input.errors, status: Result::STATUS[:failed_at_input])
-    end
-
-    def with_notification(action)
-      ActiveSupport::Notifications.instrument("#{self.class.name}::#{action.to_s.classify}") do |payload|
-        yield payload if block_given?
-      end
-    end
+  class Base < ActiveInteractor::Interactor::Base
+    include Type::DeclerationMethods
   end
 end

data/lib/active_interactor/context/attribute_assignment.rb

@@ -36,16 +36,14 @@ module ActiveInteractor
                 "wrong number of arguments (given #{arguments.length}, expected 1)"
         end
 
-        assign_attribute_value(method_name, arguments.first)
+        assign_attribute_value(method_name.to_s.delete('=').to_sym, arguments.first)
       end
 
-      def method_missing(method_id, *arguments)
-        return super unless respond_to_missing?(method_id)
+      def method_missing(method_name, *arguments)
+        return super unless respond_to_missing?(method_name)
+        return assignment_method_missing(method_name, *arguments) if method_name.to_s.end_with?('=')
 
-        method_name = method_id[/.*(?==\z)/m]
-        return assignment_method_missing(method_name, *arguments) if method_name
-
-        read_attribute_value(method_id)
+        read_attribute_value(method_name)
       end
 
       def read_attribute_value(attribute_name)
@@ -57,7 +55,7 @@ module ActiveInteractor
 
       def respond_to_missing?(method_name, _include_private = false)
         return true if attribute_set.attribute_names.include?(method_name.to_sym)
-        return true if attribute_set.attribute_names.include?(method_name[/.*(?==\z)/m]&.to_sym)
+        return true if attribute_set.attribute_names.include?(method_name.to_s.delete('=').to_sym)
 
         super
       end

data/lib/active_interactor/context/base.rb

@@ -3,11 +3,10 @@
 module ActiveInteractor
   module Context
     class Base
-      include ActiveModel::Validations
-      include HasActiveModelErrors
+      include ActiveModelErrorMethods
       include AttributeRegistration
       include AttributeAssignment
-      include Type::HasTypes
+      include Type::DeclerationMethods
 
       def initialize(attributes = {})
         super

data/lib/active_interactor/context/result.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Context
+    class Result
+      def self.register_owner(owner)
+        owner.const_set(:ResultContext, Class.new(self))
+      end
+
+      def self.for_output_context(owner, context)
+        context.fields.each_key { |field| owner::ResultContext.send(:attr_reader, field) }
+        owner::ResultContext.new(context.fields)
+      end
+
+      def initialize(attributes = {})
+        attributes.each_pair { |key, value| instance_variable_set(:"@#{key}", value) }
+      end
+    end
+  end
+end

data/lib/active_interactor/context/runtime.rb

@@ -28,11 +28,10 @@ module ActiveInteractor
         @table[attribute_name.to_sym] = value
       end
 
-      def method_missing(method_id, *arguments)
-        method_name = method_id[/.*(?==\z)/m]
-        return assignment_method_missing(method_name, *arguments) if method_name
+      def method_missing(method_name, *arguments)
+        return assignment_method_missing(method_name, *arguments) if method_name.to_s.end_with?('=')
 
-        read_attribute_value(method_id)
+        read_attribute_value(method_name)
       end
 
       def read_attribute_value(attribute_name)

data/lib/active_interactor/context.rb

@@ -11,6 +11,7 @@ module ActiveInteractor
     autoload :Base
     autoload :Input
     autoload :Output
+    autoload :Result
     autoload :Runtime
   end
 end

data/lib/active_interactor/interactor/base.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Interactor
+    class Base
+      include ContextMethods
+      include InteractionMethods
+
+      def initialize(input = {})
+        @raw_input = input.dup
+        validate_input_and_generate_runtime_context!
+      end
+
+      def perform!
+        with_notification(:perform) do |payload|
+          interact
+          generate_and_validate_output_context!
+          payload[:result] = Result.success(data: output_to_result_context!)
+        end
+      end
+
+      protected
+
+      def fail!(errors = {})
+        result = nil
+        with_notification(:rollback) do |payload|
+          rollback
+          result = Result.failure(data: parse_output!, errors: errors)
+          payload[:result] = result
+        end
+
+        raise Error, result
+      end
+
+      def with_notification(action)
+        ActiveSupport::Notifications.instrument("#{self.class.name}::#{action.to_s.classify}") do |payload|
+          yield payload if block_given?
+        end
+      end
+    end
+  end
+end

data/lib/active_interactor/interactor/context_methods.rb

@@ -0,0 +1,79 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Interactor
+    module ContextMethods
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        delegate :argument, :argument_names, :arguments, to: :input_context_class
+        delegate :returns, :field_names, :fields, to: :output_context_class
+
+        def input_context_class
+          @input_context_class ||= const_set(:InputContext, Class.new(Context::Input))
+        end
+
+        def accepts_arguments_matching(set_input_context_class)
+          @input_context_class = set_input_context_class
+        end
+        alias input_context accepts_arguments_matching
+        alias input_type accepts_arguments_matching
+
+        def output_context_class
+          @output_context_class ||= const_set(:OutputContext, Class.new(Context::Output))
+        end
+
+        def returns_data_matching(set_output_context_class)
+          @output_context_class = set_output_context_class
+        end
+        alias output_context returns_data_matching
+        alias output_type returns_data_matching
+
+        def runtime_context_class
+          @runtime_context_class ||= begin
+            context_class = const_set(:RuntimeContext, Class.new(Context::Runtime))
+            context_class.send(:attribute_set).merge(input_context_class.send(:attribute_set).attributes)
+            context_class.send(:attribute_set).merge(output_context_class.send(:attribute_set).attributes)
+            context_class
+          end
+        end
+
+        protected
+
+        def result_context
+          @result_context ||= Context::Result.register_owner(self)
+        end
+      end
+
+      included do
+        extend ClassMethods
+
+        protected
+
+        attr_reader :context
+      end
+
+      protected # rubocop:disable Lint/UselessAccessModifier
+
+      def generate_and_validate_output_context!
+        @output = self.class.output_context_class.new(context.attributes)
+        @output.validate!
+        return if @output.errors.empty?
+
+        raise Error, Result.failure(errors: @output.errors, status: Result::STATUS[:failed_at_output])
+      end
+
+      def output_to_result_context!
+        self.class.send(:result_context).for_output_context(self.class, @output)
+      end
+
+      def validate_input_and_generate_runtime_context!
+        @input = self.class.input_context_class.new(@raw_input)
+        @input.validate!
+        return (@context = self.class.runtime_context_class.new(@raw_input)) if @input.errors.empty?
+
+        raise Error, Result.failure(errors: @input.errors, status: Result::STATUS[:failed_at_input])
+      end
+    end
+  end
+end

data/lib/active_interactor/interactor/interaction_methods.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Interactor
+    module InteractionMethods
+      extend ActiveSupport::Concern
+
+      module ClassMethods
+        def perform!(input_context = {})
+          new(input_context).perform!
+        end
+
+        def perform(input_context = {})
+          perform!(input_context)
+        rescue Error => e
+          e.result
+        rescue StandardError => e
+          Result.failure(errors: e.message)
+        end
+      end
+
+      included do
+        extend ClassMethods
+      end
+
+      def perform
+        perform!
+      rescue Error => e
+        e.result
+      rescue StandardError => e
+        Result.failure(errors: e.message)
+      end
+
+      def interact; end
+      def rollback; end
+    end
+  end
+end

data/lib/active_interactor/interactor.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+module ActiveInteractor
+  module Interactor
+    extend ActiveSupport::Autoload
+
+    autoload :Base
+    autoload :ContextMethods
+    autoload :InteractionMethods
+  end
+end

data/lib/active_interactor/result.rb

@@ -2,7 +2,7 @@
 
 module ActiveInteractor
   class Result
-    include HasActiveModelErrors
+    include ActiveModelErrorMethods
 
     delegate :to_json, to: :to_hash
 
@@ -68,7 +68,7 @@ module ActiveInteractor
       {
         success: success?,
         errors: errors.to_hash,
-        data: data.to_hash
+        data: data.to_json
       }
     end
     alias to_h to_hash

data/lib/active_interactor/type/{has_types.rb → decleration_methods.rb}

@@ -2,7 +2,7 @@
 
 module ActiveInteractor
   module Type
-    module HasTypes
+    module DeclerationMethods
       extend ActiveSupport::Concern
 
       Boolean = ActiveInteractor::Type::Boolean

data/lib/active_interactor/type.rb

@@ -6,7 +6,7 @@ module ActiveInteractor
 
     autoload :Base
     autoload :Boolean
-    autoload :HasTypes
+    autoload :DeclerationMethods
     autoload :List
     autoload :Union
   end

data/lib/active_interactor.rb

@@ -9,9 +9,10 @@ require_relative 'active_interactor/errors'
 module ActiveInteractor
   extend ActiveSupport::Autoload
 
+  autoload :ActiveModelErrorMethods
   autoload :Base
   autoload :Context
-  autoload :HasActiveModelErrors
+  autoload :Interactor
   autoload :Result
   autoload :Type
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activeinteractor
 version: !ruby/object:Gem::Version
-  version: 2.0.0.alpha.2.3.1
+  version: 2.0.0.alpha.2.3.3
 platform: ruby
 authors:
 - Aaron Allen
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-12 00:00:00.000000000 Z
+date: 2023-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -63,6 +63,7 @@ files:
 - LICENSE
 - README.md
 - lib/active_interactor.rb
+- lib/active_interactor/active_model_error_methods.rb
 - lib/active_interactor/base.rb
 - lib/active_interactor/context.rb
 - lib/active_interactor/context/attribute.rb
@@ -72,14 +73,18 @@ files:
 - lib/active_interactor/context/base.rb
 - lib/active_interactor/context/input.rb
 - lib/active_interactor/context/output.rb
+- lib/active_interactor/context/result.rb
 - lib/active_interactor/context/runtime.rb
 - lib/active_interactor/errors.rb
-- lib/active_interactor/has_active_model_errors.rb
+- lib/active_interactor/interactor.rb
+- lib/active_interactor/interactor/base.rb
+- lib/active_interactor/interactor/context_methods.rb
+- lib/active_interactor/interactor/interaction_methods.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/decleration_methods.rb
 - lib/active_interactor/type/list.rb
 - lib/active_interactor/type/union.rb
 - sig/active_interactor.rbs
@@ -88,9 +93,9 @@ 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.3.1/CHANGELOG.md
+  changelog_uri: https://github.com/activeinteractor/activeinteractor/blob/v2.0.0-alpha.2.3.3/CHANGELOG.md
   homepage_uri: https://github.com/activeinteractor/activeinteractor
-  source_code_uri: https://github.com/activeinteractor/activeinteractor/tree/v2.0.0-alpha.2.3.1
+  source_code_uri: https://github.com/activeinteractor/activeinteractor/tree/v2.0.0-alpha.2.3.3
   wiki_uri: https://github.com/activeinteractor/activeinteractor/wiki
   rubygems_mfa_required: 'true'
 post_install_message: