active_list 6.9.3 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 1d974ce0487a1daa388beac4ddbb5ff08a6c6c2c
-  data.tar.gz: f9b308f405d8a88365bd1ecb457f189c1f79e12b
+SHA256:
+  metadata.gz: 884ba63410b0ba502c551bdbf9035360ad2ddefefc959de5d0b3809274e57b60
+  data.tar.gz: 38f2ddcea9c3beb17cc6c4527152f1dba440869e4830d73d8f2c46db0b7c5f7e
 SHA512:
-  metadata.gz: f2ef81730abf3d78093f164e899c2f0b7fc632058e634da3b4736c34ff4fe47d9e3e0688841d0a120b2aa80498e192d43018675fcc3cfc258573172743be71ae
-  data.tar.gz: 973afbb44c55421b312fd2f8e6c78be04e7db128a581cb10173a4de0ae57c3b70c8020e70f0f5541765aaf36fdb5aa29f6f6b89c53d31af4dd40ebb3c573fb37
+  metadata.gz: dfa9c5a61880233f0b49f883cfe340a6b63d197a2369fd6a26a079ff87f059fea98ed8ee9f4bc853a97dd6b20112de497923ab62995f642907eb3dfabfcaa877
+  data.tar.gz: e3bf5e8a58a7ecdc81924f71476a433c03fb52b313ff304ebc8755ab13a39b7d2ea60194c669368d1139fbe37321fadbb38c854932fc46fce04d025c1e55e9e1

data/app/assets/javascripts/active_list.jquery.js.coffee

@@ -23,7 +23,7 @@ ActiveList = {}
         content = $(data)
         list_data = content.find(".list-data")
         list_control = content.find(".list-control")
-        for type in ["actions", "pagination", "settings"]
+        for type in ["actions", "pagination", "footer-pagination","settings"]
           $("*[data-list-ref='#{list_id}'].list-#{type}").replaceWith list_control.find(".list-#{type}")
         list.find(".list-data").html(list_data)
         selection = list.prop('selection')
@@ -158,6 +158,11 @@ ActiveList = {}
 
   # Select row
   $(document).on "click", "*[data-list-source] td>input[data-list-selector]", (event) ->
+    mainCheckbox = $("input[data-list-selector]").first()
+    someChecked = $("*[data-list-source] td>input[data-list-selector]:checked").length > 0
+    someUnchecked = $("*[data-list-source] td>input[data-list-selector]:not(:checked)").length > 0
+    mainCheckbox.prop("indeterminate", someChecked && someUnchecked);
+    mainCheckbox.prop("checked", someChecked || !someUnchecked);
     AL.select $(this)
     true
 

data/app/assets/stylesheets/active_list/theme.scss

@@ -78,7 +78,7 @@
     @include background(transparentize(mix($theme-color, #FFF, 40%), 0.7));
   }
 
-  .list-pagination {
+  .list-pagination, .list-footer-pagination {
     & { text-align: left; }
     html[dir="rtl"] & { text-align: right; }
     & > * {

data/lib/active_list.rb

@@ -4,6 +4,7 @@ require 'action_dispatch'
 require 'rails'
 require 'code_string'
 require 'i18n-complements'
+require 'tmpdir'
 
 module ActiveList
   # Build and returns a short UID

data/lib/active_list/definition/abstract_column.rb

@@ -1,13 +1,14 @@
 module ActiveList
   module Definition
     class AbstractColumn
-      attr_reader :table, :name, :id, :options
+      attr_reader :table, :name, :id, :options, :condition
 
       def initialize(table, name, options = {})
         @table   = table
         @name    = name.to_sym
         @options = options
         @hidden  = !!@options.delete(:hidden)
+        @condition = @options.delete(:condition)
         @id = 'c' + @table.new_column_id # ActiveList.new_uid
       end
 

data/lib/active_list/definition/action_column.rb

@@ -94,8 +94,8 @@ module ActiveList
             url[:redirect] ||= 'params[:redirect]'.c
             url.delete_if { |_k, v| v.nil? }
             cases << "#{record}.#{@name} == #{expected.inspect}\nlink_to(content_tag(:i) + h(#{url[:action].inspect}.t(scope: 'rest.actions'))"\
-                     ', {' + url.collect { |k, v| "#{k}: " + urlify(v, record) }.join(', ') + format + '}' \
-                                                                                                       ", {class: '#{@name}'" + link_options + '}'\
+                     ', {' + url.collect { |k, v| "#{k}: " + urlify(k, v, record) }.join(', ') + format + '}' \
+                                                                                                       ", {class: '#{@options[:icon_name] || @name}'" + link_options + '}'\
                                                                                                                                                ")\n"
           end
 
@@ -108,8 +108,8 @@ module ActiveList
           url[:id] = 'RECORD.id'.c if url[:id] == ID_PLACEHOLDER
           url[:redirect] ||= 'params[:redirect]'.c
           url.delete_if { |_k, v| v.nil? }
-          url = '{' + url.collect { |k, v| "#{k}: " + urlify(v, record) }.join(', ') + format + '}'
-          code = "{class: '#{@name}'" + link_options + '}'
+          url = '{' + url.collect { |k, v| "#{k}: " + urlify(k, v, record) }.join(', ') + format + '}'
+          code = "{class: '#{@options[:icon_name] || @name}'" + link_options + '}'
           code = "link_to(content_tag(:i) + h(' ' + :#{action}.t(scope: 'rest.actions')), " + url + ', ' + code + ')'
         end
         if @options[:if]

data/lib/active_list/definition/attribute_column.rb

@@ -11,13 +11,7 @@ module ActiveList
                         else
                           @label_method.to_s.gsub('human_', '').to_sym
                         end
-        unless @sort_column = options[:sort]
-          @sort_column = if @table.model.columns_hash[@label_method.to_s]
-                           @label_method
-                         elsif @table.model.columns_hash[@name.to_s]
-                           @name
-                         end
-        end
+        @sort_column = get_sort_column
         @computation_method = options[:on_select]
         @column = @table.model.columns_hash[@label_method.to_s]
       end
@@ -51,9 +45,27 @@ module ActiveList
         code.c
       end
 
+      def get_sort_column
+        selects = @table.options[:select] || {}
+        selects_label = selects.find { |sql_name, name| name.to_s == @label_method.to_s }&.last
+        selects_name = selects.find { |sql_name, name| name.to_s == @name.to_s }&.last
+        if (selects_label || selects_name) && options[:sort].blank?
+          sort_column = (selects_label || selects_name)
+        else
+          sort_column = options[:sort]
+          sort_column ||= if @table.model.columns_hash[@label_method.to_s]
+                             @label_method
+                           elsif @table.model.columns_hash[@name.to_s]
+                             @name
+                           end
+          sort_column &&= "#{@table.model.table_name}.#{sort_column}"
+        end
+        sort_column
+      end
+
       # Returns the class name of the used model
       def class_name
-        table.model.name
+        "RECORD.class.name.tableize".c
       end
 
       def sortable?
@@ -70,7 +82,7 @@ module ActiveList
       end
 
       def sort_expression
-        "#{@table.model.table_name}.#{@sort_column}"
+        @sort_column
       end
     end
   end

data/lib/active_list/definition/empty_column.rb

@@ -1,6 +1,10 @@
 module ActiveList
   module Definition
     class EmptyColumn < AbstractColumn
+
+      def header_code
+        "#{name.to_s.strip.inspect}.t(scope: 'labels')".c
+      end
     end
   end
 end

data/lib/active_list/definition/status_column.rb

@@ -1,6 +1,19 @@
 module ActiveList
   module Definition
     class StatusColumn < AttributeColumn
+      def initialize(table, name, options = {})
+        super
+
+        @tooltip_method = options.fetch(:tooltip_method, nil)
+      end
+
+      def tooltip_title_code(record, child)
+        c = if @tooltip_method.nil?
+          "#{record}.try(:human_status) || #{record}&.try(:human_state_name) || #{datum_value(record, child)}.to_s.capitalize"
+        else
+          "#{record}.#{@tooltip_method}"
+        end
+      end
     end
   end
 end

data/lib/active_list/definition/table.rb

@@ -103,6 +103,10 @@ module ActiveList
         add :action, name, options
       end
 
+      # Add a new method in Table which permit to define empty columns
+      def empty(name, options = {})
+        add :empty, name, options
+      end
       # # Add a new method in Table which permit to define data columns
       # def attribute(name, options = {})
       #   add :attribute, name, options

data/lib/active_list/exporters/csv_exporter.rb

@@ -6,7 +6,7 @@ module ActiveList
       end
 
       def mime_type
-        Mime::CSV
+        Mime[:csv]
       end
 
       def send_data_code

data/lib/active_list/exporters/excel_csv_exporter.rb

@@ -9,7 +9,7 @@ module ActiveList
       end
 
       def mime_type
-        Mime::XCSV
+        Mime[:xcsv]
       end
 
       def send_data_code

data/lib/active_list/exporters/open_document_spreadsheet_exporter.rb

@@ -19,7 +19,7 @@ module ActiveList
       end
 
       def mime_type
-        Mime::ODS
+        Mime[:ods]
       end
 
       def send_data_code

data/lib/active_list/generator.rb

@@ -7,7 +7,7 @@ module ActiveList
       @controller = options[:controller]
       name = args.shift || @controller.controller_name.to_sym
       model = (options[:model] || name).to_s.classify.constantize
-      @collection = !!(model.name == @controller.controller_name.to_s.classify)
+      @collection = options[:collection] || !!(model.name == @controller.controller_name.to_s.classify)
       @controller_method_name = "list#{'_' + name.to_s if name != @controller.controller_name.to_sym}"
       @view_method_name       = "_#{@controller.controller_name}_list_#{name}_tag"
       @records_variable_name  = "@#{name}"
@@ -70,7 +70,7 @@ module ActiveList
       code = "# encoding: utf-8\n"
       code << "def #{view_method_name}(options={}, &block)\n"
       code << session_initialization_code.dig
-      code << renderer.build_table_code.dig
+      code <<   "#{renderer.build_table_code}(options).dig\n"
       code << "end\n"
       # code.split("\n").each_with_index{|l, x| puts((x+1).to_s.rjust(4)+": "+l)}
       unless ::Rails.env.production?
@@ -83,7 +83,8 @@ module ActiveList
 
     def session_initialization_code
       code = "options = {} unless options.is_a? Hash\n"
-      code << "options.update(params)\n"
+      # For Rails 5
+      code << "options.update(params.to_unsafe_h)\n"
       if defined?(User) && User.instance_methods.include?(:preference)
         code << "#{var_name(:params)} = YAML::load(current_user.preference('list.#{view_method_name}', YAML::dump({})).value).symbolize_keys\n"
         code << "#{var_name(:params)} = {} unless #{var_name(:params)}.is_a?(Hash)\n"

data/lib/active_list/generator/finder.rb

@@ -10,13 +10,14 @@ module ActiveList
         @table.options[:order] = (columns.any? ? columns.first.name.to_sym : { id: :desc })
       end
 
-      class_name = @table.model.name
-      class_name = "(controller_name != '#{class_name.tableize}' ? controller_name.to_s.classify.constantize : #{class_name})" if collection?
+      class_name = "options[\"constant_name\"]&.constantize || #{@table.model.name}"
+      class_name = "(controller_name != '#{class_name.tableize}' && !options[\"constant_name\"] ? controller_name.to_s.classify.constantize : #{class_name})" if collection?
 
       # Find data
       query_code = class_name.to_s
       query_code << scope_code if scope_code
       query_code << ".select(#{select_code})" if select_code
+      query_code << ".from(#{from_code})" if from_code
       query_code << ".where(#{conditions_code})" unless @table.options[:conditions].blank?
       query_code << ".joins(#{@table.options[:joins].inspect})" unless @table.options[:joins].blank?
       unless includes_reflections.empty?
@@ -26,8 +27,14 @@ module ActiveList
       end
 
       code = ''
-      code << "#{var_name(:count)} = #{query_code}.count\n"
+      code << "#{query_code}\n"
 
+      code << if @table.options[:count].present?
+                "#{var_name(:count)} = #{query_code}.count(#{@table.options[:count].inspect})\n"
+              else
+                "#{var_name(:count)} = #{query_code}.count\n"
+              end
+      query_code << ".group(#{@table.options[:group].inspect})" unless @table.options[:group].blank?
       query_code << ".reorder(#{var_name(:order)})"
 
       if paginate
@@ -111,15 +118,33 @@ module ActiveList
       code
     end
 
+    def from_code
+      return nil unless @table.options[:from]
+      from = @table.options[:from]
+      code = ''
+      code << '(' + from.gsub(/\s*\n\s*/, ';') + ')'
+      code
+    end
+
     def select_code
       return nil unless @table.options[:distinct] || @table.options[:select]
       code = ''
       code << 'DISTINCT ' if @table.options[:distinct]
-      code << "#{@table.model.table_name}.*"
       if @table.options[:select]
-        code << @table.options[:select].collect { |k, v| ", #{k[0].to_s + '.' + k[1].to_s} AS #{v}" }.join
+        # code << @table.options[:select].collect { |k, v| ", #{k[0].to_s + '.' + k[1].to_s} AS #{v}" }.join
+        code << @table.options[:select].collect do |k, v|
+          c = if k.is_a? Array
+                k[0].to_s + '.' + k[1].to_s
+              else
+                k
+              end
+          c += " AS #{v}" unless v.blank?
+          c
+        end.join(', ')
+      else
+        code << "#{@table.model.table_name}.*"
       end
-      ("'" + code + "'").c
+      ('"' + code + '"').c
     end
 
     def sanitize_condition(value)

data/lib/active_list/helpers.rb

@@ -20,11 +20,12 @@ module ActiveList
       end
     end
 
-    def urlify(value, record_name)
-      if value.is_a?(CodeString)
-        '(' + value.gsub(/RECORD/, record_name) + ')'
+    def urlify(key, value, record_name, namespace = nil)
+      return value.inspect unless value.is_a?(CodeString)
+      if key == :controller && namespace
+        '(' + "'/#{namespace}/' + " + value.gsub(/RECORD/, record_name) + ')'
       else
-        value.inspect
+        '(' + value.gsub(/RECORD/, record_name) + ')'
       end
     end
   end

data/lib/active_list/renderers/simple_renderer.rb

@@ -34,14 +34,16 @@ module ActiveList
         code
       end
 
-      def build_table_code
+      def build_table_code(options = {})
         record = 'r'
 
         # colgroup = columns_definition_code
         header = header_code
         extras = extras_codes
 
-        code = generator.select_data_code
+        code = "#{generator.select_data_code}(options)\n"
+        # Hack for Rails 5
+        code << "__params = params.permit!\n"
         code << "#{var_name(:tbody)} = '<tbody data-total=\"' + #{var_name(:count)}.to_s + '\""
         if table.paginate?
           code << " data-per-page=\"' + #{var_name(:limit)}.to_s + '\""
@@ -51,11 +53,17 @@ module ActiveList
         code << "if #{var_name(:count)} > 0\n"
         code << "  #{generator.records_variable_name}.each do |#{record}|\n"
         code << "    #{var_name(:attrs)} = {id: 'r' + #{record}.id.to_s}\n"
+        code << " if #{var_name(:params)}[:data]\n"
+        code << "   #{var_name(:params)}[:data] = [#{var_name(:params)}[:data]] unless #{var_name(:params)}[:data].is_a?(Array)\n"
+        code << "   #{var_name(:params)}[:data].each do |attr|\n"
+        code << "     #{var_name(:attrs)}['data-' + attr.gsub('_', '-')] = #{record}.send(attr)\n"
+        code << "   end\n"
+        code << " end\n"
         if table.options[:line_class]
           code << "    #{var_name(:attrs)}[:class] = (#{recordify!(table.options[:line_class], record)}).to_s\n"
-          code << "    #{var_name(:attrs)}[:class] << ' focus' if params['#{table.name}-id'].to_i == #{record}.id\n"
+          code << "    #{var_name(:attrs)}[:class] << ' focus' if __params['#{table.name}-id'].to_i == #{record}.id\n"
         else
-          code << "    #{var_name(:attrs)}[:class] = 'focus' if params['#{table.name}-id'].to_i == #{record}.id\n"
+          code << "    #{var_name(:attrs)}[:class] = 'focus' if __params['#{table.name}-id'].to_i == #{record}.id\n"
         end
         code << "    #{var_name(:tbody)} << content_tag(:tr, #{var_name(:attrs)}) do\n"
         code << columns_to_cells(:body, record: record).dig(3)
@@ -107,6 +115,7 @@ module ActiveList
           code << "options[:content_for] ||= {}\n"
           code << "#{var_name(:extras)} = ''\n"
           extras.each do |name, ecode|
+            next if name == :footer_pagination
             code << "if options[:content_for][:#{name}]\n"
             code << "  content_for(options[:content_for][:#{name}], (#{ecode}).html_safe)\n"
             code << "else\n"
@@ -127,10 +136,21 @@ module ActiveList
         code << "end\n"
         code << "#{var_name(:content)} << #{var_name(:tbody)}\n"
         code << "#{var_name(:content)} << '</table></div>'\n"
+
+        if table.options[:footer_pagination]
+          code << "  footer_code = ''\n"
+          code << "  if options[:content_for][:footer_pagination]\n"
+          code << "    footer_code << content_for(options[:content_for][:pagination])\n"
+          code << "  else\n"
+          code << "    footer_code << (#{extras[:footer_pagination]})\n"
+          code << "  end\n"
+          code << "  #{var_name(:content)} << content_tag(:div, (footer_code).html_safe, class: 'list-control') unless footer_code.blank?\n"
+        end
+
         # code << "return #{var_name(:content)}.html_safe if options[:only] == 'content'\n"
 
         # Build whole
-        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 << "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"
         # File.open('debug-activelist', 'w') { |file| file.write code }
         code
       end
@@ -150,17 +170,20 @@ module ActiveList
         children_mode = !!(nature == :children)
         for column in table.columns
           value_code = ''
+          title_value_code = ''
           if column.is_a? ActiveList::Definition::EmptyColumn
             value_code = 'nil'
           elsif column.is_a? ActiveList::Definition::StatusColumn
-
+            title_value_code = nil
             value_code = column.datum_code(record, children_mode)
+            title_code = column.tooltip_title_code(record, children_mode)
             levels = %w[go caution stop]
             lights = levels.collect do |light|
               "content_tag(:span, '', :class => #{light.inspect})"
             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'))"
+
+            value_code = "content_tag(:span, #{lights}, :class => 'lights lights-' + (#{levels.inspect}.include?(#{value_code}.to_s) ? #{value_code}.to_s : 'undefined'), data: { toggle: :tooltip, placement: :top }, title: #{title_code})"
 
           elsif column.is_a? ActiveList::Definition::DataColumn
             if column.options[:children].is_a?(FalseClass) && children_mode
@@ -168,6 +191,7 @@ module ActiveList
             else
               value_code = column.datum_code(record, children_mode)
               if column.datatype == :boolean
+                title_value_code = value_code
                 value_code = "content_tag(:div, '', :class => 'checkbox-'+(" + value_code.to_s + " ? 'true' : 'false'))"
               elsif %i[date datetime timestamp measure].include? column.datatype
                 value_code = "(#{value_code}.nil? ? '' : #{value_code}.l)"
@@ -179,7 +203,7 @@ module ActiveList
                 currency = :currency if currency.is_a?(TrueClass)
                 # currency = "#{record}.#{currency}".c if currency.is_a?(Symbol)
                 currency = "#{column.record_expr(record)}.#{currency}".c if currency.is_a?(Symbol)
-                value_code = "(#{value_code}.nil? ? '' : #{value_code}.l(currency: #{currency.inspect}))"
+                value_code = "(#{value_code}.nil? || #{value_code}.zero? ? ('#{column.options[:default]}'.present? ? '#{column.options[:default]}' : '') : #{value_code}.l(currency: #{currency.inspect}))"
               elsif column.datatype == :decimal
                 value_code = "(#{value_code}.nil? ? '' : #{value_code}.l)"
               elsif column.enumerize?
@@ -189,15 +213,21 @@ module ActiveList
                 column.options[:url] = {} unless column.options[:url].is_a?(Hash)
                 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(', ')
+                default_controller = column.class_name.is_a?(CodeString) ? column.class_name : column.class_name.tableize.to_sym
+                column.options[:url][:controller] ||= default_controller
+                namespace = column.options[:url].delete(:namespace)
+                url = column.options[:url].collect { |k, v| "#{k}: " + urlify(k, v, record, namespace) }.join(', ')
+
+                title_value_code = value_code
                 value_code = "(#{value_code}.blank? ? '' : link_to(#{value_code}.to_s, #{url}))"
               elsif column.options[:mode] || column.label_method == :email
+                title_value_code = value_code
                 value_code = "(#{value_code}.blank? ? '' : mail_to(#{value_code}))"
               elsif column.options[:mode] || column.label_method == :website
+                title_value_code = value_code
                 value_code = "(#{value_code}.blank? ? '' : link_to(" + value_code + ', ' + value_code + '))'
               elsif column.label_method == :color
+                title_value_code = value_code
                 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::Currency[#{value_code}] ? Nomen::Currency[#{value_code}].human_name : #{value_code})"
@@ -207,11 +237,13 @@ module ActiveList
                 value_code = "(Nomen::Country[#{value_code}]  ? (image_tag('countries/' + #{value_code}.to_s + '.png') + ' ' + Nomen::Country[#{value_code}].human_name).html_safe : #{value_code})"
               else # if column.datatype == :string
                 value_code = "h(#{value_code}.to_s)"
+                title_value_code = nil
               end
 
               value_code = "if #{record}\n#{value_code.dig}end" if column.is_a?(ActiveList::Definition::AssociationColumn)
             end
           elsif column.is_a?(ActiveList::Definition::CheckBoxColumn)
+            title_value_code = nil
             if nature == :body
               form_name = column.form_name || "'#{table.name}[' + #{record}.id.to_s + '][#{column.name}]'".c
               value = 'nil'
@@ -226,15 +258,26 @@ module ActiveList
               value_code << 'nil'
             end
           elsif column.is_a?(ActiveList::Definition::TextFieldColumn)
+            title_value_code = nil
             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}'
           elsif column.is_a?(ActiveList::Definition::ActionColumn)
+            title_value_code = nil
             next unless column.use_single?
             value_code = (nature == :body ? column.operation(record) : 'nil')
           else
             value_code = "'&#160;&#8709;&#160;'.html_safe"
           end
-          code << "content_tag(:td, :class => \"#{column_classes(column)}\","
+
+          title_attr_code = if title_value_code.nil?
+                              ''
+                            elsif title_value_code.blank?
+                              ":title => (#{value_code}),"
+                            else
+                              ":title => (#{title_value_code}),"
+                            end
+
+          code << "content_tag(:td, #{title_attr_code} :class => \"#{column_classes(column)}\","
           code << " data: { 'list-column-header' => '#{column.short_id}'"
           code << ", 'list-cell-value' => \"\#{#{column.datum_value(record, children_mode)}.to_f}\"" if column.computable?
           code << " } ) do\n"
@@ -282,7 +325,7 @@ module ActiveList
         menu << '<li class="separator"></li>'
         # Exports
         ActiveList.exporters.each do |format, _exporter|
-          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>"
+          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>'
         menu
@@ -299,7 +342,7 @@ module ActiveList
         end
         table.columns.each do |column|
           next if column.is_a?(ActiveList::Definition::ActionColumn) && !column.use_single?
-          code << "<th data-list-column=\"#{column.sort_id}\""
+          code << "<th data-list-column=\"#{column.options[:icon_name] || 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 << " data-list-column-computation=\"#{column.computation_method}\"" if column.computable?
@@ -368,6 +411,26 @@ module ActiveList
 
           code << "'#{pagination}'"
           codes[:pagination] = "'#{pagination}'"
+
+          if table.options[:footer_pagination]
+            pagination = ''
+            current_page = var_name(:page).to_s
+            last_page = var_name(:last).to_s
+
+            pagination << "<span class=\"list-footer-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">'
+            pagination << "<a href=\"#\" data-list-move-to-page=\"' + (#{current_page} - 1).to_s + '\" class=\"btn previous-page\"' + (#{current_page} != 1 ? '' : ' disabled=\"true\"') + '><i></i>' + ::I18n.translate('list.pagination.previous') + '</a>"
+
+            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>'
+
+            code << "'#{pagination}'"
+            codes[:footer_pagination] = "'#{pagination}'"
+          end
         end
         codes
       end
@@ -389,7 +452,11 @@ module ActiveList
         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
+        if column.is_a? ActiveList::Definition::DataColumn
+          conds << [:hidden, "#{var_name(:params)}[:hidden_columns].include?(:#{column.name})".c]
+        elsif column.condition
+          conds << [:hidden, "h(#{column.condition}) == 'false'".c]
+        end
         classes << column.options[:class].to_s.strip unless column.options[:class].blank?
         classes << column.short_id unless without_id
         if column.is_a? ActiveList::Definition::ActionColumn

data/lib/active_list/version.rb

@@ -1,3 +1,3 @@
 module ActiveList
-  VERSION = '6.9.3'.freeze
+  VERSION = '7.2.0'.freeze
 end

data/test/dummy/Gemfile

@@ -1,23 +1,25 @@
 source 'https://rubygems.org'
 
-gem 'rails', '4.2.8'
+gem 'rails', '~> 5.0'
 
 # Bundle edge Rails instead:
 # gem 'rails', :git => 'git://github.com/rails/rails.git'
 
-gem 'sqlite3'
+gem 'sqlite3', '~> 1.3.6'
 gem 'active_list', path: '../..'
 
+gem 'sprockets', '< 4'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do
-  gem 'sass-rails',   '~> 4'
-  gem 'coffee-rails', '~> 4'
+  gem 'sass-rails'
+  gem 'coffee-rails'
 
   # See https://github.com/sstephenson/execjs#readme for more supported runtimes
   gem 'therubyracer', platform: :ruby
 
-  gem 'uglifier', '>= 1.0.3'
+  gem 'uglifier'
 end
 
 gem 'jquery-rails'

data/test/dummy/config/application.rb

@@ -39,6 +39,7 @@ module Dummy
     # Configure sensitive parameters which will be filtered from the log file.
     config.filter_parameters += [:password]
 
+    config.active_record.sqlite3.represent_boolean_as_integer = true
     # Use SQL instead of Active Record's schema dumper when creating the database.
     # This is necessary if your schema can't be completely dumped by the schema dumper,
     # like if you have constraints or database-specific column types

data/test/dummy/config/initializers/secret_token.rb

@@ -5,4 +5,3 @@
 # Make sure the secret is at least 30 characters and all random,
 # no regular words or you'll be exposed to dictionary attacks.
 Dummy::Application.config.secret_key_base = '7a06e73398090c095bed02f2dff3808b043e50cb928f7b7bfd02faadd988a0d9cf31dfc74d1bf661ac94c8d0d73c8ceb4d98210d09f251f0c6d70f09923db784'
-Dummy::Application.config.secret_token = '7a06e73398090c095bed02f2dff3808b043e50cb928f7b7bfd02faadd988a0d9cf31dfc74d1bf661ac94c8d0d73c8ceb4d98210d09f251f0c6d70f09923db784'

data/test/dummy/db/migrate/20120510131331_create_people.rb

@@ -1,4 +1,4 @@
-class CreatePeople < ActiveRecord::Migration
+class CreatePeople < ActiveRecord::Migration[4.2]
   def change
     create_table :people do |t|
       t.string :name

data/test/dummy/db/migrate/20120510134500_create_contacts.rb

@@ -1,4 +1,4 @@
-class CreateContacts < ActiveRecord::Migration
+class CreateContacts < ActiveRecord::Migration[4.2]
   def change
     create_table :contacts do |t|
       t.integer :person_id

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -11,26 +10,26 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20120510134500) do
+ActiveRecord::Schema.define(version: 2012_05_10_134500) do
 
   create_table "contacts", force: :cascade do |t|
-    t.integer  "person_id"
-    t.text     "address"
-    t.string   "phone"
-    t.string   "fax"
-    t.string   "country"
+    t.integer "person_id"
+    t.text "address"
+    t.string "phone"
+    t.string "fax"
+    t.string "country"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
   end
 
   create_table "people", force: :cascade do |t|
-    t.string   "name"
-    t.date     "born_on"
-    t.decimal  "height"
-    t.decimal  "balance_amount"
-    t.string   "currency"
-    t.datetime "created_at",     null: false
-    t.datetime "updated_at",     null: false
+    t.string "name"
+    t.date "born_on"
+    t.decimal "height"
+    t.decimal "balance_amount"
+    t.string "currency"
+    t.datetime "created_at", null: false
+    t.datetime "updated_at", null: false
   end
 
 end

data/test/people_controller_test.rb

@@ -5,10 +5,10 @@ class PeopleControllerTest < ActionController::TestCase
     get :list
     assert_response :success
 
-    get :list, format: :csv
+    get :list, params: {format: :csv}
     assert_response :success
 
-    get :list, format: :ods
+    get :list, params: {format: :ods}
     assert_response :success
   end
 
@@ -18,19 +18,19 @@ class PeopleControllerTest < ActionController::TestCase
   end
 
   test 'parameters' do
-    get :list, 'people-id' => 10
+    get :list, params: {'people-id' => 10}
     assert_response :success
 
-    get :list, page: 0
+    get :list, params: {page: 0}
     assert_response :success
 
-    get :list, page: 5, per_page: 25
+    get :list, params: {page: 5, per_page: 25}
     assert_response :success
 
-    get :list, page: 50, per_page: 25
+    get :list, params: {page: 50, per_page: 25}
     assert_response :success
 
-    get :list, page: 500, per_page: 25
+    get :list, params: {page: 500, per_page: 25}
     assert_response :success
   end
 end

data/test/test_helper.rb

@@ -1,3 +1,4 @@
+# coding: utf-8
 require 'bundler/setup'
 require 'pathname'
 
@@ -8,7 +9,7 @@ require 'active_list'
 dummy_path = Pathname.new(__FILE__).dirname.join('dummy')
 
 ENV['BUNDLE_GEMFILE'] = ''
-Kernel.system("cd #{dummy_path} && bundle install && bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=test")
+# Kernel.system("cd #{dummy_path} && bundle install && bundle exec rake db:drop db:create db:migrate db:seed RAILS_ENV=test")
 
 # CURRENT FILE :: test/test_helper.rb
 # Configure Rails Environment
@@ -22,6 +23,22 @@ ActionMailer::Base.delivery_method = :test
 ActionMailer::Base.perform_deliveries = true
 ActionMailer::Base.default_url_options[:host] = 'test.com'
 
+# Patch from https://github.com/rails/rails/issues/34790#issuecomment-450502805
+if RUBY_VERSION >= '2.6.0'
+  if Rails.version < '5'
+    class ActionController::TestResponse < ActionDispatch::TestResponse
+      def recycle!
+        # hack to avoid MonitorMixin double-initialize error:
+        @mon_mutex_owner_object_id = nil
+        @mon_mutex = nil
+        initialize
+      end
+    end
+  else
+    puts "Monkeypatch for ActionController::TestResponse no longer needed"
+  end
+end
+
 module ActionView
   class Base
     module Nomen

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.9.3
+  version: 7.2.0
 platform: ruby
 authors:
 - Brice Texier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-07-04 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -19,7 +19,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '3.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: '6'
 - !ruby/object:Gem::Dependency
   name: arel
   requirement: !ruby/object:Gem::Requirement
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.0
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -90,16 +90,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.6
 description: Generates action methods to provide clean tables.
 email: burisu@oneiros.fr
 executables: []
@@ -208,11 +208,11 @@ files:
 - test/people_controller_test.rb
 - test/table_test.rb
 - test/test_helper.rb
-homepage: http://github.com/ekylibre/active_list
+homepage: http://gitlab.com/ekylibre/active_list
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -227,9 +227,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.4.5.2
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Simple interactive tables for Rails app
 test_files: