simple_drilldown 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f10c93cd2049eaa829e29002181350220b204776e6144abdf9ccb4a099f0410
-  data.tar.gz: 78f94e8d4d20eec48892fbd917fbc7b72d563d4707aac2c85b94c491f66e884c
+  metadata.gz: 67475c124f66b63918120130bef9a0d96d911c061c1e81853229088d2a1bba32
+  data.tar.gz: c73d08fec7a08faac6ae93e9a38ce4a351f056c50339d1473fc5ed20da4ce44e
 SHA512:
-  metadata.gz: c95c74daefab61fe569b0aa45717d11a47d47a5ffd77e885cfbcc3b3b22063a50e9ba8609b7d128445984417eda7eafe85f21344f9b4831059fe368662e4fac7
-  data.tar.gz: 3432bc0565e8fef78ff48a9dffb0f73dfd95872ba233fb91987942667878e55c1b326367998e7f8cc9f3d6a05d655c663b731167bdc4d2a55df426aa5b142bd8
+  metadata.gz: ac86c2eb185285bfd9a5f27c90e4c99600a029778595956d99a55ff1d92248c3052d1765227c98368c7a709a16f8d840b46cf09db178d522e9d9ef30f4bde0f9
+  data.tar.gz: 988d82b766671b72d4df71a705feb68aef5b7ac8eef66987136712bb276b760985e5c3b5b4af4942eefea1dce3c34547acdf1e7e6f0c3c97dcbab6d3d90f4b51

data/lib/simple_drilldown/controller.rb

@@ -267,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}")
@@ -276,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

data/lib/simple_drilldown/version.rb

@@ -1,3 +1,3 @@
 module SimpleDrilldown
-  VERSION = '0.10.0'
+  VERSION = '0.10.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simple_drilldown
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - Uwe Kubosch