dry_crud 2.0.0 → 2.1.0

data/lib/generators/dry_crud/templates/test/helpers/{crud/form_builder_test.rb → dry_crud/form/builder_test.rb}

@@ -2,8 +2,8 @@
 require 'test_helper'
 require 'support/crud_test_model'
 
-# Test Crud::FormBuilder
-class Crud::FormBuilderTest < ActionView::TestCase
+# Test DryCrud::Form::Builder
+class DryCrud::Form::BuilderTest < ActionView::TestCase
 
   include FormatHelper
   include I18nHelper
@@ -19,62 +19,75 @@ class Crud::FormBuilderTest < ActionView::TestCase
 
   def create_form
     @entry = CrudTestModel.first
-<% if Rails.version < '4.0' -%>
-    @form = Crud::FormBuilder.new(:entry, @entry, self, {},
-                                  ->(form) { form })
-<% else -%>
-    @form = Crud::FormBuilder.new(:entry, @entry, self, {})
-<% end -%>
+    if Rails.version < '4.0'
+      @form = DryCrud::Form::Builder.new(:entry, @entry, self, {},
+                                    ->(form) { form })
+    else
+      @form = DryCrud::Form::Builder.new(:entry, @entry, self, {})
+    end
   end
 
   test 'input_field dispatches string attr to string_field' do
-    assert_equal form.string_field(:name), form.input_field(:name)
+    assert_equal form.with_addon(
+                   form.string_field(:name,
+                                     class: 'form-control',
+                                     required: 'required'),
+                   '*'),
+                 form.input_field(:name)
     assert form.string_field(:name).html_safe?
   end
 
   test 'input_field dispatches password attr to password_field' do
-    assert_equal form.password_field(:password), form.input_field(:password)
+    assert_equal form.password_field(:password, class: 'form-control'),
+                 form.input_field(:password)
     assert form.password_field(:name).html_safe?
   end
 
   test 'input_field dispatches email attr to email_field' do
-    assert_equal form.email_field(:email), form.input_field(:email)
+    assert_equal form.email_field(:email, class: 'form-control'),
+                 form.input_field(:email)
     assert form.email_field(:name).html_safe?
   end
 
   test 'input_field dispatches text attr to text_area' do
-    assert_equal form.text_area(:remarks), form.input_field(:remarks)
+    assert_equal form.text_area(:remarks, class: 'form-control'),
+                 form.input_field(:remarks)
     assert form.text_area(:remarks).html_safe?
   end
 
   test 'input_field dispatches integer attr to integer_field' do
-    assert_equal form.integer_field(:children), form.input_field(:children)
+    assert_equal form.integer_field(:children, class: 'form-control'),
+                 form.input_field(:children)
     assert form.integer_field(:children).html_safe?
   end
 
   test 'input_field dispatches boolean attr to boolean_field' do
-    assert_equal form.boolean_field(:human), form.input_field(:human)
+    assert_equal form.boolean_field(:human, class: 'form-control'),
+                 form.input_field(:human)
     assert form.boolean_field(:human).html_safe?
   end
 
   test 'input_field dispatches date attr to date_field' do
-    assert_equal form.date_field(:birthdate), form.input_field(:birthdate)
+    assert_equal form.date_field(:birthdate, class: 'form-control'),
+                 form.input_field(:birthdate)
     assert form.date_field(:birthdate).html_safe?
   end
 
   test 'input_field dispatches belongs_to attr to select field' do
-    assert_equal form.belongs_to_field(:companion_id),
+    assert_equal form.belongs_to_field(:companion_id, class: 'form-control'),
                  form.input_field(:companion_id)
     assert form.belongs_to_field(:companion_id).html_safe?
   end
 
   test 'input_field dispatches has_and_belongs_to_many attr to select field' do
-    assert_equal form.has_many_field(:other_ids), form.input_field(:other_ids)
+    assert_equal form.has_many_field(:other_ids, class: 'form-control'),
+                 form.input_field(:other_ids)
     assert form.has_many_field(:other_ids).html_safe?
   end
 
   test 'input_field dispatches has_many attr to select field' do
-    assert_equal form.has_many_field(:more_ids), form.input_field(:more_ids)
+    assert_equal form.has_many_field(:more_ids, class: 'form-control'),
+                 form.input_field(:more_ids)
     assert form.has_many_field(:more_ids).html_safe?
   end
 
@@ -88,15 +101,15 @@ class Crud::FormBuilderTest < ActionView::TestCase
 
   test 'labeld_input_field adds required mark' do
     result = form.labeled_input_field(:name)
-    assert result.include?(Crud::FormBuilder::REQUIRED_MARK)
+    assert result.include?('input-group-addon')
     result = form.labeled_input_field(:remarks)
-    assert !result.include?(Crud::FormBuilder::REQUIRED_MARK)
+    assert !result.include?('input-group-addon')
   end
 
   test 'labeld_input_field adds help text' do
     result = form.labeled_input_field(:name, help: 'Some Help')
     assert result.include?(form.help_block('Some Help'))
-    assert result.include?(Crud::FormBuilder::REQUIRED_MARK)
+    assert result.include?('input-group-addon')
   end
 
   test 'belongs_to_field has all options by default' do
@@ -211,14 +224,14 @@ class Crud::FormBuilderTest < ActionView::TestCase
 
   test 'labeled field creates label with caption' do
     result = form.labeled('gugus',
-                          'Caption',
-                          "<input type='text' name='gugus' />".html_safe)
+                          "<input type='text' name='gugus' />".html_safe,
+                          caption: 'Caption')
     assert result.html_safe?
     assert_match /label [^>]*for.+>Caption<\/label>.*<input/m, result
   end
 
   test 'labeled field creates label with caption and block' do
-    result = form.labeled('gugus', 'Caption') do
+    result = form.labeled('gugus', caption: 'Caption') do
       "<input type='text' name='gugus' />".html_safe
     end
     assert result.html_safe?
@@ -236,4 +249,4 @@ class Crud::FormBuilderTest < ActionView::TestCase
     assert form.respond_to?(:text_field)
     assert form.respond_to?(:labeled_text_field)
   end
-end
+end

data/lib/generators/dry_crud/templates/test/helpers/{crud/table_builder_test.rb → dry_crud/table/builder_test.rb}

@@ -1,8 +1,8 @@
 # encoding: UTF-8
 require 'test_helper'
 
-# Test Crud::TableBuilder
-class Crud::TableBuilderTest < ActionView::TestCase
+# Test DryCrud::Table::Builder
+class DryCrud::Table::BuilderTest < ActionView::TestCase
 
   # set dummy helper class for ActionView::TestCase
   self.helper_class = UtilityHelper
@@ -13,7 +13,7 @@ class Crud::TableBuilderTest < ActionView::TestCase
 
   def setup
     @entries = %w(foo bahr)
-    @table = Crud::TableBuilder.new(entries, self)
+    @table = DryCrud::Table::Builder.new(entries, self)
   end
 
   def format_size(obj)
@@ -122,7 +122,7 @@ class Crud::TableBuilderTest < ActionView::TestCase
     FIN
     dom.gsub!(/[\n\t]/, '').gsub!(/\s{2,}/, '')
 
-   table = Crud::TableBuilder.new([], self)
+   table = DryCrud::Table::Builder.new([], self)
     table.col('head', class: 'left') { |e| link_to e, '/' }
     table.attrs :upcase, :size
     table.col { |e| "Never #{e}" }

data/lib/generators/dry_crud/templates/test/helpers/form_helper_test.rb

@@ -54,7 +54,8 @@ class FormHelperTest < ActionView::TestCase
     assert_match /input .*?name="crud_test_model\[name\]"
                         .*?type="text"
                         .*?value="AAAAA"/x, f
-    assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
+    assert_match /input .*?name="crud_test_model\[birthdate\]"
+                        .*?type="date"/x, f
     assert_match /input .*?name="crud_test_model\[children\]"
                         .*?type="number"
                         .*?value=\"9\"/x, f
@@ -87,15 +88,12 @@ class FormHelperTest < ActionView::TestCase
                         .*?type="hidden"
                         .*?value="(patch|put)"/x, f
     assert_match /div[^>]* id='error_explanation'/, f
-    assert_match /div\ class="control-group\ error"\>.*?
+    assert_match /div\ class="form-group\ has-error"\>.*?
                   \<input .*?name="crud_test_model\[name\]"
                           .*?type="text"/x, f
-    assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
-    assert_match /option selected="selected" value="1910">1910<\/option>/, f
-    assert_match /option\ selected="selected"\ value="1"\>
-                  #{t('date.month_names')[1]}
-                  \<\/option\>/x, f
-    assert_match /option selected="selected" value="1">1<\/option>/, f
+    assert_match /input .*?name="crud_test_model\[birthdate\]"
+                        .*?type="date"
+                        .*?value="1910-01-01"/x, f
   end
 
   test 'crud form' do
@@ -114,7 +112,12 @@ class FormHelperTest < ActionView::TestCase
                         .*?type="number"/x, f
     assert_match /input .*?name="crud_test_model\[income\]"
                         .*?type="number"/x, f
-    assert_match /select .*?name="crud_test_model\[birthdate\(1i\)\]"/, f
+    assert_match /input .*?name="crud_test_model\[birthdate\]"
+                        .*?type="date"/x, f
+    assert_match /input .*?name="crud_test_model\[gets_up_at\]"
+                        .*?type="time"/x, f
+    assert_match /input .*?name="crud_test_model\[last_seen\]"
+                        .*?type="datetime"/x, f
     assert_match /input .*?name="crud_test_model\[human\]"
                         .*?type="checkbox"/x, f
     assert_match /select .*?name="crud_test_model\[companion_id\]"/, f

data/lib/generators/dry_crud/templates/test/helpers/format_helper_test.rb

@@ -95,7 +95,7 @@ class FormatHelperTest < ActionView::TestCase
     m = crud_test_models(:AAAAA)
     assert_equal '9', format_type(m, :children)
 
-    m.children = 10000
+    m.children = 10_000
     assert_equal '10000', format_type(m, :children)
   end
 
@@ -136,6 +136,18 @@ class FormatHelperTest < ActionView::TestCase
     assert format_type(m, :remarks).html_safe?
   end
 
+  test 'format boolean false column' do
+    m = crud_test_models(:AAAAA)
+    m.human = false
+    assert_equal 'no', format_type(m, :human)
+  end
+
+  test 'format boolean true column' do
+    m = crud_test_models(:AAAAA)
+    m.human = true
+    assert_equal 'yes', format_type(m, :human)
+  end
+
   test 'format belongs to column without content' do
     m = crud_test_models(:AAAAA)
     assert_equal t('global.associations.no_entry'),

data/lib/generators/dry_crud/templates/test/helpers/table_helper_test.rb

@@ -26,7 +26,7 @@ class TableHelperTest < ActionView::TestCase
   end
 
   test 'empty table should render message' do
-    result = plain_table_or_message([]) { }
+    result = plain_table_or_message([]) {}
     assert result.html_safe?
     assert_match /\<div class=["']table["']\>.*\<\/div\>/, result
   end
@@ -40,9 +40,9 @@ class TableHelperTest < ActionView::TestCase
   end
 
   test 'table with attrs' do
-    expected = Crud::TableBuilder.table(%w(foo bar),
-                                        self,
-                                        class: 'table') do |t|
+    expected = DryCrud::Table::Builder.table(
+                 %w(foo bar), self,
+                 class: 'table table-striped table-hover') do |t|
       t.attrs :size, :upcase
     end
     actual = plain_table(%w(foo bar), :size, :upcase)

data/lib/generators/dry_crud/templates/test/support/crud_controller_test_helper.rb

@@ -81,7 +81,7 @@ module CrudControllerTestHelper
       post :create, test_params(model_identifier => new_entry_attrs)
     end
     assert_redirected_to_show entry
-    assert ! entry.new_record?
+    assert !entry.new_record?
     assert_attrs_equal(new_entry_attrs)
   end
 
@@ -179,12 +179,12 @@ module CrudControllerTestHelper
 
   # Test object used in several tests.
   def test_entry
-    raise 'Implement this method in your test class'
+    fail 'Implement this method in your test class'
   end
 
   # Attribute hash used in several tests.
   def test_entry_attrs
-    raise 'Implement this method in your test class'
+    fail 'Implement this method in your test class'
   end
 
   # Attribute hash used in edit/update tests.

data/lib/generators/dry_crud/templates/test/support/crud_test_model.rb

@@ -313,7 +313,7 @@ module CrudTestHelper
       gets_up_at: Time.zone.local(2000, 1, 1, index, index),
       last_seen: "#{2000 + 10 * index}-#{index}-#{index} " +
                     "1#{index}:2#{index}",
-      human: index % 2 == 0,
+      human: index.even?,
       remarks: "#{c} #{str(index + 1)} #{str(index + 2)}\n" *
                   (index % 3 + 1))
     m.companion = companion
