fixes #515 by allowing filters nested in arrays to have a default

AaronLasseigne · Oct 14, 2021 · 5ad3a07 · 5ad3a07
1 parent cd2811d
commit 5ad3a07
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# [4.0.6][] (2021-10-13)
+
+## Fix
+
+- [#515][] - Filters nested in arrays should accept default values as indicated in the documentation.
+
 # [4.0.5][] (2021-07-11)
 
 ## Fix
@@ -964,6 +970,7 @@ Example.run
 
 - Initial release.
 
+ [4.0.6]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.5...v4.0.6
  [4.0.5]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.4...v4.0.5
  [4.0.4]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.3...v4.0.4
  [4.0.3]: https://github.com/AaronLasseigne/active_interaction/compare/v4.0.2...v4.0.3
@@ -1182,3 +1189,4 @@ Example.run
  [#511]: https://github.com/AaronLasseigne/active_interaction/issues/511
  [#412]: https://github.com/AaronLasseigne/active_interaction/issues/412
  [#480]: https://github.com/AaronLasseigne/active_interaction/issues/480
+ [#515]: https://github.com/AaronLasseigne/active_interaction/issues/515
diff --git a/lib/active_interaction/filters/array_filter.rb b/lib/active_interaction/filters/array_filter.rb
@@ -91,7 +91,7 @@ def method_missing(*, &block)
 
  filters[filters.size.to_s.to_sym] = filter
 
- validate!(filter, names)
+ validate!(names)
  end
  end
  # rubocop:enable Style/MissingRespondToMissing
@@ -100,13 +100,11 @@ def method_missing(*, &block)
  # @param names [Array<Symbol>]
  #
  # @raise [InvalidFilterError]
- def validate!(filter, names)
+ def validate!(names)
  raise InvalidFilterError, 'multiple filters in array block' if filters.size > 1
 
  raise InvalidFilterError, 'attribute names in array block' unless names.empty?
 
- raise InvalidDefaultError, 'default values in array block' if filter.default?
-
  nil
  end
  end

diff --git a/spec/active_interaction/filters/array_filter_spec.rb b/spec/active_interaction/filters/array_filter_spec.rb
@@ -25,14 +25,6 @@
  end
  end
 
- context 'with a nested default' do
- let(:block) { proc { array default: nil } }
-
- it 'raises an error' do
- expect { filter }.to raise_error ActiveInteraction::InvalidDefaultError
- end
- end
-
  describe '#cast' do
  let(:result) { filter.send(:cast, value, nil) }