active_list 6.5.1 → 6.6.0

data/lib/active_list/rails/engine.rb

@@ -1,12 +1,12 @@
 module ActiveList
   module Rails
     class Engine < ::Rails::Engine
-      engine_name "active_list"
-      initializer "active_list.integrate_methods" do |app|
+      engine_name 'active_list'
+      initializer 'active_list.integrate_methods' do |_app|
         ::ActionController::Base.send(:include, ActiveList::Rails::Integration::ActionController)
         ::ActionView::Base.send(:include, ActiveList::Rails::Integration::ViewsHelper)
         # Adds locales
-        for file in Dir.glob(Pathname.new(__FILE__).dirname.join("..", "locales", "*.yml"))
+        for file in Dir.glob(Pathname.new(__FILE__).dirname.join('..', 'locales', '*.yml'))
           ::I18n.load_path << file unless ::I18n.load_path.include?(file)
         end
       end

data/lib/active_list/rails/integration.rb

@@ -1,15 +1,12 @@
 module ActiveList
   module Rails
     module Integration
-
       module ActionController
-
         def self.included(base) #:nodoc:
           base.extend(ClassMethods)
         end
 
         module ClassMethods
-
           # Permits to define and generate methods to manage dynamic
           # table ActiveList
           def list(*args, &block)
@@ -20,27 +17,22 @@ module ActiveList
             class_eval(generator.controller_method_code, __FILE__, __LINE__)
             ActionView::Base.send(:class_eval, generator.view_method_code, __FILE__, __LINE__)
           end
-
         end
-
       end
 
       module ViewsHelper
-
         # Calls the generated view helper
         def list(*args, &block)
           options = args.extract_options!
           name = args.shift
-          kontroller = self.controller.class
+          kontroller = controller.class
           begin
             helper_method = "_#{kontroller.controller_name}_#{__method__}_#{name || kontroller.controller_name}_tag".to_sym
             kontroller = kontroller.superclass
           end until self.respond_to?(helper_method)
-          return self.send(helper_method, options, &block)
+          send(helper_method, options, &block)
         end
-
       end
-
     end
   end
 end

data/lib/active_list/renderers.rb

@@ -1,9 +1,7 @@
 # require 'active_support/core_ext/module/attribute_accessors'
 
 module ActiveList
-
   module Renderers
-
     def self.[](name)
       ActiveList.renderers[name]
     end
@@ -11,6 +9,4 @@ module ActiveList
     autoload :AbstractRenderer, 'active_list/renderers/abstract_renderer'
     autoload :SimpleRenderer,   'active_list/renderers/simple_renderer'
   end
-
 end
-

data/lib/active_list/renderers/abstract_renderer.rb

@@ -1,7 +1,5 @@
 module ActiveList
-
   module Renderers
-
     class AbstractRenderer
       attr_reader :generator, :table
 
@@ -15,15 +13,12 @@ module ActiveList
       end
 
       def remote_update_code
-        raise NotImplementedError, "#{self.class.name}#remote_update_code is not implemented."
+        fail NotImplementedError, "#{self.class.name}#remote_update_code is not implemented."
       end
 
       def build_data_code
-        raise NotImplementedError, "#{self.class.name}#build_table_code is not implemented."
+        fail NotImplementedError, "#{self.class.name}#build_table_code is not implemented."
       end
-
     end
-
   end
-
 end

data/lib/active_list/renderers/simple_renderer.rb

@@ -1,11 +1,8 @@
 module ActiveList
-
   module Renderers
-
     class SimpleRenderer < AbstractRenderer
       include ActiveList::Helpers
 
-
       DATATYPE_ABBREVIATION = {
         binary:    :bin,
         boolean:   :bln,
@@ -22,7 +19,7 @@ module ActiveList
       }
 
       def remote_update_code
-        code  = "if params[:column] and params[:visibility]\n"
+        code = "if params[:column] && params[:visibility]\n"
         code << "  column = params[:column].to_sym\n"
         # Removes potentially unwanted columns
         code << "  #{var_name(:params)}[:hidden_columns].delete_if{|c| !#{table.data_columns.map(&:name).inspect}.include?(c)}\n"
@@ -34,18 +31,18 @@ module ActiveList
         code << "else\n"
         code << "  render(inline: '<%=#{generator.view_method_name}-%>')\n"
         code << "end\n"
-        return code
+        code
       end
 
       def build_table_code
-        record = "r"
-        child  = "c"
+        record = 'r'
+        child  = 'c'
 
         # colgroup = columns_definition_code
         header = header_code
         extras = extras_codes
 
-        code  = generator.select_data_code
+        code = generator.select_data_code
         code << "#{var_name(:tbody)} = '<tbody data-total=\"' + #{var_name(:count)}.to_s + '\""
         if table.paginate?
           code << " data-per-page=\"' + #{var_name(:limit)}.to_s + '\""
@@ -74,12 +71,12 @@ module ActiveList
         # end
         code << "  end\n"
         code << "else\n"
-        code << "  #{var_name(:tbody)} << '<tr class=\"empty\"><td colspan=\"#{table.columns.size+1}\">' + ::I18n.translate('list.no_records') + '</td></tr>'\n"
+        code << "  #{var_name(:tbody)} << '<tr class=\"empty\"><td colspan=\"#{table.columns.size + 1}\">' + ::I18n.translate('list.no_records') + '</td></tr>'\n"
         code << "end\n"
 
         code << "#{var_name(:tbody)} << '</tbody>'\n"
         code << "return #{var_name(:tbody)}.html_safe if options[:only] == 'table-body'\n"
-        
+
         # Build content
         code << "#{var_name(:content)} = ''\n"
         if extras.any?
@@ -103,23 +100,21 @@ module ActiveList
         code << ">'\n"
         code << "#{var_name(:content)} << (#{header})\n"
         code << "if block_given?\n"
-        code << "  #{var_name(:content)} << '<tfoot>' + capture(" + table.columns.collect{|c| {name: c.name, id: c.id}}.inspect + ", &block).to_s + '</tfoot>'\n"
+        code << "  #{var_name(:content)} << '<tfoot>' + capture(" + table.columns.collect { |c| { name: c.name, id: c.id } }.inspect + ", &block).to_s + '</tfoot>'\n"
         code << "end\n"
         code << "#{var_name(:content)} << #{var_name(:tbody)}\n"
         code << "#{var_name(:content)} << '</table></div>'\n"
         # code << "return #{var_name(:content)}.html_safe if options[:only] == 'content'\n"
 
         # Build whole
-        code << "return ('<div id=\"#{self.uid}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" data-list-redirect=\"' + params[:redirect].to_s + '\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
-        return code
+        code << "return ('<div id=\"#{uid}\" data-list-source=\"'+h(url_for(options.merge(:action => '#{generator.controller_method_name}')))+'\" data-list-redirect=\"' + params[:redirect].to_s + '\" class=\"active-list\">' + #{var_name(:content)} + '</div>').html_safe\n"
+        code
       end
 
-
-
-      def columns_to_cells(nature, options={})
+      def columns_to_cells(nature, options = {})
         code = ''
         unless [:body, :children].include?(nature)
-          raise ArgumentError, "Nature is invalid"
+          fail ArgumentError, 'Nature is invalid'
         end
         record = options[:record] || 'record_of_the_death'
         if table.selectable?
@@ -130,7 +125,7 @@ module ActiveList
 
         children_mode = !!(nature == :children)
         for column in table.columns
-          value_code = ""
+          value_code = ''
           if column.is_a? ActiveList::Definition::EmptyColumn
             value_code = 'nil'
           elsif column.is_a? ActiveList::Definition::StatusColumn
@@ -139,23 +134,23 @@ module ActiveList
             levels = %w(go caution stop)
             lights = levels.collect do |light|
               "content_tag(:span, '', :class => #{light.inspect})"
-            end.join(" + ")
+            end.join(' + ')
             # Expected value are :valid, :warning, :error
             value_code = "content_tag(:span, #{lights}, :class => 'lights lights-' + (#{levels.inspect}.include?(#{value_code}.to_s) ? #{value_code}.to_s : 'undefined'))"
 
           elsif column.is_a? ActiveList::Definition::DataColumn
-            if column.options[:children].is_a? FalseClass and children_mode
+            if column.options[:children].is_a?(FalseClass) && children_mode
               value_code = 'nil'
             else
               value_code = column.datum_code(record, children_mode)
               if column.datatype == :boolean
-                value_code = "content_tag(:div, '', :class => 'checkbox-'+("+value_code.to_s+" ? 'true' : 'false'))"
+                value_code = "content_tag(:div, '', :class => 'checkbox-'+(" + value_code.to_s + " ? 'true' : 'false'))"
               elsif [:date, :datetime, :timestamp, :measure].include? column.datatype
                 value_code = "(#{value_code}.nil? ? '' : #{value_code}.l)"
               elsif [:item].include? column.datatype
                 value_code = "(#{value_code}.nil? ? '' : #{value_code}.human_name)"
               end
