miscellany 0.1.21 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ec30930b46e2c70b23b56abcf878afe159e0f18ffb3233c7ab1e87de6483573
-  data.tar.gz: b4eea0d8cb2ea1dfc0b3d52351f63fd54dcb9581ed877967ea78beb5cbc96a2f
+  metadata.gz: 6de3e8ac55956c58bff00af5ffae6ce8972b142be6a5aad47096c4776658ba4e
+  data.tar.gz: 4668195d6a891348e495fff7ecf187415eef6f2588d14e33be556f04f7358042
 SHA512:
-  metadata.gz: 53a2d235b7ea3e209b0249eab4964eb3f2426e2de48c7ac6594a06fb077bae34f7df160ff9f7b8bd797fc2a1d47a2cf8f63cf223f45ef71e4899884fd43dd0c6
-  data.tar.gz: ee1e2a42ce1376ecd3a182e0aa228b248e154b554fcd9fdf6126a4c42855db20e83063b6a71ecd291c7a3fedfc6aa409b001a5d998e78ec8357c0e50d24f6941
+  metadata.gz: 2cec7d17686d2d9faf88dcfc20ac2ca5fba8f10ca7c1e021a7e0b67af4f6506b8d0a03444437ac1aae23eaa39e3a116cbb9e9ef62b649ec73faaf3b45e155772
+  data.tar.gz: 7a0c8b98668ad66aebd4b51e3d41aa969a13e3138992021f36bf95f04be3e1db289f95fb43e95f04e8b8876c2f5e4652a9e1609b1dfbd907595f21f7d9513d4d

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/active_record/complex_query.rb

@@ -130,14 +130,40 @@ module Miscellany
       filters.flatten.select(&:present?).map { |q| "(#{q})" }.join(' AND ').presence || '1=1'
     end
 
-    def date_filter(column, key)
-      if filters["#{key}_end"].present? && filters["#{key}_start"].present?
-        "#{column} BETWEEN '#{DateTime.parse(filters["#{key}_start"]).beginning_of_day}' AND '#{DateTime.parse(filters["#{key}_end"]).end_of_day}'"
-      elsif filters["#{key}_start"].present?
-        "#{column} >= '#{DateTime.parse(filters["#{key}_start"]).beginning_of_day}'"
-      elsif filters["#{key}_end"].present?
-        "#{column} <= '#{DateTime.parse(filters["#{key}_end"]).end_of_day}'"
+    def date_filter(column, range, timezone: nil)
+      range = _parse_datetime_range(range)
+
+      range = range.map{|dt| dt&.in_time_zone(timezone) } if timezone.present?
+      range[0] = range[0]&.beginning_of_day
+      range[1] = range[1]&.end_of_day
+
+      datetime_filter(column, range)
+    end
+
+    def datetime_filter(column, range)
+      range = _parse_datetime_range(range)
+
+      start_date = range[0]
+      end_date = range[1]
+
+      if end_date.present? && start_date.present?
+        "#{column} BETWEEN '#{start_date}' AND '#{end_date}'"
+      elsif start_date.present?
+        "#{column} >= '#{start_date}'"
+      elsif end_date.present?
+        "#{column} <= '#{end_date}'"
       end
     end
+
+    def _parse_datetime_range(range)
+      range = [filters["#{key}_start"], filters["#{key}_end"]] if range.is_a?(String) || range.is_a?(Symbol)
+      range = range.map{|v| _parse_datetime(v)}
+      range
+    end
+
+    def _parse_datetime(value)
+      return DateTime.parse(value) if value.is_a?(String)
+      value
+    end
   end
 end

data/lib/miscellany/controller/sliced_response.rb

@@ -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.21".freeze
+  VERSION = "0.1.24".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,14 @@
 --- !ruby/object:Gem::Specification
 name: miscellany
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.24
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2024-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails