active_interaction-extras 1.0.4 → 2.0.0

data/lib/active_interaction/extras/nested_attributes.rb

@@ -0,0 +1,126 @@
+# inspired by store_model/nested_attributes.rb
+module ActiveInteraction::Extras::NestedAttributes
+  extend ActiveSupport::Concern
+
+  module InputsExtension
+    extend ActiveSupport::Concern
+
+    def normalize(inputs)
+      if @base.class.respond_to? :nested_attribute_options
+        @base.class.nested_attribute_options.each do |attribute, options|
+          alias_name = "#{attribute}_attributes"
+          next if !inputs.key?(alias_name) && !inputs.key?(alias_name.to_sym)
+
+          value = inputs[alias_name] || inputs[alias_name.to_sym]
+          value = @base.class.process_nested_collection(value, options)
+
+          inputs[attribute.to_s] = value
+        end
+      end
+
+      super
+    end
+  end
+
+  included do
+    ActiveInteraction::Inputs.prepend InputsExtension
+
+    class_attribute :nested_attribute_options, default: {}
+  end
+
+  class_methods do
+    def accepts_nested_attributes_for(*attributes)
+      options = attributes.extract_options!
+      options.reverse_merge!(allow_destroy: false, update_only: false)
+
+      if options.key?(:permit)
+        if options[:permit].is_a?(Array)
+          options[:permit] |= [:id, :_destroy]
+        end
+      else
+        raise ArgumentError, "missing :permit option"
+      end
+
+      attributes.each do |attribute|
+        nested_attribute_options[attribute] = options
+
+        case filters[attribute]
+        when ActiveInteraction::ArrayFilter
+          define_association_setter_for_many attribute, options
+        else
+          define_association_setter_for_single(attribute, options)
+          define_method "#{attribute}_attributes=" do |*args, **kwargs|
+            send("#{attribute}=", *args, **kwargs)
+          end
+        end
+      end
+    end
+
+    def define_association_setter_for_many(association, options)
+      define_method "#{association}_attributes=" do |attributes|
+        attributes = self.class.process_nested_collection(attributes, options)
+        send("#{association}=", attributes)
+      end
+    end
+
+    def define_association_setter_for_single(association, options)
+      return unless options&.dig(:allow_destroy)
+
+      define_method "#{association}=" do |attributes|
+        if ActiveRecord::Type::Boolean.new.cast(attributes.stringify_keys.dig("_destroy"))
+          super(nil)
+        else
+          super(attributes)
+        end
+      end
+    end
+
+    def process_nested_collection(attributes, options = nil)
+      attributes = attributes.values if attributes.is_a?(Hash)
+      if options&.dig(:allow_destroy)
+        attributes.reject! do |attribute|
+          ActiveRecord::Type::Boolean.new.cast(attribute.stringify_keys.dig("_destroy"))
+        end
+      end
+
+      attributes.reject! { |attribute| call_reject_if(attribute, options[:reject_if]) } if options&.dig(:reject_if)
+
+      attributes
+    end
+
+    def call_reject_if(attributes, callback)
+      callback = ActiveRecord::NestedAttributes::ClassMethods::REJECT_ALL_BLANK_PROC if callback == :all_blank
+
+      case callback
+      when Symbol
+        method(callback).arity.zero? ? send(callback) : send(callback, attributes)
+      when Proc
+        callback.call(attributes)
+      end
+    end
+  end
+
+  def assign_collection_association(model, association_name, attributes_collection, destroy_missing: false, **options)
+
+    if attributes_collection.is_a?(ActiveRecord::Associations::CollectionProxy)
+      return attributes_collection
+    end
+
+    model.instance_exec do
+      begin
+        old_options = nested_attributes_options[association_name]
+        nested_attributes_options[association_name] = options
+
+        list = assign_nested_attributes_for_collection_association(association_name, attributes_collection)
+
+        if destroy_missing
+          association(association_name).scope.excluding(list).each(&:destroy!)
+        end
+
+        list
+      ensure
+        nested_attributes_options[association_name] = old_options
+      end
+    end
+  end
+end

data/lib/active_interaction/extras/strong_params.rb

