active_list 7.0.0 → 8.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '022092abfbb1ef56a9e935ba1f815b5f13dd7fc4'
-  data.tar.gz: c15a78e14c48e10bfe281e2f735e5b3bc9084ea7
+SHA256:
+  metadata.gz: 27436c5734c9477fdef8d87ba8d8baf417a3c6a63e74dcbe6461f02236139452
+  data.tar.gz: 9da5f80f7bd3617a7bb71dc0266c23c943180523a7f64ffa1d522afdc08f7b5e
 SHA512:
-  metadata.gz: 51bed46ba112355efe2aadbeae3e652296fbe9071d63d915a73d4189b87c21b933c44b3af2eefc14032827bcf13e5e370f6310f6f30dc66c30ddbaf658330013
-  data.tar.gz: edc59cfcb98fa9f621d67f1f6b593657ca2e1ede60c22631884c0ec749ed455e5ff0e8724c6559e2a2e8a915288d22311d8d72a6247aaea69687b7df29eb5fd5
+  metadata.gz: 6b1e434947929a963d81ad16c5fc34cae590f1010139da5862ad43aebc18f32ea946b378636c516939d7b2d0c6fa1074cf4e3a09364ebbabdbc6eef3cd85010e
+  data.tar.gz: e6344a3442a0c812667cd07ec35504e4545e526d4acb76bc27f02d4cbccf8205e52efccec42f8719a8f09bf25d0c3f8965ccc74b698e2a015a79f37904ccf2fc

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

@@ -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/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/data_column.rb

@@ -22,11 +22,11 @@ module ActiveList
           currency = currency_for(record)
           datum = "(#{datum}.nil? ? '' : #{datum}.l(#{'currency: ' + currency.inspect if currency}))"
         elsif @name.to_s.match(/(^|\_)currency$/) && datatype == :string
-          datum = "(Nomen::Currency[#{datum}] ? Nomen::Currency[#{datum}].human_name : '')"
+          datum = "(Onoma::Currency[#{datum}] ? Onoma::Currency[#{datum}].human_name : '')"
         elsif @name.to_s.match(/(^|\_)country$/) && datatype == :string
-          datum = "(Nomen::Country[#{datum}] ? Nomen::Country[#{datum}].human_name : '')"
+          datum = "(Onoma::Country[#{datum}] ? Onoma::Country[#{datum}].human_name : '')"
         elsif @name.to_s.match(/(^|\_)language$/) && datatype == :string
-          datum = "(Nomen::Language[#{datum}] ? Nomen::Language[#{datum}].human_name : '')"
+          datum = "(Onoma::Language[#{datum}] ? Onoma::Language[#{datum}].human_name : '')"
         elsif enumerize?
           datum = "(#{datum}.nil? ? '' : #{datum}.text)"
         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/abstract_exporter.rb

@@ -12,12 +12,39 @@ module ActiveList
         'txt'
       end
 
+      def file_name_code
+        "file_name = #{table.model.name}.model_name.human\n".c
+      end
+
       def mime_type
         Mime::TEXT
       end
 
+      def generate_file_code(format)
+        code = file_name_code
+        if generator.export_class
+          code << generator.exportable_query_code
+          code << "#{generator.export_class}.perform_later(user: current_user,\n"
+          code << "                                        query: query,\n"
+          code << "                                        content: #{columns_to_hash},\n"
+          code << "                                        file_name: file_name,\n"
+          code << "                                        format: '#{format}',\n"
+          code << "                                        file_extension: '#{file_extension}')\n"
+          code << "notify_success(:document_in_preparation)\n"
+          code << "redirect_to(:back)\n"
+        else
+          code << generate_data_code
+          code << send_data_code
+        end
+        code.c
+      end
+
       def send_data_code
-        raise NotImplementedError, "#{self.class.name}#format_data_code is not implemented."
+        raise NotImplementedError.new("#{self.class.name}#send_data_code must be implemented in sub-classes.")
+      end
+
+      def generate_data_code
+        raise NotImplementedError.new("#{self.class.name}#generate_data_code must be implemented in sub-classes.")
       end
 
       def columns_headers(options = {})
@@ -46,6 +73,12 @@ module ActiveList
         end
         array
       end
+
+      def columns_to_hash
+        table.exportable_columns.map do |column|
+          [column.header_code, column.exporting_datum_code('record').to_s]
+        end.to_h
+      end
     end
   end
 end

