simple_drilldown 0.9.11 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4bf78b23713b09e5007b4b8ab3c084e511bdb2cd620f45b9e8d8f4b8d181729c
-  data.tar.gz: 37110d16927f895350153faaec36bead96f2bf9f6b4263e014eaffe46eb52ecc
+  metadata.gz: 5f10c93cd2049eaa829e29002181350220b204776e6144abdf9ccb4a099f0410
+  data.tar.gz: 78f94e8d4d20eec48892fbd917fbc7b72d563d4707aac2c85b94c491f66e884c
 SHA512:
-  metadata.gz: d9a1f536867c67dd52cebfc34ed71e0c67e121f181afc0b169e00640176776fb9909ac049214eaadc06e886744cde84efc35d70a1009a6977478c90141254bc2
-  data.tar.gz: 4ac0a883010bdddfe9e5eaa81d87e41f8f5e2ea018d33297c80395154c9b2c45ca8efd024edb465cda8c779f24a0ca00d5a15b8cb6ac4ebe0d0d72647c6e5747
+  metadata.gz: c95c74daefab61fe569b0aa45717d11a47d47a5ffd77e885cfbcc3b3b22063a50e9ba8609b7d128445984417eda7eafe85f21344f9b4831059fe368662e4fac7
+  data.tar.gz: 3432bc0565e8fef78ff48a9dffb0f73dfd95872ba233fb91987942667878e55c1b326367998e7f8cc9f3d6a05d655c663b731167bdc4d2a55df426aa5b142bd8

data/app/views/drilldown/data_2.builder

@@ -4,7 +4,7 @@ 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,
+  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',

data/app/views/drilldown/data_3.builder

@@ -5,7 +5,7 @@ xml.chart(
   caption: caption, subcaption: subcaption,
   showNames: '1',
   showValues:
-      @result[:rows].size > 15 || @result[:rows][0] && @result[:rows][0][:rows].size > 4 ? 0 : 1,
+      @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',

data/app/views/drilldown/excel_export_xlsx.xlsx.axlsx

@@ -11,7 +11,7 @@ def excel_summary_row_xlsx(sheet, result, parent_result = nil, dimension = 0, he
           else
             headers + [{
               value: result[:value],
-              display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0)
+              display_row_count: result[:nodes] + (result[:row_count] * (@search.list ? 1 : 0))
             }]
           end
         else

data/lib/simple_drilldown/controller.rb

@@ -36,9 +36,7 @@ module SimpleDrilldown
             # 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"
+        base.update_base_condition
       end
 
       def base_condition(base_condition)
@@ -63,6 +61,7 @@ module SimpleDrilldown
 
       def target_class(target_class)
         self.c_target_class = target_class
+        update_base_condition
       end
 
       def select(select)
@@ -148,25 +147,18 @@ module SimpleDrilldown
 
       def legal_values_for(field, preserve_filter = false)
         lambda do |search|
-          my_filter = search.filter.dup
-          my_filter.delete(field.to_s) unless preserve_filter
-          filter_conditions, _t, includes = make_conditions(my_filter)
+          filter = search.filter.dup
+          filter.delete(field.to_s) unless preserve_filter
+          filter_conditions, _t, includes = make_conditions(filter)
           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)
-                includes += query[:includes]
-              else
-                includes << query[:includes]
-              end
-              includes.uniq!
-            end
+            includes = merge_includes(includes, query[:includes]) if query[:includes]
             rows_query = c_target_class.unscoped.where(c_base_condition)
                                        .select("#{query[:select]} AS value")
                                        .joins(make_join([], c_target_class.name.underscore.to_sym, includes))
                                        .order('value')
                                        .group(:value)
-            # rows_query = rows_query.without_deleted if c_target_class.try :paranoid?
+            rows_query = rows_query.without_deleted if c_target_class.try :paranoid?
             rows_query = rows_query.where(filter_conditions) if filter_conditions
             rows_query = rows_query.where(query[:where]) if query[:where]
             rows = rows_query.to_a
@@ -301,6 +293,51 @@ module SimpleDrilldown
           raise "Unknown join class: #{include.inspect}"
         end
       end
+
+      def merge_includes(*args)
+        hash = hash_includes(*args)
+        result = hash.dup.map do |k, v|
+          if v.blank?
+            hash.delete(k)
+            k
+          end
+        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 do |v|
+              h = hash_includes(h, v)
+            end
+          when Hash
+            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
+            raise "Unknown include type: #{inc.inspect}"
+          end
+          h
+        end
+      end
+
+      def update_base_condition
+        self.c_base_condition = "#{c_target_class.table_name}.deleted_at IS NULL" if c_target_class.try :paranoid?
+      end
     end
 
     def initialize
@@ -535,7 +572,7 @@ module SimpleDrilldown
     def populate_list(conditions, includes, result, values)
       return result[:rows].each { |r| populate_list(conditions, includes, r, values + [r[:value]]) } if result[:rows]
 
-      list_includes = merge_includes(includes, c_list_includes)
+      list_includes = self.class.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
@@ -557,47 +594,6 @@ module SimpleDrilldown
       result[:records] = base_query.to_a
     end
 
-    def merge_includes(*args)
-      hash = hash_includes(*args)
-      result = hash.dup.map do |k, v|
-        if v.blank?
-          hash.delete(k)
-          k
-        end
-      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 do |v|
-            h = hash_includes(h, v)
-          end
-        when Hash
-          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
-          raise "Unknown include type: #{inc.inspect}"
-        end
-        h
-      end
-    end
-
     def list_conditions(conditions, values)
       conditions ||= ['']
 

data/lib/simple_drilldown/helper.rb

@@ -31,7 +31,7 @@ module SimpleDrilldown
       if result[:rows]
         sub_headers = headers + [{
           value: result[:value],
-          display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0)
+          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|
@@ -62,7 +62,7 @@ module SimpleDrilldown
               else
                 headers + [{
                   value: result[:value],
-                  display_row_count: result[:nodes] + result[:row_count] * (@search.list ? 1 : 0)
+                  display_row_count: result[:nodes] + (result[:row_count] * (@search.list ? 1 : 0))
                 }]
               end
             else

data/lib/simple_drilldown/search.rb

@@ -47,7 +47,7 @@ module SimpleDrilldown
         attributes = attributes_or_search
         @default_fields = default_fields
         @default_select_value = default_select_value
-        @dimensions = attributes && attributes[:dimensions] || []
+        @dimensions = (attributes && attributes[:dimensions]) || []
         @dimensions.delete_if(&:empty?)
         @filter = attributes && attributes[:filter] ? attributes[:filter] : {}
         @filter.keys.dup.each { |k| @filter[k] = Array(@filter[k]) }

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.9.11'
+  VERSION = '0.10.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: 0.10.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -170,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: Simple data warehouse and drilldown.