active_interaction 0.5.0 → 0.6.1

data/lib/active_interaction/filters/date_filter.rb

@@ -5,8 +5,8 @@ module ActiveInteraction
     #   unless the format option is given, in which case they will be processed
     #   with `strptime`.
     #
-    # @macro attribute_method_params
-    # @option options [String] :format Parse strings using this format string.
+    # @macro filter_method_params
+    # @option options [String] :format parse strings using this format string
     #
     # @example
     #   date :birthday
@@ -14,13 +14,40 @@ module ActiveInteraction
     # @example
     #   date :birthday, format: '%Y-%m-%d'
     #
+    # @since 0.1.0
+    #
     # @method self.date(*attributes, options = {})
   end
 
   # @private
-  class DateFilter < AbstractDateTimeFilter
-    def self.prepare(key, value, options = {}, &block)
-      super(key, value, options.merge(class: Date), &block)
+  class DateFilter < Filter
+    def cast(value)
+      case value
+      when Date
+        value
+      when String
+        begin
+          if has_format?
+            Date.strptime(value, format)
+          else
+            Date.parse(value)
+          end
+        rescue ArgumentError
+          super
+        end
+      else
+        super
+      end
+    end
+
+    private
+
+    def has_format?
+      options.has_key?(:format)
+    end
+
+    def format
+      options.fetch(:format)
     end
   end
 end

data/lib/active_interaction/filters/date_time_filter.rb

@@ -5,22 +5,49 @@ module ActiveInteraction
     #   unless the format option is given, in which case they will be processed
     #   with `strptime`.
     #
-    # @macro attribute_method_params
-    # @option options [String] :format Parse strings using this format string.
+    # @macro filter_method_params
+    # @option options [String] :format parse strings using this format string
     #
     # @example
-    #   date_time :start_date
+    #   date :start_date
     #
     # @example
-    #   date_time :start_date, format: '%Y-%m-%dT%H:%M:%S'
+    #   date :start_date, format: '%Y-%m-%dT%H:%M:%S%:z'
+    #
+    # @since 0.1.0
     #
     # @method self.date_time(*attributes, options = {})
   end
 
   # @private
-  class DateTimeFilter < AbstractDateTimeFilter
-    def self.prepare(key, value, options = {}, &block)
-      super(key, value, options.merge(class: DateTime), &block)
+  class DateTimeFilter < Filter
+    def cast(value)
+      case value
+      when DateTime
+        value
+      when String
+        begin
+          if has_format?
+            DateTime.strptime(value, format)
+          else
+            DateTime.parse(value)
+          end
+        rescue ArgumentError
+          super
+        end
+      else
+        super
+      end
+    end
+
+    private
+
+    def has_format?
+      options.has_key?(:format)
+    end
+
+    def format
+      options.fetch(:format)
     end
   end
 end

data/lib/active_interaction/filters/file_filter.rb

@@ -1,38 +1,41 @@
 module ActiveInteraction
   class Base
     # Creates accessors for the attributes and ensures that values passed to
-    #   the attributes are Files or TempFiles. It will also extract a file from
+    #   the attributes are Files or Tempfiles. It will also extract a file from
     #   any object with a `tempfile` method. This is useful when passing in
     #   Rails params that include a file upload.
     #
-    # @macro attribute_method_params
+    # @macro filter_method_params
     #
     # @example
     #   file :image
     #
+    # @since 0.1.0
+    #
     # @method self.file(*attributes, options = {})
   end
 
   # @private
   class FileFilter < Filter
-    def self.prepare(key, value, options = {}, &block)
+    def cast(value)
       value = extract_file(value)
 
       case value
-        when File, Tempfile
-          value
-        else
-          super
+      when File, Tempfile
+        value
+      else
+        super
       end
     end
 
-    def self.extract_file(value)
+    private
+
+    def extract_file(value)
       if value.respond_to?(:tempfile)
         value.tempfile
       else
         value
       end
     end
-    private_class_method :extract_file
   end
 end

data/lib/active_interaction/filters/float_filter.rb

@@ -4,28 +4,30 @@ module ActiveInteraction
     #   the attributes are Floats. Integer and String values are converted into
     #   Floats.
     #
-    # @macro attribute_method_params
+    # @macro filter_method_params
     #
     # @example
     #   float :amount
     #
+    # @since 0.1.0
+    #
     # @method self.float(*attributes, options = {})
   end
 
   # @private
   class FloatFilter < Filter
-    def self.prepare(key, value, options = {}, &block)
+    def cast(value)
       case value
-        when Float
-          value
-        when Integer, String
-          begin
-            Float(value)
-          rescue ArgumentError
-            super
-          end
-        else
+      when Numeric
+        value.to_f
+      when String
+        begin
+          Float(value)
+        rescue ArgumentError
           super
+        end
+      else
+        super
       end
     end
   end

data/lib/active_interaction/filters/hash_filter.rb

@@ -3,8 +3,9 @@ module ActiveInteraction
     # Creates accessors for the attributes and ensures that values passed to
     #   the attributes are Hashes.
     #
-    # @macro attribute_method_params
-    # @param block [Proc] Filter methods to apply for select keys.
+    # @macro filter_method_params
+    # @param block [Proc] filter methods to apply for select keys
+    # @option options [Boolean] :strip (true) strip unknown keys
     #
     # @example
     #   hash :order
@@ -17,33 +18,51 @@ module ActiveInteraction
     #     boolean :delivered
     #   end
     #
+    # @since 0.1.0
+    #
     # @method self.hash(*attributes, options = {}, &block)
   end
 
   # @private
   class HashFilter < Filter
-    def self.prepare(key, value, options = {}, &block)
+    include MethodMissing
+
+    def cast(value)
       case value
-        when Hash
-          convert_values(value.merge(options[:default] || {}), &block)
-        else
-          super
+      when Hash
+        value = value.symbolize_keys
+        filters.reduce(strip? ? {} : value) do |h, f|
+          k = f.name
+          h[k] = f.clean(value[k])
+          h
+        end
+      else
+        super
+      end
+    end
+
+    def default
+      if options[:default].is_a?(Hash) && !options[:default].empty?
+        raise InvalidDefaultError, "#{name}: #{options[:default].inspect}"
       end
+
+      super
     end
 
-    def self.convert_values(hash, &block)
-      return hash unless block_given?
+    def method_missing(*args, &block)
+      super do |klass, names, options|
+        raise InvalidFilterError, 'no name' if names.empty?
 
-      FilterMethods.evaluate(&block).each do |method|
-        key = method.attribute
-        hash[key] = Filter.factory(method.method_name).
-          prepare(key, hash[key], method.options, &method.block)
+        names.each do |name|
+          filters.add(klass.new(name, options, &block))
+        end
       end
+    end
+
+    private
 
-      hash
-    rescue InvalidValue, MissingValue
-      raise InvalidNestedValue
+    def strip?
+      options.fetch(:strip, true)
     end
-    private_class_method :convert_values
   end
 end

data/lib/active_interaction/filters/integer_filter.rb

@@ -3,28 +3,30 @@ module ActiveInteraction
     # Creates accessors for the attributes and ensures that values passed to
     #   the attributes are Integers. String values are converted into Integers.
     #
-    # @macro attribute_method_params
+    # @macro filter_method_params
     #
     # @example
     #   integer :quantity
     #
+    # @since 0.1.0
+    #
     # @method self.integer(*attributes, options = {})
   end
 
   # @private
   class IntegerFilter < Filter
-    def self.prepare(key, value, options = {}, &block)
+    def cast(value)
       case value
-        when Integer
-          value
-        when String
-          begin
-            Integer(value)
-          rescue ArgumentError
-            super
-          end
-        else
+      when Numeric
+        value.to_i
+      when String
+        begin
+          Integer(value)
+        rescue ArgumentError
           super
+        end
+      else
+        super
       end
     end
   end

data/lib/active_interaction/filters/model_filter.rb

@@ -3,7 +3,7 @@ module ActiveInteraction
     # Creates accessors for the attributes and ensures that values passed to
     #   the attributes are the correct class.
     #
-    # @macro attribute_method_params
+    # @macro filter_method_params
     # @option options [Class, String, Symbol] :class (use the attribute name)
     #   Class name used to ensure the value.
     #
@@ -13,29 +13,29 @@ module ActiveInteraction
     # @example Ensures that the class is `User`
     #   model :account, class: User
     #
+    # @since 0.1.0
+    #
     # @method self.model(*attributes, options = {})
   end
 
   # @private
   class ModelFilter < Filter
-    def self.prepare(key, value, options = {}, &block)
-      key_class = constantize(options.fetch(:class, key))
-
+    def cast(value)
       case value
-        when key_class
-          value
-        else
-          super
+      when klass
+        value
+      else
+        super
       end
     end
 
-    def self.constantize(constant_name)
-      if constant_name.is_a?(Symbol) || constant_name.is_a?(String)
-        constant_name.to_s.classify.constantize
-      else
-        constant_name
-      end
+    private
+
+    def klass
+      klass_name = options.fetch(:class, name).to_s.classify
+      klass_name.constantize
+    rescue NameError
+      raise InvalidClassError, klass_name.inspect
     end
-    private_class_method :constantize
   end
 end

data/lib/active_interaction/filters/string_filter.rb

@@ -3,25 +3,36 @@ module ActiveInteraction
     # Creates accessors for the attributes and ensures that values passed to
     #   the attributes are Strings.
     #
-    # @macro attribute_method_params
-    # @option options [Boolean] :strip (true) Strip leading and trailing
-    #   whitespace.
+    # @macro filter_method_params
+    # @option options [Boolean] :strip (true) strip leading and trailing
+    #   whitespace
     #
     # @example
     #   string :first_name
     #
+    # @example
+    #   string :first_name, strip: false
+    #
+    # @since 0.1.0
+    #
     # @method self.string(*attributes, options = {})
   end
 
   # @private
   class StringFilter < Filter
-    def self.prepare(key, value, options = {}, &block)
+    def cast(value)
       case value
-        when String
-          options.fetch(:strip, true) ? value.strip : value
-        else
-          super
+      when String
+        strip? ? value.strip : value
+      else
+        super
       end
     end
+
+    private
+
+    def strip?
+      options.fetch(:strip, true)
+    end
   end
 end

data/lib/active_interaction/filters/symbol_filter.rb

@@ -0,0 +1,29 @@
+module ActiveInteraction
+  class Base
+    # Creates accessors for the attributes and ensures that values passed to
+    #   the attributes are Symbols. Strings will be converted to Symbols.
+    #
+    # @macro filter_method_params
+    #
+    # @example
+    #   symbol :condiment
+    #
+    # @since 0.6.0
+    #
+    # @method self.symbol(*attributes, options = {})
+  end
+
+  # @private
+  class SymbolFilter < Filter
+    def cast(value)
+      case value
+      when Symbol
+        value
+      when String
+        value.to_sym
+      else
+        super
+      end
+    end
+  end
+end