active_interaction 4.0.5 → 5.0.0

data/spec/active_interaction/filters/date_time_filter_spec.rb

@@ -12,14 +12,14 @@ describe ActiveInteraction::DateTimeFilter, :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 Datetime' do
       let(:value) { DateTime.new }
 
       it 'returns the DateTime' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -27,7 +27,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
       let(:value) { '2011-12-13T14:15:16+17:18' }
 
       it 'returns a DateTime' do
-        expect(result).to eql DateTime.parse(value)
+        expect(result.value).to eql DateTime.parse(value)
       end
 
       context 'with format' do
@@ -36,7 +36,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
         let(:value) { '13/12/2011 14:15:16 +17:18' }
 
         it 'returns a DateTime' do
-          expect(result).to eql DateTime.strptime(value, format)
+          expect(result.value).to eql DateTime.strptime(value, format)
         end
       end
     end
@@ -44,19 +44,21 @@ describe ActiveInteraction::DateTimeFilter, :filter do
     context 'with an invalid String' do
       let(:value) { 'invalid' }
 
-      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
 
       context 'with format' do
         include_context 'with format'
 
-        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
@@ -71,7 +73,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
       end
 
       it 'returns a DateTime' do
-        expect(result).to eql DateTime.parse(value)
+        expect(result.value).to eql DateTime.parse(value)
       end
     end
 
@@ -88,17 +90,18 @@ describe ActiveInteraction::DateTimeFilter, :filter do
         include_context 'optional'
 
         it 'returns the default' do
-          expect(result).to eql options[:default]
+          expect(result.value).to eql options[:default]
         end
       end
 
       context 'required' do
         include_context 'required'
 
-        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
     end
@@ -123,7 +126,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
 
       it 'returns a DateTime' do
         expect(
-          result
+          result.value
         ).to eql DateTime.new(year, month, day, hour, min, sec)
       end
     end
@@ -132,10 +135,11 @@ describe ActiveInteraction::DateTimeFilter, :filter do
       context 'empty' do
         let(:value) { ActiveInteraction::GroupedInput.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
 
@@ -146,10 +150,11 @@ describe ActiveInteraction::DateTimeFilter, :filter do
           )
         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
@@ -157,7 +162,7 @@ describe ActiveInteraction::DateTimeFilter, :filter do
 
   describe '#database_column_type' do
     it 'returns :datetime' do
-      expect(filter.database_column_type).to eql :datetime
+      expect(filter.database_column_type).to be :datetime
     end
   end
 

data/spec/active_interaction/filters/decimal_filter_spec.rb

@@ -12,14 +12,14 @@ describe ActiveInteraction::DecimalFilter, :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 Float' do
       let(:value) { rand }
 
       it 'returns the BigDecimal' do
-        expect(result).to eql BigDecimal(value, 0)
+        expect(result.value).to eql BigDecimal(value, 0)
       end
 
       context 'with :digits option' do
@@ -28,7 +28,7 @@ describe ActiveInteraction::DecimalFilter, :filter do
         let(:value) { 1.23456789 }
 
         it 'returns BigDecimal with given digits' do
-          expect(result).to eql BigDecimal('1.235')
+          expect(result.value).to eql BigDecimal('1.235')
         end
       end
     end
@@ -43,7 +43,7 @@ describe ActiveInteraction::DecimalFilter, :filter do
       end
 
       it 'returns a BigDecimal' do
-        expect(result).to eql BigDecimal(value.to_int)
+        expect(result.value).to eql BigDecimal(value.to_int)
       end
     end
 
@@ -51,7 +51,7 @@ describe ActiveInteraction::DecimalFilter, :filter do
       let(:value) { rand(1 << 16) }
 
       it 'returns a BigDecimal' do
-        expect(result).to eql BigDecimal(value)
+        expect(result.value).to eql BigDecimal(value)
       end
     end
 
@@ -59,17 +59,18 @@ describe ActiveInteraction::DecimalFilter, :filter do
       let(:value) { rand.to_s }
 
       it 'returns a BigDecimal' do
-        expect(result).to eql BigDecimal(value)
+        expect(result.value).to eql BigDecimal(value)
       end
     end
 
     context 'with an invalid String' do
       let(:value) { 'invalid' }
 
-      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
 
@@ -83,7 +84,7 @@ describe ActiveInteraction::DecimalFilter, :filter do
       end
 
       it 'returns a BigDecimal' do