data/lib/active_list/exporters/csv_exporter.rb

@@ -1,6 +1,7 @@
 module ActiveList
   module Exporters
     class CsvExporter < AbstractExporter
+
       def file_extension
         'csv'
       end
@@ -9,7 +10,7 @@ module ActiveList
         Mime[:csv]
       end
 
-      def send_data_code
+      def generate_data_code
         record = 'r'
         code = generator.select_data_code(paginate: false)
         code << "data = ::CSV.generate do |csv|\n"
@@ -18,9 +19,12 @@ module ActiveList
         code << "    csv << [#{columns_to_array(:body, record: record).join(', ')}]\n"
         code << "  end\n"
         code << "end\n"
-        code << "send_data(data, type: #{mime_type.to_s.inspect}, disposition: 'inline', filename: #{table.model.name}.model_name.human.gsub(/[^a-z0-9]/i, '_') + '.#{file_extension}')\n"
         code.c
       end
+
+      def send_data_code
+        "send_data(data, type: #{mime_type.to_s.inspect}, disposition: 'inline', filename: file_name.parameterize + '.#{file_extension}')\n".c
+      end
     end
   end
 end

data/lib/active_list/exporters/excel_csv_exporter.rb

@@ -4,6 +4,7 @@ Mime::Type.register('text/csv', :xcsv) unless defined? Mime::XCSV
 module ActiveList
   module Exporters
     class ExcelCsvExporter < CsvExporter
+
       def file_extension
         'csv'
       end
@@ -12,7 +13,7 @@ module ActiveList
         Mime[:xcsv]
       end
 
-      def send_data_code
+      def generate_data_code
         record = 'r'
         code = generator.select_data_code(paginate: false)
         encoding = 'CP1252'
@@ -22,7 +23,6 @@ module ActiveList
         code << "    csv << [#{columns_to_array(:body, record: record, encoding: encoding).join(', ')}]\n"
         code << "  end\n"
         code << "end\n"
-        code << "send_data(data, type: #{mime_type.to_s.inspect}, disposition: 'inline', filename: #{table.model.name}.model_name.human.gsub(/[^a-z0-9]/i,'_')+'.#{file_extension}')\n"
         code.c
       end
     end

data/lib/active_list/exporters/open_document_spreadsheet_exporter.rb

@@ -1,6 +1,6 @@
 # encoding: UTF-8
 
-require 'zip'
+require 'rodf'
 
 # Register ODS format unless is already set
 Mime::Type.register('application/vnd.oasis.opendocument.spreadsheet', :ods) unless defined? Mime::ODS
@@ -8,11 +8,6 @@ Mime::Type.register('application/vnd.oasis.opendocument.spreadsheet', :ods) unle
 module ActiveList
   module Exporters
     class OpenDocumentSpreadsheetExporter < AbstractExporter
-      DATE_ELEMENTS = {
-        'm' => '<number:month number:style="long"/>',
-        'd' => '<number:day number:style="long"/>',
-        'Y' => '<number:year/>'
-      }.freeze
 
       def file_extension
         'ods'
@@ -22,55 +17,42 @@ module ActiveList
         Mime[:ods]
       end
 
-      def send_data_code
-        xml_escape = "to_s.gsub('&', '&amp;').gsub('\\'', '&apos;').gsub('<', '&lt;').gsub('>', '&gt;')"
-        xml_escape << ".force_encoding('US-ASCII')" if xml_escape.respond_to?(:force_encoding)
+      def generate_data_code
         record = 'r'
-        code = generator.select_data_code(paginate: false)
-        code << "name = #{table.model.name}.model_name.human.gsub(/[^a-z0-9]/i, '_')\n"
-        code << "file = ActiveList.temporary_directory.join(name + rand(999_999_999).to_s(36) + '.#{file_extension}')\n"
-        code << "FileUtils.mkdir_p(file.dirname)\n"
-        code << "Zip::OutputStream.open(file) do |zile|\n"
-        # MimeType in first place
-        code << "  zile.put_next_entry('mimetype', nil, nil, Zip::Entry::STORED)\n"
-        code << "  zile << '#{mime_type}'\n"
-
-        # Manifest
-        code << "  zile.put_next_entry('META-INF/manifest.xml')\n"
-        code << "  zile << ('<?xml version=\"1.0\" encoding=\"UTF-8\"?><manifest:manifest xmlns:manifest=\"urn:oasis:names:tc:opendocument:xmlns:manifest:1.0\"><manifest:file-entry manifest:media-type=\"#{mime_type}\" manifest:full-path=\"/\"/><manifest:file-entry manifest:media-type=\"text/xml\" manifest:full-path=\"content.xml\"/></manifest:manifest>')\n"
-        code << "  zile.put_next_entry('content.xml')\n"
 
-        code << "  zile << ('<?xml version=\"1.0\" encoding=\"UTF-8\"?><office:document-content xmlns:office=\"urn:oasis:names:tc:opendocument:xmlns:office:1.0\" xmlns:style=\"urn:oasis:names:tc:opendocument:xmlns:style:1.0\" xmlns:text=\"urn:oasis:names:tc:opendocument:xmlns:text:1.0\" xmlns:table=\"urn:oasis:names:tc:opendocument:xmlns:table:1.0\" xmlns:draw=\"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0\" xmlns:fo=\"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" xmlns:dc=\"http://purl.org/dc/elements/1.1/\" xmlns:meta=\"urn:oasis:names:tc:opendocument:xmlns:meta:1.0\" xmlns:number=\"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0\" xmlns:presentation=\"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0\" xmlns:svg=\"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0\" xmlns:chart=\"urn:oasis:names:tc:opendocument:xmlns:chart:1.0\" xmlns:dr3d=\"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0\" xmlns:math=\"http://www.w3.org/1998/Math/MathML\" xmlns:form=\"urn:oasis:names:tc:opendocument:xmlns:form:1.0\" xmlns:script=\"urn:oasis:names:tc:opendocument:xmlns:script:1.0\" xmlns:ooo=\"http://openoffice.org/2004/office\" xmlns:ooow=\"http://openoffice.org/2004/writer\" xmlns:oooc=\"http://openoffice.org/2004/calc\" xmlns:dom=\"http://www.w3.org/2001/xml-events\" xmlns:xforms=\"http://www.w3.org/2002/xforms\" xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xmlns:field=\"urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:field:1.0\" office:version=\"1.1\"><office:scripts/>')\n"
-        # Styles
-        code << "  zile << ('<office:automatic-styles>"\
-                '<style:style style:name="co1" style:family="table-column"><style:table-column-properties fo:break-before="auto" style:use-optimal-column-width="true"/></style:style>'\
-                '<style:style style:name="header" style:family="table-cell"><style:text-properties fo:font-weight="bold" style:font-weight-asian="bold" style:font-weight-complex="bold"/></style:style>'\
-                '<number:date-style style:name="K4D" number:automatic-order="true"><number:text>' + ::I18n.translate('date.formats.default').gsub(/\%./) { |x| '</number:text>' + DATE_ELEMENTS[x[1..1]] + '<number:text>' } + '</number:text></number:date-style><style:style style:name="ce1" style:family="table-cell" style:data-style-name="K4D"/>'\
-                                                                                                                                                                                                                                   "</office:automatic-styles>')\n"
+        code = generator.select_data_code(paginate: false)
+        code << <<~RUBY
+          records = #{generator.records_variable_name}
+          data = RODF::Spreadsheet.new
+
+          data.instance_eval do
+            office_style :head, family: :cell do
+              property :text, 'font-weight': :bold
+              property :paragraph, 'text-align': :center
+            end
+
+            table #{table.model.name}.model_name.human do
+              row do
+                #{columns_to_array(:header)}.each do |header|
+                  cell header, style: :head
+                end
+              end
+
+              for #{record} in records
+                row do
+                  #{columns_to_array(:body, record: record)}.each do |value|
+                    cell value
+                  end
+                end
+              end
+            end
+          end
+        RUBY
+        code.c
+      end
 
-        # Tables
-        code << "  zile << ('<office:body><office:spreadsheet><table:table table:name=\"'+#{table.model.name}.model_name.human.#{xml_escape}+'\">')\n"
-        code << "  zile << ('<table:table-column table:number-columns-repeated=\"#{table.exportable_columns.size}\"/>')\n"
-        code << "  zile << ('<table:table-header-rows><table:table-row>" + columns_headers.collect { |h| "<table:table-cell table:style-name=\"header\" office:value-type=\"string\"><text:p>'+(#{h}).#{xml_escape}+'</text:p></table:table-cell>" }.join + "</table:table-row></table:table-header-rows>')\n"
-        code << "  for #{record} in #{generator.records_variable_name}\n"
-        code << "    zile << ('<table:table-row>" + table.exportable_columns.collect do |column|
-          '<table:table-cell' + (if column.numeric? || column.datatype == :decimal
-                                   " office:value-type=\"float\" office:value=\"'+(#{column.datum_code(record)}).#{xml_escape}+'\""
-                                 elsif column.datatype == :boolean
-                                   " office:value-type=\"boolean\" office:boolean-value=\"'+(#{column.datum_code(record)}).#{xml_escape}+'\""
-                                 elsif column.datatype == :date
-                                   " office:value-type=\"date\" table:style-name=\"ce1\" office:date-value=\"'+(#{column.datum_code(record)}).#{xml_escape}+'\""
-                                 else
-                                   ' office:value-type="string"'
-                                 end) + "><text:p>'+(" + column.exporting_datum_code(record, true) + ").#{xml_escape}+'</text:p></table:table-cell>"
-        end.join + "</table:table-row>')\n"
-        code << "  end\n"
-        code << "  zile << ('</table:table></office:spreadsheet></office:body></office:document-content>')\n"
-        code << "end\n"
-        code << "send_file(file, stream: false, type: #{mime_type.to_s.inspect}, disposition: 'inline', filename: name+'.#{file_extension}')\n"
-        # code << "File.delete(file)\n" # Removes tmp files before they explode the disk
-        # raise code
-        code
+      def send_data_code
+        "send_data(data.bytes, type: #{mime_type.to_s.inspect}, disposition: 'inline', filename: file_name.parameterize + '.#{file_extension}')\n".c
       end
     end
   end

data/lib/active_list/generator.rb

@@ -1,17 +1,18 @@
 module ActiveList
   class Generator
-    attr_accessor :table, :controller, :controller_method_name, :view_method_name, :records_variable_name
+    attr_accessor :table, :controller, :controller_method_name, :view_method_name, :records_variable_name, :export_class
 
     def initialize(*args, &_block)
       options = args.extract_options!
       @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}"
       @table = ActiveList::Definition::Table.new(name, model, options)
+      @export_class = options[:export_class]
       if block_given?
         yield @table
       else
@@ -47,7 +48,7 @@ module ActiveList
       code << "    end\n"
       for format, exporter in ActiveList::Exporters.hash
         code << "    format.#{format} do\n"
-        code << exporter.new(self).send_data_code.dig(3)
+        code << exporter.new(self).generate_file_code(format).dig(3)
         code << "    end\n"
       end
       code << "  end\n"

data/lib/active_list/generator/finder.rb

@@ -10,8 +10,8 @@ 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
@@ -34,7 +34,6 @@ module ActiveList
               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)})"
 
@@ -65,6 +64,64 @@ module ActiveList
       code
     end
 
+    def exportable_query_code(options = {})
+      unless @table.options.keys.include?(:order)
+        columns = @table.table_columns
+        @table.options[:order] = (columns.any? ? columns.first.name.to_sym : { id: :desc })
+      end
+
+      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?
+
+      code = ''
+
+      code << "query = #{class_name}.to_s\n"
+      code << "query << #{scope_code.inspect}\n" if scope_code
+
+      if select_code
+        code << "select = #{select_code}\n"
+        code << "query << \".select(\"\n"
+        code << "query << select.inspect\n"
+        code << "query << \")\"\n"
+      end
+
+      if from_code
+        code << "from = #{from_code}\n"
+        code << "query << \".from(\"\n"
+        code << "query << from.inspect\n"
+        code << "query << \")\"\n"
+      end
+
+      unless @table.options[:conditions].blank?
+        code << "condition = #{conditions_code}\n"
+        code << "query << \".where(\"\n"
+        code << "query << condition.inspect\n"
+        code << "query << \")\"\n"
+      end
+
+      code << "query << \".joins(#{@table.options[:joins].inspect})\"\n" unless @table.options[:joins].blank?
+
+      unless includes_reflections.empty?
+        expr = includes_reflections.inspect[1..-2]
+        code << "query << \".includes(#{expr})\"\n"
+        code << "query << \".references(#{expr})\"\n"
+      end
+
+      unless @table.options[:group].blank?
+        code << "group = #{@table.options[:group].inspect}\n"
+        code << "query << \".group(\"\n"
+        code << "query << group.inspect\n"
+        code << "query << \")\"\n"
+      end
+
+      code << "order = #{var_name(:order)}\n"
+      code << "query << \".reorder(\"\n"
+      code << "query << order.inspect\n"
+      code << "query << \")\"\n"
+
+      code.c
+    end
+
     protected
 
     # Compute includes Hash
