make filters more self contained by adding column types

lib/active_interaction/base.rb

@@ -166,7 +166,7 @@ def initialize(inputs = {})
 
     def column_for_attribute(name)
       filter = self.class.filters[name]
-      FilterColumn.new(filter.class.slug) if filter
+      FilterColumn.new(filter.database_column_type) if filter
     end
 
     # @!method compose(other, inputs = {})

lib/active_interaction/errors.rb

@@ -22,11 +22,6 @@ module ActiveInteraction
   # @return [Class]
   InvalidFilterError = Class.new(Error)
 
-  # Raised if a filter has an invalid definition.
-  #
-  # @return [Class]
-  InvalidFilterColumnError = Class.new(Error)
-
   # Raised if an interaction is invalid.
   #
   # @return [Class]

lib/active_interaction/filter.rb

@@ -195,6 +195,10 @@ def cast(value)
       end
     end
 
+    def database_column_type
+      self.class.slug
+    end
+
     private
 
     # @return [Object]

lib/active_interaction/filter_column.rb

@@ -3,27 +3,10 @@
 module ActiveInteraction
   #
   class FilterColumn
-    TYPE_MAPPING = {
-      array:     :string,
-      boolean:   :boolean,
-      date:      :date,
-      date_time: :datetime,
-      file:      :file,
-      float:     :float,
-      hash:      :string,
-      integer:   :integer,
-      model:     :string,
-      string:    :string,
-      symbol:    :string,
-      time:      :datetime
-    }.freeze
-
     attr_reader :limit, :type
 
     def initialize(type)
-      @type = TYPE_MAPPING.fetch(type) do
-        fail InvalidFilterColumnError, "#{type} is not a valid type"
-      end
+      @type = type
     end
 
     def number?

lib/active_interaction/filters/array_filter.rb

@@ -37,6 +37,10 @@ def cast(value)
       end
     end
 
+    def database_column_type
+      :string
+    end
+
     def method_missing(*, &block)
       super do |klass, names, options|
         filter = klass.new(name, options, &block)

lib/active_interaction/filters/date_time_filter.rb

@@ -19,5 +19,8 @@ class Base
 
   # @private
   class DateTimeFilter < AbstractDateTimeFilter
+    def database_column_type
+      :datetime
+    end
   end
 end

lib/active_interaction/filters/hash_filter.rb

@@ -41,6 +41,10 @@ def cast(value)
       end
     end
 
+    def database_column_type
+      :string
+    end
+
     def method_missing(*args, &block)
       super(*args) do |klass, names, options|
         fail InvalidFilterError, 'missing attribute name' if names.empty?

lib/active_interaction/filters/model_filter.rb

@@ -30,6 +30,10 @@ def cast(value, reconstantize = true)
       end
     end
 
+    def database_column_type
+      :string
+    end
+
     private
 
     # @return [Class]

lib/active_interaction/filters/symbol_filter.rb

@@ -24,5 +24,9 @@ def cast(value)
         super
       end
     end
+
+    def database_column_type
+      :string
+    end
   end
 end

lib/active_interaction/filters/time_filter.rb

@@ -33,6 +33,10 @@ def cast(value)
       end
     end
 
+    def database_column_type
+      :datetime
+    end
+
     private
 
     def klass

spec/active_interaction/filter_column_spec.rb

@@ -3,27 +3,21 @@
 require 'spec_helper'
 
 describe ActiveInteraction::FilterColumn do
+  let(:type) { :float }
   subject(:column) { described_class.new(type) }
-  let(:type) { described_class::TYPE_MAPPING.keys.first }
-
-  describe '.new' do
-    context 'type is not in TYPE_MAPPING' do
-      let(:type) { SecureRandom.hex }
-
-      it 'fails' do
-        expect do
-          column
-        end.to raise_error ActiveInteraction::InvalidFilterColumnError
-      end
-    end
-  end
 
   describe '#limit' do
     it 'returns nil' do
       expect(column.limit).to be_nil
     end
   end
 
+  describe '#type' do
+    it 'returns the type' do
+      expect(column.type).to eql type
+    end
+  end
+
   describe '#number?' do
     let(:number?) { column.number? }
 

spec/active_interaction/filters/array_filter_spec.rb

@@ -82,4 +82,10 @@
       end
     end
   end
+
+  describe '#database_column_type' do
+    it 'returns :string' do
+      expect(filter.database_column_type).to eql :string
+    end
+  end
 end

spec/active_interaction/filters/date_time_filter_spec.rb

@@ -61,4 +61,10 @@
       end
     end
   end
+
+  describe '#database_column_type' do
+    it 'returns :datetime' do
+      expect(filter.database_column_type).to eql :datetime
+    end
+  end
 end

spec/active_interaction/filters/hash_filter_spec.rb

@@ -92,4 +92,10 @@
       end
     end
   end
+
+  describe '#database_column_type' do
+    it 'returns :string' do
+      expect(filter.database_column_type).to eql :string
+    end
+  end
 end

spec/active_interaction/filters/model_filter_spec.rb

@@ -95,4 +95,10 @@ def self.name
       end
     end
   end
+
+  describe '#database_column_type' do
+    it 'returns :string' do
+      expect(filter.database_column_type).to eql :string
+    end
+  end
 end

spec/active_interaction/filters/symbol_filter_spec.rb

@@ -23,4 +23,10 @@
       end
     end
   end
+
+  describe '#database_column_type' do
+    it 'returns :string' do
+      expect(filter.database_column_type).to eql :string
+    end
+  end
 end

spec/active_interaction/filters/time_filter_spec.rb

@@ -61,4 +61,10 @@
       end
     end
   end
+
+  describe '#database_column_type' do
+    it 'returns :datetime' do
+      expect(filter.database_column_type).to eql :datetime
+    end
+  end
 end

spec/support/filters.rb

@@ -221,4 +221,10 @@
       expect(filter.options).to eq options
     end
   end
+
+  describe '#database_column_type' do
+    it 'returns a symbol' do
+      expect(filter.database_column_type).to be_a Symbol
+    end
+  end
 end