-              if !column.options[:currency].is_a?(FalseClass) and currency = column.options[:currency]
+              if !column.options[:currency].is_a?(FalseClass) && currency = column.options[:currency]
                 currency = currency[nature] if currency.is_a?(Hash)
                 currency = :currency if currency.is_a?(TrueClass)
                 # currency = "#{record}.#{currency}".c if currency.is_a?(Symbol)
@@ -166,25 +161,25 @@ module ActiveList
               elsif column.enumerize?
                 value_code = "(#{value_code}.nil? ? '' : #{value_code}.text)"
               end
-              if column.options[:url] and nature == :body
+              if column.options[:url] && nature == :body
                 column.options[:url] = {} unless column.options[:url].is_a?(Hash)
-                column.options[:url][:id] ||= (column.record_expr(record)+'.id').c
+                column.options[:url][:id] ||= (column.record_expr(record) + '.id').c
                 column.options[:url][:action] ||= :show
                 column.options[:url][:controller] ||= column.class_name.tableize.to_sym # (self.generator.collection? ? "RECORD.class.name.tableize".c : column.class_name.tableize.to_sym)
                 # column.options[:url][:controller] ||= "#{value_code}.class.name.tableize".c
-                url = column.options[:url].collect{|k, v| "#{k}: " + urlify(v, record)}.join(", ")
+                url = column.options[:url].collect { |k, v| "#{k}: " + urlify(v, record) }.join(', ')
                 value_code = "(#{value_code}.blank? ? '' : link_to(#{value_code}.to_s, #{url}))"
-              elsif column.options[:mode]||column.label_method == :email
+              elsif column.options[:mode] || column.label_method == :email
                 value_code = "(#{value_code}.blank? ? '' : mail_to(#{value_code}))"
-              elsif column.options[:mode]||column.label_method == :website
-                value_code = "(#{value_code}.blank? ? '' : link_to("+value_code+", "+value_code+"))"
+              elsif column.options[:mode] || column.label_method == :website
+                value_code = "(#{value_code}.blank? ? '' : link_to(" + value_code + ', ' + value_code + '))'
               elsif column.label_method == :color
-                value_code = "content_tag(:div, #{column.datum_code(record)}, style: 'background: #'+"+column.datum_code(record)+")"
-              elsif column.label_method.to_s.match(/(^|\_)currency$/) and column.datatype == :string
+                value_code = "content_tag(:div, #{column.datum_code(record)}, style: 'background: #'+" + column.datum_code(record) + ')'
+              elsif column.label_method.to_s.match(/(^|\_)currency$/) && column.datatype == :string
                 value_code = "(Nomen::Currencies[#{value_code}] ? Nomen::Currencies[#{value_code}].human_name : #{value_code})"
-              elsif column.label_method.to_s.match(/(^|\_)language$/) and column.datatype == :string
+              elsif column.label_method.to_s.match(/(^|\_)language$/) && column.datatype == :string
                 value_code = "(Nomen::Languages[#{value_code}]  ? Nomen::Languages[#{value_code}].human_name : #{value_code})"
-              elsif column.label_method.to_s.match(/(^|\_)country$/)  and column.datatype == :string
+              elsif column.label_method.to_s.match(/(^|\_)country$/) && column.datatype == :string
                 value_code = "(Nomen::Countries[#{value_code}]  ? (image_tag('countries/' + #{value_code}.to_s + '.png') + ' ' + Nomen::Countries[#{value_code}].human_name).html_safe : #{value_code})"
               else # if column.datatype == :string
                 value_code = "h(#{value_code}.to_s)"
@@ -195,7 +190,7 @@ module ActiveList
           elsif column.is_a?(ActiveList::Definition::CheckBoxColumn)
             if nature == :body
               form_name = column.form_name || "'#{table.name}[' + #{record}.id.to_s + '][#{column.name}]'".c
-              value = "nil"
+              value = 'nil'
               if column.form_value
                 value = recordify(column.form_value, record)
               else
@@ -204,14 +199,14 @@ module ActiveList
               end
               value_code << "check_box_tag(#{form_name.inspect}, #{value}, #{recordify!(column.options[:value] || column.name, record)})" # , id: '#{table.name}_'+#{record}.id.to_s+'_#{column.name}'
             else
-              value_code << "nil"
+              value_code << 'nil'
             end
           elsif column.is_a?(ActiveList::Definition::TextFieldColumn)
             form_name = column.form_name || "'#{table.name}[' + #{record}.id.to_s + '][#{column.name}]'".c
