miscellany 0.1.21 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ec30930b46e2c70b23b56abcf878afe159e0f18ffb3233c7ab1e87de6483573
-  data.tar.gz: b4eea0d8cb2ea1dfc0b3d52351f63fd54dcb9581ed877967ea78beb5cbc96a2f
+  metadata.gz: cbc281a50690bfaa8e5745c43786179654ffd59a87a5df621d1f7423f8a1cb6c
+  data.tar.gz: 105181f0df9279f89e85ba59a35ddda7d390d2dc86068b8a5d2e28ee5cc4887e
 SHA512:
-  metadata.gz: 53a2d235b7ea3e209b0249eab4964eb3f2426e2de48c7ac6594a06fb077bae34f7df160ff9f7b8bd797fc2a1d47a2cf8f63cf223f45ef71e4899884fd43dd0c6
-  data.tar.gz: ee1e2a42ce1376ecd3a182e0aa228b248e154b554fcd9fdf6126a4c42855db20e83063b6a71ecd291c7a3fedfc6aa409b001a5d998e78ec8357c0e50d24f6941
+  metadata.gz: f393bac71597cef4b0879b0a8d9a21003d5e36355887706951880f4cac5ea769ffc8088f5b4d523ea2cdbe7c0b2552d56a4a759db0a9ae4acf69134a2e4e15b8
+  data.tar.gz: a9265249c223ebd121fe8189aacfd462376250b3fb13726ea1878e2b2931317604cec856d6db7f457ecefb77e645bc178a07d45e7a3b95b7347cb8e9eda9515c

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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miscellany
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
 platform: ruby
 authors:
 - Ethan Knapp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-10-19 00:00:00.000000000 Z
+date: 2023-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails