ui_bibz 2.4.0 → 2.5.0

data/lib/ui_bibz/ui/ux/tables/extensions/searchable.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
+
 module UiBibz::Ui::Ux::Tables
   class Searchable < UiBibz::Ui::Base
-
-    def initialize store, options, html_options = nil
+    def initialize(store, options, html_options = nil)
       @store        = store
       @options      = options
       @html_options = html_options
@@ -20,17 +21,17 @@ module UiBibz::Ui::Ux::Tables
       @options[:searchable].nil? ? true : @options[:searchable]
     end
 
-  private
+    private
 
-    def translate_searchable_attributes_by_active_record attr
+    def translate_searchable_attributes_by_active_record(attr)
       @store.model.human_attribute_name(attr)
     end
 
     def table_title
-      if @options[:title] != false
-        title = @options[:title] || "#{ @store.controller.humanize } list"
-        UiBibz::Utils::Internationalization.new("ui_bibz.table.title.#{ model_name }", default: ["ui_bibz.table.title.defaults", title]).translate
-      end
+      return unless @options[:title] != false
+
+      title = @options[:title] || "#{@store.controller.humanize} list"
+      UiBibz::Utils::Internationalization.new("ui_bibz.table.title.#{model_name}", default: ['ui_bibz.table.title.defaults', title]).translate
     end
 
     def model_name
@@ -44,6 +45,5 @@ module UiBibz::Ui::Ux::Tables
     def table_glyph
       UiBibz::Ui::Core::Icons::Glyph.new(@options[:glyph]).render unless @options[:glyph].nil?
     end
-
   end
 end

data/lib/ui_bibz/ui/ux/tables/extensions/sortable.rb

@@ -1,13 +1,14 @@
+# frozen_string_literal: true
+
 module UiBibz::Ui::Ux::Tables
   class Sortable < UiBibz::Ui::Base
-
-    def initialize store, options
+    def initialize(store, options)
       @store   = store
       @options = options
     end
 
     # header use i18n
-    def header column, name = nil
+    def header(column, name = nil)
       @column  = column
       defaults = [
         header_name(name),
@@ -16,61 +17,61 @@ module UiBibz::Ui::Ux::Tables
         translate_headers_by_active_record,
         default_header_name(name)
       ].compact
-      @name    = UiBibz::Utils::Internationalization.new(translate_headers_by_model, default: defaults).translate
+      @name = UiBibz::Utils::Internationalization.new(translate_headers_by_model, default: defaults).translate
       sortable? ? sortable_link : title
     end
 
-  private
+    private
 
     def sortable_link
       link_to title.html_safe, url_for(url_options_o), { class: cls }
     end
 
-    def header_name name
+    def header_name(name)
       name || @column.name
     end
 
-    def default_header_name name
+    def default_header_name(name)
       name || @column.data_index.to_s.try('titleize')
     end
 
     def translate_headers_by_model
-      "ui_bibz.grid.headers.#{ @store.model.to_s.underscore }.#{ @column.data_index }"
+      "ui_bibz.grid.headers.#{@store.model.to_s.underscore}.#{@column.data_index}"
     end
 
     def translate_headers_by_defaults
-      "ui_bibz.grid.headers.defaults.#{ @column.data_index }"
+      "ui_bibz.grid.headers.defaults.#{@column.data_index}"
     end
 
     def translate_headers_by_defaults_active_record
-      "activerecord.attributes.defaults.#{ @column.data_index }"
+      "activerecord.attributes.defaults.#{@column.data_index}"
     end
 
     def translate_headers_by_active_record
-      "activerecord.attributes.#{ @store.model.to_s.underscore }.#{ @column.data_index }"
+      "activerecord.attributes.#{@store.model.to_s.underscore}.#{@column.data_index}"
     end
 
     def url_options_o
-      args =  {
-        controller:  @store.controller,
-        action:      @store.action,
-        search:      @store.search,
-        sort:        sort_name,
-        column_id:   @column.id,
-        direction:   direction,
-        only_path:   true
+      args = {
+        controller: @store.controller,
+        action: @store.action,
+        search: @store.search,
+        sort: sort_name,
+        column_id: @column.id,
+        direction: direction,
+        only_path: true
       }
       args = args.merge({ id: @store.param_id }) if @store.param_id
       args = args.merge({ custom_sort: true, column_name: @column.data_index }) if @column.custom_sort
       args = args.merge({ parent: true }) if @column.parent
       args = args.merge({ store_id: @store.id }) unless @store.id.nil?
       args = args.merge({ link_type: 'column' })
-      args = args.merge(@store.parameters.reject{ |k,v| default_parameters.include?(k.to_s) })
+      args = args.merge(@store.parameters.reject { |k, _v| default_parameters.include?(k.to_s) })
       args.with_indifferent_access
     end
 
     def default_parameters
-      %w(column_id direction search store_id controller sort page per_page)
+      %w[column_id direction search store_id controller sort page per_page]
     end
 
     def sortable?
@@ -86,7 +87,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def caret
-      UiBibz::Ui::Core::Icons::Glyph.new("caret-#{ direction == 'desc' ? 'up' : 'down' }").render
+      UiBibz::Ui::Core::Icons::Glyph.new("caret-#{direction == 'desc' ? 'up' : 'down'}").render
     end
 
     def cls
@@ -94,7 +95,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def direction
-      sort_name == sort_column && sort_direction == "asc" ? "desc" : "asc"
+      sort_name == sort_column && sort_direction == 'asc' ? 'desc' : 'asc'
     end
 
     def column_name
@@ -102,7 +103,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def sort_column_name
-      @column.sort.nil? ? "#{ @store.model.to_s.underscore.pluralize }.#{ @column.data_index}" : @column.sort
+      @column.sort.nil? ? "#{@store.model.to_s.underscore.pluralize}.#{@column.data_index}" : @column.sort
     end
 
     def sort_name
@@ -114,8 +115,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def sort_direction
-      %w[asc desc].include?(@store.direction) ? @store.direction : "asc"
+      %w[asc desc].include?(@store.direction) ? @store.direction : 'asc'
     end
-
   end
 end

data/lib/ui_bibz/ui/ux/tables/table.rb

@@ -1,16 +1,17 @@
-require "ui_bibz/ui/ux/tables/components/store"
-require "ui_bibz/ui/ux/tables/components/columns"
-require "ui_bibz/ui/ux/tables/components/column"
-require "ui_bibz/ui/ux/tables/components/actions"
-require "ui_bibz/ui/ux/tables/components/thead"
-require "ui_bibz/ui/ux/tables/components/as"
-require "ui_bibz/ui/ux/tables/extensions/paginable"
-require "ui_bibz/ui/ux/tables/extensions/paginable"
-require "ui_bibz/ui/ux/tables/extensions/searchable"
-require "ui_bibz/ui/ux/tables/extensions/sortable"
-require "ui_bibz/ui/ux/tables/extensions/actionable"
+# frozen_string_literal: true
+
+require 'ui_bibz/ui/ux/tables/components/store'
+require 'ui_bibz/ui/ux/tables/components/columns'
+require 'ui_bibz/ui/ux/tables/components/column'
+require 'ui_bibz/ui/ux/tables/components/actions'
+require 'ui_bibz/ui/ux/tables/components/thead'
+require 'ui_bibz/ui/ux/tables/components/as'
+require 'ui_bibz/ui/ux/tables/extensions/paginable'
+require 'ui_bibz/ui/ux/tables/extensions/paginable'
+require 'ui_bibz/ui/ux/tables/extensions/searchable'
+require 'ui_bibz/ui/ux/tables/extensions/sortable'
+require 'ui_bibz/ui/ux/tables/extensions/actionable'
 module UiBibz::Ui::Ux::Tables
-
   # Create a Table
   #
   # This element is an extend of UiBibz::Ui::Core::Component.
@@ -95,23 +96,20 @@ module UiBibz::Ui::Ux::Tables
   #     end
   #   end
   class Table < UiBibz::Ui::Core::Component
-
-    attr_accessor :columns
-
     # See UiBibz::Ui::Core::Component.initialize
-    def initialize content = nil, options = nil, html_options = nil, &block
+    def initialize(content = nil, options = nil, html_options = nil, &block)
       super
       @columns = Columns.new
       @actions = Actions.new store
     end
 
     # Add table columns items
-    def columns &block
+    def columns(&block)
       @columns.tap(&block)
     end
 
     # Add table actions items
-    def actions &block
+    def actions(&block)
       @actions.tap(&block)
     end
 
@@ -127,16 +125,13 @@ module UiBibz::Ui::Ux::Tables
 
     # Store must be generated by *table_search_pagination* method
     def store
-      @store ||= if @options[:store].nil?
-        raise 'Store is nil!'
-      elsif @options[:store].try(:records).nil?
-        raise 'Store can be created only with "table_search_pagination" method!'
-      else
-        Store.new @options.delete :store
-      end
+      raise 'Store is nil!' if @options[:store].nil?
+      raise 'Store can be created only with "table_search_pagination" method!' if @options[:store].try(:records).nil?
+
+      @store ||= Store.new @options[:store]
     end
 
-  protected
+    protected
 
     def sort
       @sort ||= Sortable.new store, @options
@@ -151,12 +146,11 @@ module UiBibz::Ui::Ux::Tables
     end
 
     def type
-      "table-#{ @options[:type] }" unless @options[:type].nil?
+      "table-#{@options[:type]}" unless @options[:type].nil?
     end
 
     def table_html
       content_tag(:table, html_options) do
-
         ths = cols.collect do |col|
           content_tag(:th, sort.header(col), class: col.class) unless col.hidden?
         end
@@ -178,7 +172,7 @@ module UiBibz::Ui::Ux::Tables
     end
 
     # Maybe create a class for td_content
-    def td_content record, col
+    def td_content(record, col)
       content = col.count ? record.send(col.data_index).count : record.send(col.data_index)
       unless content.nil?
         content = content.strftime(col.date_format)                    unless col.date_format.nil?
@@ -189,39 +183,38 @@ module UiBibz::Ui::Ux::Tables
       content
     end
 
-  private
+    private
 
     def component_html_classes
-      ["table", striped, bordered, hoverable, size, responsive, reflow]
+      ['table', striped, bordered, hoverable, size, responsive, reflow]
     end
 
     def status
-      "table-#{ @options[:status] }" unless @options[:status].nil?
+      "table-#{@options[:status]}" unless @options[:status].nil?
     end
 
     def striped
-      "table-striped" unless @options[:striped].nil?
+      'table-striped' unless @options[:striped].nil?
     end
 
     def bordered
-      "table-bordered" unless @options[:bordered].nil?
+      'table-bordered' unless @options[:bordered].nil?
     end
 
     def hoverable
-      "table-hoverable" unless @options[:hoverable].nil?
+      'table-hoverable' unless @options[:hoverable].nil?
     end
 
     def size
-      "table-#{ @options[:size] }" unless @options[:size].nil?
+      "table-#{@options[:size]}" unless @options[:size].nil?
     end
 
     def responsive
-      "table-responsive" unless @options[:responsive].nil?
+      'table-responsive' unless @options[:responsive].nil?
     end
 
     def reflow
-      "table-reflow" unless @options[:reflow].nil?
+      'table-reflow' unless @options[:reflow].nil?
     end
-
   end
 end

data/lib/ui_bibz/ui/ux/tables/table_card.rb

@@ -1,6 +1,7 @@
-require "ui_bibz/ui/ux/tables/components/store"
-module UiBibz::Ui::Ux::Tables
+# frozen_string_literal: true
 
+require 'ui_bibz/ui/ux/tables/components/store'
+module UiBibz::Ui::Ux::Tables
   # Create a TableCard
   #
   # This element is an extend of UiBibz::Ui::Core::Boxes::card.
@@ -104,11 +105,8 @@ module UiBibz::Ui::Ux::Tables
   #     end
   #   end
   class TableCard < UiBibz::Ui::Core::Boxes::Card
-
-    attr_accessor :columns
-
     # See UiBibz::Ui::Core::Boxes::Card.initialize
-    def initialize content = nil, options = nil, html_options = nil, &block
+    def initialize(content = nil, options = nil, html_options = nil, &block)
       super
       table_options = (@options[:table_options] || {}).merge({ store: store })
       @table        = UiBibz::Ui::Ux::Tables::Table.new(table_options, @options[:table_html_options])
@@ -120,7 +118,7 @@ module UiBibz::Ui::Ux::Tables
 
       content_tag :div, html_options do
         form_tag(url_for(url_parameters), method: :get) do
-          store.parameters.with_indifferent_access.reject{ |k,v|  default_parameters?(k) || v.blank? }.each do |k,v|
+          store.parameters.with_indifferent_access.reject { |k, v| default_parameters?(k) || v.blank? }.each do |k, v|
             concat tag(:input, type: 'hidden', name: k, value: v)
           end
           concat tag(:input, type: 'hidden', name: 'store_id', value: store.id) unless store.id.nil? # if there is more one table in html page
@@ -130,13 +128,13 @@ module UiBibz::Ui::Ux::Tables
     end
 
     # Add table columns item
-    def columns &block
-      @table.columns &block
+    def columns(&block)
+      @table.columns(&block)
     end
 
     # Add table actions item
-    def actions &block
-      @table.actions &block
+    def actions(&block)
+      @table.actions(&block)
     end
 
     # for test
@@ -144,20 +142,17 @@ module UiBibz::Ui::Ux::Tables
       @table.actions_list
     end
 
-  private
+    private
 
     def component_html_classes
-      %w(card table-card)
+      %w[card table-card]
     end
 
     def store
-      @store ||= if @options[:store].nil?
-        raise 'Store is nil!'
-      elsif @options[:store].try(:records).nil?
-        raise 'Store can be created only with "table_search_pagination" method!'
-      else
-        Store.new @options.delete(:store) if @options[:store]
-      end
+      raise 'Store is nil!' if @options[:store].nil?
+      raise 'Store can be created only with "table_search_pagination" method!' if @options[:store].try(:records).nil?
+
+      @store ||= Store.new @options[:store]
     end
 
     def init_components
@@ -166,17 +161,15 @@ module UiBibz::Ui::Ux::Tables
       @items << pagination.render if pagination.paginable?
     end
 
-    def default_parameters?(k)
-      %w(store_id per_page page search utf8 search controller action link_type).include?(k)
+    def default_parameters?(key)
+      %w[store_id per_page page search utf8 search controller action link_type].include?(key)
     end
 
     def url_parameters
       { controller: store.controller, action: store.action, id: store.param_id }
     end
 
-    def table
-      @table
-    end
+    attr_reader :table
 
     def table_html
       content_tag :div, @table.render, class: 'card-table'
@@ -189,6 +182,5 @@ module UiBibz::Ui::Ux::Tables
     def pagination
       @pagination ||= Paginable.new store, @options.merge({ wrap_form: false }), { class: 'card-footer' }
     end
-
   end
 end

data/lib/ui_bibz/ui/ux/tables/table_pagination.rb

@@ -1,8 +1,9 @@
-#require 'will_paginate'
-require "will_paginate-bootstrap4"
-require "ui_bibz/ui/ux/tables/components/store"
-module UiBibz::Ui::Ux::Tables
+# frozen_string_literal: true
 
+# require 'will_paginate'
+require 'will_paginate-bootstrap4'
+require 'ui_bibz/ui/ux/tables/components/store'
+module UiBibz::Ui::Ux::Tables
   # Create a pagination for table
   #
   # ==== Attributes
@@ -27,11 +28,11 @@ module UiBibz::Ui::Ux::Tables
   class TablePagination < UiBibz::Ui::Base
     include WillPaginate::ActionView
     include ActionView
-    #include WillPaginate::ActionView::BootstrapLinkRenderer
+    # include WillPaginate::ActionView::BootstrapLinkRenderer
 
     # Initialize pagination with component item
     # pagination require WillPaginate gem
-    def initialize options = nil, html_options = nil
+    def initialize(options = nil, html_options = nil)
       @pagination = UiBibz::Ui::Core::Component.new nil, options, html_options
     end
 
@@ -41,25 +42,21 @@ module UiBibz::Ui::Ux::Tables
       paginate_parameters = paginate_parameters.merge({ store_id: store.id }) unless store.id.nil?
       paginate_parameters = paginate_parameters.merge(store.parameters)
       paginate_parameters = paginate_parameters.merge({ link_type: 'pagination' })
-      will_paginate(store.records, params: paginate_parameters.with_indifferent_access.reject{|k,v| default_parameters?(k) || v.blank? }, renderer: WillPaginate::ActionView::BootstrapLinkRenderer)
+      will_paginate(store.records, params: paginate_parameters.with_indifferent_access.reject { |k, v| default_parameters?(k) || v.blank? }, renderer: WillPaginate::ActionView::BootstrapLinkRenderer)
     end
 
-  private
+    private
 
-    def default_parameters?(k)
-      %w(per_page page link_type).include?(k)
+    def default_parameters?(key)
+      %w[per_page page link_type].include?(key)
     end
 
     # Store must be generated by *table_search_pagination* method
     def store
-      @store ||= if @pagination.options[:store].nil?
-        raise 'Store is nil!'
-      elsif @pagination.options[:store].try(:records).nil?
-        raise 'Store can be created only with "table_search_pagination" method!'
-      else
-        Store.new @pagination.options.delete :store
-      end
-    end
+      raise 'Store is nil!' if @pagination.options[:store].nil?
+      raise 'Store can be created only with "table_search_pagination" method!' if @pagination.options[:store].try(:records).nil?
 
+      @store ||= Store.new @pagination.options[:store]
+    end
   end
 end