@@ -330,7 +330,7 @@ module CrudTestHelper
   end
 
   def str(index)
-     (index + 64).chr * 5
+    (index + 64).chr * 5
   end
 
   # A hack to avoid ddl in transaction issues with mysql.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry_crud
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Pascal Zumkehr
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-13 00:00:00.000000000 Z
+date: 2013-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -40,75 +40,83 @@ extra_rdoc_files:
 - README.rdoc
 - VERSION
 files:
+- app/assets/images/actions/add.png
+- app/assets/images/actions/delete.png
+- app/assets/images/actions/edit.png
+- app/assets/images/actions/list.png
+- app/assets/images/actions/show.png
+- app/assets/stylesheets/crud.scss
+- app/assets/stylesheets/sample.scss
+- app/controllers/crud_controller.rb
+- app/controllers/dry_crud/generic_model.rb
+- app/controllers/dry_crud/nestable.rb
+- app/controllers/dry_crud/rememberable.rb
+- app/controllers/dry_crud/render_callbacks.rb
+- app/controllers/dry_crud/responder.rb
+- app/controllers/dry_crud/searchable.rb
+- app/controllers/dry_crud/sortable.rb
+- app/controllers/list_controller.rb
+- app/helpers/actions_helper.rb
+- app/helpers/dry_crud/form/builder.rb
+- app/helpers/dry_crud/form/control.rb
+- app/helpers/dry_crud/table/actions.rb
+- app/helpers/dry_crud/table/builder.rb
+- app/helpers/dry_crud/table/col.rb
+- app/helpers/dry_crud/table/sorting.rb
+- app/helpers/form_helper.rb
+- app/helpers/format_helper.rb
+- app/helpers/i18n_helper.rb
+- app/helpers/table_helper.rb
+- app/helpers/utility_helper.rb
+- app/views/crud/_actions_edit.html.erb
+- app/views/crud/_actions_edit.html.haml
+- app/views/crud/_actions_index.html.erb
+- app/views/crud/_actions_index.html.haml
+- app/views/crud/_actions_show.html.erb
+- app/views/crud/_actions_show.html.haml
+- app/views/crud/_attrs.html.erb
+- app/views/crud/_attrs.html.haml
+- app/views/crud/_form.html.erb
+- app/views/crud/_form.html.haml
+- app/views/crud/_list.html.erb
+- app/views/crud/_list.html.haml
+- app/views/crud/edit.html.erb
+- app/views/crud/edit.html.haml
+- app/views/crud/new.html.erb
+- app/views/crud/new.html.haml
+- app/views/crud/show.html.erb
+- app/views/crud/show.html.haml
+- app/views/layouts/_flash.html.erb
+- app/views/layouts/_flash.html.haml
+- app/views/layouts/_nav.html.erb
+- app/views/layouts/_nav.html.haml
+- app/views/layouts/application.html.erb
+- app/views/layouts/application.html.haml
+- app/views/list/_actions_index.html.erb
+- app/views/list/_actions_index.html.haml
+- app/views/list/_list.html.erb
+- app/views/list/_list.html.haml
+- app/views/list/_search.html.erb
+- app/views/list/_search.html.haml
+- app/views/list/index.html.erb
+- app/views/list/index.html.haml
+- app/views/shared/_error_messages.html.erb
+- app/views/shared/_error_messages.html.haml
+- app/views/shared/_labeled.html.erb
+- app/views/shared/_labeled.html.haml
+- config/locales/crud.de.yml
+- config/locales/crud.en.yml
+- lib/dry_crud.rb
+- lib/dry_crud/engine.rb
 - lib/generators/dry_crud/USAGE
 - lib/generators/dry_crud/dry_crud_generator.rb