-            value_code = (nature == :body ? "text_field_tag(#{form_name.inspect}, #{recordify!(column.options[:value] || column.name, record)}#{column.options[:size] ? ', size: ' + column.options[:size].to_s : ''})" : "nil") # , id: '#{table.name}_'+#{record}.id.to_s + '_#{column.name}'
+            value_code = (nature == :body ? "text_field_tag(#{form_name.inspect}, #{recordify!(column.options[:value] || column.name, record)}#{column.options[:size] ? ', size: ' + column.options[:size].to_s : ''})" : 'nil') # , id: '#{table.name}_'+#{record}.id.to_s + '_#{column.name}'
           elsif column.is_a?(ActiveList::Definition::ActionColumn)
             next unless column.use_single?
-            value_code = (nature == :body ? column.operation(record) : "nil")
+            value_code = (nature == :body ? column.operation(record) : 'nil')
           else
             value_code = "'&#160;&#8709;&#160;'.html_safe"
           end
@@ -227,15 +222,14 @@ module ActiveList
 
         code << "''.html_safe"
         # code << "content_tag(:td)"
-        return code.c
+        code.c
       end
 
-
       # Produces main menu code
       def menu_code
-        menu = "<span class=\"list-settings\" data-list-ref=\"#{self.uid}\">"
+        menu = "<span class=\"list-settings\" data-list-ref=\"#{uid}\">"
         menu << "<a class=\"settings-start\"><i></i>' + h('list.menu'.t) + '</a>"
-        menu << "<ul>"
+        menu << '<ul>'
         if table.paginate?
           # Per page
           list = [5, 10, 20, 50, 100, 200]
@@ -246,7 +240,7 @@ module ActiveList
           for n in list
             menu << "<li data-list-change-page-size=\"#{n}\" '+(#{var_name(:params)}[:per_page] == #{n} ? ' class=\"check\"' : '') + '><a><i></i>' + h('list.x_per_page'.t(count: #{n})) + '</a></li>"
           end
-          menu << "</ul></li>"
+          menu << '</ul></li>'
         end
 
         # Column selector
@@ -255,7 +249,7 @@ module ActiveList
         for column in table.data_columns
           menu << "<li data-list-toggle-column=\"#{column.name}\" class=\"' + (#{var_name(:params)}[:hidden_columns].include?(:#{column.name}) ? 'unchecked' : 'checked') + '\"><a><i></i>' + h(#{column.header_code}) + '</a></li>"
         end
-        menu << "</ul></li>"
+        menu << '</ul></li>'
 
         # Separator
         menu << "<li class=\"separator\"></li>"
@@ -263,31 +257,29 @@ module ActiveList
         for format, exporter in ActiveList.exporters
           menu << "<li class=\"export export-#{format}\">' + link_to(content_tag(:i) + h('list.export_as'.t(exported: :#{format}.t(scope: 'list.export.formats'))), params.merge(action: :#{generator.controller_method_name}, sort: #{var_name(:params)}[:sort], dir: #{var_name(:params)}[:dir], format: '#{format}')) + '</li>"
         end
-        menu << "</ul></span>"
-        return menu
+        menu << '</ul></span>'
+        menu
       end
 
       # Produces the code to create the header line using  top-end menu for columns
       # and pagination management
       def header_code
         code = "'<thead><tr>"
-        if table.selectable?
-          code << "<th class=\"list-selector\"></th>"
-        end
+        code << "<th class=\"list-selector\"></th>" if table.selectable?
         for column in table.columns
-          next if column.is_a?(ActiveList::Definition::ActionColumn) and !column.use_single?
+          next if column.is_a?(ActiveList::Definition::ActionColumn) && !column.use_single?
           code << "<th data-list-column=\"#{column.sort_id}\""
           code << " data-list-column-cells=\"#{column.short_id}\""
           code << " data-list-column-sort=\"'+(#{var_name(:params)}[:sort] != '#{column.sort_id}' ? 'asc' : #{var_name(:params)}[:dir] == 'asc' ? 'desc' : 'asc')+'\"" if column.sortable?
           code << " class=\"#{column_classes(column, true, true)}\""
-          code << ">"
+          code << '>'
           code << "' + h(#{column.header_code}) + '"
-          code << "<i></i>"
-          code << "</th>"
+          code << '<i></i>'
+          code << '</th>'
         end
         # code << "<th class=\"spe\">#{menu_code}</th>"
         code << "</tr></thead>'"
-        return code
+        code
       end
 
       # Produces the code to create bottom menu and pagination
