simple_drilldown 0.3.5 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 388fda7e00b8742770fafabfe6742b0fa910bd6055ba7dc8dfe323c46a2bca74
-  data.tar.gz: a765fbd6f39829ecf2ac58c40b44e48095f502530f30a26b75e3d6fed0513538
+  metadata.gz: 32063b0fd8dec6ee846e38eb37753d795acb2c6f3cca5d98a45d6c6a9c9bd868
+  data.tar.gz: 4c95e97c4780f82a6227a0f5e2048c7501d29e5534e7c74953746be915f42b1d
 SHA512:
-  metadata.gz: 49e848195ec11d171b4968f5645d15805241acb3dfed17a9df221204324d320e238dd70c23234c506282f279afeabcd01277340417a35d5dc3495c1ecbf59305
-  data.tar.gz: dfa6461733db75343fb7c8b4199c08b83bfa49fb22e9a8babadba6ec30a5aa8b9317c91701e817b6635736438aff4e83923d50bfc22a6f61f733a0bd4cb38b46
+  metadata.gz: b78736b952b5c7727ea627d83a4c47a72cf0665fded104fd6f65bb0f0adfc8b09a6899c4b832ce3a05991e05be2be8496ba6935ac24bc618af4492f7b997833b
+  data.tar.gz: e4f976920fcd12bd3820c390b22dd0d36af9a13f6d3f01517acb82574879d0196f4fc6fe7417a91a5a916a064d3187bc115119bfa1f16ea8954d53e9ee61b159

data/README.md

@@ -4,9 +4,9 @@
 <img align="right" src="https://travis-ci.org/DatekWireless/simple_drilldown.svg?branch=master" alt="Build Status">
 </a>
 
-simple_drilldown offers a simple way to define axis to filter and group records
+`simple_drilldown` offers a simple way to define axis to filter and group records
 for analysis.  The result is a record count for the selected filter and
-distribution and the option to list the actual records.
+distribution and the option to list and export the actual records.
 
 ## Usage
 
@@ -16,6 +16,10 @@ For a given schema:
 
 ```ruby
 ActiveRecord::Schema.define(version: 20141204155251) do
+  create_table "users" do |t|
+    t.string "name",   limit: 16, null: false
+  end
+
   create_table "posts" do |t|
     t.string   "title",      null: false
     t.text     "body",       null: false
@@ -25,12 +29,9 @@ ActiveRecord::Schema.define(version: 20141204155251) do
     t.datetime "updated_at", null: false
   end
 
-  create_table "users" do |t|
-    t.string "name",   limit: 16, null: false
-  end
-
   create_table "comments" do |t|
     t.integer  "post_id", null: false
+    t.integer  "user_id",    null: false
     t.string   "title",   null: false
     t.text     "body",    null: false
     t.integer  "rating",  null: false
@@ -65,6 +66,8 @@ end
 Create a new controller to focus on posts.  Each drilldown controller focuses on
 one main entity.
 
+    bin/rails g drilldown_controller User
+
 ```ruby
 class PostsDrilldownController < DrilldownController
 

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

@@ -37,7 +37,7 @@
   <% (0..2).each do |i|
     options = [['', '']]
     options << [@dimensions[i][:pretty_name], @dimensions[i][:url_param_name]] if @dimensions[i]
-    options += @remaining_dimensions.keys.map { |name| [@dimension_defs[name][:pretty_name], name] }  %>
+    options += @remaining_dimensions.keys.map { |name| [controller.c_dimension_defs[name][:pretty_name], name] }  %>
     <%= t(i == 0 ? :group_by : :then_by) %>:
     <%= form.select 'dimensions', options, { :selected => @search.dimensions && @search.dimensions[i] },
         { :onChange => 'form.submit()', :name => 'search[dimensions][]', :id => "search_dimensions_#{i}" } %>

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

@@ -1,4 +1,3 @@
-<% dimension = @dimension_defs[dimension_name] %>
 <% if dimension_name == 'calendar_date' %>
   <% dates = [*@search.filter[dimension_name]] %>
   <tr>

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