@@ -133,7 +190,7 @@ module ActiveList
       code << 'DISTINCT ' if @table.options[:distinct]
       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 do |k, v| 
+        code << @table.options[:select].collect do |k, v|
           c = if k.is_a? Array
                 k[0].to_s + '.' + k[1].to_s
               else
@@ -145,7 +202,7 @@ module ActiveList
       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

@@ -41,7 +41,7 @@ module ActiveList
         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 + '\""
@@ -53,7 +53,12 @@ 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 << "    #{var_name(:attrs)}['data-' + options[:data].gsub('_', '-')] = #{record}.send(options[:data]) if options[:data]\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"
@@ -165,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
@@ -183,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)"
@@ -204,29 +213,37 @@ 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})"
+                value_code = "(Onoma::Currency[#{value_code}] ? Onoma::Currency[#{value_code}].human_name : #{value_code})"
               elsif column.label_method.to_s.match(/(^|\_)language$/) && column.datatype == :string
-                value_code = "(Nomen::Language[#{value_code}]  ? Nomen::Language[#{value_code}].human_name : #{value_code})"
+                value_code = "(Onoma::Language[#{value_code}]  ? Onoma::Language[#{value_code}].human_name : #{value_code})"
               elsif column.label_method.to_s.match(/(^|\_)country$/) && column.datatype == :string
-                value_code = "(Nomen::Country[#{value_code}]  ? (image_tag('countries/' + #{value_code}.to_s + '.png') + ' ' + Nomen::Country[#{value_code}].human_name).html_safe : #{value_code})"
+                value_code = "(Onoma::Country[#{value_code}]  ? (image_tag('countries/' + #{value_code}.to_s + '.png') + ' ' + Onoma::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'
@@ -241,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"
@@ -314,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?
@@ -322,8 +350,8 @@ module ActiveList
             unit = "''"
             precision = "''"
             if column.options[:currency]
-              unit = "Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').symbol.to_s"
-              precision = "Nomen::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').precision.to_s"
+              unit = "Onoma::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').symbol.to_s"
+              precision = "Onoma::Currency.find(#{column.currency_for(generator.records_variable_name + '.first').inspect} || 'EUR').precision.to_s"
             elsif column.computable?
               unit = "#{generator.records_variable_name}.first.#{column.value_method}.symbol"
               precision = "'2'"
@@ -424,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 = '7.0.0'.freeze
+  VERSION = '8.1.0'.freeze
 end

data/test/dummy/Gemfile

@@ -1,4 +1,5 @@
 source 'https://rubygems.org'
+git_source(:gitlab) { |repo_name| "https://gitlab.com/#{repo_name}.git" }
 
 gem 'rails', '~> 5.0'
 
@@ -8,6 +9,10 @@ gem 'rails', '~> 5.0'
 gem 'sqlite3', '~> 1.3.6'
 gem 'active_list', path: '../..'
 
+gem 'sprockets', '< 4'
+
+gem 'onoma', gitlab: 'ekylibre/onoma'
+
 # Gems used only for assets and not required
 # in production environments by default.
 group :assets do

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/test_helper.rb

@@ -41,7 +41,7 @@ end
 
 module ActionView
   class Base
-    module Nomen
+    module Onoma
       class Currencies
         def self.[](_)
           klass = Struct.const_defined?(:Currency) ? Struct::Currency : Struct.new('Currency', :precision, :symbol)

metadata

@@ -1,91 +1,119 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 8.1.0
 platform: ruby
 authors:
 - Brice Texier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-04-01 00:00:00.000000000 Z
+date: 2020-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: arel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '6'
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
-  name: arel
+  name: code_string
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.0.0
+        version: 0.0.1
 - !ruby/object:Gem::Dependency
-  name: code_string
+  name: i18n-complements
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: onoma
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+- !ruby/object:Gem::Dependency
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '3.2'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '6'
 - !ruby/object:Gem::Dependency
-  name: i18n-complements
+  name: rodf
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+- !ruby/object:Gem::Dependency
+  name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -208,11 +236,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 +255,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Simple interactive tables for Rails app
 test_files: