simple_drilldown 0.6.7 → 0.7.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20d7b53c9e1fdf228a84a025903f46d614625db9fdd66080576969700136f3a6
-  data.tar.gz: 75bdf58b4bc191390cdf9aa358a0f9e018c5bc20be0c6f0db8b686deff584a06
+  metadata.gz: d998f2cd5f57af22c3c8831275dad5d173180d99000f2770e02db5accf6183ab
+  data.tar.gz: c1dab92e5b931b7c2396ad59ffabd97e1b61c8b28bd58a30e5409216488a5dd8
 SHA512:
-  metadata.gz: d6a3da501e77e3d0e8c4fdff93372014e7c0761e2971e750ea8de2eea9208174740467a16f55558dc8be69446dce84a1709547664e759d796787620fa2032a58
-  data.tar.gz: bef5d70dc50b1b68396464410844c05c40698298339476a43c825f09899f9a0d01d0e4283207a30f3b1858415d2bd2509fcc6aad88f61484c10fec7a13244ea6
+  metadata.gz: 734f1d871a340e5b6f7c44e28eadc13f91e60b7492bead90f4b6681e0ec1f76db237042856350795d43ac3d0ed2b099dfd74ada3f3c5ba801019a57cd5bde217
+  data.tar.gz: 71fe4b0435b2ca9230f4baaea43535522ef48389f37fe1c03b895769de8bf045ba95be62eb39421a9cc7db81039fa94dd7a882f0a21e5fdf33e9ddd251fabb4a

data/app/views/drilldown/_excel_record_list.builder

@@ -3,5 +3,8 @@
 xml << render(partial: '/drilldown/excel_row_header')
 
 result[:records].each do |t|
-  xml << render(partial: '/drilldown/excel_row', locals: { transaction: t, previous_transaction: nil, errors: [], error_row: false, meter1_errors: false })
+  xml << render(
+    partial: '/drilldown/excel_row',
+    locals: { transaction: t, previous_transaction: nil, errors: [], error_row: false, meter1_errors: false }
+  )
 end

data/app/views/drilldown/_excel_row.builder

@@ -6,7 +6,12 @@ xml.Row do
 
   @search.fields.each_with_index do |field, i|
     if field == 'time'
-      value = (transaction.respond_to?(:completed_at) ? transaction.completed_at : transaction.created_at).localtime.strftime('%Y-%m-%d %H:%M')
+      value = ((
+      if transaction.respond_to?(:completed_at)
+        transaction.completed_at
+      else
+        transaction.created_at
+      end)).localtime.strftime('%Y-%m-%d %H:%M')
     else
       value = if @transaction_fields_map[field.to_sym][:attr_method]
                 @transaction_fields_map[field.to_sym][:attr_method].call(transaction)

data/app/views/drilldown/_excel_styles.builder

@@ -46,8 +46,7 @@ xml.Styles do
     xml.Interior 'ss:Color' => '#dedede', 'ss:Pattern' => 'Solid'
     xml.NumberFormat 'ss:Format' => "\#,\#\#0"
   end
-  xml.Style 'ss:ID' => 'Outer' do
-  end
+  xml.Style 'ss:ID' => 'Outer'
   xml.Style 'ss:ID' => 'ShortDate' do
     xml.NumberFormat 'ss:Format' => 'Short Date'
   end

data/app/views/drilldown/_excel_summary_row.builder

@@ -9,7 +9,11 @@ xml.Row do
     end
   end
   if dimension > 0
-    xml.Cell('ss:StyleID' => 'Outer', 'ss:Index' => dimension.to_s) { xml.Data value_label(dimension - 1, result[:value]), 'ss:Type' => 'String' }
+    xml.Cell('ss:StyleID' => 'Outer',
+             'ss:Index' => dimension.to_s) do
+      xml.Data value_label(dimension - 1, result[:value]),
+               'ss:Type' => 'String'
+    end
   end
 
   xml.Cell('ss:StyleID' => 'Outer') { xml.Data result[:count].inspect, 'ss:Type' => 'Number' }

data/app/views/drilldown/data_1.builder

@@ -4,8 +4,12 @@ xml.chart(xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", '')
           showValues: '1', caption: caption, subcaption: subcaption,
           yAxisName: "Election #{t(@search.select_value.downcase)}", numberSuffix: '') do
   @result[:rows].each do |res|