@@ -6,7 +6,7 @@
           </style>
 
         <% @transaction_fields.each do | field | %>
-          <%=form.label "fields[#{field}]", t(field), :class => "field_label" %>
+          <%=form.label "fields[#{field}]", t(field, default: :"attributes.#{field}"), :class => "field_label" %>
           <%=form.check_box :fields, :id => "search_fields[#{field}]", :name => "search[fields][#{field}]", :checked => @search.fields.include?(field) %>
           <br/>
         <% end %>

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

@@ -3,18 +3,8 @@
   <%= form.text_field :title, class: 'form-control' %>
 </div>
 
-<% choices = Concurrent::Hash.new %>
-<% threads = @dimension_defs.keys.map do |dimension_name| %>
-    <% dimension = @dimension_defs[dimension_name] %>
-    <% t = Thread.start do |thread| %>
-        <% ActiveRecord::Base.connection_pool.with_connection do %>
-            <% choices[dimension_name] = [[t(:all), nil]] + (dimension[:legal_values] && dimension[:legal_values].call(@search).map { |o| o.is_a?(Array) ? [o[0].to_s, o[1].to_s] : o.to_s } || []) %>
-        <% end %>
-    <% end %>
-    <% next [t, dimension_name] %>
-<% end %>
-<% threads.each do |t, dimension_name| %>
-    <% t.join %>
-    <%= render partial: 'drilldown/field', locals: {choices: choices[dimension_name] || [],
-            form: form, dimension_name: dimension_name} %>
+<% controller.c_dimension_defs.each do |dimension_name, dimension| %>
+  <% choices = [[t(:all), nil]] + (dimension[:legal_values] && dimension[:legal_values].call(@search).map { |o| o.is_a?(Array) ? [o[0].to_s, o[1].to_s] : o.to_s } || []) %>
+  <%= render partial: 'drilldown/field', locals: { choices: choices || [],
+      form: form, dimension_name: dimension_name } %>
 <% end %>

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

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

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

@@ -1,13 +1,13 @@
 <tr valign="top">
   <% @search.fields.each do |field| %>
-      <td>
-        <% if field == 'time' %>
-            <%= (transaction.respond_to?(:completed_at) ? transaction.completed_at : transaction.created_at).localtime.strftime('%Y-%m-%d %H:%M') %>
-        <% else %>
-            <% field_def = @transaction_fields_map[field.to_sym] %>
-            <%= field_def[:attr_method] ? field_def[:attr_method].call(transaction) : transaction.send(field) %>
-        <% end %>
-      </td>
+    <td>
+      <% if field == 'time' %>
+        <%= (transaction.respond_to?(:completed_at) ? transaction.completed_at : transaction.created_at).localtime.strftime('%Y-%m-%d %H:%M') %>
+      <% else %>
+        <% field_def = controller.c_fields[field.to_sym] %>
+        <%= field_def[:attr_method] ? field_def[:attr_method].call(transaction) : transaction.send(field) %>
+      <% end %>
+    </td>
   <% end %>
-  <td><%= detour_to t(:show), transaction %></td>
+  <td><%= link_to t(:show), transaction %></td>
 </tr>

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

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <% @search.fields.each do |field| %>
-      <th><%=t field %></th>
+      <th><%=t field, default: :"attributes.#{field}" %></th>
     <% end %>
     <th></th>
   </tr>

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

@@ -3,8 +3,8 @@
   <% @dimensions.each do |d| %>
     <th><%=h d[:pretty_name]%></th>
   <% end %>
-  <th><%= t @target_class.table_name.capitalize %></th>
-  <%= @summary_fields.map{|l| "<th>#{t(l)}</th>"}.join("\n").html_safe %>
+  <th><%= t controller.c_target_class.table_name.capitalize %></th>
+  <%= controller.c_summary_fields.map{|l| "<th>#{t(l)}</th>"}.join("\n").html_safe %>
 </tr>
 
 <%=summary_row(@result) %>

