simple_drilldown 0.14.3 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84022afd7bb8dd36bfca2b285ddf9451f794848c41119745506f5cef2d700796
-  data.tar.gz: 79bd64686fecaf97e94ae35bbae64a19ee08a229d9643e7d22d6932d0988dc20
+  metadata.gz: c75a32411dc7a49757b326fd1a8825bb670a37d445d0338d5278fc721752f45b
+  data.tar.gz: 9bfcc32200e6b63cd7ba969044fc8ef027110f11cb69ef52cdd29b4258fd5803
 SHA512:
-  metadata.gz: 28350243c7fcbf93d18648a7b212b89d3762edff818068d2f6e6ee876841dfd1df8ce4e74910f42e2762c2c0336d661e96fbed5458ce739ac342468fb727f490
-  data.tar.gz: 113ca437b9d800ef894e0a8ff6cdfecec7cdc70e21fd83721b1a527fae35b703a3564fd4d975adde78806b446bd92c34388d87a79ac388d100b0f0f4f6f060e4
+  metadata.gz: 34dbd1c41945059e2a9d952f6cfb3bb656437693dff75dfcd3f09a0b7c64a18f742d837caefe0706b6b28807cb0f66fe7eae76938d5d872a1281e815fd05047c
+  data.tar.gz: c8e788ae028fccdff2503b9e988562fc5fae24926272cd6981d97ed8fa5caf433d1b7204c3a1b426db62eed9b30e10f81f1535621367cabeea354c24c16faa3f

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

@@ -9,7 +9,7 @@
       @result[:rows].map do |r|
         {
           name: r[:value],
-          data: r[:rows].map { |r2| [r2[:value], r2[@search.select_value]] }
+          data: r[:rows].map { |r2| [@dimensions[1][:label_method] ? @dimensions[1][:label_method].call(r2[:value]) : r2[:value], r2[@search.select_value]] }
         }
       end
     when 3

data/app/views/simple_drilldown/_excel_record_list_xlsx.xlsx.axlsx

@@ -3,7 +3,9 @@
 def excel_header_row(sheet)
   padding_cells = @dimensions.empty? ? 1 : @dimensions.size
   row = (1...(padding_cells - 1)).map { |_n| nil }
-  @search.fields.each_with_index { |field, _i| row << t(field, default: field.titleize) }
+  @search.fields.each do |field|
+    row << t(field, default: [:"attributes.#{field}", field.humanize])
+  end
   sheet.add_row row
 end
 

data/app/views/simple_drilldown/_excel_row_header.builder

@@ -5,6 +5,8 @@ xml.Row do
   1.upto(padding_cells - 1) { |_n| xml.Cell('ss:StyleID' => 'Outer') }
 
   @search.fields.each_with_index do |field, i|
-    xml.Cell('ss:Index' => (padding_cells + i).to_s) { xml.Data t(field), 'ss:Type' => 'String' }
+    xml.Cell('ss:Index' => (padding_cells + i).to_s) do
+      xml.Data t(field, default: [:"attributes.#{field}", field.humanize]), 'ss:Type' => 'String'
+    end
   end
 end

data/app/views/simple_drilldown/_excel_styles.builder

@@ -31,7 +31,7 @@ xml.Styles do
     xml.NumberFormat 'ss:Format' => '0.000'
   end
   xml.Style 'ss:ID' => 'NoDecimalNumberFormat' do
-    xml.NumberFormat 'ss:Format' => "\#,\#\#0"
+    xml.NumberFormat 'ss:Format' => '#,##0'
   end
   xml.Style 'ss:ID' => 'Percent' do
     xml.NumberFormat 'ss:Format' => '0%'
@@ -44,7 +44,7 @@ xml.Styles do
       xml.Border 'ss:Position' => 'Bottom', 'ss:Weight' => '1'
     end
     xml.Interior 'ss:Color' => '#dedede', 'ss:Pattern' => 'Solid'
-    xml.NumberFormat 'ss:Format' => "\#,\#\#0"
+    xml.NumberFormat 'ss:Format' => '#,##0'
   end
   xml.Style 'ss:ID' => 'Outer'
   xml.Style 'ss:ID' => 'ShortDate' do

data/lib/simple_drilldown/controller.rb

@@ -117,6 +117,9 @@ module SimpleDrilldown
           end
         end
 
+        pretty_name = I18n.t(:"simple_drilldown.dimension.#{name}",
+                             default: [:"simple_drilldown.#{name}", :"activerecord.models.#{name}", name.to_sym,
+                                       name.to_s.titleize])
         c_dimension_defs[name.to_s] = {
           includes: queries.inject(nil) do |a, e|
             i = e[:includes]
@@ -135,9 +138,7 @@ module SimpleDrilldown
           interval: interval,
           label_method: label_method,
           legal_values: legal_values,
-          pretty_name: I18n.t(:"simple_drilldown.dimension.#{name}",
-                              default: [:"simple_drilldown.#{name}", :"activerecord.models.#{name}", name.to_sym,
-                                        name.to_s.titleize]),
+          pretty_name: pretty_name,
           queries: queries,
           reverse: reverse,
           select_expression:
@@ -207,7 +208,7 @@ module SimpleDrilldown
             dimension_def[:queries].each do |query|
               next unless (where = query[:where])
 
-              where_mapped = where.map { |e| e.respond_to?(:call) ? e.call : e }
+              where_mapped = [*where].map { |e| e.respond_to?(:call) ? e.call : e }
               condition_strings << where_mapped[0]
               condition_values += where_mapped[1..]
             end
@@ -265,7 +266,12 @@ module SimpleDrilldown
           include.each do |parent, child|
             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 << case ass.macro
+                   when :has_many
+                     " #{make_join(joins, ass.class_name.underscore, child, ass.class_name.constantize)}"
+                   else
+                     " #{make_join(joins, parent, child, ass.class_name.constantize)}"
+                   end
           end
           sql
         when Symbol
@@ -634,6 +640,21 @@ module SimpleDrilldown
         instance_eval(&scope)
       end
 
+      # def merge(scope)
+      #   @merged_scope = scope
+      #   self
+      # end
+      #
+      # def includes(includes)
+      #   @includes = includes
+      #   self
+      # end
+      #
+      # def references(references)
+      #   @references = references
+      #   self
+      # end
+      #
       def order(order)
         @order = order
         self

data/lib/simple_drilldown/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SimpleDrilldown
-  VERSION = '0.14.3'
+  VERSION = '0.15.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.14.3
+  version: 0.15.0
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2023-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -145,7 +145,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.4.6
 signing_key:
 specification_version: 4
 summary: Simple data warehouse and drilldown.