active_list 6.9.4 → 6.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b860bd10a1b420c93a9c97b1b80b98b350928b1
-  data.tar.gz: abf875e4b6fea99f161ed9cf39507cf6c7d33358
+  metadata.gz: 5baaa0da5fd9dd52b02bc136ea12da6ebe1ae498
+  data.tar.gz: b4b7bb336a78617923273ff0fae085552a7d8669
 SHA512:
-  metadata.gz: ec7e678f2f037d0bd2539a541300a11dc6a7a4e2428d98b7bca6a1bb89d2b83f35cdbeecd5758f5e746c40a6f4de164372f3dadd4363e20f4e53bd9c6623d554
-  data.tar.gz: 7dd686f77a080a88027a2f82792744e0d53f0e96f07a9fdd57e4847dcb0fbb74914ce2584eb2cb4bb4f52fc404061a2b0a0d06772962df798ca6ce0ebbb7a88d
+  metadata.gz: f8bc42dfee4953d3a2b3d260e8afd18ef54a5fd66bb8e4976e5a155897b4c0f1dfa4381f2736f463b0fd8b1270c382342401d63f2059c0048bcc0ab52f2d35a7
+  data.tar.gz: e03b4bc03ddfd5f31d5c4a1b90c98920d62021a9f1f9c4ef44feafc234299a6d7e2c0e85231533751de7db6f1f71d0bb62e6dc0bc5685c5f73e42daacfa5b750

data/lib/active_list/generator.rb

@@ -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?

data/lib/active_list/generator/finder.rb

@@ -17,6 +17,7 @@ module ActiveList
       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,15 @@ 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,13 +119,31 @@ 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
     end

data/lib/active_list/renderers/simple_renderer.rb

@@ -34,7 +34,7 @@ module ActiveList
         code
       end
 
-      def build_table_code
+      def build_table_code(options = {})
         record = 'r'
 
         # colgroup = columns_definition_code
@@ -51,6 +51,7 @@ 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"
         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"
@@ -179,7 +180,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?

data/lib/active_list/version.rb

@@ -1,3 +1,3 @@
 module ActiveList
-  VERSION = '6.9.4'.freeze
+  VERSION = '6.10.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_list
 version: !ruby/object:Gem::Version
-  version: 6.9.4
+  version: 6.10.0
 platform: ruby
 authors:
 - Brice Texier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-06 00:00:00.000000000 Z
+date: 2019-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Simple interactive tables for Rails app