subroutine 0.10.0.beta → 0.10.0.beta2

data/test/support/ops.rb

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-require 'subroutine/auth'
-require 'subroutine/association'
+require "subroutine/auth"
+require "subroutine/association_fields"
 
 ## Models ##
 
 class User
+
   include ::ActiveModel::Model
 
   attr_accessor :id
@@ -17,15 +18,19 @@ class User
   def self.find(id)
     new(id: id)
   end
+
 end
 
 class AdminUser < ::User
-  validates :email_address, format: { with: /@admin\.com/, message: 'has gotta be @admin.com' }
+
+  validates :email_address, format: { with: /@admin\.com/, message: "has gotta be @admin.com" }
+
 end
 
 ## Ops ##
 
 class SignupOp < ::Subroutine::Op
+
   string :email, aka: :email_address
   string :password
 
@@ -63,43 +68,57 @@ class SignupOp < ::Subroutine::Op
   def user_class
     ::User
   end
+
 end
 
 class AdminSignupOp < ::SignupOp
-  field :privileges, default: 'min'
+
+  field :privileges, default: "min"
 
   protected
 
   def user_class
     ::AdminUser
   end
+
 end
 
 class BusinessSignupOp < ::Subroutine::Op
+
   string :business_name
 
   inputs_from ::SignupOp
+
 end
 
 class DefaultsOp < ::Subroutine::Op
-  field :foo, default: 'foo'
-  field :bar, default: 'bar'
+
+  field :foo, default: "foo"
+  field :bar, default: "bar"
   field :baz, default: false
+
 end
 
 class ExceptFooBarOp < ::Subroutine::Op
-  inputs_from ::DefaultsOp, except: [:foo, :bar]
+
+  inputs_from ::DefaultsOp, except: %i[foo bar]
+
 end
 
 class OnlyFooBarOp < ::Subroutine::Op
-  inputs_from ::DefaultsOp, only: [:foo, :bar]
+
+  inputs_from ::DefaultsOp, only: %i[foo bar]
+
 end
 
 class InheritedDefaultsOp < ::DefaultsOp
-  field :bar, default: 'barstool'
+
+  field :bar, default: "barstool", allow_overwrite: true
+
 end
 
 class TypeCastOp < ::Subroutine::Op
+
   integer :integer_input
   number :number_input
   decimal :decimal_input
@@ -110,39 +129,51 @@ class TypeCastOp < ::Subroutine::Op
   iso_date :iso_date_input
   iso_time :iso_time_input
   object :object_input
-  array :array_input, default: 'foo'
+  array :array_input, default: "foo"
   array :type_array_input, of: :integer
   file :file_input
+
 end
 
 class OpWithAuth < ::Subroutine::Op
+
   include ::Subroutine::Auth
   def perform
     true
   end
+
 end
 
 class MissingAuthOp < OpWithAuth
 end
 
 class RequireUserOp < OpWithAuth
+
   require_user!
+
 end
 
 class RequireNoUserOp < OpWithAuth
+
   require_no_user!
+
 end
 
 class NoUserRequirementsOp < OpWithAuth
+
   no_user_requirements!
+
 end
 
 class DifferentUserClassOp < OpWithAuth
+
   self.user_class_name = "AdminUser"
   require_user!
+
 end
 
 class CustomAuthorizeOp < OpWithAuth
+
   require_user!
   authorize :authorize_user_is_correct
 
@@ -151,13 +182,17 @@ class CustomAuthorizeOp < OpWithAuth
   def authorize_user_is_correct
     unauthorized! unless current_user.email_address.to_s =~ /example\.com$/
   end
+
 end
 
 class PolicyOp < OpWithAuth
+
   class FakePolicy
+
     def user_can_access?
       false
     end
+
   end
 
   require_user!
@@ -166,13 +201,17 @@ class PolicyOp < OpWithAuth
   def policy
     @policy ||= FakePolicy.new
   end
+
 end
 
 class IfConditionalPolicyOp < OpWithAuth
+
   class FakePolicy
+
     def user_can_access?
       false
     end
+
   end
 
   require_user!
@@ -183,13 +222,17 @@ class IfConditionalPolicyOp < OpWithAuth
   def policy
     @policy ||= FakePolicy.new
   end
+
 end
 
 class UnlessConditionalPolicyOp < OpWithAuth
+
   class FakePolicy
+
     def user_can_access?
       false
     end
+
   end
 
   require_user!
@@ -200,95 +243,149 @@ class UnlessConditionalPolicyOp < OpWithAuth
   def policy
     @policy ||= FakePolicy.new
   end
