ui_bibz 2.4.0 → 2.5.5

data/app/assets/stylesheets/fix_addon.sass

@@ -127,7 +127,6 @@ $input-group-btn-border-color: $input-border-color
     margin-top: 0.1rem
 
   i.glyph
-    margin-top: 0.4rem
     font-size: 1.3rem
 
 

data/config/initializers/simple_form_init.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 unless defined?(SimpleForm).nil?
   SimpleForm.setup do |config|
     # Namespaces where SimpleForm should look for custom input classes that
     # override default inputs.
-    config.custom_inputs_namespaces << "UiBibzInputs"
+    config.custom_inputs_namespaces << 'UiBibzInputs'
   end
 end

data/config/initializers/will_paginate.rb

@@ -1,9 +1,14 @@
+# frozen_string_literal: true
+
 require 'will_paginate/view_helpers/action_view'
 
 module WillPaginate
   module ActionView
     def will_paginate(collection = nil, options = {})
-      options, collection = collection, nil if collection.is_a? Hash
+      if collection.is_a? Hash
+        options = collection
+        collection = nil
+      end
       collection ||= infer_collection_from_controller
 
       options = options.symbolize_keys
@@ -21,10 +26,10 @@ module WillPaginate
       def to_html
         list_items = pagination.map do |item|
           case item
-            when Integer
-              page_number(item)
-            else
-              send(item)
+          when Integer
+            page_number(item)
+          else
+            send(item)
           end
         end.join(@options[:link_separator])
 
@@ -33,7 +38,7 @@ module WillPaginate
       end
 
       def container_attributes
-        super.except(*[:link_options])
+        super.except(:link_options)
       end
 
       protected

data/lib/generators/ui_bibz/install_generator.rb

@@ -1,16 +1,17 @@
+# frozen_string_literal: true
+
 require 'rails/generators'
 module UiBibz
   module Generators
     class InstallGenerator < ::Rails::Generators::Base
-      source_root File.expand_path("../templates", __FILE__)
-      desc "Creates Ui Bibz initializer for your application"
+      source_root File.expand_path('templates', __dir__)
+      desc 'Creates Ui Bibz initializer for your application'
 
       def copy_initializer
-        template "ui_bibz_initializer.rb", "config/initializers/ui_bibz.rb"
+        template 'ui_bibz_initializer.rb', 'config/initializers/ui_bibz.rb'
 
-        puts "Install complete in config/initializers/ui_bibz.rb. Now you can configure the library!"
+        puts 'Install complete in config/initializers/ui_bibz.rb. Now you can configure the library!'
       end
     end
   end
 end
-

data/lib/generators/ui_bibz/templates/ui_bibz_initializer.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
+
 UiBibz.configure do |config|
   config.fontawesomejs = true
 end
-

data/lib/tasks/ui_bibz_tasks.rake

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :ui_bibz do
 #   # Task goes here

data/lib/ui_bibz.rb

@@ -1,40 +1,37 @@
+# frozen_string_literal: true
+
 require 'action_view'
 require 'will_paginate'
 require 'will-paginate-i18n'
 
 module UiBibzForm
-
-  autoload :UiBibzFormBuilder, "ui_bibz/inputs/ui_bibz_form/ui_bibz_form_builder"
-
+  autoload :UiBibzFormBuilder, 'ui_bibz/inputs/ui_bibz_form/ui_bibz_form_builder'
 end
 
 module UiBibzInputs