@@ -5,6 +5,8 @@ module ActiveInteraction::Extras::StrongParams
     # TODO: whitelist :params and :form_params, so they could not be used as filters
     return super if self.class.filters.key?(:params) || self.class.filters.key?(:form_params)
 
+    return super if %i[fetch key? merge].any? { |m| !inputs.respond_to?(m) }
+
     if inputs.key?(:params) && inputs.key?(:form_params)
       raise ArgumentError, 'Both options :params and :form_params are given. ' \
       'One or none are accepted.'
@@ -27,18 +29,56 @@ module ActiveInteraction::Extras::StrongParams
 
   class_methods do
     def permitted_params
-      filters.map do |filter_name, filter|
-        next unless filter.options[:permit]
-
-        case filter
-        when ActiveInteraction::ArrayFilter
-          { filter_name => [] }
-        when ActiveInteraction::HashFilter
-          { filter_name => {} }
+      permissions = filters.map do |filter_name, filter|
+        [
+          permission_for_filter(filter, filter_name),
+          # (permission_for_filter(filter, filter.options[:as]) if filter.options[:as])
+        ]
+      end.flatten(1).compact
+
+      if respond_to?(:nested_attribute_options)
+        nested_attribute_options.each do |attribute, opts|
+          permitted_list = opts.fetch(:permit)
+          permissions << {"#{attribute}_attributes": permitted_list}
+        end
+      end
+
+      permissions
+    end
+
+    def permission_for_filter(filter, name = filter.name)
+      permit = filter.options[:permit]
+      return unless permit
+
+      case filter
+      when ActiveInteraction::ArrayFilter
+        value =
+          if permit == true
+            nested_type = filter.filters.values.first
+            case nested_type
+            when ActiveInteraction::HashFilter, ActiveInteraction::ObjectFilter
+              {}
+            else
+              []
+            end
+          else
+            permit
+          end
+
+        { name => value }
+      when ActiveInteraction::HashFilter, ActiveInteraction::ObjectFilter
+        if permit == true
+          { name => {} }
         else
-          filter_name
+          { name => permit }
         end
-      end.compact
+      else
+        if permit == true
+          name
+        else
+          { name => permit }
+        end
+      end
     end
   end
 end

data/lib/active_interaction/extras/transaction.rb

@@ -6,22 +6,44 @@ module ActiveInteraction::Extras::Transaction
 
   included do
     class_attribute :run_in_transaction_options
-    set_callback :execute, :around, ->(_interaction, block) {
+
+    around_execute if: :run_in_transaction_options do |_interaction, block|
       ActiveRecord::Base.transaction(**run_in_transaction_options) do
         block.call
         raise ActiveRecord::Rollback if _interaction.errors.any?
       end
-    }, if: :run_in_transaction_options
+    end
   end
 
   class_methods do
     # https://pragtob.wordpress.com/2017/12/12/surprises-with-nested-transactions-rollbacks-and-activerecord/
-    def run_in_transaction!(requires_new: true)
-      self.run_in_transaction_options = {requires_new: requires_new}
+    def run_in_transaction!(enabled = true, requires_new: true)
+      value =
+        if enabled
+          { requires_new: requires_new }
+        else
+          false
+        end
+
+      self.run_in_transaction_options = value
     end
 
     def skip_run_in_transaction!
-      self.run_in_transaction_options = nil
+      self.run_in_transaction_options = false
+    end
+
+    def force_explicit_transactions!
+      before_filter do
+        if run_in_transaction_options.nil?
+          raise "Missing transaction definition. Add `run_in_transaction!`."
+        end
+      end
+    end
+
+    def list_missing_transaction_definition
+      Zeitwerk::Loader.eager_load_all
+      descendants
+        .select { |klass| klass.run_in_transaction_options.nil? }
     end
   end
 end

data/lib/active_interaction/extras/version.rb

@@ -1,5 +1,5 @@
 module ActiveInteraction
   module Extras
-    VERSION = "1.0.4"
+    VERSION = "2.0.0"
   end
 end

data/lib/active_interaction/extras.rb

@@ -1,38 +1,25 @@
 require "active_interaction/extras/version"
 
 require 'active_support'
+require 'active_support/core_ext/class/attribute'
 require 'active_interaction'
 
-module ActiveInteraction
-  module Extras
-    module Filters
-    end
-
-    module FilterExtensions
-    end
-
-    module Jobs
-      autoload(:Core, "active_interaction/extras/jobs/core")
-    end
+require 'zeitwerk'
 
-    autoload(:All, "active_interaction/extras/all")
-
-    autoload(:FilterAlias, "active_interaction/extras/filter_alias")
-    autoload(:Halt, "active_interaction/extras/halt")
-    autoload(:ModelFields, "active_interaction/extras/model_fields")
-    autoload(:RunCallback, "active_interaction/extras/run_callback")
-    autoload(:StrongParams, "active_interaction/extras/strong_params")
-    autoload(:Transaction, "active_interaction/extras/transaction")
+loader = Zeitwerk::Loader.for_gem_extension(ActiveInteraction)
+loader.inflector.inflect(
+  'uuid_filter' => 'UUIDFilter',
+)
+loader.setup
 
-    autoload(:TimezoneSupport, "active_interaction/extras/timezone_support")
-    autoload(:Rspec, "active_interaction/extras/rspec")
+module ActiveInteraction
+  module Extras
 
-    autoload(:ActiveJob, "active_interaction/extras/active_job")
-    autoload(:Sidekiq, "active_interaction/extras/sidekiq")
   end
 end
 
 require 'active_interaction/extras/filters/anything_filter'
+require 'active_interaction/extras/filters/ar_relation_filter'
 require 'active_interaction/extras/filters/uuid_filter'
 
 I18n.load_path.unshift(

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: active_interaction-extras
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 2.0.0
 platform: ruby
 authors:
 - Anton Katunin
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_interaction
@@ -16,54 +15,74 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.2
+        version: '5.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6.0'
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
@@ -114,14 +133,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -185,18 +204,33 @@ files:
 - bin/setup
 - lib/active_interaction/extras.rb
 - lib/active_interaction/extras/active_job.rb
+- lib/active_interaction/extras/add_to_batch.rb
+- lib/active_interaction/extras/after_initialize.rb
 - lib/active_interaction/extras/all.rb
+- lib/active_interaction/extras/all_runner.rb
+- lib/active_interaction/extras/append_inputs.rb
+- lib/active_interaction/extras/current.rb
+- lib/active_interaction/extras/file_blobs.rb
 - lib/active_interaction/extras/filter_alias.rb
 - lib/active_interaction/extras/filter_extensions.rb
 - lib/active_interaction/extras/filter_extensions/hash_auto_strip.rb
 - lib/active_interaction/extras/filter_extensions/object_classes.rb
 - lib/active_interaction/extras/filter_extensions/timezone_support.rb
 - lib/active_interaction/extras/filters/anything_filter.rb
+- lib/active_interaction/extras/filters/ar_relation_filter.rb
 - lib/active_interaction/extras/filters/uuid_filter.rb
+- lib/active_interaction/extras/form_for.rb
+- lib/active_interaction/extras/good_job.rb
 - lib/active_interaction/extras/halt.rb
+- lib/active_interaction/extras/include_errors.rb
+- lib/active_interaction/extras/initialize_with.rb
+- lib/active_interaction/extras/instance_runnable.rb
 - lib/active_interaction/extras/jobs/core.rb
 - lib/active_interaction/extras/locale/en.yml
 - lib/active_interaction/extras/model_fields.rb
+- lib/active_interaction/extras/model_names.rb
+- lib/active_interaction/extras/named_callbacks.rb
+- lib/active_interaction/extras/nested_attributes.rb
 - lib/active_interaction/extras/rspec.rb
 - lib/active_interaction/extras/run_callback.rb
 - lib/active_interaction/extras/sidekiq.rb
@@ -208,7 +242,6 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/antulik/active_interaction-extras/blob/master/CHANGELOG.md
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -216,15 +249,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key:
+rubygems_version: 4.0.14
 specification_version: 4
 summary: Extensions for active_interaction gem
 test_files: []