+
 end
 
 class OpWithAssociation < ::Subroutine::Op
-  include ::Subroutine::Association
+
+  include ::Subroutine::AssociationFields
+
 end
 
 class SimpleAssociationOp < ::OpWithAssociation
+
   association :user
+
 end
 
 class UnscopedSimpleAssociationOp < ::OpWithAssociation
-  association :user, unscoped: true
+
+  association :user, unscoped: true, allow_overwrite: true
+
 end
 
 class PolymorphicAssociationOp < ::OpWithAssociation
+
   association :admin, polymorphic: true
+
 end
 
 class AssociationWithClassOp < ::OpWithAssociation
-  association :admin, class_name: 'AdminUser'
+
+  association :admin, class_name: "AdminUser"
+
 end
 
 class InheritedSimpleAssociation < ::Subroutine::Op
+
   inputs_from SimpleAssociationOp
+
 end
 
 class InheritedUnscopedAssociation < ::Subroutine::Op
+
   inputs_from UnscopedSimpleAssociationOp
+
 end
 
 class InheritedPolymorphicAssociationOp < ::Subroutine::Op
+
   inputs_from PolymorphicAssociationOp
+
 end
 
 class FalsePerformOp < ::Subroutine::Op
+
   def perform
     false
   end
+
 end
 
 class MissingOutputOp < ::Subroutine::Op
+
   def perform
-    output :foo, 'bar'
+    output :foo, "bar"
   end
+
 end
 
 class MissingOutputSetOp < ::Subroutine::Op
+
   outputs :foo
   def perform
     true
   end
+
 end
 
 class OutputNotRequiredOp < ::Subroutine::Op
+
   outputs :foo, required: false
   def perform
     true
   end
+
 end
 
 class NoOutputNoSuccessOp < ::Subroutine::Op
+
   outputs :foo
   def perform
-    errors.add(:foo, 'bar')
+    errors.add(:foo, "bar")
   end
+
 end
 
 class ErrorTraceOp < ::Subroutine::Op
+
   class SomeObject
+
     include ::ActiveModel::Model
     include ::ActiveModel::Validations::Callbacks
 
     def foo
-      errors.add(:base, 'Failure of things')
+      errors.add(:base, "Failure of things")
       raise Subroutine::Failure, self
     end
 
     def bar
       foo
     end
+
   end
 
   class SubOp < ::Subroutine::Op
+
     def perform
       SomeObject.new.bar
     end
+
   end
 
   def perform
     SubOp.submit!
   end
+
+end
+
+class CustomFailureClassOp < ::Subroutine::Op
+
+  class Failure < StandardError
+
+    attr_reader :record
+    def initialize(record)
+      @record = record
+      errors = @record.errors.full_messages.join(", ")
+      super(errors)
+    end
+
+  end
+
+  failure_class Failure
+
+  def perform
+    errors.add(:base, "Will never work")
+  end
+
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: subroutine
 version: !ruby/object:Gem::Version
-  version: 0.10.0.beta
+  version: 0.10.0.beta2
 platform: ruby
 authors:
 - Mike Nelson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-11-14 00:00:00.000000000 Z
+date: 2019-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -144,14 +144,20 @@ files:
 - gemfiles/am52.gemfile
 - gemfiles/am60.gemfile
 - lib/subroutine.rb
-- lib/subroutine/association.rb
+- lib/subroutine/association_fields.rb
+- lib/subroutine/association_fields/component_configuration.rb
+- lib/subroutine/association_fields/configuration.rb
 - lib/subroutine/auth.rb
 - lib/subroutine/failure.rb
 - lib/subroutine/fields.rb
+- lib/subroutine/fields/configuration.rb
+- lib/subroutine/fields/mass_assignment_error.rb
 - lib/subroutine/op.rb
-- lib/subroutine/output_not_set_error.rb
+- lib/subroutine/outputs.rb
+- lib/subroutine/outputs/configuration.rb
+- lib/subroutine/outputs/output_not_set_error.rb
+- lib/subroutine/outputs/unknown_output_error.rb
 - lib/subroutine/type_caster.rb
-- lib/subroutine/unknown_output_error.rb
 - lib/subroutine/version.rb
 - subroutine.gemspec
 - test/subroutine/association_test.rb
@@ -180,8 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14.4
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Feature-driven operation objects.

data/lib/subroutine/association.rb