-
-  autoload :BaseInput,                  "ui_bibz/inputs/ui_bibz_inputs/base_input"
-  autoload :CollectionInput,            "ui_bibz/inputs/ui_bibz_inputs/collection_input"
-  autoload :StringInput,                "ui_bibz/inputs/ui_bibz_inputs/string_input"
-  autoload :UiAutoCompleteFieldInput,   "ui_bibz/inputs/ui_bibz_inputs/ui_auto_complete_field_input"
-  autoload :UiChoiceGroupInput,         "ui_bibz/inputs/ui_bibz_inputs/ui_choice_group_input"
-  autoload :UiDatePickerFieldInput,     "ui_bibz/inputs/ui_bibz_inputs/ui_date_picker_field_input"
-  autoload :UiDropdownSelectFieldInput, "ui_bibz/inputs/ui_bibz_inputs/ui_dropdown_select_field_input"
-  autoload :UiFormulaFieldInput,        "ui_bibz/inputs/ui_bibz_inputs/ui_formula_field_input"
-  autoload :UiMarkdownEditorFieldInput, "ui_bibz/inputs/ui_bibz_inputs/ui_markdown_editor_field_input"
-  autoload :UiMultiColumnFieldInput,    "ui_bibz/inputs/ui_bibz_inputs/ui_multi_column_field_input"
-  autoload :UiMultiSelectFieldInput,    "ui_bibz/inputs/ui_bibz_inputs/ui_multi_select_field_input"
-  autoload :UiNumberFieldInput,         "ui_bibz/inputs/ui_bibz_inputs/ui_number_field_input"
-  autoload :UiRadioFieldInput,          "ui_bibz/inputs/ui_bibz_inputs/ui_radio_field_input"
-  autoload :UiSelectFieldInput,         "ui_bibz/inputs/ui_bibz_inputs/ui_select_field_input"
-  autoload :UiBoxSwitchFieldInput,      "ui_bibz/inputs/ui_bibz_inputs/ui_box_switch_field_input"
-  autoload :UiSwitchFieldInput,         "ui_bibz/inputs/ui_bibz_inputs/ui_switch_field_input"
-  autoload :UiTextFieldInput,           "ui_bibz/inputs/ui_bibz_inputs/ui_text_field_input"
-  autoload :UiFileFieldInput,           "ui_bibz/inputs/ui_bibz_inputs/ui_file_field_input"
-  autoload :UiRangeFieldInput,          "ui_bibz/inputs/ui_bibz_inputs/ui_range_field_input"
-
+  autoload :BaseInput,                  'ui_bibz/inputs/ui_bibz_inputs/base_input'
+  autoload :CollectionInput,            'ui_bibz/inputs/ui_bibz_inputs/collection_input'
+  autoload :StringInput,                'ui_bibz/inputs/ui_bibz_inputs/string_input'
+  autoload :UiAutoCompleteFieldInput,   'ui_bibz/inputs/ui_bibz_inputs/ui_auto_complete_field_input'
+  autoload :UiChoiceGroupInput,         'ui_bibz/inputs/ui_bibz_inputs/ui_choice_group_input'
+  autoload :UiDatePickerFieldInput,     'ui_bibz/inputs/ui_bibz_inputs/ui_date_picker_field_input'
+  autoload :UiDropdownSelectFieldInput, 'ui_bibz/inputs/ui_bibz_inputs/ui_dropdown_select_field_input'
+  autoload :UiFormulaFieldInput,        'ui_bibz/inputs/ui_bibz_inputs/ui_formula_field_input'
+  autoload :UiMarkdownEditorFieldInput, 'ui_bibz/inputs/ui_bibz_inputs/ui_markdown_editor_field_input'
+  autoload :UiMultiColumnFieldInput,    'ui_bibz/inputs/ui_bibz_inputs/ui_multi_column_field_input'
+  autoload :UiMultiSelectFieldInput,    'ui_bibz/inputs/ui_bibz_inputs/ui_multi_select_field_input'
+  autoload :UiNumberFieldInput,         'ui_bibz/inputs/ui_bibz_inputs/ui_number_field_input'
+  autoload :UiRadioFieldInput,          'ui_bibz/inputs/ui_bibz_inputs/ui_radio_field_input'
+  autoload :UiSelectFieldInput,         'ui_bibz/inputs/ui_bibz_inputs/ui_select_field_input'
+  autoload :UiBoxSwitchFieldInput,      'ui_bibz/inputs/ui_bibz_inputs/ui_box_switch_field_input'
+  autoload :UiSwitchFieldInput,         'ui_bibz/inputs/ui_bibz_inputs/ui_switch_field_input'
+  autoload :UiTextFieldInput,           'ui_bibz/inputs/ui_bibz_inputs/ui_text_field_input'
+  autoload :UiFileFieldInput,           'ui_bibz/inputs/ui_bibz_inputs/ui_file_field_input'
+  autoload :UiRangeFieldInput,          'ui_bibz/inputs/ui_bibz_inputs/ui_range_field_input'
 end
 
 module UiBibz
