table.rb in tableficate-0.2.0

- old
+ new

@@ -1,8 +1,8 @@
 module Tableficate
   class Table
-    attr_reader :columns, :rows, :current_sort, :filters, :options, :as
+    attr_reader :columns, :rows, :current_sort, :filters, :options, :as, :template
 
     def initialize(template, rows, options, data)
       @template = template
       @rows     = rows
       @columns  = []
@@ -23,27 +23,73 @@
       )
 
       @columns.push(Column.new(self, name, options, &block))
     end
 
-    def actions(options = {}, &block)
-      @columns.push(ActionColumn.new(self, options, block))
+    def actions(&block)
+      @columns.push(ActionColumn.new(self, &block))
     end
 
     def show_sort?
       self.columns.any?{|column| column.show_sort?}
     end
 
-    def input_filter(name, options = {})
-      @filters.push(InputFilter.new(self, name, options))
-    end
+    def filter(name, options = {})
+      as_map = {
+        :'datetime-local' => Filter::Input,
+        text:     Filter::Input,
+        email:    Filter::Input,
+        url:      Filter::Input,
+        tel:      Filter::Input,
+        number:   Filter::Input,
+        range:    Filter::Input,
+        date:     Filter::Input,
+        month:    Filter::Input,
+        week:     Filter::Input,
+        time:     Filter::Input,
+        datetime: Filter::Input,
+        search:   Filter::Input,
+        color:    Filter::Input,
+        select:   Filter::Select,
+        radio:    Filter::Radio,
+        checkbox: Filter::CheckBox
+      }
 
-    def input_range_filter(name, options = {})
-      @filters.push(InputRangeFilter.new(self, name, options))
+      as = options.delete(:as) || (options[:collection] ? :select : :text)
+
+      raise Filter::UnknownInputType if as_map[as].nil?
+
+      options[:type] = as.to_s
+
+      @filters.push(as_map[as].new(self, name, options))
     end
 
-    def select_filter(name, choices, options = {})
-      @filters.push(SelectFilter.new(self, name, choices, options))
+    def filter_range(name, options = {})
+      as_map = {
+        :'datetime-local' => Filter::InputRange,
+        text:     Filter::InputRange,
+        email:    Filter::InputRange,
+        url:      Filter::InputRange,
+        tel:      Filter::InputRange,
+        number:   Filter::InputRange,
+        range:    Filter::InputRange,
+        date:     Filter::InputRange,
+        month:    Filter::InputRange,
+        week:     Filter::InputRange,
+        time:     Filter::InputRange,
+        datetime: Filter::InputRange,
+        search:   Filter::InputRange,
+        color:    Filter::InputRange,
+        select:   Filter::SelectRange
+      }
+
+      as = options.delete(:as) || (options[:collection] ? :select : :text)
+
+      raise Filter::UnknownInputType if as_map[as].nil?
+
+      options[:type] = as.to_s
+
+      @filters.push(as_map[as].new(self, name, options))
     end
 
     def render(options = {})
       options.reverse_merge!(
         partial: Tableficate::Utils::template_path('table', @options[:theme]),