active_interaction 4.1.0 → 5.0.0

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

data/spec/active_interaction/filters/record_filter_spec.rb

@@ -14,11 +14,7 @@ class RecordThing
   end
 
   def self.finds_bad_value(_)
-    ''
-  end
-
-  def self.passthrough(obj)
-    obj
+    Object.new
   end
 end
 
@@ -27,23 +23,19 @@ BackupRecordThing = RecordThing
 
 describe ActiveInteraction::RecordFilter, :filter do
   include_context 'filters'
-  it_behaves_like 'a filter'
-
   before do
     options[:class] = RecordThing
   end
 
-  describe '#cast' do
-    before do
-      options[:finder] = :finder
-    end
+  it_behaves_like 'a filter'
 
+  describe '#process' do
     let(:value) { RecordThing.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
@@ -51,18 +43,18 @@ describe ActiveInteraction::RecordFilter, :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, :RecordThing)
         RecordThing = BackupRecordThing # rubocop:disable Lint/ConstantDefinitionInBlock
         value = RecordThing.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
@@ -73,11 +65,12 @@ describe ActiveInteraction::RecordFilter, :filter do
         class SubRecordThing < RecordThing; end # rubocop:disable Lint/ConstantDefinitionInBlock
         value = SubRecordThing.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, :RecordThing) }
+
         after { RecordThing = BackupRecordThing } # rubocop:disable Lint/ConstantDefinitionInBlock
 
         it 'does not raise an error on initialization' do
@@ -92,7 +85,7 @@ describe ActiveInteraction::RecordFilter, :filter do
       end
 
       it 'returns the instance' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -102,7 +95,7 @@ describe ActiveInteraction::RecordFilter, :filter do
       end
 
       it 'returns the instance' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -112,7 +105,7 @@ describe ActiveInteraction::RecordFilter, :filter do
       before { options[:class] = RecordThings }
 
       it 'returns the instance' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -129,48 +122,77 @@ describe ActiveInteraction::RecordFilter, :filter do
     end
 
     context 'with a value that does not match the class' do
-      let(:value) { '' }
+      let(:value) { 1 }
 
-      it 'calls the finder' do
-        expect(result).to eql RecordThing.finder(value)
+      it 'calls the default finder' do
+        allow(RecordThing).to receive(:find)
+        result
+        expect(RecordThing).to have_received(:find).with(value)
       end
 
       context 'with a custom finder' do
+        before do
+          options[:finder] = :finder
+        end
+
         it 'calls the custom finder' do
-          expect(result).to eql RecordThing.finder(value)
+          allow(RecordThing).to receive(:finder)
+          result
+          expect(RecordThing).to have_received(:finder).with(value)
         end
       end
-    end
-  end
 
-  describe '#clean' do
-    context 'with a value that does not match the class' do
       context 'that returns a nil' do
-        let(:value) { '' }
+        let(:value) { 1 }
 
         before do
           options[:default] = RecordThing.new
           options[:finder] = :finds_nil
         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
 
       context 'that returns an invalid value' do
-        let(:value) { '' }
+        let(:value) { 1 }
 
         before do
           options[:finder] = :finds_bad_value
         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
+
+    context 'with a blank String' do
+      let(:value) { ' ' }
+
+      context 'optional' do
+        include_context 'optional'
+
+        it 'returns the default' do
+          expect(filter.process(value, nil).value).to eql options[:default]
+        end
+      end
+
+      context 'required' do
+        include_context 'required'
+
+        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 :missing
         end
       end
     end
@@ -178,7 +200,7 @@ describe ActiveInteraction::RecordFilter, :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/string_filter_spec.rb

@@ -10,14 +10,14 @@ describe ActiveInteraction::StringFilter, :filter do
     end
   end
 
-  describe '#cast' do
-    let(:result) { filter.send(:cast, value, nil) }
+  describe '#process' do
+    let(:result) { filter.process(value, nil) }
 
     context 'with a String' do
       let(:value) { SecureRandom.hex }
 
       it 'returns the String' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -31,7 +31,7 @@ describe ActiveInteraction::StringFilter, :filter do
       end
 
       it 'returns the String' do
-        expect(result).to eql value.to_str
+        expect(result.value).to eql value.to_str
       end
     end
 
@@ -39,14 +39,14 @@ describe ActiveInteraction::StringFilter, :filter do
       let(:value) { " #{SecureRandom.hex} " }
 
       it 'returns the stripped string' do
-        expect(result).to eql value.strip
+        expect(result.value).to eql value.strip
       end
 
       context 'without strip' do
         include_context 'without strip'
 
         it 'returns the String' do
-          expect(result).to eql value
+          expect(result.value).to eql value
         end
       end
     end
@@ -54,7 +54,7 @@ describe ActiveInteraction::StringFilter, :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/symbol_filter_spec.rb

@@ -4,14 +4,14 @@ describe ActiveInteraction::SymbolFilter, :filter do
   include_context 'filters'
   it_behaves_like 'a filter'
 
-  describe '#cast' do
-    let(:result) { filter.send(:cast, value, nil) }
+  describe '#process' do
+    let(:result) { filter.process(value, nil) }
 
     context 'with a Symbol' do
       let(:value) { SecureRandom.hex.to_sym }
 
       it 'returns the Symbol' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -25,7 +25,7 @@ describe ActiveInteraction::SymbolFilter, :filter do
       end
 
       it 'returns a symbol' do
-        expect(result).to eql value.to_sym
+        expect(result.value).to eql value.to_sym
       end
     end
 
@@ -33,14 +33,14 @@ describe ActiveInteraction::SymbolFilter, :filter do
       let(:value) { SecureRandom.hex }
 
       it 'returns a Symbol' do
-        expect(result).to eql value.to_sym
+        expect(result.value).to eql value.to_sym
       end
     end
   end
 
   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