-
-  @@configured = false
+  @@configured = false # rubocop:disable Style/ClassVars
 
   # Configuration of Ui Bibz
   class << self
@@ -47,7 +44,7 @@ module UiBibz
 
   def self.configure
     self.configuration ||= Configuration.new
-    @@configured = true
+    @@configured = true # rubocop:disable Style/ClassVars
     yield(configuration)
   end
 
@@ -63,162 +60,156 @@ module UiBibz
 
   # Add modules
   module Utils
-    autoload :Screwdriver,             "ui_bibz/utils/screwdriver"
-    autoload :GlyphChanger,            "ui_bibz/utils/glyph_changer"
+    autoload :Screwdriver,             'ui_bibz/utils/screwdriver'
+    autoload :GlyphChanger,            'ui_bibz/utils/glyph_changer'
   end
 
   module Ui
     # Base
-    autoload :Base,                    "ui_bibz/ui/base"
+    autoload :Base,                    'ui_bibz/ui/base'
 
     # Core
     module Core
-
       module Boxes
-        autoload :Card,                    "ui_bibz/ui/core/boxes/card"
-        autoload :CardAccordion,           "ui_bibz/ui/core/boxes/card_accordion"
-        autoload :CardColumn,              "ui_bibz/ui/core/boxes/card_column"
-        autoload :CardDeck,                "ui_bibz/ui/core/boxes/card_deck"
-        autoload :CardGroup,               "ui_bibz/ui/core/boxes/card_group"
-        autoload :Jumbotron,               "ui_bibz/ui/core/boxes/jumbotron"
+        autoload :Card,                    'ui_bibz/ui/core/boxes/card'
+        autoload :CardAccordion,           'ui_bibz/ui/core/boxes/card_accordion'
+        autoload :CardColumn,              'ui_bibz/ui/core/boxes/card_column'
+        autoload :CardDeck,                'ui_bibz/ui/core/boxes/card_deck'
+        autoload :CardGroup,               'ui_bibz/ui/core/boxes/card_group'
+        autoload :Jumbotron,               'ui_bibz/ui/core/boxes/jumbotron'
       end
 
       module Forms
-
         module Dropdowns
-          autoload :Dropdown,                "ui_bibz/ui/core/forms/dropdowns/dropdown"
-          autoload :SplitDropdown,           "ui_bibz/ui/core/forms/dropdowns/split_dropdown"
+          autoload :Dropdown,                'ui_bibz/ui/core/forms/dropdowns/dropdown'
+          autoload :SplitDropdown,           'ui_bibz/ui/core/forms/dropdowns/split_dropdown'
         end
 
         module Dates
-          autoload :DatePickerField,         "ui_bibz/ui/core/forms/dates/date_picker_field"
+          autoload :DatePickerField,         'ui_bibz/ui/core/forms/dates/date_picker_field'
         end
 
         module Choices