data/app/views/drilldown/excel_export_transactions.builder

@@ -45,7 +45,7 @@ xml.Workbook(
       @transactions.each do |transaction|
         xml.Row do
           @transaction_fields.each do |field|
-            field_map = @transaction_fields_map[field.to_sym]
+            field_map = controller.c_fields[field.to_sym]
             if field == 'time'
               xml.Cell 'ss:StyleID' => 'DateOnlyFormat' do
                 xml.Data transaction.completed_at.gmtime.xmlschema, 'ss:Type' => 'DateTime'

data/lib/generators/drilldown_controller/USAGE

@@ -6,3 +6,4 @@ Example:
 
     This will create:
         app/controllers/thing_drilldown_controller.rb
+        test/controllers/thing_drilldown_controller_test.rb

data/lib/generators/drilldown_controller/drilldown_controller_generator.rb

@@ -5,6 +5,7 @@ class DrilldownControllerGenerator < Rails::Generators::NamedBase
 
   def copy_drilldown_controller_file
     template 'drilldown_controller.rb.erb', "app/controllers/#{file_name}_drilldown_controller.rb"
-    route "resources(:#{singular_name}_drilldown, only: :index){collection{get :excel_export;get :html_export}}"
+    template 'drilldown_controller_test.rb.erb', "test/controllers/#{file_name}_drilldown_controller_test.rb"
+    route "draw_drilldown :#{singular_name}_drilldown"
   end
 end

data/lib/generators/drilldown_controller/templates/drilldown_controller.rb.erb

@@ -1,14 +1,23 @@
 # frozen_string_literal: true
 
-class <%= class_name %>DrilldownController < DrilldownController
-  # What fields should be displayed as default when listing actual <%= class_name %> records.
-  default_fields %w[created_at updated_at] # TODO(uwe): Read fields from schema?
+require 'simple_drilldown/controller'
 
+class <%= class_name %>DrilldownController < SimpleDrilldown::Controller
   # The main focus of the drilldown
-  target_class <%= class_name %>
+  # target_class <%= class_name %>
+
+  # `where` clause for the base line
+  # base_condition '1=1'
 
   # How should we count the reords?
-  select 'count(*) as count'
+  # select 'count(*) as count'
+
+  # When selecting records, what relations should be included for optimization?
+  # Other relations can be included for specific dimensions and fields.
+  # base_includes :user, :comments # TODO(uwe): Read relations from schema?
+
+  # What fields should be displayed as default when listing actual <%= class_name %> records.
+  default_fields %w[created_at updated_at] # TODO(uwe): Read fields from schema?
 
   # When listing records, what relations should be included for optimization?
   # list_includes :user, :comments # TODO(uwe): Read relations from schema?

data/lib/generators/drilldown_controller/templates/drilldown_controller_test.rb.erb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+class <%= class_name %>DrilldownControllerTest < ActionDispatch::IntegrationTest
+  test 'should get index' do
+    get <%= singular_name %>_drilldown_url
+    assert_response :success
+  end
+
+  test 'should get index with list' do
+    get <%= singular_name %>_drilldown_url search: { list: 1 }
+    assert_response :success
+  end
+end

data/lib/simple_drilldown/{drilldown_controller.rb → controller.rb}

@@ -1,54 +1,84 @@
 # frozen_string_literal: true
 
-require 'simple_drilldown/drilldown_helper'
+require 'simple_drilldown/helper'
 require 'simple_drilldown/search'
 
 module SimpleDrilldown
-  class DrilldownController < ::ApplicationController
-    helper DrilldownHelper
+  class Controller < ::ApplicationController
+    helper Helper
 
     LIST_LIMIT = 10_000
 
+    class_attribute :c_base_condition, default: '1=1'
+    class_attribute :c_base_group, default: []
+    class_attribute :c_base_includes, default: []
+    class_attribute :c_default_fields, default: []
+    class_attribute :c_default_select_value, default: SimpleDrilldown::Search::SelectValue::COUNT
+    class_attribute :c_dimension_defs
+    class_attribute :c_fields
+    class_attribute :c_list_includes, default: []
+    class_attribute :c_list_order
+    class_attribute :c_select, default: 'count(*) as count'
+    class_attribute :c_summary_fields, default: []
+    class_attribute :c_target_class
+
     class << self
+      def inherited(base)
+        super
+        base.c_dimension_defs = Concurrent::Hash.new
+        base.c_fields = {}
+        begin
+          base.c_target_class = base.name.chomp('DrilldownController').constantize
+        rescue NameError
+          begin
+            base.c_target_class = base.name.chomp('Controller').constantize
+          rescue NameError
+          end
+        end
+      end
+
       def base_condition(base_condition)
-        @@base_condition = base_condition
+        self.c_base_condition = base_condition
       end
 
       def base_includes(base_includes)
-        @@base_includes = base_includes
+        self.c_base_includes = base_includes
       end
 
       def base_group(base_group)
-        @@base_group = base_group
+        self.c_base_group = base_group
+      end
+
+      def default_fields(default_fields)
+        self.c_default_fields = default_fields.flatten
       end
 
-      def default_fields(fields)
-        @@default_fields = fields
+      def default_select_value(default_select_value)
+        self.c_default_select_value = default_select_value
       end
 
       def target_class(target_class)
-        @@target_class = target_class
+        self.c_target_class = target_class
       end
 
       def select(select)
-        @@select = select
+        self.c_select = select
       end
 
       def list_includes(list_includes)
-        @@list_includes = list_includes
+        self.c_list_includes = list_includes.flatten
       end
 
       def list_order(list_order)
-        @@list_order = list_order
+        self.c_list_order = list_order
       end
 
       def field(name, **options)
-        @@fields ||= {}
-        @@fields[name] = options
+        c_fields[name] = options
       end
 
       def summary_fields(*summary_fields)
-        @@summary_fields = summary_fields
+        self.c_summary_fields = summary_fields.flatten
       end
 
       def dimension(name, select_expression = name, options = {})
@@ -74,15 +104,20 @@ module SimpleDrilldown
           raise "Unknown options: #{query_opts.keys.inspect}" unless (query_opts.keys - %i[select includes where]).empty?
         end
 
-        @@dimension_defs ||= Concurrent::Hash.new
-
-        @@dimension_defs[name.to_s] = {
-          includes: queries.inject([]) do |a, e|
+        c_dimension_defs[name.to_s] = {
+          includes: queries.inject(nil) do |a, e|
             i = e[:includes]
             next a unless i
-            next a if a.include?(i)
+            next a if a&.include?(i)
 
-            a + [i]
+            case a
+            when nil
+              i
+            when Symbol
+              [a, *i]
+            else
+              a.concat(*i)
+            end
           end,
           interval: interval,
           label_method: label_method,
@@ -101,7 +136,7 @@ module SimpleDrilldown
           my_filter = search.filter.dup
           my_filter.delete(field.to_s) unless preserve_filter
           filter_conditions, _t, includes = make_conditions(my_filter)
-          dimension_def = @@dimension_defs[field.to_s]
+          dimension_def = c_dimension_defs[field.to_s]
           result_sets = dimension_def[:queries].map do |query|
             if query[:includes]
               if query[:includes].is_a?(Array)
@@ -111,11 +146,11 @@ module SimpleDrilldown
               end
               includes.uniq!
             end
-            rows = @@target_class.unscoped.where(@@base_condition)
+            rows = c_target_class.unscoped.where(c_base_condition)
                                  .select("#{query[:select]} AS value")
-                                 .where(filter_conditions)
-                                 .where(query[:where])
-                                 .joins(make_join([], @@target_class.name.underscore.to_sym, includes))
+                                 .where(filter_conditions || '1=1')
+                                 .where(query[:where] || '1=1')
+                                 .joins(make_join([], c_target_class.name.underscore.to_sym, includes))
                                  .order('value')
                                  .group(:value)
                                  .to_a
@@ -137,14 +172,14 @@ module SimpleDrilldown
       end
 
       def make_conditions(search_filter)
-        includes = @@base_includes.dup
+        includes = c_base_includes.dup
         if search_filter
           condition_strings = []
           condition_values = []
 
           filter_texts = []
           search_filter.each do |field, values|
-            dimension_def = @@dimension_defs[field]
+            dimension_def = c_dimension_defs[field]
             raise "Unknown filter field: #{field.inspect}" if dimension_def.nil?
 
             values = [*values]
@@ -202,9 +237,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
@@ -254,24 +289,7 @@ module SimpleDrilldown
 
     def initialize
       super()
-      @fields = @@fields
-      @default_fields = @@default_fields
-      @default_select_value = SimpleDrilldown::Search::SelectValue::COUNT
-      @target_class = @@target_class
-      @select = @@select
-      @@base_condition = '1 = 1' unless defined?(@@base_condition)
-      @base_condition = @@base_condition
-      @@base_includes = [] unless defined?(@@base_includes)
-      @base_includes = @@base_includes
-      @base_group = defined?(@@base_group) ? @@base_group : []
-      @@list_includes = [] unless defined?(@@list_includes)
-      @list_includes = @@list_includes
-      @list_order = @@list_order
-      @dimension_defs = @@dimension_defs
-      @@summary_fields = [] unless defined?(@@summary_fields)
-      @summary_fields = @@summary_fields
-
-      @history_fields = @fields.select { |_k, v| v[:list_change_times] }.map { |k, _v| k.to_s }
+      @history_fields = c_fields.select { |_k, v| v[:list_change_times] }.map { |k, _v| k.to_s }
     end
 
     # ?dimension[0]=supplier&dimension[1]=transaction_type&
@@ -279,18 +297,17 @@ module SimpleDrilldown
     def index(do_render = true)
       @search = new_search_object
 
-      @transaction_fields = (@search.fields + (@fields.keys.map(&:to_s) - @search.fields))
-      @transaction_fields_map = @fields
+      @transaction_fields = (@search.fields + (c_fields.keys.map(&:to_s) - @search.fields))
 
-      select = @select.dup
-      includes = @base_includes.dup
+      select = c_select.dup
+      includes = c_base_includes.dup
 
       @dimensions = []
-      select << ", 'All'::text as value0"
+      select << ", 'All'#{'::text' if c_target_class.connection.adapter_name == 'PostgreSQL'} as value0"
       @dimensions += @search.dimensions.map do |dn|
-        raise "Unknown distribution field: #{dn.inspect}" if @dimension_defs[dn].nil?
+        raise "Unknown distribution field: #{dn.inspect}" if c_dimension_defs[dn].nil?
 
-        @dimension_defs[dn]
+        c_dimension_defs[dn]
       end
       @dimensions.each_with_index do |d, i|
         select << ", #{d[:select_expression]} as value#{i + 1}"
@@ -315,18 +332,18 @@ module SimpleDrilldown
         order = (1..@dimensions.size).map { |i| "value#{i}" }.join(',')
         order = nil if order.empty?
       end
-      group = (@base_group + (1..@dimensions.size).map { |i| "value#{i}" }).join(',')
+      group = (c_base_group + (1..@dimensions.size).map { |i| "value#{i}" }).join(',')
       group = nil if group.empty?
 
-      joins = self.class.make_join([], @target_class.name.underscore.to_sym, includes)
-      rows = @target_class.unscoped.where(@base_condition).select(select).where(conditions)
-                          .joins(joins)
-                          .group(group)
-                          .order(order).to_a
+      joins = self.class.make_join([], c_target_class.name.underscore.to_sym, includes)
+      rows = c_target_class.unscoped.where(c_base_condition).select(select).where(conditions)
+                           .joins(joins)
+                           .group(group)
+                           .order(order).to_a
 
       if rows.empty?
         @result = { value: 'All', count: 0, row_count: 0, nodes: 0, rows: [] }
-        @summary_fields.each { |f| @result[f] = 0 }
+        c_summary_fields.each { |f| @result[f] = 0 }
       else
         if do_render && @search.list && rows.inject(0) { |sum, r| sum + r[:count].to_i } > LIST_LIMIT
           @search.list = false
@@ -335,9 +352,9 @@ module SimpleDrilldown
         @result = result_from_rows(rows, 0, 0, ['All'])
       end
 
-      remove_duplicates(@result) unless @base_group.empty?
+      remove_duplicates(@result) unless c_base_group.empty?
 
-      @remaining_dimensions = @dimension_defs.dup
+      @remaining_dimensions = c_dimension_defs.dup
       @remaining_dimensions.each_key do |dim_name|
         if (@search.filter[dim_name] && @search.filter[dim_name].size == 1) ||
            (@dimensions.any? { |d| d[:url_param_name] == dim_name })
@@ -352,9 +369,9 @@ module SimpleDrilldown
     def choices
       @search = new_search_object
       dimension_name = params[:dimension_name]
-      dimension = @dimension_defs[dimension_name]
+      dimension = c_dimension_defs[dimension_name]
       selected = @search.filter[dimension_name] || []
-      raise "Unknown dimension #{dimension_name.inspect}: #{@dimension_defs.keys.inspect}" unless dimension
+      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 } || [])
@@ -398,7 +415,7 @@ module SimpleDrilldown
     private
 
     def new_search_object
-      SimpleDrilldown::Search.new(params[:search]&.to_unsafe_h, @default_fields, @default_select_value)
+      SimpleDrilldown::Search.new(params[:search]&.to_unsafe_h, c_default_fields, c_default_select_value)
     end
 
     def remove_duplicates(result)
@@ -411,7 +428,7 @@ module SimpleDrilldown
         if prev_row
           if prev_row[:value] == r[:value]
             prev_row[:count] += r[:count]
-            @summary_fields.each do |f|
+            c_summary_fields.each do |f|
               prev_row[f] += r[f]
             end
             prev_row[:row_count] = [prev_row[:row_count], r[:row_count]].max
@@ -449,7 +466,7 @@ module SimpleDrilldown
             row_count: 0,
             nodes: 0
           }
