simple_drilldown 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c25058c9633cfe67926c2cbf3dca1105481fde8297077ba68414063ab239e05e
-  data.tar.gz: 5ff52f26970deef096886d62451ca80f545d3fbf88601ed20cc2ed3334c01397
+  metadata.gz: 8b9e45eda9e3936d570de7055da2f5ec4eea29f3bfc6a8acc7a7134d364e2343
+  data.tar.gz: e4738f7b4a2bb699724c34b3fcf764de181c56bdfb015f9274a048e8b630a363
 SHA512:
-  metadata.gz: 478e1fa749626a6599055b82022553c5778f8ef4085fa513f28261c9340cb3a112235ff6968115f95de00d4c4af4ec6d9e9b721596edd03693249c5e299e0938
-  data.tar.gz: 2c4b94ae99c33ced23f149fbb0d0f5356867773a13e979619fe0c030ae83fbfac18444579b2b6b78427c48bca1e66a650455640a9d1fe9d95eb2c9629116a2ad
+  metadata.gz: b3eb61535dcd5068e5353f5076c29fb1632aaa252f4bbb61d1644295c423db4f063f12a0417f3495f3b6dde3c01501351b1052af3dca04b1d43b59320e74e33c
+  data.tar.gz: 9f424d5a153153886d7f2732d1dbeeb7f141095f9fc991e4b32f1a09b4e4dee32de54564b67101f74a9d31127627e37a80ebd514e24a5b0e2f60a22c236cb6d1

data/app/views/drilldown/_excel_record_list.builder

@@ -2,6 +2,9 @@
 
 xml << render(partial: '/drilldown/excel_row_header')
 
-result[:transactions].each do |t|
-  xml << render(partial: '/drilldown/excel_row', locals: { transaction: t, previous_transaction: nil, errors: [], error_row: false, meter1_errors: false })
+result[:records].each do |t|
+  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_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/_export_links.html.erb

@@ -0,0 +1,2 @@
+<%= link_to 'Excel', @search.url_options.merge(action: :excel_export) %>&nbsp;|
+<%= link_to 'HTML', @search.url_options.merge(action: :html_export), data_popup: ['Elections', 'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes, width=1024px'] %>

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

@@ -1,9 +1,9 @@
-<% unless result[:transactions].empty? %>
+<% unless result[:records].empty? %>
   <tr>
     <td colspan="<%= controller.c_summary_fields.size + 1 %>">
       <table class="table table-condensed table-bordered" style="padding-bottom: 10px;">
         <%= render :partial => '/drilldown/row_header' %>
-        <% result[:transactions].each do |t| %>
+        <% result[:records].each do |t| %>
           <%= render :partial => '/drilldown/row', :locals => { :transaction => t, :previous_transaction => nil, :errors => [], :error_row => false, :meter1_errors => false } %>
         <% end %>
       </table>

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,9 +10,9 @@ 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' => 'Transactions' do
+  xml.Worksheet 'ss:Name' => 'Drilldown' do
     xml.Table do
       xml.Row 'ss:Height' => '18.75' do
         xml.Cell 'ss:MergeAcross' => '35', 'ss:StyleID' => 'MainTitle' do
@@ -29,20 +29,20 @@ xml.Workbook(
         @transaction_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
       end
 
-      @transactions.each do |transaction|
+      @records.each do |transaction|
         xml.Row do
           @transaction_fields.each do |field|
             field_map = controller.c_fields[field.to_sym]

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

@@ -13,25 +13,25 @@
     }
 </style>
 
-<%= form_for @search, :html => {:id => 'edit_search_SEARCH', :method => :get, :class => :search, :style => 'background: inherit', :onsubmit => 'return this.submit()'}, :url => {} do |form| %>
+<%= form_for @search, html: { id: 'edit_search_SEARCH', method: :get, class: :search, style: 'background: inherit', onsubmit: 'return this.submit()' }, url: {} do |form| %>
     <div class="row">
       <div class="col-md-3" valign="top">
         <ul class="nav nav-tabs">
-          <li class="active">
-            <a href="#filter" data-toggle="tab"><em><%= t :filter %></em></a></li>
-          <li><a href="#fields" data-toggle="tab"><em><%= t :fields %></em></a>
+          <li class="nav-item">
+            <a id="filter-tab" class="nav-link active" data-target="#filter" data-toggle="tab"><%= t :filter %></a></li>
+          <li><a id="fields-tab" class="nav-link" data-target="#fields" data-toggle="tab"><%= t :fields %></a>
           </li>
         </ul>
 
         <!-- Tab panes -->
         <div class="tab-content">
           <div class="tab-pane active" id="filter">
-            <%= render :partial => '/drilldown/tab_buttons', :locals => {:form => form} %>
-            <%= render :partial => '/drilldown/filter', :locals => {:form => form} %>
+            <%= render '/drilldown/tab_buttons', form: form %>
+            <%= render '/drilldown/filter', form: form  %>
           </div>
           <div class="tab-pane" id="fields">
-            <%= render :partial => '/drilldown/tab_buttons', :locals => {:form => form} %>
-            <%= render :partial => '/drilldown/fields', :locals => {:form => form} %>
+            <%= render '/drilldown/tab_buttons', form: form %>
+            <%= render '/drilldown/fields', form: form %>
           </div>
         </div>
 
@@ -39,20 +39,16 @@
       <div class="col-md-9">
         <div class="row" valign="top">
           <div class="col-md-12">
-            <%= render :partial => '/drilldown/chart', :locals => {:form => form} %>
-            <br/>
+            <%= render '/drilldown/chart', form: form %>
           </div>
         </div>
 
         <div class="row">
           <div class="col-md-12" valign="top">
             <div style="float: right; clear: both;">
