miscellany 0.1.20 → 0.1.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 31028be35ab95451d190d0a669321bd265bc82230f8c07ddab8c52a4e526fcf0
-  data.tar.gz: ee7c51e33f2147ab49e05f3c0783dd5a8f938a931a33468d1289214233b34a4e
+  metadata.gz: cbc281a50690bfaa8e5745c43786179654ffd59a87a5df621d1f7423f8a1cb6c
+  data.tar.gz: 105181f0df9279f89e85ba59a35ddda7d390d2dc86068b8a5d2e28ee5cc4887e
 SHA512:
-  metadata.gz: 9f94c830dc69bf00eb3b0c9e423741ce5d70caac4f7cad67e85e4df9c9b929fc60ad2034516ed9924c2f37ce2dab6cbb56f92d02a45b7cd6179b753479f278d8
-  data.tar.gz: 7cfdc3d21e2c648c9031ce061a59529db42236734b50a00bfc058fafde17039ef7660def4f8e8a8775d4a0b65cf30317fc4bbd87a01900b61d6866823904ba19
+  metadata.gz: f393bac71597cef4b0879b0a8d9a21003d5e36355887706951880f4cac5ea769ffc8088f5b4d523ea2cdbe7c0b2552d56a4a759db0a9ae4acf69134a2e4e15b8
+  data.tar.gz: a9265249c223ebd121fe8189aacfd462376250b3fb13726ea1878e2b2931317604cec856d6db7f457ecefb77e645bc178a07d45e7a3b95b7347cb8e9eda9515c

data/lib/miscellany/active_record/complex_query.rb

@@ -47,7 +47,7 @@ module Miscellany
       end
       psql += " LIMIT #{length} OFFSET #{start}"
       records = ActiveRecord::Base.connection.exec_query(psql).to_a
-      records.map!(&:with_indifferent_access)
+      records = records.map(&:with_indifferent_access)
       augment_batch(records)
       records
     end
@@ -63,7 +63,7 @@ module Miscellany
         batch = ActiveRecord::Base.connection.exec_query(
           "SELECT * FROM #{tbl} LIMIT #{of} OFFSET #{offset}",
         )
-        batch.map!(&:with_indifferent_access)
+        batch = batch.map(&:with_indifferent_access)
         augment_batch(batch)
         yield batch
         offset += of
@@ -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.20".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.20
+  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