-        expect(result).to eql BigDecimal(value)
+        expect(result.value).to eql BigDecimal(value)
       end
     end
 
@@ -100,17 +101,18 @@ describe ActiveInteraction::DecimalFilter, :filter do
         include_context 'optional'
 
         it 'returns the default' do
-          expect(result).to eql options[:default]
+          expect(result.value).to eql options[:default]
         end
       end
 
       context 'required' do
         include_context 'required'
 
-        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
     end
@@ -118,7 +120,7 @@ describe ActiveInteraction::DecimalFilter, :filter do
 
   describe '#database_column_type' do
     it 'returns :decimal' do
-      expect(filter.database_column_type).to eql :decimal
+      expect(filter.database_column_type).to be :decimal
     end
   end
 end

data/spec/active_interaction/filters/file_filter_spec.rb

@@ -4,14 +4,14 @@ describe ActiveInteraction::FileFilter, :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 File' do
       let(:value) { File.new(__FILE__) }
 
       it 'returns the File' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -19,22 +19,22 @@ describe ActiveInteraction::FileFilter, :filter do
       let(:value) { Tempfile.new(SecureRandom.hex) }
 
       it 'returns the Tempfile' do
-        expect(result).to eq value
+        expect(result.value).to eq value
       end
     end
 
     context 'with an object that responds to #rewind' do
-      let(:value) { double(rewind: nil) }
+      let(:value) { double(rewind: nil) } # rubocop:disable RSpec/VerifiedDoubles
 
       it 'returns the object' do
-        expect(result).to eq value
+        expect(result.value).to eq value
       end
     end
   end
 
   describe '#database_column_type' do
     it 'returns :file' do
-      expect(filter.database_column_type).to eql :file
+      expect(filter.database_column_type).to be :file
     end
   end
 end

data/spec/active_interaction/filters/float_filter_spec.rb

@@ -5,14 +5,14 @@ describe ActiveInteraction::FloatFilter, :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 Float' do
       let(:value) { rand }
 
       it 'returns the Float' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -26,7 +26,7 @@ describe ActiveInteraction::FloatFilter, :filter do
       end
 
       it 'returns a Float' do
-        expect(result).to eql value.to_int.to_f
+        expect(result.value).to eql value.to_int.to_f
       end
     end
 
@@ -34,7 +34,7 @@ describe ActiveInteraction::FloatFilter, :filter do
       let(:value) { BigDecimal('1.2') }
 
       it 'returns a Float' do
-        expect(result).to eql value.to_f
+        expect(result.value).to eql value.to_f
       end
     end
 
@@ -42,17 +42,18 @@ describe ActiveInteraction::FloatFilter, :filter do
       let(:value) { rand.to_s }
 
       it 'returns a Float' do
-        expect(result).to eql Float(value)
+        expect(result.value).to eql Float(value)
       end
     end
 
     context 'with an invalid String' do
       let(:value) { 'invalid' }
 
-      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
 
@@ -67,7 +68,7 @@ describe ActiveInteraction::FloatFilter, :filter do
 
       it 'returns a Float' do
         # apparently `Float()` doesn't do this even though `Integer()` does
-        expect(result).to eql Float(value.to_str)
+        expect(result.value).to eql Float(value.to_str)
       end
     end
 
@@ -84,17 +85,18 @@ describe ActiveInteraction::FloatFilter, :filter do
         include_context 'optional'
 
         it 'returns the default' do
-          expect(result).to eql options[:default]
+          expect(result.value).to eql options[:default]
         end
       end
 
       context 'required' do
         include_context 'required'
 
-        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
     end
@@ -102,7 +104,7 @@ describe ActiveInteraction::FloatFilter, :filter do
 
   describe '#database_column_type' do
     it 'returns :float' do
-      expect(filter.database_column_type).to eql :float
+      expect(filter.database_column_type).to be :float
     end
   end
 end

data/spec/active_interaction/filters/hash_filter_spec.rb

@@ -12,14 +12,15 @@ describe ActiveInteraction::HashFilter, :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 Hash' do
       let(:value) { {} }
 
       it 'returns the Hash' do
-        expect(result).to eql value
+        expect(result.value).to eql value
+        expect(result.value).to be_an_instance_of HashWithIndifferentAccess
       end
     end
 
@@ -33,7 +34,7 @@ describe ActiveInteraction::HashFilter, :filter do
       end
 
       it 'returns the Hash' do
-        expect(result).to eql value.to_hash
+        expect(result.value).to eql value.to_hash
       end
     end
 
@@ -41,7 +42,7 @@ describe ActiveInteraction::HashFilter, :filter do
       let(:value) { { a: {} } }
 
       it 'returns an empty Hash' do
-        expect(result).to eql({})
+        expect(result.value).to eql({})
       end
     end
 
@@ -52,7 +53,8 @@ describe ActiveInteraction::HashFilter, :filter do
         let(:value) { { 'a' => {} } }
 
         it 'returns the Hash' do
-          expect(result).to eql value
+          expect(result.value).to eql value
+          expect(result.value).to be_an_instance_of HashWithIndifferentAccess
         end
 
         context 'with String keys' do
@@ -71,17 +73,13 @@ describe ActiveInteraction::HashFilter, :filter do
         let(:v) { double }
         let(:value) { { k => v } }
 
-        it 'raises an error' do
-          expect do
-            result
-          end.to raise_error ActiveInteraction::InvalidNestedValueError
-        end
+        it 'indicates an error' do
+          error = result.errors.first
 
-        it 'populates the error' do
-          result
-        rescue ActiveInteraction::InvalidNestedValueError => e
-          expect(e.filter_name).to eql k
-          expect(e.input_value).to eql v
+          expect(result.errors.size).to be 1
+          expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+          expect(error.name).to be :"#{filter.name}.#{error.filter.name}"
+          expect(error.type).to be :invalid_type
         end
       end
     end
@@ -93,7 +91,7 @@ describe ActiveInteraction::HashFilter, :filter do
         let(:value) { { 'a' => {} } }
 
         it 'returns an empty Hash' do
-          expect(result).to eql value
+          expect(result.value).to eql value
         end
       end
     end
@@ -125,7 +123,7 @@ describe ActiveInteraction::HashFilter, :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/integer_filter_spec.rb

@@ -4,14 +4,14 @@ describe ActiveInteraction::IntegerFilter, :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 an Integer' do
       let(:value) { rand(1 << 16) }
 
       it 'returns the Integer' do
-        expect(result).to eql value
+        expect(result.value).to eql value
       end
     end
 
@@ -19,7 +19,7 @@ describe ActiveInteraction::IntegerFilter, :filter do
       let(:value) { rand(1 << 16) + rand }
 
       it 'returns an Integer' do
-        expect(result).to eql value.to_i
+        expect(result.value).to eql value.to_i
       end
     end
 
@@ -27,17 +27,18 @@ describe ActiveInteraction::IntegerFilter, :filter do
       let(:value) { rand(1 << 16).to_s }
 
       it 'returns an Integer' do
-        expect(result).to eql Integer(value, 10)
+        expect(result.value).to eql Integer(value, 10)
       end
     end
 
     context 'with an invalid String' do
       let(:value) { 'invalid' }
 
-      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
 
@@ -51,8 +52,7 @@ describe ActiveInteraction::IntegerFilter, :filter do
       end
 
       it 'returns an Integer' do
-        # jRuby freezes on the implicit string value
-        expect(result).to eql Integer(value.to_str, 10)
+        expect(result.value).to eql Integer(value.to_str, 10)
       end
     end
 
@@ -69,34 +69,36 @@ describe ActiveInteraction::IntegerFilter, :filter do
         include_context 'optional'
 
         it 'returns the default' do
-          expect(result).to eql options[:default]
+          expect(result.value).to eql options[:default]
         end
       end
 
       context 'required' do
         include_context 'required'
 
-        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
     end
 
     it 'supports different bases' do
       expect(
-        described_class.new(name, base: 8).send(:cast, '071', nil)
-      ).to eql 57
-      expect do
-        described_class.new(name, base: 8).send(:cast, '081', nil)
-      end.to raise_error ActiveInteraction::InvalidValueError
+        described_class.new(name, base: 8).process('071', nil).value
+      ).to be 57
+      error = described_class.new(name, base: 8).process('081', nil).errors.first
+
+      expect(error).to be_an_instance_of ActiveInteraction::Filter::Error
+      expect(error.type).to be :invalid_type
     end
   end
 
   describe '#database_column_type' do
     it 'returns :integer' do
-      expect(filter.database_column_type).to eql :integer
+      expect(filter.database_column_type).to be :integer
     end
   end
 end