-              <%= link_to 'Excel', @search.url_options.merge(action: :excel_export) %>&nbsp;|
-              <%= link_to 'HTML', @search.url_options.merge(action: :html_export), :data_popup => ['Elections', 'toolbar=no,location=no,directories=no,status=no,menubar=no,scrollbars=yes,resizable=yes, width=1024px'] %>
+              <%= render '/drilldown/export_links' %>
             </div>
-            <br/>
-
-            <%= render :partial => '/drilldown/summary_table' %>
+            <%= render '/drilldown/summary_table' %>
           </div>
         </div>
       </div>
@@ -60,16 +56,16 @@
 
 <% end %> <!-- END  FORM -->
 
-<%=javascript_tag do %>
-form = document.getElementById("edit_search_SEARCH");
-form.submit = function() {
-    elements = form.elements;
-    params = new Array();
-    for (var el, i = 0; (el = elements[i] ); i++) {
-      if (el.type == "text" && el.value == "") {
+<%= javascript_tag do %>
+  form = document.getElementById("edit_search_SEARCH");
+  form.submit = function() {
+    let elements = form.elements;
+    let params = [];
+    for (let el, i = 0; (el = elements[i] ); i++) {
+      if (el.name === '' || (el.type === "text" && el.value === "")) {
         continue;
       }
-      if (el.type == "select-multiple") {
+      if (el.type === "select-multiple") {
         if (el.selectedIndex > 0) {
           for (var j = 0; j < el.options.length; j++) {
             // Ignore "All" and unselected options
@@ -80,28 +76,24 @@ form.submit = function() {
         }
         continue;
       }
-      if (el.type == "select-one" && el.selectedIndex == 0) {
+      if (el.type === "select-one" && el.selectedIndex === 0) {
         continue;
       }
-      if (el.type == "checkbox" && el.checked != true) {
+      if (el.type === "checkbox" && el.checked !== true) {
         continue;
       }
-      if (el.type == "radio" && el.checked != true) {
+      if (el.type === "radio" && (el.checked !== true || el.value === 'NONE')) {
         continue;
       }
-      if (el.type == "hidden" && (el.value == "0" || el.value == "")) {
+      if (el.type === "hidden" && (el.value === "0" || el.value === "")) {
         continue;
       }
-      if (el.type == "submit") {
+      if (el.type === "submit") {
         continue;
       }
       params.push("" + el.name + "=" + encodeURIComponent(el.value));
     }
     location = form.action + "?" + params.join('&');
     return false;
-};
-
-$(document).ready(function () {
-  $('[data-behaviour~=datepicker]').datepicker({format: "yyyy-mm-dd"});
-})
+  };
 <% end %>

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/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,6 +33,7 @@ module SimpleDrilldown
           begin
             base.c_target_class = base.name.chomp('Controller').constantize
           rescue NameError
+            # No default target class found
           end
         end
       end
@@ -101,7 +102,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 +128,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 +186,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 +241,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 +377,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 +386,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="transactions.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_transactions
+    def excel_export_records
+      params[:search] ||= {}
       params[:search][:list] = '1'
-      index(false)
-      @transactions = get_transactions(@result)
-      headers['Content-Type'] = 'application/vnd.ms-excel'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.xml"'
-      render template: '/drilldown/excel_export_transactions', layout: false
+      excel_export
     end
 
-    def xml_export
-      params[:search][:list] = '1'
-      index(false)
-      @transactions = get_transactions(@result)
-      headers['Content-Type'] = 'text/xml'
-      headers['Content-Disposition'] = 'attachment; filename="transactions.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 +499,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 +522,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
@@ -541,17 +543,17 @@ module SimpleDrilldown
       list_conditions = list_conditions(conditions, values)
       base_query = c_target_class.unscoped.where(c_base_condition).joins(joins).order(c_list_order)
       base_query = base_query.where(list_conditions) if list_conditions
-      result[:transactions] = base_query.to_a
+      result[:records] = base_query.to_a
     end
 
     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 +569,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
@@ -594,10 +597,10 @@ module SimpleDrilldown
       [list_conditions_string, *(conditions[1..-1] + values)]
     end
 
-    def get_transactions(tree)
-      return tree[:transactions] if tree[:transactions]
+    def get_records(tree)
+      return tree[:records] if tree[:records]
 
-      tree[:rows].map { |r| get_transactions(r) }.flatten
+      tree[:rows].map { |r| get_records(r) }.flatten
     end
 
     class ScopeHolder

data/lib/simple_drilldown/helper.rb

@@ -11,9 +11,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 +20,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 +36,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 +51,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,11 +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
+      scope path, as: path do
+        %i[choices excel_export excel_export_records html_export index].each do |action|
+          get "#{action}(/:id)(.:format)", controller: controller, action: action, as: action
         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')
@@ -108,6 +100,10 @@ module SimpleDrilldown
       'SEARCH'
     end
 
+    def list?
+      list
+    end
+
     def drill_down(dimensions, *values)
       raise 'Too many values' if values.size > self.dimensions.size
 

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.6.4'
+  VERSION = '0.7.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-09-13 00:00:00.000000000 Z
+date: 2020-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -97,6 +97,7 @@ files:
 - app/views/drilldown/_excel_styles.builder
 - app/views/drilldown/_excel_summary_row.builder
 - app/views/drilldown/_excel_summary_total_row.builder
+- app/views/drilldown/_export_links.html.erb
 - app/views/drilldown/_field.html.erb
 - app/views/drilldown/_fields.html.erb
 - app/views/drilldown/_filter.html.erb
@@ -112,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
@@ -145,7 +146,7 @@ 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:
   - - ">="