-    xml.set(name: @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(res[:value]) : res[:value],
+    xml.set name: @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(res[:value]) : res[:value],
             value: res[@search.select_value.downcase.to_sym],
-            link: @dimensions[0][:url_param_name] ? CGI.escape(url_for(@search.drill_down(@dimensions, res[:value]).url_options)) : '')
+            link: if @dimensions[0][:url_param_name]
+                    CGI.escape(url_for(@search.drill_down(@dimensions, res[:value]).url_options))
+                  else
+                    ''
+                  end
   end
 end

data/app/views/drilldown/data_2.builder

@@ -1,23 +1,35 @@
 # frozen_string_literal: true
 
-xml.chart xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", ''), palette: '2',
-          caption: caption, subcaption: subcaption,
-          showNames: '1', showValues: @result[:rows].size > 15 || @result[:rows][0] && @result[:rows][0][:rows].size > 4 ? 0 : 1, decimals: '0',
-          numberPrefix: '', clustered: '0', exeTime: '1.5', showPlotBorder: '0', zGapPlot: '30',
-          zDepth: '90', divLineEffect: 'emboss', startAngX: '10', endAngX: '18', startAngY: '-10',
-          numberSuffix: '', zAxisName: 'Z Axis', yAxisName: "Transaction #{t(@search.select_value.downcase)}", endAngY: '-40' do
+xml.chart(
+  xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", ''), palette: '2',
+  caption: caption, subcaption: subcaption,
+  showNames: '1',
+  showValues: @result[:rows].size > 15 || @result[:rows][0] && @result[:rows][0][:rows].size > 4 ? 0 : 1,
+  decimals: '0',
+  numberPrefix: '', clustered: '0', exeTime: '1.5', showPlotBorder: '0', zGapPlot: '30',
+  zDepth: '90', divLineEffect: 'emboss', startAngX: '10', endAngX: '18', startAngY: '-10',
+  numberSuffix: '', zAxisName: 'Z Axis',
+  yAxisName: "Transaction #{t(@search.select_value.downcase)}", endAngY: '-40'
+) do
   unless @result[:rows].empty?
     xml.categories do
       @result[:rows].each do |result|
-        xml.category label: @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(result[:value]) : result[:value]
+        label_method = @dimensions[0][:label_method]
+        xml.category label: label_method ? label_method.call(result[:value]) : result[:value]
       end
     end
 
     @result[:rows][0][:rows].reverse.each_with_index do |result, i|
-      xml.dataset seriesName: @dimensions[1][:label_method] ? @dimensions[1][:label_method].call(result[:value]) : result[:value] do
+      name = if @dimensions[1][:label_method]
+               @dimensions[1][:label_method].call(result[:value])
+             else
+               result[:value]
+             end
+      xml.dataset seriesName: name do
         @result[:rows].each do |res|
           value = res[:rows].reverse[i][:value]
-          xml.set(label: @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(res[:value]) : "#{res[:value]}, #{value}",
+          label_method = @dimensions[0][:label_method]
+          xml.set(label: (label_method ? label_method.call(res[:value]) : "#{res[:value]}, #{value}"),
                   value: res[:rows].reverse[i][@search.select_value.downcase.to_sym],
                   link: CGI.escape(url_for(@search.drill_down(@dimensions, res[:value], value).url_options)))
         end

data/app/views/drilldown/data_3.builder

@@ -1,25 +1,48 @@
 # frozen_string_literal: true
 
-xml.chart xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", ''), palette: '2',
-          caption: caption, subcaption: subcaption,
-          showNames: '1', showValues: @result[:rows].size > 15 || @result[:rows][0] && @result[:rows][0][:rows].size > 4 ? 0 : 1, decimals: '0',
-          numberPrefix: '', clustered: '0', exeTime: '1.5', showPlotBorder: '0', zGapPlot: '30',
-          zDepth: '90', divLineEffect: 'emboss', startAngX: '10', endAngX: '18', startAngY: '-10',
-          numberSuffix: '', zAxisName: 'Z Axis', yAxisName: "Transaction #{t(@search.select_value.downcase)}", endAngY: '-40' do
+xml.chart(
+  xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", ''), palette: '2',
+  caption: caption, subcaption: subcaption,
+  showNames: '1',
+  showValues:
+      @result[:rows].size > 15 || @result[:rows][0] && @result[:rows][0][:rows].size > 4 ? 0 : 1,
+  decimals: '0',
+  numberPrefix: '', clustered: '0', exeTime: '1.5', showPlotBorder: '0', zGapPlot: '30',
+  zDepth: '90', divLineEffect: 'emboss', startAngX: '10', endAngX: '18', startAngY: '-10',
+  numberSuffix: '', zAxisName: 'Z Axis',
+  yAxisName: "Transaction #{t(@search.select_value.downcase)}", endAngY: '-40'
+) do
   unless @result[:rows].empty?
     xml.categories do
       @result[:rows].each do |result|
-        xml.category label: @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(result[:value]) : result[:value]
+        xml.category label: if @dimensions[0][:label_method]
+                              @dimensions[0][:label_method].call(result[:value])
+                            else
+                              result[:value]
+                            end
       end
     end
 
     @result[:rows][0][:rows].reverse.each_with_index do |result, i|
-      xml.dataset seriesName: @dimensions[1][:label_method] ? @dimensions[1][:label_method].call(result[:value]) : result[:value] do
+      series_name =
+        if @dimensions[1][:label_method]
+          @dimensions[1][:label_method].call(result[:value])
+        else
+          result[:value]
+        end
+      xml.dataset seriesName: series_name do
         @result[:rows].each do |res|
           value = res[:rows].reverse[i][:value]
-          xml.set(label: @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(res[:value]) : "#{res[:value]}, #{value}",
-                  value: res[:rows].reverse[i][@search.select_value.downcase.to_sym],
-                  link: CGI.escape(url_for(@search.drill_down(@dimensions, res[:value], value).url_options)))
+          xml.set(
+            label:
+                if @dimensions[0][:label_method]
+                  @dimensions[0][:label_method].call(res[:value])
+                else
+                  "#{res[:value]}, #{value}"
+                end,
+            value: res[:rows].reverse[i][@search.select_value.downcase.to_sym],
+            link: CGI.escape(url_for(@search.drill_down(@dimensions, res[:value], value).url_options))
+          )
         end
       end
     end

data/app/views/drilldown/excel_export.builder

@@ -15,12 +15,14 @@ xml.Workbook(
   xml.Worksheet 'ss:Name' => 'Transaction Summary' do
     xml.Table do
       xml.Row 'ss:Height' => '18.75' do
-        xml.Cell 'ss:MergeAcross' => @search.list ? @search.fields.size - 1 : @dimensions.size + 2, 'ss:StyleID' => 'MainTitle' do
+        xml.Cell 'ss:MergeAcross' => @search.list ? @search.fields.size - 1 : @dimensions.size + 2,
+                 'ss:StyleID' => 'MainTitle' do
           xml.Data caption, 'ss:Type' => 'String'
         end
       end
       xml.Row 'ss:Height' => '15.75' do
-        xml.Cell 'ss:MergeAcross' => @search.list ? @search.fields.size - 1 : @dimensions.size + 2, 'ss:StyleID' => 'SubTitle' do
+        xml.Cell 'ss:MergeAcross' => @search.list ? @search.fields.size - 1 : @dimensions.size + 2,
+                 'ss:StyleID' => 'SubTitle' do
           xml.Data subcaption, 'ss:Type' => 'String'
         end
       end

data/app/views/drilldown/{excel_export_transactions.builder → excel_export_records.builder}

@@ -10,7 +10,7 @@ xml.Workbook(
   'xmlns:ss' => 'urn:schemas-microsoft-com:office:spreadsheet',
   'xmlns:html' => 'http://www.w3.org/TR/REC-html40'
 ) do
-  xml << render(partial: '/layouts/excel_styles')
+  xml << render(partial: '/drilldown/excel_styles')
 
   xml.Worksheet 'ss:Name' => 'Drilldown' do
     xml.Table do
@@ -26,17 +26,17 @@ xml.Workbook(
       end
 
       xml.Row 'ss:StyleID' => 'Heading' do
-        @transaction_fields.each do |field|
+        @search.fields.each do |field|
           if field == 'time'
             xml.Cell do
-              xml.Data (l :short_date).to_s, 'ss:Type' => 'String'
+              xml.Data (t :short_date).to_s, 'ss:Type' => 'String'
             end
             xml.Cell do
-              xml.Data (l :time).to_s, 'ss:Type' => 'String'
+              xml.Data (t :time).to_s, 'ss:Type' => 'String'
             end
           else
             xml.Cell do
-              xml.Data (l field).to_s, 'ss:Type' => 'String'
+              xml.Data (t field).to_s, 'ss:Type' => 'String'
             end
           end
         end
@@ -44,7 +44,7 @@ xml.Workbook(
 
       @records.each do |transaction|
         xml.Row do
-          @transaction_fields.each do |field|
+          @search.fields.each do |field|
             field_map = controller.c_fields[field.to_sym]
             if field == 'time'
               xml.Cell 'ss:StyleID' => 'DateOnlyFormat' do
@@ -54,7 +54,8 @@ xml.Workbook(
                 xml.Data transaction.completed_at.gmtime.xmlschema, 'ss:Type' => 'DateTime'
               end
             else
-              value = field_map[:attr_method] ? field_map[:attr_method].call(transaction) : transaction.send(field)
+              attr_method = field_map[:attr_method]
+              value = attr_method ? attr_method.call(transaction) : transaction.send(field)
               xml.Cell field_map[:excel_style] ? { 'ss:StyleID' => field_map[:excel_style] } : {} do
                 xml.Data value, 'ss:Type' => field_map[:excel_type] || 'String'
               end

data/app/views/drilldown/html_export.html.erb

@@ -1,6 +1,6 @@
-<h1><%=caption%></h2>
-<h2><%=subcaption %></h3>
+<h1><%= caption %></h1>
+<h2><%= subcaption %></h2>
 <br/>
 <div style="width: 98%; padding: 5px;">
-  <%=render :partial => '/drilldown/summary_table' %>
+  <%= render '/drilldown/summary_table' %>
 </div>

data/app/views/drilldown/print.html.erb

@@ -1,12 +1,15 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<%= render 'layouts/headers' %>
-<%= stylesheet_link_tag 'drilldown' %>
+<%= stylesheet_link_tag 'application' %>
 <body>
 <style type="text/css">
-    @media print {#print_link {display: none}}
+  @media print {
+    #print_link {
+      display: none
+    }
+  }
 </style>
 <div class="container">
   <div id="print_link" class="pull-right">

data/config/routes.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
 
 SimpleDrilldown::Engine.routes.draw do
+  # No routes, yet.
 end

data/lib/generators/drilldown_controller/drilldown_controller_generator.rb

@@ -6,6 +6,6 @@ class DrilldownControllerGenerator < Rails::Generators::NamedBase
   def copy_drilldown_controller_file
     template 'drilldown_controller.rb.erb', "app/controllers/#{file_name}_drilldown_controller.rb"
     template 'drilldown_controller_test.rb.erb', "test/controllers/#{file_name}_drilldown_controller_test.rb"
-    route "draw_drilldown :#{singular_name}_drilldown"
+    route "draw_drilldown :#{singular_name}"
   end
 end

data/lib/simple_drilldown/controller.rb

@@ -33,8 +33,12 @@ module SimpleDrilldown
           begin
             base.c_target_class = base.name.chomp('Controller').constantize
           rescue NameError
+            # No default target class found
           end
         end
+        return unless base.c_target_class.try :paranoid?
+
+        base.c_base_condition = "#{base.c_target_class.table_name}.deleted_at IS NULL"
       end
 
       def base_condition(base_condition)
@@ -101,7 +105,9 @@ module SimpleDrilldown
         raise "Unexpected options: #{options.inspect}" if options.present?
 
         queries.each do |query_opts|
-          raise "Unknown options: #{query_opts.keys.inspect}" unless (query_opts.keys - %i[select includes where]).empty?
+          unless (query_opts.keys - %i[select includes where]).empty?
+            raise "Unknown options: #{query_opts.keys.inspect}"
+          end
         end
 
         c_dimension_defs[name.to_s] = {
@@ -125,7 +131,8 @@ module SimpleDrilldown
           pretty_name: I18n.t(name, default: :"activerecord.models.#{name}"),
           queries: queries,
           reverse: reverse,
-          select_expression: queries.size > 1 ? "COALESCE(#{queries.map { |q| q[:select] }.join(',')})" : queries[0][:select],
+          select_expression:
+            queries.size == 1 ? queries[0][:select] : "COALESCE(#{queries.map { |q| q[:select] }.join(',')})",
           row_class: row_class,
           url_param_name: name.to_s
         }
@@ -182,7 +189,7 @@ module SimpleDrilldown
             dimension_def = c_dimension_defs[field]
             raise "Unknown filter field: #{field.inspect}" if dimension_def.nil?
 
-            values = [*values]
+            values = Array(values)
             if dimension_def[:interval]
               values *= 2 if values.size == 1
               raise "Need 2 values for interval filter: #{values.inspect}" if values.size != 2
@@ -237,9 +244,9 @@ module SimpleDrilldown
         when Hash
           sql = +''
           include.each do |parent, child|
-            sql << ' ' + make_join(joins, model, parent)
+            sql << " #{make_join(joins, model, parent)}"
             ass = model.to_s.camelize.constantize.reflect_on_association parent
-            sql << ' ' + make_join(joins, parent, child, ass.class_name.constantize)
+            sql << " #{make_join(joins, parent, child, ass.class_name.constantize)}"
           end
           sql
         when Symbol
@@ -373,8 +380,7 @@ module SimpleDrilldown
       selected = @search.filter[dimension_name] || []
       raise "Unknown dimension #{dimension_name.inspect}: #{c_dimension_defs.keys.inspect}" unless dimension
 
-      choices = [[t(:all), nil]] +
-                (dimension[:legal_values]&.call(@search)&.map { |o| o.is_a?(Array) ? o[0..1].map(&:to_s) : o.to_s } || [])
+      choices = [[t(:all), nil]] + (legal_values_for_dimension(dimension) || [])
       choices_html = choices.map do |c|
         %(<option value="#{c[1]}"#{' SELECTED' if selected.include?(c[1])}>#{c[0]}</option>)
       end.join("\n")
@@ -383,36 +389,37 @@ module SimpleDrilldown
 
     def html_export
       index(false)
-      render template: '/drilldown/html_export', layout: 'print'
+      render template: '/drilldown/html_export', layout: '../drilldown/print'
     end
 
     def excel_export
       index(false)
-      headers['Content-Type'] = 'application/vnd.ms-excel'
-      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
-      headers['Cache-Control'] = ''
-      render template: '/drilldown/excel_export', layout: false
+      set_excel_headers
+      if params.dig(:search, :list) == '1'
+        @records = get_records(@result)
+        render template: '/drilldown/excel_export_records', layout: false
+      else
+        render template: '/drilldown/excel_export', layout: false
+      end
     end
 
     def excel_export_records
+      params[:search] ||= {}
       params[:search][:list] = '1'
-      index(false)
-      @records = get_records(@result)
-      headers['Content-Type'] = 'application/vnd.ms-excel'
-      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
-      render template: '/drilldown/excel_export_records', layout: false
+      excel_export
     end
 
-    def xml_export
-      params[:search][:list] = '1'
-      index(false)
-      @records = get_records(@result)
-      headers['Content-Type'] = 'text/xml'
-      headers['Content-Disposition'] = 'attachment; filename="drilldown.xml"'
-      render template: '/drilldown/xml_export', layout: false
+    private
+
+    def set_excel_headers
+      headers['Content-Type'] = 'application/vnd.ms-excel'
+      headers['Content-Disposition'] = %{attachment; filename="#{c_target_class.table_name}.xml"}
+      headers['Cache-Control'] = ''
     end
 
-    private
+    def legal_values_for_dimension(dimension)
+      dimension[:legal_values]&.call(@search)&.map { |o| o.is_a?(Array) ? o[0..1].map(&:to_s) : o.to_s }
+    end
 
     def new_search_object
       SimpleDrilldown::Search.new(params[:search]&.to_unsafe_h, c_default_fields, c_default_select_value)
@@ -495,7 +502,8 @@ module SimpleDrilldown
 
       result_rows = []
       loop do
-        sub_result = result_from_rows(rows, row_index, dimension + 1, values + [rows[row_index]["value#{dimension + 1}"]])
+        sub_result = result_from_rows(rows, row_index, dimension + 1,
+                                      values + [rows[row_index]["value#{dimension + 1}"]])
         break if sub_result.nil?
 
         result_rows << sub_result
@@ -517,23 +525,20 @@ module SimpleDrilldown
     end
 
     def populate_list(conditions, includes, result, values)
-      if result[:rows]
-        return result[:rows].each { |r| populate_list(conditions, includes, r, values + [r[:value]]) }
-      end
+      return result[:rows].each { |r| populate_list(conditions, includes, r, values + [r[:value]]) } if result[:rows]
+
       list_includes = merge_includes(includes, c_list_includes)
       @search.fields.each do |field|
         field_def = c_fields[field.to_sym]
         raise "Field definition missing for: #{field.inspect}" unless field_def
 
         field_includes = field_def[:include]
-        if field_includes
-          list_includes = merge_includes(list_includes , field_includes)
-        end
+        list_includes = merge_includes(list_includes, field_includes) if field_includes
       end
       if @search.list_change_times
         @history_fields.each do |f|
           if @search.fields.include? f
-            list_includes = merge_includes(list_includes, assignment: { order: :"#{f}_changes" } )
+            list_includes = merge_includes(list_includes, assignment: { order: :"#{f}_changes" })
           end
         end
       end
@@ -546,12 +551,12 @@ module SimpleDrilldown
 
     def merge_includes(*args)
       hash = hash_includes(*args)
-      result = hash.dup.map { |k, v|
+      result = hash.dup.map do |k, v|
         if v.blank?
           hash.delete(k)
           k
         end
-      }.compact
+      end.compact
       result << hash unless hash.blank?
       case result.size
       when 0
@@ -567,14 +572,15 @@ module SimpleDrilldown
       args.inject({}) do |h, inc|
         case inc
         when Array
-          inc.each { |v|
+          inc.each do |v|
             h = hash_includes(h, v)
-          }
+          end
         when Hash
-          inc.each { |k, v|
+          inc.each do |k, v|
             h[k] = merge_includes(h[k], v)
-          }
+          end
         when NilClass, FalseClass
+          # Leave as it is
         when String, Symbol
           h[inc] ||= []
         else

data/lib/simple_drilldown/helper.rb

@@ -3,6 +3,10 @@
 module SimpleDrilldown
   # View helper for SimpleDrilldown
   module Helper
+    # FIXME(uwe): Should not be necessary: https://github.com/rails/rails/issues/41038
+    include Rails.application.routes.url_helpers
+    # EMXIF
+
     def value_label(dimension_index, value)
       dimension = @dimensions[dimension_index]
       return nil if dimension.nil?
@@ -11,9 +15,8 @@ module SimpleDrilldown
     end
 
     def caption
-      result = @search.title || "#{controller.c_target_class} #{t(@search.select_value.downcase)}" +
-                                (@dimensions && @dimensions.any? ? ' by ' + @dimensions.map { |d| d[:pretty_name] }.join(' and ') : '')
-      result.gsub('$date', [*@search.filter[:calendar_date]].uniq.join(' - '))
+      result = @search.title || caption_txt
+      result.gsub('$date', Array(@search.filter[:calendar_date]).uniq.join(' - '))
     end
 
     def subcaption
@@ -21,9 +24,15 @@ module SimpleDrilldown
     end
 
     def summary_row(result, parent_result = nil, dimension = 0, headers = [], new_row = true)
-      html = render(partial: '/drilldown/summary_row', locals: { result: result, parent_result: parent_result, new_row: new_row, dimension: dimension, headers: headers, with_results: !result[:rows] })
+      html = render(partial: '/drilldown/summary_row', locals: {
+                      result: result, parent_result: parent_result, new_row: new_row, dimension: dimension,
+                      headers: headers, with_results: !result[:rows]
+                    })
       if result[:rows]
-        sub_headers = headers + [{ value: result[:value], display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0) }]
+        sub_headers = headers + [{
+          value: result[:value],
+          display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0)
+        }]
         significant_rows = result[:rows].reject { |r| r[:row_count].zero? }
         significant_rows.each_with_index do |r, i|
           html << summary_row(r, result, dimension + 1, sub_headers, i.positive?)
@@ -31,7 +40,12 @@ module SimpleDrilldown
       elsif @search.list
         html << render(partial: '/drilldown/record_list', locals: { result: result })
       end
-      html << render(partial: '/drilldown/summary_total_row', locals: { result: result, parent_result: parent_result, headers: headers.dup, dimension: dimension }) if dimension < @dimensions.size
+      if dimension < @dimensions.size
+        html << render(partial: '/drilldown/summary_total_row',
+                       locals: {
+                         result: result, parent_result: parent_result, headers: headers.dup, dimension: dimension
+                       })
+      end
 
       html
     end
@@ -41,25 +55,42 @@ module SimpleDrilldown
       if result[:rows]
         significant_rows = result[:rows].reject { |r| r[:row_count].zero? }
         significant_rows.each_with_index do |r, i|
-          sub_headers = if i.zero?
-                          if dimension.zero?
-                            headers
-                          else
-                            headers + [{ value: result[:value], display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0) }]
-                          end
-                        else
-                          [] # [{:value => result[:value], :row_count => result[:row_count]}]
-                        end
+          sub_headers =
+            if i.zero?
+              if dimension.zero?
+                headers
+              else
+                headers + [{
+                  value: result[:value],
+                  display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0)
+                }]
+              end
+            else
+              [] # [{:value => result[:value], :row_count => result[:row_count]}]
+            end
           xml << excel_summary_row(r, result, dimension + 1, sub_headers)
         end
       else
-        xml << render(partial: '/drilldown/excel_summary_row', locals: { result: result, parent_result: parent_result, headers: headers.dup, dimension: dimension })
+        xml << render(partial: '/drilldown/excel_summary_row',
+                      locals: { result: result, parent_result: parent_result, headers: headers.dup,
+                                dimension: dimension })
 
         xml << render(partial: '/drilldown/excel_record_list', locals: { result: result }) if @search.list
       end
 
-      xml << render(partial: '/drilldown/excel_summary_total_row', locals: { result: result, headers: headers.dup, dimension: dimension }) if dimension < @dimensions.size
+      if dimension < @dimensions.size
+        xml << render(partial: '/drilldown/excel_summary_total_row', locals: {
+                        result: result, headers: headers.dup, dimension: dimension
+                      })
+      end
       xml
     end
+
+    private
+
+    def caption_txt
+      "#{controller.c_target_class} #{t(@search.select_value.downcase)}" +
+        (@dimensions && @dimensions.any? ? " by #{@dimensions.map { |d| d[:pretty_name] }.join(' and ')}" : '')
+    end
   end
 end

data/lib/simple_drilldown/routing.rb

@@ -3,12 +3,13 @@
 module SimpleDrilldown
   # Routing helper methods
   module Routing
-    def draw_drilldown(path, controller = path)
+    def draw_drilldown(path, controller = nil)
+      path = "#{path}_drilldown" unless /_drilldown$/.match?(path)
+      controller ||= path
       get "#{path}(.:format)" => "#{controller}#index", as: path
-      scope path do
-        %i[choices excel_export html_export index].each do |action|
-          get "#{action}(/:id)(.:format)", controller: controller, action: action
-        end
+      scope path, controller: controller, as: path do
+        %i[excel_export excel_export_records html_export].each { |action| get action }
+        get 'choices/:dimension_name', action: :choices, as: :choices
       end
     end
   end

data/lib/simple_drilldown/search.rb

@@ -19,17 +19,9 @@ module SimpleDrilldown
       VOLUME_COMPENSATED = 'VOLUME_COMPENSATED'
     end
 
-    attr_reader :dimensions
-    attr_reader :display_type
-    attr_reader :fields
-    attr_reader :filter
-    attr_accessor :list
-    attr_accessor :percent
-    attr_reader :list_change_times
-    attr_reader :order_by_value
-    attr_reader :select_value
-    attr_reader :title
-    attr_reader :default_fields
+    attr_reader :dimensions, :display_type, :fields, :filter, :list_change_times, :order_by_value,
+                :select_value, :title, :default_fields
+    attr_accessor :list, :percent
 
     def self.validators_on(_attribute)
       []
@@ -60,7 +52,7 @@ module SimpleDrilldown
         @dimensions = attributes && attributes[:dimensions] || []
         @dimensions.delete_if(&:empty?)
         @filter = attributes && attributes[:filter] ? attributes[:filter] : {}
-        @filter.keys.dup.each { |k| @filter[k] = [*@filter[k]] }
+        @filter.keys.dup.each { |k| @filter[k] = Array(@filter[k]) }
         @filter.each do |_k, v|
           v.delete('')
           v.delete('Select Some Options')

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.6.7'
+  VERSION = '0.7.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.7.3
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2021-02-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -50,14 +50,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.80'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -113,7 +113,7 @@ files:
 - app/views/drilldown/data_2.builder
 - app/views/drilldown/data_3.builder
 - app/views/drilldown/excel_export.builder
-- app/views/drilldown/excel_export_transactions.builder
+- app/views/drilldown/excel_export_records.builder
 - app/views/drilldown/html_export.html.erb
 - app/views/drilldown/index.html.erb
 - app/views/drilldown/print.html.erb
@@ -146,14 +146,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.2.3
 signing_key:
 specification_version: 4
 summary: Simple data warehouse and drilldown.