active_interaction 4.1.0 → 5.1.1

data/spec/active_interaction/filters/interface_filter_spec.rb

@@ -10,8 +10,8 @@ describe ActiveInteraction::InterfaceFilter, :filter do
     let(:name) { :interface_module }
   end
 
-  describe '#cast' do
-    let(:result) { filter.send(:cast, value, nil) }
+  describe '#process' do
+    let(:result) { filter.process(value, nil) }
 
     context 'with an implicit constant name' do
       context 'passed an instance' do
@@ -24,7 +24,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -35,7 +35,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -46,7 +46,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -54,10 +54,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_module }
           let(:value) { Class.new }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
 
@@ -65,10 +66,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_module }
           let(:value) { nil }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::MissingValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :missing
           end
         end
 
@@ -78,10 +80,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
             InterfaceClass.new
           end
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
       end
@@ -94,7 +97,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -107,7 +110,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -115,10 +118,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_class }
           let(:value) { Class }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
 
@@ -126,10 +130,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_class }
           let(:value) { InterfaceClass }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
       end
@@ -144,7 +149,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -152,10 +157,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_module }
           let(:value) { Module.new }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
 
@@ -163,10 +169,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_module }
           let(:value) { InterfaceModule }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
       end
@@ -187,6 +194,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
       context 'passed an instance' do
         context 'with the module included' do
           before { options.merge!(from: :interface_module) }
+
           let(:value) do
             Class.new do
               include InterfaceModule
@@ -194,29 +202,31 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
         context 'with the class inherited from' do
           before { options.merge!(from: :interface_class) }
+
           let(:value) do
             Class.new(InterfaceClass) {}.new # rubocop:disable Lint/EmptyBlock
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
         context 'that is extended by the ancestor' do
           before { options.merge!(from: :interface_module) }
+
           let(:value) do
             Class.new {}.new.extend(InterfaceModule) # rubocop:disable Lint/EmptyBlock
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -224,10 +234,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_class }
           let(:value) { Class.new }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
 
@@ -235,10 +246,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_class }
           let(:value) { InterfaceClass.new }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
       end
@@ -246,17 +258,19 @@ describe ActiveInteraction::InterfaceFilter, :filter do
       context 'passed a class' do
         context 'with the class inherited from' do
           before { options.merge!(from: :interface_class) }
+
           let(:value) do
             Class.new(InterfaceClass) {} # rubocop:disable Lint/EmptyBlock
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
         context 'that is extended by the ancestor' do
           before { options.merge!(from: :interface_module) }
+
           let(:value) do
             Class.new do
               extend InterfaceModule
@@ -264,7 +278,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -272,10 +286,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_class }
           let(:value) { Class }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
 
@@ -283,10 +298,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_class }
           let(:value) { InterfaceClass }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
       end
@@ -294,6 +310,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
       context 'passed a module' do
         context 'that is extended by the ancestor' do
           before { options.merge!(from: :interface_module) }
+
           let(:value) do
             Module.new do
               extend InterfaceModule
@@ -301,7 +318,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           end
 
           it 'returns a the value' do
-            expect(result).to eql value
+            expect(result.value).to eql value
           end
         end
 
@@ -309,10 +326,11 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_module }
           let(:value) { Module.new }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
 
@@ -320,16 +338,18 @@ describe ActiveInteraction::InterfaceFilter, :filter do
           let(:name) { :interface_module }
           let(:value) { InterfaceModule }
 
-          it 'raises an error' do
-            expect do
-              result
-            end.to raise_error ActiveInteraction::InvalidValueError
+          it 'indicates an error' do
+            error = result.errors.first
+
+            expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+            expect(error.type).to be :invalid_type
           end
         end
       end
 
       context 'given an invalid name' do
         before { options.merge!(from: :invalid) }
+
         let(:value) { Object }
 
         it 'raises an error' do
@@ -353,17 +373,18 @@ describe ActiveInteraction::InterfaceFilter, :filter do
         end
 
         it 'returns a the value' do
-          expect(result).to eql value
+          expect(result.value).to eql value
         end
       end
 
       context 'passed an invalid instance' do
         let(:value) { Class.new }
 
-        it 'raises an error' do
-          expect do
-            result
-          end.to raise_error ActiveInteraction::InvalidValueError
+        it 'indicates an error' do
+          error = result.errors.first
+
+          expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+          expect(error.type).to be :invalid_type
         end
       end
 
@@ -377,17 +398,18 @@ describe ActiveInteraction::InterfaceFilter, :filter do
         end
 
         it 'returns a the value' do
-          expect(result).to eql value
+          expect(result.value).to eql value
         end
       end
 
       context 'passed an invalid class' do
         let(:value) { Class }
 
-        it 'raises an error' do
-          expect do
-            result
-          end.to raise_error ActiveInteraction::InvalidValueError
+        it 'indicates an error' do
+          error = result.errors.first
+
+          expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+          expect(error.type).to be :invalid_type
         end
       end
 
@@ -401,17 +423,18 @@ describe ActiveInteraction::InterfaceFilter, :filter do
         end
 
         it 'returns a the value' do
-          expect(result).to eql value
+          expect(result.value).to eql value
         end
       end
 
       context 'passed an invalid module' do
         let(:value) { Module.new }
 
-        it 'raises an error' do
-          expect do
-            result
-          end.to raise_error ActiveInteraction::InvalidValueError
+        it 'indicates an error' do
+          error = result.errors.first
+
+          expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+          expect(error.type).to be :invalid_type
         end
       end
     end
@@ -432,7 +455,7 @@ describe ActiveInteraction::InterfaceFilter, :filter do
 
   describe '#database_column_type' do
     it 'returns :string' do
-      expect(filter.database_column_type).to eql :string
+      expect(filter.database_column_type).to be :string
     end
   end
 end

data/spec/active_interaction/filters/object_filter_spec.rb

@@ -15,19 +15,19 @@ BackupObjectThing = ObjectThing
 
 describe ActiveInteraction::ObjectFilter, :filter do
   include_context 'filters'
-  it_behaves_like 'a filter'
-
   before do
     options[:class] = ObjectThing
   end
 
-  describe '#cast' do
+  it_behaves_like 'a filter'
+
+  describe '#process' do
     let(:value) { ObjectThing.new }
-    let(:result) { filter.send(:cast, value, nil) }
+    let(:result) { filter.process(value, nil) }
 
     context 'with an instance of the class' do
       it 'returns the instance' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
 
       context 'with an instance that is a subclass' do
@@ -35,18 +35,18 @@ describe ActiveInteraction::ObjectFilter, :filter do
         let(:value) { subclass.new }
 
         it 'returns the instance' do
-          expect(result).to eql value
+          expect(result.value).to eql value
         end
       end
 
       it 'handles reconstantizing' do
-        expect(result).to eql value
+        expect(result.value).to eql value
 
         Object.send(:remove_const, :ObjectThing)
         ObjectThing = BackupObjectThing # rubocop:disable Lint/ConstantDefinitionInBlock
         value = ObjectThing.new
 
-        expect(filter.send(:cast, value, nil)).to eql value
+        expect(filter.process(value, nil).value).to eql value
       end
 
       it 'handles reconstantizing subclasses' do
@@ -57,11 +57,12 @@ describe ActiveInteraction::ObjectFilter, :filter do
         class SubObjectThing < ObjectThing; end # rubocop:disable Lint/ConstantDefinitionInBlock
         value = SubObjectThing.new
 
-        expect(filter.send(:cast, value, nil)).to eql value
+        expect(filter.process(value, nil).value).to eql value
       end
 
       context 'without the class available' do
         before { Object.send(:remove_const, :ObjectThing) }
+
         after { ObjectThing = BackupObjectThing } # rubocop:disable Lint/ConstantDefinitionInBlock
 
         it 'does not raise an error on initialization' do
@@ -76,7 +77,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
       end
 
       it 'returns the instance' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -86,7 +87,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
       before { options[:class] = ObjectThings }
 
       it 'returns the instance' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -111,7 +112,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
         end
 
         it 'calls the class method' do
-          expect(result).to eql ObjectThing.converter(value)
+          expect(result.value).to eql ObjectThing.converter(value)
         end
       end
 
@@ -121,7 +122,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
         end
 
         it 'gets called' do
-          expect(result).to eql ObjectThing.converter(value)
+          expect(result.value).to eql ObjectThing.converter(value)
         end
       end
 
@@ -129,8 +130,13 @@ describe ActiveInteraction::ObjectFilter, :filter do
         let(:value) { ObjectThing.new }
 
         it 'does not call the converter' do
-          expect(ObjectThing).to_not receive(:converter)
-          expect(result).to eql value
+          allow(ObjectThing).to receive(:converter)
+          result.value
+          expect(ObjectThing).to_not have_received(:converter)
+        end
+
+        it 'returns the correct value' do
+          expect(result.value).to eql value
         end
       end
 
@@ -139,18 +145,29 @@ describe ActiveInteraction::ObjectFilter, :filter do
         let(:value) { subclass.new }
 
         it 'does not call the converter' do
-          expect(subclass).to_not receive(:converter)
-          expect(result).to eql value
+          allow(subclass).to receive(:converter)
+          result.value
+          expect(subclass).to_not have_received(:converter)
+        end
+
+        it 'returns the correct value' do
+          expect(result.value).to eql value
         end
       end
 
       context 'with a nil value' do
         let(:value) { nil }
+
         include_context 'optional'
 
         it 'returns nil' do
-          expect(ObjectThing).to_not receive(:converter)
-          expect(result).to eql value
+          allow(ObjectThing).to receive(:converter)
+          result.value
+          expect(ObjectThing).to_not have_received(:converter)
+        end
+
+        it 'returns the correct value' do
+          expect(result.value).to eql value
         end
       end
 
@@ -171,17 +188,14 @@ describe ActiveInteraction::ObjectFilter, :filter do
           options[:converter] = :converter_with_error
         end
 
-        it 'raises an error' do
-          expect do
-            result
-          end.to raise_error ActiveInteraction::InvalidValueError
+        it 'indicates an error' do
+          error = result.errors.first
+
+          expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+          expect(error.type).to be :invalid_type
         end
       end
-    end
-  end
 
-  describe '#clean' do
-    context 'with a converter' do
       context 'that returns a nil' do
         let(:value) { '' }
 
@@ -190,10 +204,11 @@ describe ActiveInteraction::ObjectFilter, :filter do
           options[:converter] = ->(_) {}
         end
 
-        it 'raises an error' do
-          expect do
-            filter.clean(value, nil)
-          end.to raise_error ActiveInteraction::InvalidValueError
+        it 'indicates an error' do
+          error = filter.process(value, nil).errors.first
+
+          expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+          expect(error.type).to be :invalid_type
         end
       end
 
@@ -204,10 +219,11 @@ describe ActiveInteraction::ObjectFilter, :filter do
           options[:converter] = ->(_) { 'invalid' }
         end
 
-        it 'raises an error' do
-          expect do
-            filter.clean(value, nil)
-          end.to raise_error ActiveInteraction::InvalidValueError
+        it 'indicates an error' do
+          error = filter.process(value, nil).errors.first
+
+          expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+          expect(error.type).to be :invalid_type
         end
       end
     end
@@ -215,7 +231,7 @@ describe ActiveInteraction::ObjectFilter, :filter do
 
   describe '#database_column_type' do
     it 'returns :string' do
-      expect(filter.database_column_type).to eql :string
+      expect(filter.database_column_type).to be :string
     end
   end
 end