-          @summary_fields.each { |f| sub_result[f] = 0 }
+          c_summary_fields.each { |f| sub_result[f] = 0 }
           sub_result[:rows] = add_zero_results([], dimension + 1) if dimension < @dimensions.size - 1
           result_rows << sub_result
         end
@@ -472,7 +489,7 @@ module SimpleDrilldown
           row_count: 1,
           nodes: @search.list ? 2 : 1
         }
-        @summary_fields.each { |f| result[f] = row[f].to_i }
+        c_summary_fields.each { |f| result[f] = row[f].to_i }
         return result
       end
 
@@ -495,37 +512,75 @@ module SimpleDrilldown
         nodes: result_rows.inject(0) { |t, r| t + r[:nodes] } + 1,
         rows: result_rows
       }
-      @summary_fields.each { |f| result[f] = result_rows.inject(0) { |t, r| t + r[f] } }
+      c_summary_fields.each { |f| result[f] = result_rows.inject(0) { |t, r| t + r[f] } }
       result
     end
 
     def populate_list(conditions, includes, result, values)
       if result[:rows]
-        result[:rows].each do |r|
-          populate_list(conditions, includes, r, values + [r[:value]])
+        return result[:rows].each { |r| populate_list(conditions, includes, r, values + [r[:value]]) }
+      end
+      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
-      else
-        list_includes = includes + @list_includes
-        @search.fields.each do |field|
-          field_def = @transaction_fields_map[field.to_sym]
-          raise "Field definition missing for: #{field.inspect}" unless field_def
-
-          field_includes = field_def[:include]
-          if field_includes
-            list_includes += field_includes.is_a?(Array) ? field_includes : [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" } )
           end
         end
-        list_includes.uniq!
-        if @search.list_change_times
-          @history_fields.each do |f|
-            list_includes << { assignment: { order: :"#{f}_changes" } } if @search.fields.include? f
-          end
+      end
+      joins = self.class.make_join([], c_target_class.name.underscore.to_sym, list_includes)
+      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
+    end
+
+    def merge_includes(*args)
+      hash = hash_includes(*args)
+      result = hash.dup.map { |k, v|
+        if v.blank?
+          hash.delete(k)
+          k
+        end
+      }.compact
+      result << hash unless hash.blank?
+      case result.size
+      when 0
+        nil
+      when 1
+        result[0]
+      else
+        result
+      end
+    end
+
+    def hash_includes(*args)
+      args.inject({}) do |h, inc|
+        case inc
+        when Array
+          inc.each { |v|
+            h = hash_includes(h, v)
+          }
+        when Hash
+          inc.each { |k, v|
+            h[k] = merge_includes(h[k], v)
+          }
+        when NilClass, FalseClass
+        when String, Symbol
+          h[inc] ||= []
+        else
+          raise "Unknown include type: #{inc.inspect}"
         end
-        joins = self.class.make_join([], @target_class.name.underscore.to_sym, list_includes)
-        list_conditions = list_conditions(conditions, values)
-        base_query = @target_class.unscoped.where(@base_condition).joins(joins).order(@list_order)
-        base_query = base_query.where(list_conditions) if list_conditions
-        result[:transactions] = base_query.to_a
+        h
       end
     end
 

data/lib/simple_drilldown/engine.rb

@@ -1,11 +1,17 @@
 # frozen_string_literal: true
 
+require 'chartkick'
+require 'simple_drilldown/routing'
+
 module SimpleDrilldown
   class Engine < ::Rails::Engine
     isolate_namespace SimpleDrilldown
+    config.autoload_paths << File.dirname(__dir__)
 
     initializer 'simple_drilldown.assets.precompile' do |app|
       app.config.assets.precompile += %w[chartkick.js]
     end
+
+    ActionDispatch::Routing::Mapper.include SimpleDrilldown::Routing
   end
 end

data/lib/simple_drilldown/{drilldown_helper.rb → helper.rb}

@@ -2,7 +2,7 @@
 
 module SimpleDrilldown
   # View helper for SimpleDrilldown
-  module DrilldownHelper
+  module Helper
     def value_label(dimension_index, value)
       dimension = @dimensions[dimension_index]
       return nil if dimension.nil?
@@ -11,7 +11,7 @@ module SimpleDrilldown
     end
 
     def caption
-      result = @search.title || "#{@target_class} #{t(@search.select_value.downcase)}" +
+      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(' - '))
     end

data/lib/simple_drilldown/routing.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module SimpleDrilldown
+  # Routing helper methods
+  module Routing
+    def draw_drilldown(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
+      end
+    end
+  end
+end

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.3.5'
+  VERSION = '0.6.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.6.3
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-19 00:00:00.000000000 Z
+date: 2020-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -123,10 +123,12 @@ files:
 - lib/generators/drilldown_controller/USAGE
 - lib/generators/drilldown_controller/drilldown_controller_generator.rb
 - lib/generators/drilldown_controller/templates/drilldown_controller.rb.erb
+- lib/generators/drilldown_controller/templates/drilldown_controller_test.rb.erb
 - lib/simple_drilldown.rb
-- lib/simple_drilldown/drilldown_controller.rb
-- lib/simple_drilldown/drilldown_helper.rb
+- lib/simple_drilldown/controller.rb
 - lib/simple_drilldown/engine.rb
+- lib/simple_drilldown/helper.rb
+- lib/simple_drilldown/routing.rb
 - lib/simple_drilldown/search.rb
 - lib/simple_drilldown/version.rb
 - lib/tasks/simple_drilldown_tasks.rake
@@ -135,7 +137,7 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org/
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -151,7 +153,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Simple data warehouse and drilldown.
 test_files: []