@@ -296,11 +288,11 @@ module ActiveList
 
         codes = {}
         if table.global_action_columns.any?
-          
-          actions = ""
-          actions << "<span class=\"list-actions\" data-list-ref=\"#{self.uid}\">'"
+
+          actions = ''
+          actions << "<span class=\"list-actions\" data-list-ref=\"#{uid}\">'"
           for column in table.global_action_columns
-            actions << " + link_to(content_tag(:i) + h(' ' + :#{column.name.to_s}.t(scope: 'rest.actions')), #{column.default_url.inspect}, class: 'btn btn-#{column.name}'#{', style: "display: none"' unless column.use_none?}#{', method: "' + column.options[:method].to_s + '"' if column.options[:method]}, data: {list_actioner: :#{column.use_none? ? 'none' : 'many'}#{', confirm: :' + column.options[:confirm].to_s + '.t(scope: "labels")' if column.options[:confirm]}})"
+            actions << " + link_to(content_tag(:i) + h(' ' + :#{column.name}.t(scope: 'rest.actions')), #{column.default_url.inspect}, class: 'btn btn-#{column.name}'#{', style: "display: none"' unless column.use_none?}#{', method: "' + column.options[:method].to_s + '"' if column.options[:method]}, data: {list_actioner: :#{column.use_none? ? 'none' : 'many'}#{', confirm: :' + column.options[:confirm].to_s + '.t(scope: "labels")' if column.options[:confirm]}})"
           end
           actions << " + '</span>"
           code << "'#{actions}'"
@@ -312,11 +304,11 @@ module ActiveList
         codes[:settings] = "'#{menu_code}'"
 
         if table.paginate?
-          pagination = ""
+          pagination = ''
           current_page = "#{var_name(:page)}"
           last_page = "#{var_name(:last)}"
 
-          pagination << "<span class=\"list-pagination\" data-list-ref=\"#{self.uid}\">"
+          pagination << "<span class=\"list-pagination\" data-list-ref=\"#{uid}\">"
           pagination << "<span class=\"status\">' + 'list.pagination.x_to_y_of_total'.t(x: (#{var_name(:offset)} + (#{var_name(:count)} > 0 ? 1 : 0)), y: ((#{var_name(:last)} == #{var_name(:page)}) ? #{var_name(:count)} : #{var_name(:offset)} + #{var_name(:limit)}), total: #{var_name(:count)}) + '</span>"
 
           pagination << "<span class=\"paginator\">"
@@ -326,9 +318,9 @@ module ActiveList
           y = '@@PAGE-COUNT@@'
 
           pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} + 1).to_s + '\" class=\"btn next-page\"' + (#{current_page} != #{last_page} ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.next')+'</a>"
-          pagination << "</span>"
+          pagination << '</span>'
 
-          pagination << "</span>"
+          pagination << '</span>'
 
           code << "'#{pagination}'"
           codes[:pagination] = "'#{pagination}'"
@@ -339,14 +331,13 @@ module ActiveList
           code = "content_tag(:div, (#{code.join(' + ')}).html_safe, class: 'list-control')"
         end
 
-        return code
+        code
       end
 
       def uid
         "#{table.name}-list"
       end
 
-
       # # Not used
       # def columns_definition_code
       #   code = table.columns.collect do |column|
@@ -357,7 +348,8 @@ module ActiveList
 
       # Finds all default styles for column
       def column_classes(column, without_id = false, without_interpolation = false)
-        classes, conds = [], []
+        classes = []
+        conds = []
         conds << [:sor, "#{var_name(:params)}[:sort] == '#{column.sort_id}'".c] if column.sortable?
         conds << [:hidden, "#{var_name(:params)}[:hidden_columns].include?(:#{column.name})".c] if column.is_a? ActiveList::Definition::DataColumn
         classes << column.options[:class].to_s.strip unless column.options[:class].blank?
@@ -373,9 +365,9 @@ module ActiveList
           classes << column.label_method if [:code, :color].include? column.label_method.to_sym
           if column.options[:mode] == :download
             classes << :dld
-          elsif column.options[:mode]||column.label_method == :email
+          elsif column.options[:mode] || column.label_method == :email
             classes << :eml
-          elsif column.options[:mode]||column.label_method == :website
+          elsif column.options[:mode] || column.label_method == :website
             classes << :web
           end
         elsif column.is_a? ActiveList::Definition::TextFieldColumn
@@ -399,13 +391,8 @@ module ActiveList
             end.join
           end
         end
-        return html
+        html
       end
-
-
     end
-
-
   end
-
 end