simple_drilldown 0.15.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71d5040959b787d7adfca8b43f2d64fcfa3fe8f4d126baf6f1417ebb8a44bfae
-  data.tar.gz: ec7ac9464c96bfc1686916033cbbadb3af867b1cdc04e1ce5d1bd6ae72cf70dc
+  metadata.gz: 7b7bb3f55e6765cce2fded62fc1688d92601072b82fa760595d8ed24feb253d6
+  data.tar.gz: 94a9cc7ae437e28ac7ff8bfdf9bf290fb15aa735a012f42fee30d1831f7171fe
 SHA512:
-  metadata.gz: 149f46e2eef26f80dcaffea81456bc9950ee19d8280954b9e8fd164552d5499fc71bfd6cc16c2475f8850e3db2527491681ff9a4a5610cea495fd43ba5f1f6e1
-  data.tar.gz: a8cd1d324b1d990526c3c5021639c3a33cb940145b8ae3797d2043e5dbeea9060be7873c54f4d53c675bc9288273efb229dac0209117be549dc0d172fce4e399
+  metadata.gz: 8dd8264f046e74f5f7fb54bf5dc3fcf9f7af38dbb2469f36705f508184558522406cc5e548d65ff61d59c2ef94fe23f91bdc896612d9f90ee177799fa9a6b48a
+  data.tar.gz: 36e0928ca87085994297cd52d617060ada565c2036832090a9655261b1779f88a29d359fc39b7b0137a467f76d4cbd5f9ed0b34cf0748d8f16e5d5625e371303

data/README.md

@@ -1,8 +1,4 @@
-# SimpleDrilldown
-
-<a href="https://travis-ci.org/DatekWireless/simple_drilldown">
-<img align="right" src="https://travis-ci.org/DatekWireless/simple_drilldown.svg?branch=master" alt="Build Status">
-</a>
+# SimpleDrilldown [![Test](https://github.com/DatekWireless/simple_drilldown/actions/workflows/test.yml/badge.svg)](https://github.com/DatekWireless/simple_drilldown/actions/workflows/test.yml)
 
 `simple_drilldown` offers a simple way to define axis to filter and group records
 for analysis.  The result is a record count for the selected filter and
@@ -159,3 +155,9 @@ $ gem install simple_drilldown
 
 ## License
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).
+
+## Release
+
+```bash
+$ rake release
+```

data/Rakefile

@@ -8,7 +8,7 @@ end
 
 APP_RAKEFILE = File.expand_path('test/dummy/Rakefile', __dir__)
 load 'rails/tasks/engine.rake'
-load 'rails/tasks/statistics.rake'
+# load 'rails/tasks/statistics.rake'
 
 require 'bundler/gem_tasks'
 require 'rake/testtask'

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

@@ -87,7 +87,8 @@
     firstPoint = chart.getElementsAtEventForMode(e, 'nearest', { intersect: true }, false)[0]
     if (firstPoint) {
     label = chart.data.labels[firstPoint.index];
-    console.log("Label: " + label);
+    const values = <%== @result[:rows].map { |r| r[:value] }.to_json %>;
+    value = values[firstPoint.index];
     new_location = new URL(window.location.toString());
     new_location.hash = '';
     params = new_location.searchParams;
@@ -101,7 +102,7 @@
     }
     }
     params.delete('search[filter][<%= @dimensions[0][:url_param_name] %>][]');
-    params.set('search[filter][<%= @dimensions[0][:url_param_name] %>][]', label);
+    params.set('search[filter][<%= @dimensions[0][:url_param_name] %>][]', value);
     new_location.searchParams = params;
     window.location = new_location.href;
     }

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

@@ -9,7 +9,7 @@ def excel_header_row(sheet)
   sheet.add_row row
 end
 
-def excel_row(sheet, wrap, transaction:)
+def excel_row(sheet, _wrap, transaction:)
   padding_cells = @dimensions.empty? ? 1 : @dimensions.size
   row = (1..(padding_cells - 1)).map { |_n| nil }
 
@@ -25,8 +25,7 @@ def excel_row(sheet, wrap, transaction:)
 
     field_def = controller.c_fields[field.to_sym]
     if @search.list_change_times && field_def[:list_change_times] && transaction.assignment.try(:order)
-      changes = transaction.assignment.order.send("#{field}_changes")
-                           .map do |al|
+      changes = transaction.assignment.order.send("#{field}_changes").map do |al|
         [al.created_at.localtime.strftime('%H:%M'),
          PacMan.yaml_load(al.new_values).symbolize_keys[field.to_sym]]
       end

data/app/views/simple_drilldown/data_0.builder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 xml.chart(xAxisName: 'Elections',
-          showValues: '1', caption: caption, subcaption: subcaption,
+          showValues: '1', caption:, subcaption:,
           yAxisName: "Election #{t(@search.select_value.downcase)}", numberSuffix: '') do
   xml.set(
     name: @result[:value0],

data/app/views/simple_drilldown/data_1.builder

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 xml.chart(xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", ''),
-          showValues: '1', caption: caption, subcaption: subcaption,
+          showValues: '1', caption:, subcaption:,
           yAxisName: "Election #{t(@search.select_value.downcase)}", numberSuffix: '') do
   @result[:rows].each do |res|
     xml.set name: @dimensions[0][:label_method] ? @dimensions[0][:label_method].call(res[:value]) : res[:value],

data/app/views/simple_drilldown/data_2.builder

@@ -2,7 +2,7 @@
 
 xml.chart(
   xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", ''), palette: '2',
-  caption: caption, subcaption: subcaption,
+  caption:, subcaption:,
   showNames: '1',
   showValues: @result[:rows].size > 15 || (@result[:rows][0] && @result[:rows][0][:rows].size > 4) ? 0 : 1,
   decimals: '0',

data/app/views/simple_drilldown/data_3.builder

@@ -2,7 +2,7 @@
 
 xml.chart(
   xAxisName: (@dimensions[0][:pretty_name] || 'Elections').gsub("'", ''), palette: '2',
-  caption: caption, subcaption: subcaption,
+  caption:, subcaption:,
   showNames: '1',
   showValues:
       @result[:rows].size > 15 || (@result[:rows][0] && @result[:rows][0][:rows].size > 4) ? 0 : 1,

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

@@ -21,19 +21,19 @@ def excel_summary_row_xlsx(sheet, result, parent_result = nil, dimension = 0, he
     end
   else
     render(partial: '/simple_drilldown/excel_summary_row_xlsx',
-           locals: { sheet: sheet, result: result, parent_result: parent_result, headers: headers.dup,
-                     dimension: dimension })
+           locals: { sheet:, result:, parent_result:, headers: headers.dup,
+                     dimension: })
 
     if @search.list
       render(partial: '/simple_drilldown/excel_record_list_xlsx',
-             locals: { sheet: sheet, result: result })
+             locals: { sheet:, result: })
     end
   end
 
   return if dimension >= @dimensions.size
 
   render(partial: '/simple_drilldown/excel_summary_total_row_xlsx', locals: {
-           sheet: sheet, result: result, headers: headers.dup, dimension: dimension
+           sheet:, result:, headers: headers.dup, dimension:
          })
 end
 

data/lib/simple_drilldown/controller.rb

@@ -105,7 +105,7 @@ module SimpleDrilldown
           conditions = options.delete(:where)
           queries = [{
             select: select_expression,
-            includes: includes,
+            includes:,
             where: conditions
           }]
         end
@@ -135,15 +135,15 @@ module SimpleDrilldown
               a.concat(*i)
             end
           end,
-          interval: interval,
-          label_method: label_method,
-          legal_values: legal_values,
-          pretty_name: pretty_name,
-          queries: queries,
-          reverse: reverse,
+          interval:,
+          label_method:,
+          legal_values:,
+          pretty_name:,
+          queries:,
+          reverse:,
           select_expression:
             queries.size == 1 ? queries[0][:select] : "COALESCE(#{queries.map { |q| q[:select] }.join(',')})",
-          row_class: row_class,
+          row_class:,
           url_param_name: name.to_s
         }
       end
@@ -292,7 +292,7 @@ module SimpleDrilldown
             "LEFT JOIN #{include_table} #{include_alias} ON #{include_alias}.#{pk_col} = #{model_table}.#{fk_col}"
           when :has_one, :has_many
             fk_col = ass.options[:foreign_key] || "#{model}_id"
-            sql = +"LEFT JOIN #{include_table} #{include_alias} ON #{include_alias}.#{fk_col} = #{model_table}.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 && (base_ass_order = ScopeHolder.new(ass.scope).to_s)
               /^(?<ass_order>.*?)(?<ass_order_desc>\s+DESC)?$/i =~ base_ass_order
@@ -321,8 +321,8 @@ module SimpleDrilldown
         end
       end
 
-      def merge_includes(*args)
-        hash = hash_includes(*args)
+      def merge_includes(*)
+        hash = hash_includes(*)
         result = hash.dup.map do |k, v|
           if v.blank?
             hash.delete(k)
@@ -368,7 +368,7 @@ module SimpleDrilldown
     end
 
     def initialize
-      super()
+      super
       @history_fields = c_fields.select { |_k, v| v[:list_change_times] }.map { |k, _v| k.to_s }
     end
 
@@ -427,7 +427,7 @@ module SimpleDrilldown
       @remaining_dimensions = c_dimension_defs.dup
       @remaining_dimensions.each_key do |dim_name|
         if (@search.filter[dim_name] && @search.filter[dim_name].size == 1) ||
-           (@dimensions.any? { |d| d[:url_param_name] == dim_name })
+           @dimensions.any? { |d| d[:url_param_name] == dim_name }
           @remaining_dimensions.delete(dim_name)
         end
       end

data/lib/simple_drilldown/engine.rb

@@ -9,7 +9,7 @@ module SimpleDrilldown
     config.autoload_paths << File.dirname(__dir__)
 
     initializer 'simple_drilldown.assets.precompile' do |app|
-      app.config.try(:assets)&.precompile&.concat(%w[simple_drilldown/application.css chartkick.js])
+      app.config.try(:assets)&.precompile&.push('simple_drilldown/application.css', 'chartkick.js')
     end
 
     ActionDispatch::Routing::Mapper.include SimpleDrilldown::Routing

data/lib/simple_drilldown/helper.rb

@@ -5,6 +5,7 @@ module SimpleDrilldown
   module Helper
     # FIXME(uwe): Should not be necessary: https://github.com/rails/rails/issues/41038
     include Rails.application.routes.url_helpers
+
     # EMXIF
 
     def value_label(dimension_index, value)
@@ -25,8 +26,8 @@ module SimpleDrilldown
 
     def summary_row(result, parent_result = nil, dimension = 0, headers = [], new_row: true)
       html = render(partial: '/simple_drilldown/summary_row', locals: {
-                      result: result, parent_result: parent_result, new_row: new_row, dimension: dimension,
-                      headers: headers, with_results: !result[:rows]
+                      result:, parent_result:, new_row:, dimension:,
+                      headers:, with_results: !result[:rows]
                     })
       if result[:rows]
         sub_headers = headers + [{
@@ -38,12 +39,12 @@ module SimpleDrilldown
           html << summary_row(r, result, dimension + 1, sub_headers, new_row: i.positive?)
         end
       elsif @search.list
-        html << render(partial: '/simple_drilldown/record_list', locals: { result: result, dimension: dimension })
+        html << render(partial: '/simple_drilldown/record_list', locals: { result:, dimension: })
       end
       if dimension < @dimensions.size
         html << render(partial: '/simple_drilldown/summary_total_row',
                        locals: {
-                         result: result, parent_result: parent_result, headers: headers.dup, dimension: dimension
+                         result:, parent_result:, headers: headers.dup, dimension:
                        })
       end
 
@@ -72,15 +73,15 @@ module SimpleDrilldown
         end
       else
         xml << render(partial: '/simple_drilldown/excel_summary_row',
-                      locals: { result: result, parent_result: parent_result, headers: headers.dup,
-                                dimension: dimension })
+                      locals: { result:, parent_result:, headers: headers.dup,
+                                dimension: })
 
-        xml << render(partial: '/simple_drilldown/excel_record_list', locals: { result: result }) if @search.list
+        xml << render(partial: '/simple_drilldown/excel_record_list', locals: { result: }) if @search.list
       end
 
       if dimension < @dimensions.size
         xml << render(partial: '/simple_drilldown/excel_summary_total_row', locals: {
-                        result: result, headers: headers.dup, dimension: dimension
+                        result:, headers: headers.dup, dimension:
                       })
       end
       xml

data/lib/simple_drilldown/routing.rb

@@ -7,9 +7,9 @@ module SimpleDrilldown
       path = "#{path}_drilldown" unless /_drilldown$/.match?(path)
       controller ||= path
       get "#{path}(.:format)" => "#{controller}#index", as: path
-      scope path, controller: controller, as: path do
+      scope path, controller:, as: path do
         { excel_export: :xlsx, excel_export_records: :xlsx, html_export: :html }.each do |action, format|
-          get action, defaults: { format: format }
+          get action, defaults: { format: }
         end
         get 'choices/:dimension_name', action: :choices, as: :choices
         yield if block_given?

data/lib/simple_drilldown/search.rb

@@ -51,7 +51,7 @@ module SimpleDrilldown
         @dimensions.delete_if(&:empty?)
         @filter = attributes && attributes[:filter] ? attributes[:filter] : {}
         @filter.keys.dup.each { |k| @filter[k] = Array(@filter[k]) }
-        @filter.each do |_k, v|
+        @filter.each_value do |v|
           v.delete('')
           v.delete('Select Some Options')
         end
@@ -80,13 +80,13 @@ module SimpleDrilldown
     def url_options
       o = {
         search: {
-          title: title,
+          title:,
           list: list ? '1' : '0',
           percent: percent ? '1' : '0',
           list_change_times: list_change_times ? '1' : '0',
-          filter: filter,
-          dimensions: dimensions,
-          display_type: display_type
+          filter:,
+          dimensions:,
+          display_type:
         }
       }
       o[:search][:fields] = fields unless fields == @default_fields

data/lib/simple_drilldown/version.rb

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

data/lib/tasks/simple_drilldown_tasks.rake

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 # desc "Explaining what the task does"
 # task :simple_drilldown do
 #   # Task goes here

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.15.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Uwe Kubosch
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-04-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -44,20 +43,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '6.1'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '8'
+        version: '7.2'
 description: simple_drilldown offers a simple way to define axis to filter and group
   records for analysis.
 email:
@@ -130,7 +123,6 @@ licenses:
 metadata:
   allowed_push_host: https://rubygems.org/
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,15 +130,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '3.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
-signing_key:
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Simple data warehouse and drilldown.
 test_files: []