@@ -1,131 +0,0 @@
-# frozen_string_literal: true
-require "active_support/concern"
-
-module Subroutine
-  module Association
-    extend ActiveSupport::Concern
-
-    included do
-      class << self
-        alias_method :field_without_associations, :field
-        alias_method :field, :field_with_associations
-      end
-
-      alias_method :setup_fields_without_association, :setup_fields
-      alias_method :setup_fields, :setup_fields_with_association
-    end
-
-    module ClassMethods
-      def field_with_associations(*args)
-        opts = args.extract_options!
-        if opts[:association]
-          args.each do |arg|
-            association(arg, opts)
-          end
-        else
-          field_without_associations(*args, opts)
-        end
-      end
-
-      # association :user
-      #  - user_id
-      #  - user_type => "User"
-
-      # association :user, polymorphic: true
-      #  - user_id
-      #  - user_type
-      #  - user => polymorphic_lookup(user_type, user_id)
-
-      # association :inbound_user_request, as: :request
-      #  - inbound_user_request_id
-      #  - inbound_user_request_type => "InboundUserRequest"
-      #  - request => polymorphic_lookup(inbound_user_request_type, inbound_user_request_id)
-
-      # association :inbound_user_request, foreign_key: :request_id
-      #  - request_id
-      #  - request_type
-      #  - inbound_user_request => polymorphic_lookup(request_type, request_id)
-
-      # Other options:
-      # - unscoped => set true if the record should be looked up via Type.unscoped
-
-      def association(field, options = {})
-        if options[:as] && options[:foreign_key]
-          raise ArgumentError, ':as and :foreign_key options should be provided together to an association invocation'
-        end
-
-        class_name = options[:class_name]
-
-        poly = options[:polymorphic] || !class_name.nil?
-        as = options[:as] || field
-        unscoped = !!options[:unscoped]
-
-        klass = class_name.to_s if class_name
-
-        foreign_key_method = (options[:foreign_key] || "#{field}_id").to_s
-        foreign_type_method = foreign_key_method.gsub(/_id$/, '_type')
-
-        if poly
-          string foreign_type_method
-        else
-          class_eval <<-EV, __FILE__, __LINE__ + 1
-            def #{foreign_type_method}
-              #{as.to_s.camelize.inspect}
-            end
-          EV
-        end
-
-        integer foreign_key_method
-
-        field_without_associations as, options.merge(association: true, field_writer: false, field_reader: false)
-
-        class_eval <<-EV, __FILE__, __LINE__ + 1
-          try(:silence_redefinition_of_method, :#{as})
-          def #{as}
-            return @#{as} if defined?(@#{as})
-            @#{as} = polymorphic_instance(#{klass.nil? ? foreign_type_method : klass.to_s}, #{foreign_key_method}, #{unscoped.inspect})
-          end
-
-          try(:silence_redefinition_of_method, :#{as}=)
-          def #{as}=(r)
-            @#{as} = r
-            #{poly || klass ? "send('#{foreign_type_method}=', r.nil? ? nil : #{klass.nil? ? 'r.class.name' : klass.to_s.inspect})" : ''}
-            send('#{foreign_key_method}=', r.nil? ? nil : r.id)
-            r
-          end
-
-          try(:silence_redefinition_of_method, :#{as}_field_provided?)
-          def #{as}_field_provided?
-            field_provided?('#{foreign_key_method}')#{poly ? "&& field_provided?('#{foreign_type_method}')" : ""}
-          end
-        EV
-      end
-    end
-
-    def setup_fields_with_association(*args)
-      setup_fields_without_association(*args)
-
-      _fields.each_pair do |field, config|
-        next unless config[:association]
-        next if config[:mass_assignable] == false
-        next unless @original_params.key?(field)
-
-        send("#{field}=", @original_params[field]) # this gets the _id and _type into the params hash
-      end
-    end
-
-    def polymorphic_instance(_type, _id, _unscoped = false)
-      return nil unless _type && _id
-
-      klass = _type
-      klass = klass.classify.constantize if klass.is_a?(String)
-
-      return nil unless klass
-
-      scope = klass.all
-      scope = scope.unscoped if _unscoped
-
-      scope.find(_id)
-    end
-  end
-end

data/lib/subroutine/output_not_set_error.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Subroutine
-  class OutputNotSetError < StandardError
-    def initialize(name)
-      super("Expected output '#{name}' to be set upon completion of perform but was not.")
-    end
-  end
-end

data/lib/subroutine/unknown_output_error.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-module Subroutine
-  class UnknownOutputError < StandardError
-    def initialize(name)
-      super("Unknown output '#{name}'")
-    end
-  end
-end