active_list 7.1.0 → 7.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 81ce03aaece14d5f38d557ccc43ab2d1252aa1b9
-  data.tar.gz: 58f4a6bfc926669b9aa8b7022655141f25c16959
+SHA256:
+  metadata.gz: 884ba63410b0ba502c551bdbf9035360ad2ddefefc959de5d0b3809274e57b60
+  data.tar.gz: 38f2ddcea9c3beb17cc6c4527152f1dba440869e4830d73d8f2c46db0b7c5f7e
 SHA512:
-  metadata.gz: ae364e886416828ab7c632e871e4a7bbb8ab5b94c58ca50902fcff74ccddbb4face3ae8aae6064490e217ad806f7c0fef712ba79627cd45aad296fbbf6ff45ae
-  data.tar.gz: 71ec9909171eaba5b35562600e72da60d2e618eb8b13c6acda5d72a7fccb3f92fc2198a8b22842c172021bf088f57d52c3319cc1bb151c3ab8eb7aee3c9c5358
+  metadata.gz: dfa9c5a61880233f0b49f883cfe340a6b63d197a2369fd6a26a079ff87f059fea98ed8ee9f4bc853a97dd6b20112de497923ab62995f642907eb3dfabfcaa877
+  data.tar.gz: e3bf5e8a58a7ecdc81924f71476a433c03fb52b313ff304ebc8755ab13a39b7d2ea60194c669368d1139fbe37321fadbb38c854932fc46fce04d025c1e55e9e1

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,7 +94,7 @@ 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 + '}' \
+                     ', {' + url.collect { |k, v| "#{k}: " + urlify(k, v, record) }.join(', ') + format + '}' \
                                                                                                        ", {class: '#{@options[:icon_name] || @name}'" + link_options + '}'\
                                                                                                                                                ")\n"
           end
@@ -108,7 +108,7 @@ 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 + '}'
+          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

data/lib/active_list/definition/attribute_column.rb

@@ -65,7 +65,7 @@ module ActiveList
 
       # Returns the class name of the used model
       def class_name
-        table.model.name
+        "RECORD.class.name.tableize".c
       end
 
       def sortable?

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/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}"

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
@@ -144,7 +144,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,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})"
@@ -222,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'
@@ -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"
@@ -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.1.0'.freeze
+  VERSION = '7.2.0'.freeze
 end

data/test/dummy/Gemfile

@@ -8,6 +8,8 @@ gem 'rails', '~> 5.0'
 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

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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 7.1.0
+  version: 7.2.0
 platform: ruby
 authors:
 - Brice Texier
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-06-19 00:00:00.000000000 Z
+date: 2020-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -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.6.14
-signing_key: 
+rubygems_version: 3.0.3
+signing_key:
 specification_version: 4
 summary: Simple interactive tables for Rails app
 test_files: