simple_drilldown 0.14.4 → 0.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8aab426554898f291dfeb223b6e7c0f00b6e9e2cd505a38996116ac817abd9c8
-  data.tar.gz: 04a277b01abc17c2de599a9051a35b8ada2810455653853f90d95d794d51ad13
+  metadata.gz: 71d5040959b787d7adfca8b43f2d64fcfa3fe8f4d126baf6f1417ebb8a44bfae
+  data.tar.gz: ec7ac9464c96bfc1686916033cbbadb3af867b1cdc04e1ce5d1bd6ae72cf70dc
 SHA512:
-  metadata.gz: 6b3a363a1ae42aa1be8a1bc32ddca269b30c74f2d6cb0fba00c879add61b8294e0712a1f1f76885a30b946055fe553300096b2f1c66c8636950c85fbfaeca6e2
-  data.tar.gz: 1fd4381cda21b1ebb2a689f340204843c6d28f14d1421fb911439656176e3c90703fc05eeccf4cb3e243c6c8bfdaed645900d0f1b7a2088c44d33f4b4f8f6cba
+  metadata.gz: 149f46e2eef26f80dcaffea81456bc9950ee19d8280954b9e8fd164552d5499fc71bfd6cc16c2475f8850e3db2527491681ff9a4a5610cea495fd43ba5f1f6e1
+  data.tar.gz: a8cd1d324b1d990526c3c5021639c3a33cb940145b8ae3797d2043e5dbeea9060be7873c54f4d53c675bc9288273efb229dac0209117be549dc0d172fce4e399

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
 
@@ -35,7 +37,7 @@ def excel_row(sheet, wrap, transaction:)
 
     row << value
   end
-  sheet.add_row row, style: wrap
+  sheet.add_row row # , style: wrap
 end
 
 sheet.add_row []

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.4'
+  VERSION = '0.15.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.14.4
+  version: 0.15.1
 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.