miscellany 0.1.22 → 0.1.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbc281a50690bfaa8e5745c43786179654ffd59a87a5df621d1f7423f8a1cb6c
-  data.tar.gz: 105181f0df9279f89e85ba59a35ddda7d390d2dc86068b8a5d2e28ee5cc4887e
+  metadata.gz: 4fc8f4d4e764e532f99f3db6e45cdf8c27a9b587a9617fe75b08f54701e5f3a2
+  data.tar.gz: 790a900c2124bbefa4b6d792e76fed386ea2a6ae20037045d69398b7425fe5dd
 SHA512:
-  metadata.gz: f393bac71597cef4b0879b0a8d9a21003d5e36355887706951880f4cac5ea769ffc8088f5b4d523ea2cdbe7c0b2552d56a4a759db0a9ae4acf69134a2e4e15b8
-  data.tar.gz: a9265249c223ebd121fe8189aacfd462376250b3fb13726ea1878e2b2931317604cec856d6db7f457ecefb77e645bc178a07d45e7a3b95b7347cb8e9eda9515c
+  metadata.gz: 1c87cc64f1f2c7c41f4b56ff6097d22ad3efe57fef2979fa38951c8c444d648dc24beca35a7a8dd7c61b48956bbd993bab44f3932b5d648c8f64a5b70f4c72db
+  data.tar.gz: d5273475dbab7ef34b58bdc6ff43617a5ee6b722575d02f178a01047c716c6d581b25308b2016de0d4ca3d70dd0ab25a10146e22368b285af36235004694b41e

data/lib/miscellany/active_record/arbitrary_prefetch.rb

@@ -203,12 +203,12 @@ module Miscellany
 
       base_module ||= mod
 
-      if mod.name.ends_with? "Patch"
+      if mod.name.end_with? "Patch"
         base_full_name = base_module.to_s
         mod_full_name = mod.to_s
         mod_rel_name = mod_full_name.sub(base_full_name, '')
         mod_rel_bits = mod_rel_name.split('::').select(&:present?).map do |bit|
-          bit.ends_with?('Patch') ? bit[0..-6] : bit
+          bit.end_with?('Patch') ? bit[0..-6] : bit
         end
         final_mod_name = [install_base, *mod_rel_bits].select(&:present?).join("::")
         install_mod = final_mod_name.constantize

data/lib/miscellany/controller/sliced_response.rb

@@ -173,7 +173,7 @@ module Miscellany
       def total_item_count
         @total_item_count ||= options[:total_count] || begin
           if items.is_a?(ActiveRecord::Relation)
-            items.except(:select).count
+            items.model.from(items).count
           elsif items.respond_to?(:count)
             items.count
           elsif defined?(Miscellany::ComplexQuery) && items.is_a?(Miscellany::ComplexQuery)
@@ -202,6 +202,18 @@ module Miscellany
             limit -= offset unless limit.nil?
 
             query = items
+
+            applied_sorts.each do |sort|
+              # TODO Throw an error if joins: is present on a non-AR::Relation?
+              if sort[:joins].is_a?(ActiveRecord::Relation)
+                query = query.merge(sort[:joins])
+              elsif sort[:joins].is_a?(Proc)
+                query = sort[:joins].call(query)
+              elsif sort[:joins].present?
+                query = query.joins(sort[:joins])
+              end
+            end
+
             sort_clause = sort_sql
             query = query.order(Arel.sql(sort_clause)) if sort_clause.present?
 
@@ -219,13 +231,19 @@ module Miscellany
         [slice_start, slice_end == -1 ? nil : slice_end]
       end
 
-      def sort_sql
-        sorts = [ *Array(self.sort), *options[:sort_parser]&.default_sorts]
-        sorts.compact!
+      def applied_sorts
+        @applied_sorts ||= begin
+          sorts = [ *Array(self.sort), *options[:sort_parser]&.default_sorts]
+          sorts.compact!
+          sorts = Miscellany::SortLang.distinct_sorts(sorts)
+          sorts
+        end
+      end
 
-        return nil unless sorts.present?
+      def sort_sql
+        return nil unless applied_sorts.present?
 
-        Miscellany::SortLang.sqlize(sorts)
+        Miscellany::SortLang.sqlize(applied_sorts)
       end
     end
   end

data/lib/miscellany/sort_lang.rb

@@ -22,11 +22,11 @@ module Miscellany
       sort.compact
     end
 
-    def self.sqlize(sorts)
+    def self.distinct_sorts(sorts)
       seen_sorts = Set.new
 
       # Only include each sort key/"column" once
-      sorts = sorts.select do |sort|
+      sorts.select do |sort|
         sid = sort[:key] || sort[:column]
         next true unless sid.present?
 
@@ -37,7 +37,9 @@ module Miscellany
           true
         end
       end
+    end
 
+    def self.sqlize(sorts)
       sorts.map do |sort|
         order = sort[:order] || 'ASC'
         if sort[:column].is_a?(Proc)

data/lib/miscellany/version.rb

@@ -1,3 +1,3 @@
 module Miscellany
-  VERSION = "0.1.22".freeze
+  VERSION = "0.1.25".freeze
 end

data/spec/miscellany/sort_lang_spec.rb

@@ -30,14 +30,17 @@ describe Miscellany::SortLang do
     end
   end
 
-  describe ".sqlize" do
+  describe ".distinct_sorts" do
     it "only includes each sort key once" do
-      expect(Miscellany::SortLang.sqlize([
+      distinct = Miscellany::SortLang.distinct_sorts([
         { column: "created_at", order: "ASC" },
         { column: "created_at", order: "DESC" },
-      ])).to eql "created_at ASC NULLS FIRST"
+      ])
+      expect(Miscellany::SortLang.sqlize(distinct)).to eql "created_at ASC NULLS FIRST"
     end
+  end
 
+  describe ".sqlize" do
     describe "nulls: option" do
       it "accepts a nulls: option" do
         expect(Miscellany::SortLang.sqlize([

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: miscellany
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.25
 platform: ruby
 authors:
 - Ethan Knapp
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-20 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,7 +113,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: 
 email:
 - eknapp@instructure.com
 executables: []
@@ -154,7 +152,6 @@ files:
 homepage: https://instructure.com
 licenses: []
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -169,16 +166,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key: 
+rubygems_version: 3.6.7
 specification_version: 4
 summary: Gem for a bunch of random, re-usable Rails Concerns & Helpers
 test_files:
 - spec/db/database.yml
-- spec/miscellany/sort_lang_spec.rb
 - spec/miscellany/arbitrary_prefetch_spec.rb
-- spec/miscellany/sliced_response_spec.rb
-- spec/miscellany/param_validator_spec.rb
 - spec/miscellany/computed_columns_spec.rb
 - spec/miscellany/goldiload_value_spec.rb
+- spec/miscellany/param_validator_spec.rb
+- spec/miscellany/sliced_response_spec.rb
+- spec/miscellany/sort_lang_spec.rb
 - spec/spec_helper.rb