-          autoload :SwitchField,             "ui_bibz/ui/core/forms/choices/switch_field"
-          autoload :BoxSwitchField,          "ui_bibz/ui/core/forms/choices/box_switch_field"
-          autoload :CheckboxField,           "ui_bibz/ui/core/forms/choices/checkbox_field"
-          autoload :RadioField,              "ui_bibz/ui/core/forms/choices/radio_field"
-          autoload :ChoiceGroup,             "ui_bibz/ui/core/forms/choices/choice_group"
+          autoload :SwitchField,             'ui_bibz/ui/core/forms/choices/switch_field'
+          autoload :BoxSwitchField,          'ui_bibz/ui/core/forms/choices/box_switch_field'
+          autoload :CheckboxField,           'ui_bibz/ui/core/forms/choices/checkbox_field'
+          autoload :RadioField,              'ui_bibz/ui/core/forms/choices/radio_field'
+          autoload :ChoiceGroup,             'ui_bibz/ui/core/forms/choices/choice_group'
         end
 
         module Files
-          autoload :FileField,               "ui_bibz/ui/core/forms/files/file_field"
+          autoload :FileField,               'ui_bibz/ui/core/forms/files/file_field'
         end
 
         module Numbers
-          autoload :FormulaField,            "ui_bibz/ui/core/forms/numbers/formula_field"
-          autoload :NumberField,             "ui_bibz/ui/core/forms/numbers/number_field"
-          autoload :RangeField,              "ui_bibz/ui/core/forms/numbers/range_field"
+          autoload :FormulaField,            'ui_bibz/ui/core/forms/numbers/formula_field'
+          autoload :NumberField,             'ui_bibz/ui/core/forms/numbers/number_field'
+          autoload :RangeField,              'ui_bibz/ui/core/forms/numbers/range_field'
         end
 
         module Selects
-          autoload :AbstractSelect,          "ui_bibz/ui/core/forms/selects/abstract_select"
-          autoload :DropdownSelectField,     "ui_bibz/ui/core/forms/selects/dropdown_select_field"
-          autoload :SelectField,             "ui_bibz/ui/core/forms/selects/select_field"
-          autoload :MultiColumnField,        "ui_bibz/ui/core/forms/selects/multi_column_field"
-          autoload :MultiSelectField,        "ui_bibz/ui/core/forms/selects/multi_select_field"
+          autoload :AbstractSelect,          'ui_bibz/ui/core/forms/selects/abstract_select'
+          autoload :DropdownSelectField,     'ui_bibz/ui/core/forms/selects/dropdown_select_field'
+          autoload :SelectField,             'ui_bibz/ui/core/forms/selects/select_field'
+          autoload :MultiColumnField,        'ui_bibz/ui/core/forms/selects/multi_column_field'
+          autoload :MultiSelectField,        'ui_bibz/ui/core/forms/selects/multi_select_field'
         end
 
         module Buttons
-          autoload :Button,                  "ui_bibz/ui/core/forms/buttons/button"
-          autoload :ButtonGroup,             "ui_bibz/ui/core/forms/buttons/button_group"
-          autoload :ButtonLink,              "ui_bibz/ui/core/forms/buttons/button_link"
-          autoload :ButtonRefresh,           "ui_bibz/ui/core/forms/buttons/button_refresh"
+          autoload :Button,                  'ui_bibz/ui/core/forms/buttons/button'
+          autoload :ButtonGroup,             'ui_bibz/ui/core/forms/buttons/button_group'
+          autoload :ButtonLink,              'ui_bibz/ui/core/forms/buttons/button_link'
+          autoload :ButtonRefresh,           'ui_bibz/ui/core/forms/buttons/button_refresh'
         end
 
         module Surrounds
-          autoload :SurroundField,           "ui_bibz/ui/core/forms/surrounds/surround_field"
+          autoload :SurroundField,           'ui_bibz/ui/core/forms/surrounds/surround_field'
         end
 
         module Texts
-          autoload :AutoCompleteField,       "ui_bibz/ui/core/forms/texts/auto_complete_field"
-          autoload :TextField,               "ui_bibz/ui/core/forms/texts/text_field"
+          autoload :AutoCompleteField,       'ui_bibz/ui/core/forms/texts/auto_complete_field'
+          autoload :TextField,               'ui_bibz/ui/core/forms/texts/text_field'
         end
 
         module Textareas
-          autoload :MarkdownEditorField,     "ui_bibz/ui/core/forms/textareas/markdown_editor_field"
+          autoload :MarkdownEditorField,     'ui_bibz/ui/core/forms/textareas/markdown_editor_field'
         end
-
       end
 
       module Icons
-        autoload :Glyph,                   "ui_bibz/ui/core/icons/glyph"
-        autoload :GlyphGroup,              "ui_bibz/ui/core/icons/glyph_group"
-        autoload :Star,                    "ui_bibz/ui/core/icons/star"
+        autoload :Glyph,                   'ui_bibz/ui/core/icons/glyph'
+        autoload :GlyphGroup,              'ui_bibz/ui/core/icons/glyph_group'
+        autoload :Star,                    'ui_bibz/ui/core/icons/star'
       end
 
       module Layouts
-        autoload :Row,                     "ui_bibz/ui/core/layouts/row"
-        autoload :Col,                     "ui_bibz/ui/core/layouts/col"
-        autoload :Container,               "ui_bibz/ui/core/layouts/container"
+        autoload :Row,                     'ui_bibz/ui/core/layouts/row'
+        autoload :Col,                     'ui_bibz/ui/core/layouts/col'
+        autoload :Container,               'ui_bibz/ui/core/layouts/container'
       end
 
       module Lists
-        autoload :ListGroup,              "ui_bibz/ui/core/lists/list_group"
-        autoload :List,                   "ui_bibz/ui/core/lists/components/list"
+        autoload :ListGroup,              'ui_bibz/ui/core/lists/list_group'
+        autoload :List,                   'ui_bibz/ui/core/lists/components/list'
       end
 
       module Navigations
-        autoload :Breadcrumb,              "ui_bibz/ui/core/navigations/breadcrumb"
-        autoload :Link,                    "ui_bibz/ui/core/navigations/link"
-        autoload :Nav,                     "ui_bibz/ui/core/navigations/nav"
-        autoload :Navbar,                  "ui_bibz/ui/core/navigations/navbar"
-        autoload :Pagination,              "ui_bibz/ui/core/navigations/pagination"
-        autoload :TabGroup,                "ui_bibz/ui/core/navigations/tab_group"
-        autoload :Toolbar,                 "ui_bibz/ui/core/navigations/toolbar"
+        autoload :Breadcrumb,              'ui_bibz/ui/core/navigations/breadcrumb'
+        autoload :Link,                    'ui_bibz/ui/core/navigations/link'
+        autoload :Nav,                     'ui_bibz/ui/core/navigations/nav'
+        autoload :Navbar,                  'ui_bibz/ui/core/navigations/navbar'
+        autoload :Pagination,              'ui_bibz/ui/core/navigations/pagination'
+        autoload :TabGroup,                'ui_bibz/ui/core/navigations/tab_group'
+        autoload :Toolbar,                 'ui_bibz/ui/core/navigations/toolbar'
       end
 
       module Notifications
-        autoload :Alert,                   "ui_bibz/ui/core/notifications/alert"
-        autoload :Badge,                   "ui_bibz/ui/core/notifications/badge"
-        autoload :ProgressBar,             "ui_bibz/ui/core/notifications/progress_bar"
-        autoload :Spinner,                 "ui_bibz/ui/core/notifications/spinner"
-        autoload :Toast,                   "ui_bibz/ui/core/notifications/toast"
+        autoload :Alert,                   'ui_bibz/ui/core/notifications/alert'
+        autoload :Badge,                   'ui_bibz/ui/core/notifications/badge'
+        autoload :ProgressBar,             'ui_bibz/ui/core/notifications/progress_bar'
+        autoload :Spinner,                 'ui_bibz/ui/core/notifications/spinner'
+        autoload :Toast,                   'ui_bibz/ui/core/notifications/toast'
       end
 
       module Windows
-        autoload :Modal,                  "ui_bibz/ui/core/windows/modal"
+        autoload :Modal, 'ui_bibz/ui/core/windows/modal'
       end
 
       # Other section
