simple_drilldown 0.12.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0ee5038998f08867aae8f882ebec8163339cd1e96dcc0348988a9043c01c4abe
-  data.tar.gz: fe9d7bed224bac9ad31ef1243f75193cfaba1c7fc6205af264f0fa3fd53892ca
+  metadata.gz: 88e7498fba4f1e8b9d25a98861c8ceb5d6b38c7b986c31e8850edf513e832ad9
+  data.tar.gz: 6fc5db5c12c5e81833343ffdace9c3e94711393b33b1c8ae43c8c6b0d36c212c
 SHA512:
-  metadata.gz: a0f67e84ac3294cc28b4441871b129a221395599c55b59a3aa20a3e1b8a9baa2724f33fb6c3569781d6aa661a4a577643e1c5dfc6cc5754fcaf1a50d4f91879d
-  data.tar.gz: b506d8a98433aec2cb3e5b58002a280c41d385c30c49caf0d0ab56d41eb163214614b4b6b2a7edb2bd06070dcd7305d844bdd03963e3ec45d8b734859cb5c39b
+  metadata.gz: be393d70922fcbed0111f2f2160477db1b4020bce4ba7643617564bdd13fd22416088857e1c61fda841a36f453b909e5e17d1215b6fafc5658c0ae3207f11fa4
+  data.tar.gz: ea0f6996e1bad25de17e3e671b32cc9c0b90bb368fbdf48f8576e417413f37b4c8db147c27026bf5804530462b2ae3ecb84fc7b047da77f7573065ea09efbbf3

data/lib/generators/simple_drilldown/controller/templates/drilldown_controller.rb.erb

@@ -26,7 +26,7 @@ class <%= class_name %>DrilldownController < SimpleDrilldown::Controller
   # base_includes :user, :comments # TODO(uwe): Read relations from schema?
 
   # What fields should be displayed as default when listing actual <%= class_name %> records.
-  default_fields %w[created_at updated_at] # TODO(uwe): Read fields from schema?
+  default_fields %w[id created_at updated_at] # TODO(uwe): Read fields from schema?
 
   # When listing records, what relations should be included for optimization?
   # list_includes :user, :comments # TODO(uwe): Read relations from schema?
@@ -35,6 +35,7 @@ class <%= class_name %>DrilldownController < SimpleDrilldown::Controller
   list_order '<%= plural_name %>.created_at'
 
   # Field definitions when listing records
+  field :id
   field :created_at
   field :updated_at
 

data/lib/simple_drilldown/controller.rb

@@ -270,7 +270,7 @@ module SimpleDrilldown
             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>\S*)(?<ass_order_desc>\s+DESC)?/i =~ base_ass_order
+              /^(?<ass_order>.*?)(?<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}")
@@ -383,11 +383,9 @@ module SimpleDrilldown
       group = nil if group.empty?
 
       joins = self.class.make_join([], c_target_class.name.underscore.to_sym, includes)
-      rows = c_target_class.unscoped.where(c_base_condition).select(select).where(conditions)
-                           .joins(joins)
-                           .group(group)
-                           .order(order)
-                           .to_a
+      row_query = c_target_class.unscoped.where(c_base_condition).select(select)
+      row_query = row_query.where(conditions) if conditions
+      rows = row_query.joins(joins).group(group).order(order).to_a
       if rows.empty?
         @result = { value: 'All', count: 0, row_count: 0, nodes: 0, rows: [] }
         c_summary_fields.each { |f| @result[f] = 0 }

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.12.0'
+  VERSION = '0.12.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.12.1
 platform: ruby
 authors:
 - Uwe Kubosch
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-02-18 00:00:00.000000000 Z
+date: 2022-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx_rails
@@ -172,7 +172,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.3.7
 signing_key:
 specification_version: 4
 summary: Simple data warehouse and drilldown.