simple_drilldown 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9994fb706e46554bec7e26a9191cdc10e2675a19770e4414019f5b4a067e7daf
-  data.tar.gz: 874f30d58de361193d6faed89b2af82e8899b0c628861865b917af9466faa64d
+  metadata.gz: 3a69810eb60aa499744a6989bad20efed263b05fc51dfcb094f151494deacbad
+  data.tar.gz: e3402d01f9a8a19683c6c4095fa47725eede9dda5434ff2dd9a43cb5d5e75643
 SHA512:
-  metadata.gz: 61559d0c5e2f91474c86bbb3424c55e41d4fb355921a06cd3b4627ea1ab72a789be74989e53135b7179ea3b59feec83d140ed4e681fb85f111f0f024017a169d
-  data.tar.gz: 8bed5fd23fb6254bf5280ddce378738294af1bf5de119da11000695a3c594e48797b9f820987ef4296ed94ac6a680075f20924a6d6473702f7b05c7fe120af34
+  metadata.gz: 7701b13e4ee048dd707b9e5a787e2081932ad301cb62eb028e770033664a6d7696267fd2a409a79a540db73a06026305b2bd2eee597fdd8196c7568db161d2f6
+  data.tar.gz: 5a9a820ecee0516f76bebb0a3ce64325a80e0e3f71f4855b2529ab07b451cf87db2148544114343f40d5f35e624bf5bac8c614ca600642ca8127b62f6ffc072c

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

@@ -3,9 +3,8 @@
   <%= form.text_field :title, class: 'form-control' %>
 </div>
 
-<% choices = Concurrent::Hash.new %>
 <% controller.c_dimension_defs.each do |dimension_name, dimension| %>
-  <% 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 } || []) %>
-  <%= render partial: 'drilldown/field', locals: { choices: choices[dimension_name] || [],
+  <% 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/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/templates/drilldown_controller.rb.erb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'simple_drilldown/drilldown_controller'
+require 'simple_drilldown/controller'
 
-class <%= class_name %>DrilldownController < SimpleDrilldown::DrilldownController
+class <%= class_name %>DrilldownController < SimpleDrilldown::Controller
   # The main focus of the drilldown
   # target_class <%= class_name %>
 

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

@@ -4,7 +4,7 @@ require 'simple_drilldown/drilldown_helper'
 require 'simple_drilldown/search'
 
 module SimpleDrilldown
-  class DrilldownController < ::ApplicationController
+  class Controller < ::ApplicationController
     helper DrilldownHelper
 
     LIST_LIMIT = 10_000
@@ -14,8 +14,8 @@ module SimpleDrilldown
     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, default: Concurrent::Hash.new
-    class_attribute :c_fields, default: {}
+    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'
@@ -25,7 +25,16 @@ module SimpleDrilldown
     class << self
       def inherited(base)
         super
-        base.c_target_class = base.name.chomp('DrilldownController').constantize
+        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)
@@ -41,7 +50,11 @@ module SimpleDrilldown
       end
 
       def default_fields(default_fields)
-        self.c_default_fields = default_fields
+        self.c_default_fields = default_fields.flatten
+      end
+
+      def default_select_value(default_select_value)
+        self.c_default_select_value = default_select_value
       end
 
       def target_class(target_class)
@@ -53,7 +66,7 @@ module SimpleDrilldown
       end
 
       def list_includes(list_includes)
-        self.c_list_includes = list_includes
+        self.c_list_includes = list_includes.flatten
       end
 
       def list_order(list_order)
@@ -65,7 +78,7 @@ module SimpleDrilldown
       end
 
       def summary_fields(*summary_fields)
-        self.c_summary_fields = summary_fields
+        self.c_summary_fields = summary_fields.flatten
       end
 
       def dimension(name, select_expression = name, options = {})
@@ -92,12 +105,19 @@ module SimpleDrilldown
         end
 
         c_dimension_defs[name.to_s] = {
-          includes: queries.inject([]) do |a, e|
+          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,
@@ -217,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
@@ -498,31 +518,69 @@ module SimpleDrilldown
 
     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 + 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 += 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(@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([], 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(@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/drilldown_helper.rb

@@ -2,6 +2,7 @@
 
 module SimpleDrilldown
   # View helper for SimpleDrilldown
+  # FIXME(uwe): Rename to Helper
   module DrilldownHelper
     def value_label(dimension_index, value)
       dimension = @dimensions[dimension_index]
@@ -11,7 +12,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/engine.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'chartkick'
+require 'simple_drilldown/routing'
 
 module SimpleDrilldown
   class Engine < ::Rails::Engine
@@ -10,5 +11,7 @@ module SimpleDrilldown
     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/routing.rb

@@ -6,7 +6,7 @@ module SimpleDrilldown
     def draw_drilldown(path, controller = path)
       get "#{path}(.:format)" => "#{controller}#index", as: path
       scope path do
-        %i[excel_export html_export index].each do |action|
+        %i[choices excel_export html_export index].each do |action|
           get "#{action}(/:id)(.:format)", controller: controller, action: action
         end
       end

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-08-12 00:00:00.000000000 Z
+date: 2020-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chartkick
@@ -125,7 +125,7 @@ files:
 - 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/controller.rb
 - lib/simple_drilldown/drilldown_helper.rb
 - lib/simple_drilldown/engine.rb
 - lib/simple_drilldown/routing.rb