+- lib/generators/dry_crud/dry_crud_generator_base.rb
+- lib/generators/dry_crud/file_generator.rb
 - lib/generators/dry_crud/templates/INSTALL
-- lib/generators/dry_crud/templates/app/assets/images/actions/add.png
-- lib/generators/dry_crud/templates/app/assets/images/actions/delete.png
-- lib/generators/dry_crud/templates/app/assets/images/actions/edit.png
-- lib/generators/dry_crud/templates/app/assets/images/actions/list.png
-- lib/generators/dry_crud/templates/app/assets/images/actions/show.png
-- lib/generators/dry_crud/templates/app/assets/stylesheets/crud.scss
-- lib/generators/dry_crud/templates/app/assets/stylesheets/sample.scss
-- lib/generators/dry_crud/templates/app/controllers/crud/generic_model.rb
-- lib/generators/dry_crud/templates/app/controllers/crud/nestable.rb
-- lib/generators/dry_crud/templates/app/controllers/crud/rememberable.rb
-- lib/generators/dry_crud/templates/app/controllers/crud/render_callbacks.rb
-- lib/generators/dry_crud/templates/app/controllers/crud/responder.rb
-- lib/generators/dry_crud/templates/app/controllers/crud/searchable.rb
-- lib/generators/dry_crud/templates/app/controllers/crud/sortable.rb
-- lib/generators/dry_crud/templates/app/controllers/crud_controller.rb
-- lib/generators/dry_crud/templates/app/controllers/list_controller.rb
-- lib/generators/dry_crud/templates/app/helpers/actions_helper.rb
-- lib/generators/dry_crud/templates/app/helpers/crud/form_builder.rb
-- lib/generators/dry_crud/templates/app/helpers/crud/table_builder.rb
-- lib/generators/dry_crud/templates/app/helpers/form_helper.rb
-- lib/generators/dry_crud/templates/app/helpers/format_helper.rb
-- lib/generators/dry_crud/templates/app/helpers/i18n_helper.rb
-- lib/generators/dry_crud/templates/app/helpers/table_helper.rb
-- lib/generators/dry_crud/templates/app/helpers/utility_helper.rb
-- lib/generators/dry_crud/templates/app/views/crud/_actions_edit.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/_actions_edit.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/_actions_index.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/_actions_index.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/_actions_show.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/_actions_show.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/_attrs.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/_attrs.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/_form.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/_form.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/_list.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/_list.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/edit.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/edit.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/new.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/new.html.haml
-- lib/generators/dry_crud/templates/app/views/crud/show.html.erb
-- lib/generators/dry_crud/templates/app/views/crud/show.html.haml
-- lib/generators/dry_crud/templates/app/views/layouts/_flash.html.erb
-- lib/generators/dry_crud/templates/app/views/layouts/_flash.html.haml
-- lib/generators/dry_crud/templates/app/views/layouts/_nav.html.erb
-- lib/generators/dry_crud/templates/app/views/layouts/_nav.html.haml
-- lib/generators/dry_crud/templates/app/views/layouts/crud.html.erb
-- lib/generators/dry_crud/templates/app/views/layouts/crud.html.haml
-- lib/generators/dry_crud/templates/app/views/list/_actions_index.html.erb
-- lib/generators/dry_crud/templates/app/views/list/_actions_index.html.haml
-- lib/generators/dry_crud/templates/app/views/list/_list.html.erb
-- lib/generators/dry_crud/templates/app/views/list/_list.html.haml
-- lib/generators/dry_crud/templates/app/views/list/_search.html.erb
-- lib/generators/dry_crud/templates/app/views/list/_search.html.haml
-- lib/generators/dry_crud/templates/app/views/list/index.html.erb
-- lib/generators/dry_crud/templates/app/views/list/index.html.haml
-- lib/generators/dry_crud/templates/app/views/shared/_error_messages.html.erb
-- lib/generators/dry_crud/templates/app/views/shared/_error_messages.html.haml
-- lib/generators/dry_crud/templates/app/views/shared/_labeled.html.erb
-- lib/generators/dry_crud/templates/app/views/shared/_labeled.html.haml
 - lib/generators/dry_crud/templates/config/initializers/field_error_proc.rb