-      autoload :Component,               "ui_bibz/ui/core/component"
+      autoload :Component, 'ui_bibz/ui/core/component'
     end
 
     # Ux
     module Ux
-
       # Table section
       module Tables
-        autoload :Table,                   "ui_bibz/ui/ux/tables/table"
-        autoload :TableCard,               "ui_bibz/ui/ux/tables/table_card"
-        autoload :TableSearchField,        "ui_bibz/ui/ux/tables/table_search_field"
-        autoload :TablePagination,         "ui_bibz/ui/ux/tables/table_pagination"
-        autoload :TablePaginationPerPage,  "ui_bibz/ui/ux/tables/table_pagination_per_page"
+        autoload :Table,                   'ui_bibz/ui/ux/tables/table'
+        autoload :TableCard,               'ui_bibz/ui/ux/tables/table_card'
+        autoload :TableSearchField,        'ui_bibz/ui/ux/tables/table_search_field'
+        autoload :TablePagination,         'ui_bibz/ui/ux/tables/table_pagination'
+        autoload :TablePaginationPerPage,  'ui_bibz/ui/ux/tables/table_pagination_per_page'
       end
 
       module Containers
-        autoload :Panel,  "ui_bibz/ui/ux/containers/panel"
+        autoload :Panel, 'ui_bibz/ui/ux/containers/panel'
       end
-
     end
   end
 
   module Helpers
     module Ui
-      autoload :CoreHelper,  "ui_bibz/helpers/ui/core_helper"
-      autoload :UxHelper,    "ui_bibz/helpers/ui/ux_helper"
+      autoload :CoreHelper,  'ui_bibz/helpers/ui/core_helper'
+      autoload :UxHelper,    'ui_bibz/helpers/ui/ux_helper'
       module Core end
     end
-    autoload :UtilsHelper, "ui_bibz/helpers/utils_helper"
+    autoload :UtilsHelper, 'ui_bibz/helpers/utils_helper'
   end
 
   module Concerns
     module Models
-      autoload :Searchable, "ui_bibz/concerns/models/searchable"
+      autoload :Searchable, 'ui_bibz/concerns/models/searchable'
     end
   end
-
 end
 
-require "ui_bibz/rails/engine"
+require 'ui_bibz/rails/engine'

data/lib/ui_bibz/concerns/models/searchable.rb

@@ -1,9 +1,11 @@
+# frozen_string_literal: true
+
 module UiBibz::Concerns::Models::Searchable
   extend ActiveSupport::Concern
 
   included do
     # Maybe create a class to put all methods of table_search_pagination
-    def self.table_search_pagination params, session, args = {}
+    def self.table_search_pagination(params, session, args = {})
       @params           = params.permit!
       @session          = session
       @arguments        = args
@@ -12,22 +14,20 @@ module UiBibz::Concerns::Models::Searchable
       OpenStruct.new(generate_parameters)
     end
 
-  private
-
     def self.generate_parameters
       {
-        controller:            @params[:controller],
-        param_id:              @params[:id],
-        params:                @params,
-        direction:             @params[:direction],
-        search:                @params[:search],
-        sort:                  @params[:sort],
-        action:                @params[:action],
-        column_id:             @params[:column_id],
-        id:                    @arguments[:store_id],
-        records:               search_sort_paginate,
+        controller: @params[:controller],
+        param_id: @params[:id],
+        params: @params,
+        direction: @params[:direction],
+        search: @params[:search],
+        sort: @params[:sort],
+        action: @params[:action],
+        column_id: @params[:column_id],
+        id: @arguments[:store_id],
+        records: search_sort_paginate,
         searchable_attributes: @searchable_attributes,
-        model:                 create_model
+        model: create_model
       }
     end
 
@@ -37,22 +37,20 @@ module UiBibz::Concerns::Models::Searchable
 
     # If there is more one table in html page
     def self.initialize_params
-      @tmp_params = {}
-      if self.is_good_store_id?
-        @tmp_params = {
-          search:    @params[:search],
-          per_page:  @params[:per_page],
-          page:      self.new_search? ? nil : @params[:page],
-          sort:      @params[:sort],
-          direction: @params[:direction]
-        }
-      end
+      return unless good_store_id?
+
+      @tmp_params = {
+        search: @params[:search],
+        per_page: @params[:per_page],
+        page: new_search? ? nil : @params[:page],
+        sort: @params[:sort],
+        direction: @params[:direction]
+      }
     end
 
-
     def self.search
       sql         = all
-      column_args = get_column_args
+      column_args = fetch_column_args
 
       # Add joins
       sql = joins(column_args[:joins]) if column_args[:joins]
@@ -69,91 +67,90 @@ module UiBibz::Concerns::Models::Searchable
       generate_sql sql, column_args
     end
 
-    def self.generate_sql sql, column_args
+    def self.generate_sql(sql, column_args)
       column_args[:count].nil? ? generate_default_sql(sql) : generate_count_sql(sql)
     end
 
-    def self.generate_default_sql sql
-      if is_sorting?
-        sql.paginate(:page => @tmp_params[:page], per_page: @session[:per_page])
+    def self.generate_default_sql(sql)
+      if sorting?
+        sql.paginate(page: @tmp_params[:page], per_page: @session[:per_page])
       else
-        sql.reorder(order_sql).paginate(:page => @tmp_params[:page], per_page: @session[:per_page])
+        sql.reorder(order_sql).paginate(page: @tmp_params[:page], per_page: @session[:per_page])
       end
     end
 
-    def self.generate_count_sql sql
-      sq = "SELECT * FROM (#{ sql.group(table_name + '.id').to_sql }) countable ORDER BY countable.count #{ @tmp_params[:direction] || asc }"
-      self.paginate_by_sql(sq, :page => @tmp_params[:page], per_page: @session[:per_page])
+    def self.generate_count_sql(sql)
+      sq = "SELECT * FROM (#{sql.group(table_name + '.id').to_sql}) countable ORDER BY countable.count #{@tmp_params[:direction] || asc}"
+      paginate_by_sql(sq, page: @tmp_params[:page], per_page: @session[:per_page])
     end
 
-    def self.generate_select_count_sort_query sql, column_args
-      sql.select("#{ table_name }.*, count(#{ column_args[:column] }.*)")
+    def self.generate_select_count_sort_query(sql, column_args)
+      sql.select("#{table_name}.*, count(#{column_args[:column]}.*)")
     end
 
-    def self.generate_parent_sort_query sql
-      sql.select("#{ table_name }2.*, #{ @tmp_params[:sort] } AS parent_name").from("#{ table_name } #{ table_name }2").joins("LEFT OUTER JOIN #{ table_name } ON #{ table_name }2.parent_id = #{ table_name }.id")
+    def self.generate_parent_sort_query(sql)
+      sql.select("#{table_name}2.*, #{@tmp_params[:sort]} AS parent_name").from("#{table_name} #{table_name}2").joins("LEFT OUTER JOIN #{table_name} ON #{table_name}2.parent_id = #{table_name}.id")
     end
 
-    def self.get_column_args
+    def self.fetch_column_args
       column_args = {}
-      if !@arguments[:sortable].nil? && @params[:custom_sort]
-        column_args = [@arguments[:sortable]].flatten.detect{|f| f[:column] = @params[:column_name] } || {}
-      end
+      column_args = [@arguments[:sortable]].flatten.detect { |f| f[:column] = @params[:column_name] } || {} if !@arguments[:sortable].nil? && @params[:custom_sort]
       column_args
     end
 
-    def self.is_sorting?
+    def self.sorting?
       @tmp_params[:sort].nil? || @tmp_params[:direction].nil?
     end
 
-    def self.search_by_query sql
+    def self.search_by_query(sql)
       raise 'Add searchable_attributes method in Model' if @searchable_attributes.nil?
