tableficate 0.1.3 → 0.2.0

data/README.markdown

@@ -1,5 +1,7 @@
 # Tableficate
-A DSL for easy table creation with sorting and filtering. It tries to do to tables what simple_form and formtastic have done for forms. Below you'll find basic documentation with more compelete docs forthcoming.
+A DSL for easy table creation with sorting and filtering. It tries to do to tables what simple_form and formtastic have done for forms. Below you'll find basic documentation with more compelete docs in the [wiki](https://github.com/sei-mi/tableficate/wiki).
+
+This project follows [Semantic Versioning](http://semver.org/).
 
 ## Installation
 
@@ -7,7 +9,7 @@ A DSL for easy table creation with sorting and filtering. It tries to do to tabl
 
 If you're using Bundler, add this to your Gemfile:
 
-    gem 'tableficate'
+    gem 'tableficate', '~0.2.0'
 
 ## Support
 
@@ -33,45 +35,43 @@ Our controller:
 
     @accounts = Accounts.active.tableficate(params[:accounts]).page(params.try(:[], :accounts_page) || 1)
 
-Here we're getting active accounts, calling tableficate and then paginating with Kaminari. Tableficate works on Arel objects and passes out an Arel so you can add things like pagination. We pass in the params for the table we'll create in the view. By default the params are stored under the primary table name of the query.
+Here we're getting active accounts, calling tableficate and then paginating with Kaminari. Tableficate works on Arel objects and passes out an Arel so you can add things like pagination. We pass in the params for the table we'll create in the view. By default `:accounts` is derived from the database table name of the primary table in the query.
 
 Our View:
 
-    <%= table_for @accounts, show_sorts: true do |t|
-      t.column :id, header: 'Account Number'
-      t.column :created_at do |account|
-        account.created_at.strftime('%m/%d/%Y')
-      end
-      t.column :first_name
-      t.column :last_name
-      t.actions do |account|
-        link_to('View', account_path(account))
-      end
+    <%= table_for @accounts, show_sorts: true do |t| %>
+      <% t.column :id, header: 'Account Number' %>
+      <% t.column :created_at do |account| %>
+        <%= account.created_at.strftime('%m/%d/%Y') %>
+      <% end %>
+      <% t.column :first_name %>
+      <% t.column :last_name %>
+      <% t.actions do |account| %>
+        <%= link_to('View', account_path(account)) %>
+      <% end %>
 
-      t.input_filter :first_name
-      t.input_filter :last_name
-    %>
+      <% t.filter :first_name %>
+      <% t.filter :last_name %>
+    <% end %>
 
-This creates a sortable table with two filters, 4 data columns and an action column. Column headers are automatically generated but can be overridden as seen on the "id" column. The column output can also be overridden by passing a block to the call. This setup provides easy table creation but only covers basic functionality. Some of the more advanced functionality requires you to wrap your scope in a special table model.
+This creates a sortable table with 2 filters, 4 data columns and a column for actions. Column headers are automatically generated but can be overridden as seen on `:id`. The column output can also be overridden by passing a block to the call. This setup only covers basic functionality. Some of the more advanced functionality requires you to wrap your scope in a special table model.
 
-Having created the basic table we now want to default the sorting to show newest accounts first and we want the first and last name to be merged into one name column. First we'll need to create a table model.
+Having created the basic table we now want to default the sorting to show newest accounts first and we want `:first_name` and `:last_name` to be merged into one column. First, create a table model.
 
-In "app/tables/" we'll create a new table model. This can be done using a generator.
+In "app/tables/" we'll create a new table model using the generator. Provide the name of the new table model and then the model being wrapped.
 
-    $ rails generate tableficate:table AccountReport
+    $ rails generate tableficate:table AccountReport Account
 
 Our table model:
 
     class AccountReport < Tableficate::Base
-      scope do
-        Accounts.active
-      end
+      scope :accounts
 
-      default_sort(:created_at, 'DESC')
+      default_sort :created_at, 'DESC'
 
-      column(:full_name, sort: 'first_name ASC, last_name ASC')
+      column :full_name, sort: 'first_name ASC, last_name ASC'
 
-      filter(:full_name) do |value, scope|
+      filter :full_name do |value, scope|
         first_name, last_name = value.split(/\s+/)
 
         if last_name.nil?
@@ -82,39 +82,44 @@ Our table model:
       end
     end
 
-We've defined a scope that we're wrapping. Then we provide a default sorting and explain how to sort and filter a new column called ":full_name".
+We've defined a scope that we're wrapping. Then we provide a default sorting and explain how to sort and filter a new column called `:full_name`.
 
-Our new controller:
+Our new controller using `AccountReport`:
 
-    @accounts = AccountReport.tableficate(params[:accounts]).page(params.try(:[], :accounts_page) || 1)
+    @accounts = AccountReport.active.tableficate(params[:accounts]).page(params.try(:[], :accounts_page) || 1)
 
-The only change here is that "Accounts.active" has changed to "AccountReport".
+Our new view using `:full_name`:
 
-Our new view:
+    <%= table_for @accounts, show_sorts: true do |t| %>
+      <% t.column :id, header: 'Account Number' %>
+      <% t.column :created_at do |account| %>
+        <%= account.created_at.strftime('%m/%d/%Y') %>
+      <% end %>
+      <% t.column :full_name do |account| %>
+        <%= "#{account.first_name} #{account.last_name}" %>
+      <% end %>
+      <% t.actions do |account| %>
+        <%= link_to('View', account_path(account)) %>
+      <% end %>
 
-    <%= table_for @accounts, show_sorts: true do |t|
-      t.column :id, header: 'Account Number'
-      t.column :created_at do |account|
-        account.created_at.strftime('%m/%d/%Y')
-      end
-      t.column :full_name
-      t.actions do |account|
-        link_to('View', account_path(account))
-      end
-
-      t.input_filter :full_name
-    %>
+      <% t.filter :full_name %>
+    <% end %>
 
-In the view we've merged the first and last name into a new full name column. Now we have default sorting, sortable columns and a full name filter.
+Now we have default sorting, sortable columns and a full name filter.
 
 ## Themes
 
 New themes can be created using the theme generator.
 
-    $ rails generate tableficate:theme NAME
+    $ rails generate tableficate:theme foo
 
-The theme can then be applied to a table by passing "theme: 'NAME'" to the "table_for" call.
+The theme can then be applied to a table.
 
-    <%= table_for @accounts, theme: 'foo' do |t|
+    <%= table_for @records, theme: 'foo' do |t| %>
       ...
-    %>
+    <% end %>
+
+## Changes Needed to Upgrade From 0.1
+
+1. The filter functions used in the `table_for` call have been completely changed. They will need to be rewritten in all of your calls.
+2. New filter partials have been added to accomodate the new filter types that are available. If you have custom themes they will need to be updated. This can be done by first moving "_column_header.html.erb" to "_header.html.erb", "filters/_input_field.html.erb" to "filters/_input.html.erb" and "filters/_input_field_range.html.erb" to "filters/_input_range.html.erb". Then rerun `rails generate tableficate:theme NAME`. This will not overwrite files you have altered for your new theme.

data/app/views/tableficate/_table.html.erb

@@ -1,5 +1,5 @@
 <% if table.filters.any? %>
-  <%= form_tag '', method: :get do %>
+  <%= form_tag('', method: :get, novalidate: 'novalidate') do %>
     <% if params[table.as] and params[table.as][:sort] %>
       <%= hidden_field_tag("#{table.as}[sort]", params[table.as][:sort]) %>
     <% end %>
@@ -7,7 +7,7 @@
       <%= hidden_field_tag("#{table.as}[dir]", params[table.as][:dir]) %>
     <% end %>
     <% table.filters.each do |filter| %>
-      <%= tableficate_filter_tag filter %>
+      <%= tableficate_filter_tag(filter) %>
     <% end %>
 
     <%= submit_tag('Filter') %>
@@ -24,13 +24,13 @@
   <thead>
     <tr>
       <% table.columns.each do |column| %>
-        <%= tableficate_header_tag column %>
+        <%= tableficate_header_tag(column) %>
       <% end %>
     </tr>
   </thead>
   <tbody>
     <% table.rows.each do |row| %>
-      <%= tableficate_row_tag row, table.columns %>
+      <%= tableficate_row_tag(row, table.columns) %>
     <% end %>
   </tbody>
 <% end %>

data/app/views/tableficate/filters/_check_box.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <%= tableficate_label_tag(filter) %>
+  <%= tableficate_check_box_tags(filter) %>
+</div>

data/app/views/tableficate/filters/_radio.html.erb

@@ -0,0 +1,4 @@
+<div>
+  <%= tableficate_label_tag(filter) %>
+  <%= tableficate_radio_tags(filter) %>
+</div>

data/app/views/tableficate/filters/_select_range.html.erb

@@ -0,0 +1,6 @@
+<div>
+  <%= tableficate_label_tag(filter.start) %>
+  <%= tableficate_select_tag(filter.start) %>
+  <%= tableficate_label_tag(filter.stop) %>
+  <%= tableficate_select_tag(filter.stop) %>
+</div>

data/changelog.markdown

@@ -1,3 +1,11 @@
+## 0.2.0
+ * complete filter rewrite
+ * replaced existing filter functions in table_for calls
+ * added select based range filter
+ * added radio button filter
+ * added check box filter
+ * `column` and `actions` calls in `table_for` now accept template blocks
+
 ## 0.1.3
 * fixing html_safe break in 0.1.2
 

data/lib/tableficate/action_column.rb

@@ -1,7 +1,7 @@
 module Tableficate
   class ActionColumn < Column
-    def initialize(table, options = {}, block)
-      super(table, '', options, &block)
+    def initialize(table, &block)
+      super(table, '', {}, &block)
     end
 
     def show_sort?

data/lib/tableficate/base.rb

@@ -2,9 +2,9 @@ module Tableficate
   class Base
     extend Tableficate::Finder
 
-    def self.scope(model = nil, &block)
+    def self.scope(model = nil)
       if block_given?
-        @scope = block.call
+        @scope = yield
       else
         @scope = model.to_s.camelize.constantize
       end

data/lib/tableficate/column.rb

@@ -14,8 +14,12 @@ module Tableficate
     def value(row)
       if @block
         output = @block.call(row)
-        output = output.html_safe if output.respond_to? :html_safe
-        output
+        if output.is_a?(ActionView::OutputBuffer)
+          ''
+        else
+          output = output.html_safe if output.respond_to? :html_safe
+          output
+        end
       else
         row.send(@name)
       end

data/lib/tableficate/exceptions.rb

@@ -1,3 +1,7 @@
 module Tableficate
   class MissingScope < StandardError; end
+  
+  module Filter
+    class UnknownInputType < StandardError; end
+  end
 end

data/lib/tableficate/filters/base.rb

@@ -0,0 +1,21 @@
+module Tableficate
+  module Filter
+    class Base
+      attr_reader :name, :label, :options, :template, :table, :field_name
+
+      def initialize(table, name, options = {})
+        @table   = table
+        @name    = name
+        @options = options
+
+        @template   = 'filters/' + self.class.name.demodulize.underscore
+        @label      = @options.delete(:label) || table.columns.detect{|column| column.name == @name}.try(:header) || name.to_s.titleize
+        @field_name = "#{table.as}[filter][#{@name}]"
+      end
+
+      def field_value(params)
+        params[:filter][@name] rescue ''
+      end
+    end
+  end
+end

data/lib/tableficate/filters/check_box.rb

@@ -0,0 +1,6 @@
+module Tableficate
+  module Filter
+    class CheckBox < Base
+    end
+  end
+end

data/lib/tableficate/filters/choice.rb

@@ -0,0 +1,23 @@
+module Tableficate
+  module Filter
+    class Choice
+      attr_reader :name, :value, :options
+
+      def initialize(name, value, options = {})
+        @name  = name
+        @value = value
+
+        @selected = !!(options.has_key?(:selected) || options.has_key?(:checked))
+        options.delete(:selected)
+        options.delete(:checked)
+
+        @options = options
+      end
+
+      def selected?
+        @selected
+      end
+      alias_method :checked?, :selected?
+    end
+  end
+end

data/lib/tableficate/filters/collection.rb

@@ -0,0 +1,30 @@
+module Tableficate
+  module Filter
+    class Collection < Array
+      def initialize(container, options = {})
+        container = container.to_a if container.is_a?(Range)
+
+        selected = Array.wrap(options[:selected]).map{|item| item.to_s}
+        disabled = Array.wrap(options[:disabled]).map{|item| item.to_s}
+
+        container.map do |element|
+          text, value, choice_options = case
+            when Array === element
+              html_attrs = element.detect {|e| Hash === e} || {}
+              element = element.reject {|e| Hash === e} 
+              [element.first, element.last, html_attrs]
+            when !element.is_a?(String) && element.respond_to?(:first) && element.respond_to?(:last)
+              [element.first, element.last, {}]
+            else
+              [element, element, {}]
+            end
+
+          choice_options[:selected] = 'selected' if selected.include?(value.to_s)
+          choice_options[:disabled] = 'disabled' if disabled.include?(value.to_s)
+
+          self.push(Choice.new(text, value, choice_options))
+        end
+      end
+    end
+  end
+end

data/lib/tableficate/filters/input.rb

@@ -0,0 +1,12 @@
+module Tableficate
+  module Filter
+    class Input < Base
+      def initialize(table, name, options = {})
+        super(table, name, options)
+
+        new_template = "filters/input_#{options[:type]}"
+        @template = new_template if table.template.lookup_context.exists?(Tableficate::Utils::template_path(new_template, table.options[:theme]), [], true)
+      end
+    end
+  end
+end

data/lib/tableficate/filters/input_range.rb

@@ -0,0 +1,57 @@
+module Tableficate
+  module Filter
+    class InputStart < Input
+      def initialize(table, name, options = {})
+        super(table, name, options)
+
+        @field_name += '[start]'
+      end
+
+      def name
+        "#{@name}_start".to_sym
+      end
+
+      def field_value(params)
+        params[:filter][@name][:start] rescue ''
+      end
+    end
+
+    class InputStop < Input
+      def initialize(table, name, options = {})
+        super(table, name, options)
+
+        @field_name += '[stop]'
+      end
+
+      def name
+        "#{@name}_stop".to_sym
+      end
+
+      def field_value(params)
+        params[:filter][@name][:stop] rescue ''
+      end
+    end
+
+    class InputRange < Base
+      attr_reader :start, :stop
+
+      def initialize(table, name, options = {})
+        start_options = options.delete(:start) || {}
+        stop_options  = options.delete(:stop)  || {}
+
+        super(table, name, options)
+
+        start_options.reverse_merge!(@options)
+        start_options.reverse_merge!(label: self.label)
+        stop_options.reverse_merge!(@options)
+        stop_options.reverse_merge!(label: self.label)
+
+        @start = InputStart.new(table, name, start_options)
+        @stop  = InputStop.new(table, name, stop_options)
+
+        new_template = "filters/input_range_#{options[:type]}"
+        @template = new_template if table.template.lookup_context.exists?(Tableficate::Utils::template_path(new_template, table.options[:theme]), [], true)
+      end
+    end
+  end
+end

data/lib/tableficate/filters/radio.rb

@@ -0,0 +1,6 @@
+module Tableficate
+  module Filter
+    class Radio < Base
+    end
+  end
+end

data/lib/tableficate/filters/select.rb

@@ -0,0 +1,6 @@
+module Tableficate
+  module Filter
+    class Select < Base
+    end
+  end
+end

data/lib/tableficate/filters/select_range.rb

@@ -0,0 +1,54 @@
+module Tableficate
+  module Filter
+    class SelectStart < Select
+      def initialize(table, name, options = {})
+        super(table, name, options)
+
+        @field_name += '[start]'
+      end
+
+      def name
+        "#{@name}_start".to_sym
+      end
+
+      def field_value(params)
+        params[:filter][@name][:start] rescue ''
+      end
+    end
+
+    class SelectStop < Select
+      def initialize(table, name, options = {})
+        super(table, name, options)
+
+        @field_name += '[stop]'
+      end
+
+      def name
+        "#{@name}_stop".to_sym
+      end
+
+      def field_value(params)
+        params[:filter][@name][:stop] rescue ''
+      end
+    end
+
+    class SelectRange < Base
+      attr_reader :start, :stop
+
+      def initialize(table, name, options = {})
+        start_options = options.delete(:start) || {}
+        stop_options  = options.delete(:stop)  || {}
+
+        super(table, name, options)
+
+        start_options.reverse_merge!(@options)
+        start_options.reverse_merge!(label: self.label)
+        stop_options.reverse_merge!(@options)
+        stop_options.reverse_merge!(label: self.label)
+
+        @start = SelectStart.new(table, name, start_options)
+        @stop  = SelectStop.new(table, name, stop_options)
+      end
+    end
+  end
+end

data/lib/tableficate/helper.rb

@@ -7,7 +7,7 @@ module Tableficate
     end
 
     def tableficate_header_tag(column)
-      render partial: Tableficate::Utils::template_path('column_header', column.table.options[:theme]), locals: {column: column}
+      render partial: Tableficate::Utils::template_path('header', column.table.options[:theme]), locals: {column: column}
     end
 
     def tableficate_data_tag(row, column)
@@ -23,15 +23,80 @@ module Tableficate
     end
 
     def tableficate_label_tag(filter)
-      label_tag(filter.field_name, filter.label, filter.options[:label_options] || {})
+      label_tag(filter.field_name, filter.label, filter.options[:label_options])
     end
 
     def tableficate_text_field_tag(filter)
-      text_field_tag(filter.field_name, filter.field_value(params[filter.table.as]), filter.options[:field_options] || {})
+      text_field_tag(filter.field_name, filter.field_value(params[filter.table.as]), filter.options)
     end
 
     def tableficate_select_tag(filter)
-      select_tag(filter.field_name, filter.choices, filter.options)
+      field_value = filter.field_value(params[filter.table.as])
+
+      if field_value.present? and filter.options[:collection].is_a?(String)
+        Array.wrap(field_value).each do |fv|
+          if filter.options[:collection].match(/<option[^>]*value\s*=/)
+            filter.options[:collection].gsub!(/(<option[^>]*value\s*=\s*['"]?#{fv}[^>]*)/, '\1 selected="selected"')
+          else
+            filter.options[:collection].gsub!(/>#{fv}</, " selected=\"selected\">#{fv}<")
+          end
+        end
+      elsif not filter.options[:collection].is_a?(String)
+        filter.options[:collection] = Tableficate::Filter::Collection.new(filter.options[:collection], selected: field_value).map {|choice|
+          html_attributes = choice.options.length > 0 ? ' ' + choice.options.map {|k, v| %(#{k.to_s}="#{v}")}.join(' ') : ''
+          selected_attribute = choice.selected? ? ' selected="selected"' : ''
+
+          %(<option value="#{ERB::Util.html_escape(choice.value)}"#{selected_attribute}#{html_attributes}>#{ERB::Util.html_escape(choice.name)}</option>)
+        }.join("\n")
+      end
+
+      filter.options[:collection] = filter.options[:collection].html_safe
+
+      select_tag(filter.field_name, filter.options.delete(:collection), filter.options)
+    end
+
+    def tableficate_radio_tags(filter, &block)
+      field_value = filter.field_value(params[filter.table.as])
+
+      collection = Tableficate::Filter::Collection.new(filter.options[:collection], selected: filter.field_value(params[filter.table.as]))
+
+      html = []
+      if block_given?
+        html = collection.map {|choice| capture(choice, &block)}
+      else
+        collection.each do |choice|
+          html.push(
+            radio_button_tag(filter.field_name, choice.value, choice.checked?, choice.options),
+            label_tag("#{filter.field_name}[#{choice.value}]", choice.name),
+            '<br/>'
+          )
+        end
+      end
+
+      html.join("\n").html_safe
+    end
+
+    def tableficate_check_box_tags(filter, &block)
+      field_value = filter.field_value(params[filter.table.as])
+
+      collection = Tableficate::Filter::Collection.new(filter.options[:collection], selected: filter.field_value(params[filter.table.as]))
+
+      html = []
+      if block_given?
+        html = collection.map {|choice| capture(choice, &block)}
+      else
+        collection.each do |choice|
+          html.push(
+            check_box_tag(
+              "#{filter.field_name}[#{choice.value}]", choice.value, choice.checked?, choice.options.reverse_merge(name: "#{filter.field_name}[]")
+            ),
+            label_tag("#{filter.field_name}[#{choice.value}]", choice.name),
+            '<br/>'
+          )
+        end
+      end
+
+      html.join("\n").html_safe
     end
   end
 end