-- lib/generators/dry_crud/templates/config/locales/crud.de.yml
-- lib/generators/dry_crud/templates/config/locales/crud.en.yml
 - lib/generators/dry_crud/templates/spec/controllers/crud_test_models_controller_spec.rb
-- lib/generators/dry_crud/templates/spec/helpers/crud/form_builder_spec.rb
-- lib/generators/dry_crud/templates/spec/helpers/crud/table_builder_spec.rb
+- lib/generators/dry_crud/templates/spec/helpers/dry_crud/form/builder_spec.rb
+- lib/generators/dry_crud/templates/spec/helpers/dry_crud/table/builder_spec.rb
 - lib/generators/dry_crud/templates/spec/helpers/form_helper_spec.rb
 - lib/generators/dry_crud/templates/spec/helpers/format_helper_spec.rb
 - lib/generators/dry_crud/templates/spec/helpers/i18n_helper_spec.rb
@@ -117,9 +125,9 @@ files:
 - lib/generators/dry_crud/templates/spec/support/crud_controller_examples.rb
 - lib/generators/dry_crud/templates/spec/support/crud_controller_test_helper.rb
 - lib/generators/dry_crud/templates/test/controllers/crud_test_models_controller_test.rb
-- lib/generators/dry_crud/templates/test/helpers/crud/form_builder_test.rb
-- lib/generators/dry_crud/templates/test/helpers/crud/table_builder_test.rb
 - lib/generators/dry_crud/templates/test/helpers/custom_assertions_test.rb
+- lib/generators/dry_crud/templates/test/helpers/dry_crud/form/builder_test.rb
+- lib/generators/dry_crud/templates/test/helpers/dry_crud/table/builder_test.rb
 - lib/generators/dry_crud/templates/test/helpers/form_helper_test.rb
 - lib/generators/dry_crud/templates/test/helpers/format_helper_test.rb
 - lib/generators/dry_crud/templates/test/helpers/i18n_helper_test.rb

data/lib/generators/dry_crud/templates/app/controllers/crud/searchable.rb

@@ -1,55 +0,0 @@
-# encoding: UTF-8
-
-module Crud
-  # The search functionality for the index table.
-  # Define an array of searchable columns in your subclassing controllers
-  # using the class attribute +search_columns+.
-  module Searchable
-    extend ActiveSupport::Concern
-
-    included do
-      class_attribute :search_columns
-      self.search_columns = []
-
-      helper_method :search_support?
-
-      alias_method_chain :list_entries, :search
-    end
-
-    private
-
-    # Enhance the list entries with an optional search criteria
-    def list_entries_with_search
-      list_entries_without_search.where(search_condition)
-    end
-
-    # Compose the search condition with a basic SQL OR query.
-    def search_condition
-      if search_support? && params[:q].present?
-        col_clause = search_column_clause
-        terms = params[:q].split(/\s+/).map { |t| "%#{t}%" }
-        term_clause = terms.map { |t| "(#{col_clause})" }.join(' AND ')
-
-        term_params = terms.map { |t| [t] * search_columns.size }.flatten
-        ["(#{term_clause})", *term_params]
-      end
-    end
-
-    # SQL where clause with all search colums or'ed.
-    def search_column_clause
-      search_columns.map do |f|
-        if f.to_s.include?('.')
-          "#{f} LIKE ?"
-        else
-          "#{model_class.table_name}.#{f} LIKE ?"
-        end
-      end.join(' OR ')
-    end
-
-    # Returns true if this controller has searchable columns.
-    def search_support?
-      search_columns.present?
-    end
-
-  end
-end