ui_bibz 2.4.0 → 2.5.0

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

data/lib/ui_bibz/helpers/ui/core/boxes_helper.rb

@@ -1,5 +1,6 @@
-module UiBibz::Helpers::Ui::Core::BoxesHelper
+# frozen_string_literal: true
 
+module UiBibz::Helpers::Ui::Core::BoxesHelper
   # Card Component
   #
   # +options+ (Hash)
@@ -7,8 +8,8 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
   #
   # Option +tap: true+ is required if you want add +header+, +block+ or
   # +footer+.
-  def ui_card content = nil, options = nil, html_options = nil, &block
-    if is_tap(content, options)
+  def ui_card(content = nil, options = nil, html_options = nil, &block)
+    if tap?(content, options)
       UiBibz::Ui::Core::Boxes::Card.new(content, options, html_options).tap(&block).render
     else
       UiBibz::Ui::Core::Boxes::Card.new(content, options, html_options, &block).render
@@ -20,7 +21,7 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
   # +options+ (Hash)
   # +html_options+ (Hash)
   #
-  def ui_card_accordion content = nil, options = nil, html_options = nil, &block
+  def ui_card_accordion(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Boxes::CardAccordion.new(content, options, html_options).tap(&block).render
   end
 
@@ -28,7 +29,7 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_card_group content = nil, options = nil, html_options = nil, &block
+  def ui_card_group(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Boxes::CardGroup.new(content, options, html_options).tap(&block).render
   end
 
@@ -36,7 +37,7 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_card_deck content = nil, options = nil, html_options = nil, &block
+  def ui_card_deck(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Boxes::CardDeck.new(content, options, html_options).tap(&block).render
   end
 
@@ -44,7 +45,7 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_card_column content = nil, options = nil, html_options = nil, &block
+  def ui_card_column(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Boxes::CardColumn.new(content, options, html_options).tap(&block).render
   end
 
@@ -52,8 +53,7 @@ module UiBibz::Helpers::Ui::Core::BoxesHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_jumbotron content = nil, options = nil, html_options = nil, &block
+  def ui_jumbotron(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Boxes::Jumbotron.new(content, options, html_options, &block).render
   end
-
 end

data/lib/ui_bibz/helpers/ui/core/forms_helper.rb

@@ -1,10 +1,11 @@
-module UiBibz::Helpers::Ui::Core::FormsHelper
+# frozen_string_literal: true
 
+module UiBibz::Helpers::Ui::Core::FormsHelper
   # Button Component
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_button content = nil, options = nil, html_options = nil, &block
+  def ui_button(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Buttons::Button.new(content, options, html_options, &block).render
   end
 
@@ -12,7 +13,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_choice_group content = nil, options = nil, html_options = nil, &block
+  def ui_choice_group(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Choices::ChoiceGroup.new(content, options, html_options).tap(&block).render
   end
 
@@ -20,7 +21,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_button_group content = nil, options = nil, html_options = nil, &block
+  def ui_button_group(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Buttons::ButtonGroup.new(content, options, html_options).tap(&block).render
   end
 
@@ -28,7 +29,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_button_link content = nil, options = nil, html_options = nil, &block
+  def ui_button_link(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Buttons::ButtonLink.new(content, options, html_options, &block).render
   end
 
@@ -36,7 +37,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_date_picker_field content = nil, options = nil, html_options = nil, &block
+  def ui_date_picker_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Dates::DatePickerField.new(content, options, html_options, &block).render
   end
 
@@ -44,7 +45,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_markdown_editor_field content = nil, options = nil, html_options = nil, &block
+  def ui_markdown_editor_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Textareas::MarkdownEditorField.new(content, options, html_options, &block).render
   end
 
@@ -52,7 +53,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_multi_column_field content = nil, options = nil, html_options = nil, &block
+  def ui_multi_column_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Selects::MultiColumnField.new(content, options, html_options, &block).render
   end
 
@@ -60,7 +61,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_multi_select_field content = nil, options = nil, html_options = nil, &block
+  def ui_multi_select_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Selects::MultiSelectField.new(content, options, html_options, &block).render
   end
 
@@ -68,7 +69,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_formula_field content = nil, options = nil, html_options = nil, &block
+  def ui_formula_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Numbers::FormulaField.new(content, options, html_options, &block).render
   end
 
@@ -76,7 +77,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_text_field content = nil, options = nil, html_options = nil, &block
+  def ui_text_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Texts::TextField.new(content, options, html_options, &block).render
   end
 
@@ -84,7 +85,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_box_switch_field content = nil, options = nil, html_options = nil, &block
+  def ui_box_switch_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Choices::BoxSwitchField.new(content, options, html_options, &block).render
   end
 
@@ -92,7 +93,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_switch_field content = nil, options = nil, html_options = nil, &block
+  def ui_switch_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Choices::SwitchField.new(content, options, html_options, &block).render
   end
 
@@ -100,7 +101,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_checkbox_field content = nil, options = nil, html_options = nil, &block
+  def ui_checkbox_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Choices::CheckboxField.new(content, options, html_options, &block).render
   end
 
@@ -108,7 +109,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_radio_field content = nil, options = nil, html_options = nil, &block
+  def ui_radio_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Choices::RadioField.new(content, options, html_options, &block).render
   end
 
@@ -116,7 +117,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_select_field content = nil, options = nil, html_options = nil, &block
+  def ui_select_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Selects::SelectField.new(content, options, html_options, &block).render
   end
 
@@ -124,7 +125,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_dropdown_select_field content = nil, options = nil, html_options = nil, &block
+  def ui_dropdown_select_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Selects::DropdownSelectField.new(content, options, html_options, &block).render
   end
 
@@ -132,7 +133,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_auto_complete_field content = nil, options = nil, html_options = nil, &block
+  def ui_auto_complete_field(content = nil, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Texts::AutoCompleteField.new(content, options, html_options, &block).render
   end
 
@@ -140,8 +141,8 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   #
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_surround_field content = nil, options = nil, html_options = nil, &block
-     UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(content, options, html_options).tap(&block).render
+  def ui_surround_field(content = nil, options = nil, html_options = nil, &block)
+    UiBibz::Ui::Core::Forms::Surrounds::SurroundField.new(content, options, html_options).tap(&block).render
   end
 
   # Dropdown Component
@@ -149,7 +150,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   # +name+ (String) [Required]
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_dropdown name, options = nil, html_options = nil, &block
+  def ui_dropdown(name, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Dropdowns::Dropdown.new(name, options, html_options).tap(&block).render
   end
 
@@ -158,7 +159,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   # +name+ (String) [Required]
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_split_dropdown name, options = nil, html_options = nil, &block
+  def ui_split_dropdown(name, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Dropdowns::SplitDropdown.new(name, options, html_options).tap(&block).render
   end
 
@@ -167,7 +168,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   # +name+ (String) [Required]
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_number_field name, options = nil, html_options = nil, &block
+  def ui_number_field(name, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Numbers::NumberField.new(name, options, html_options, &block).render
   end
 
@@ -176,7 +177,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   # +name+ (String) [Required]
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_range_field name, options = nil, html_options = nil, &block
+  def ui_range_field(name, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Numbers::RangeField.new(name, options, html_options, &block).render
   end
 
@@ -185,8 +186,7 @@ module UiBibz::Helpers::Ui::Core::FormsHelper
   # +name+ (String) [Required]
   # +options+ (Hash)
   # +html_options+ (Hash)
-  def ui_file_field name, options = nil, html_options = nil, &block
+  def ui_file_field(name, options = nil, html_options = nil, &block)
     UiBibz::Ui::Core::Forms::Files::FileField.new(name, options, html_options, &block).render
   end
 end
-