simple_drilldown 0.9.10 → 0.10.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 20b3fbd48f5942a10b5ffa459c1c9c900f8275d800eb52819945a7aacda37440
-  data.tar.gz: cf384149ace94850f19310210d4cc0a278b7dde606753afbe5e43dfd5600e88d
+  metadata.gz: 4d8d435e92abad75f581cab051616487b405d0e399591c2223d40c15679631ba
+  data.tar.gz: b1576d561bc76f1b9f32055ffdb078c608ecb6888754659f67c2c33b3ed2c2fc
 SHA512:
-  metadata.gz: c9e55d9444a72c13d3fde5ac7b58f60941299ae15d45fdcfda1dd0b4db385df99b5fbdf36570131328f007da3896a33d0caa26c411c0295cf499279bda5a3e22
-  data.tar.gz: f0f6794cd72544eca752af71dcaae8f153de7674424e0eebe7f99f34f453edf1f32caf1fa6b198f41d9b49948d0a7513b5940a9c9177014e77d08ea08d84a6bb
+  metadata.gz: e60320131e2ecacb83020b4f26d1c1e890cb4f569687a41b237f39dece5b19a6aa04e34ad596fc9eb03ebd9fa9fa347ef72e9adf54212df688e028dbc4f5ef8d
+  data.tar.gz: e6bfc5405cb576cf76367529ebec4c8080d8eeda6ebfa2021f4b9b18981ffab24eec385af90b40b3c94a5b7eb3edbb5f98ca946e62758ae80ef3c5929d3b7b2b

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

@@ -6,7 +6,7 @@
           </style>
 
         <% @transaction_fields.each do | field | %>
-          <%=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) %>
+          <%=form.label "fields[#{field}]", t(field, default: [:"attributes.#{field}", field.humanize]), 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/_row_header.html.erb

@@ -1,7 +1,7 @@
 <thead>
   <tr>
     <% @search.fields.each do |field| %>
-      <th><%= t field, default: :"attributes.#{field}" %></th>
+      <th><%= t field, default: [:"attributes.#{field}", field.humanize] %></th>
     <% end %>
     <th>
       <%= render 'drilldown/export_links', records: records %>

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
@@ -275,8 +267,8 @@ module SimpleDrilldown
             fk_col = ass.options[:foreign_key] || "#{model}_id"
             sql = +"LEFT JOIN #{include_table} #{include_alias} ON #{include_alias}.#{fk_col} = #{model_table}.id"
             sql << " AND #{include_alias}.deleted_at IS NULL" if ass.klass.paranoid?
-            if ass.scope && (ass_order = ScopeHolder.new(ass.scope).to_s)
-              ass_order = ass_order.sub(/ DESC\s*$/i, '')
+            if ass.scope && (base_ass_order = ScopeHolder.new(ass.scope).to_s)
+              /^(?<ass_order>\S*)(?<ass_order_desc>\s+DESC)?/i =~ base_ass_order
               ass_order_prefixed = ass_order.dup
               ActiveRecord::Base.connection.columns(include_table).map(&:name).each do |cname|
                 ass_order_prefixed.gsub!(/\b#{cname}\b/, "#{include_alias}.#{cname}")
@@ -284,10 +276,10 @@ module SimpleDrilldown
               paranoid_clause = 'AND t2.deleted_at IS NULL' if ass.klass.paranoid?
               # FIXME(uwe):  Should we add "where" from the ScopeHolder here as well?
               #              Ref: SimpleDrilldown::Changes#changes_for
-              min_query = <<~SQL
-                SELECT MIN(#{ass_order}) FROM #{include_table} t2 WHERE t2.#{fk_col} = #{model_table}.id #{paranoid_clause}
+              aggregate_query = <<~SQL
+                SELECT #{ass_order_desc ? :MAX : :MIN}(#{ass_order}) FROM #{include_table} t2 WHERE t2.#{fk_col} = #{model_table}.id #{paranoid_clause}
               SQL
-              sql << " AND  #{ass_order_prefixed} = (#{min_query})"
+              sql << " AND  #{ass_order_prefixed} = (#{aggregate_query})"
             end
             sql
           else
@@ -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,18 +572,18 @@ 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
 
         field_includes = field_def[:include]
-        list_includes = merge_includes(list_includes, field_includes) if field_includes
+        list_includes = self.class.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 = self.class.merge_includes(list_includes, assignment: { order: :"#{f}_changes" })
           end
         end
       end
@@ -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.10'
+  VERSION = '0.10.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.10.2
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-16 00:00:00.000000000 Z
+date: 2021-11-09 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.