+
       sql_query       = []
       sql_attributes  = {}
       search_patterns = @tmp_params[:search].strip.gsub(/(?<=[\\s])\\s*|^\\s+|\\s+$/, '').downcase
 
       search_patterns_tmp = search_patterns.scan(/"(.*?)"/).flatten
       search_patterns     = search_patterns.gsub(/"(.*?)"/, '').split(' ')
-      search_patterns     << search_patterns_tmp
+      search_patterns << search_patterns_tmp
 
       search_patterns.flatten.each_with_index do |pattern, i|
         sql_subquery = []
         @searchable_attributes.each do |attribute|
-          if attribute.kind_of?(Hash)
+          if attribute.is_a?(Hash)
             if attribute == :as
-              attribute.values.each do |value|
-                sql_subquery << "lower(#{ value }) LIKE :#{ value }_#{ i }"
-                sql_attributes = sql_attributes.merge(Hash["#{ value }_#{ i }".to_sym, "%#{ pattern }%"])
+              attribute.each_value do |value|
+                sql_subquery << "lower(#{value}) LIKE :#{value}_#{i}"
+                sql_attributes = sql_attributes.merge(Hash["#{value}_#{i}".to_sym, "%#{pattern}%"])
               end
             else
               key_name = attribute.keys.first.to_s.pluralize
-              attribute.values.each do |value|
-                sql_subquery << "lower(#{ key_name }.#{ value }) LIKE :#{ key_name }_#{ value }_#{ i }"
-                sql_attributes = sql_attributes.merge(Hash["#{ key_name }_#{ value }_#{ i }".to_sym, "%#{ pattern }%"])
+              attribute.each_value do |value|
+                sql_subquery << "lower(#{key_name}.#{value}) LIKE :#{key_name}_#{value}_#{i}"
+                sql_attributes = sql_attributes.merge(Hash["#{key_name}_#{value}_#{i}".to_sym, "%#{pattern}%"])
               end
             end
           else
-            sql_subquery << "lower(#{ self.to_s.underscore.pluralize.split('/').last }.#{ attribute }) LIKE :#{ attribute }_#{ i }"
-            sql_attributes = sql_attributes.merge(Hash["#{ attribute }_#{ i }".to_sym, "%#{ pattern }%"])
+            sql_subquery << "lower(#{to_s.underscore.pluralize.split('/').last}.#{attribute}) LIKE :#{attribute}_#{i}"
+            sql_attributes = sql_attributes.merge(Hash["#{attribute}_#{i}".to_sym, "%#{pattern}%"])
           end
         end
-        sql_query << "(" + sql_subquery.join(' OR ') + ")"
+        sql_query << '(' + sql_subquery.join(' OR ') + ')'
       end
 
       sql.where([sql_query.join(' AND '), sql_attributes])
     end
 
     def self.order_sql
-      self.is_sorting? ? "#{ self.table_name }.id asc" : "#{ @tmp_params[:sort]} #{ @tmp_params[:direction] }"
+      sorting? ? "#{table_name}.id asc" : "#{@tmp_params[:sort]} #{@tmp_params[:direction]}"
     end
 
     def self.search_sort_paginate
       @session[:per_page] = @tmp_params[:per_page] unless @tmp_params[:per_page].nil?
-      self.search
+      search
     end
 
     # If there's several table in the same page
-    def self.is_good_store_id?
+    def self.good_store_id?
       @arguments[:store_id] == @params[:store_id]
     end
 
@@ -163,7 +160,6 @@ module UiBibz::Concerns::Models::Searchable
   end
 
   module ClassMethods
-
     # => searchable_attributes :name, :address
     # or
     # => searchable_attributes user: :name
@@ -172,9 +168,8 @@ module UiBibz::Concerns::Models::Searchable
     # or
     # => search_attributes :name, as: [:mybuildcolumn1, :mybuild_column2]
     #
-    def searchable_attributes *args
+    def searchable_attributes(*args)
       @searchable_attributes ||= args
     end
   end
-
 end