effective_resources 2.19.1 → 2.19.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6a849f72abd9e518e2f09b9e7f2d0bd57455c3e8c55546d73438be99449262d6
-  data.tar.gz: 23826114e818b7cad96410296dd2e995e3487affd346da7dabbb0eaf3777bcf1
+  metadata.gz: ca109163a4ec655cfcf78c96a0f2551c6609291b0e75741ffe6b5a617dd16c63
+  data.tar.gz: d8b7fecb587b577aba0f5d4cf230ecb52b7bb9a0eab8a8c8973aa5dd4ac5f553
 SHA512:
-  metadata.gz: 95059a03cb878f71e48311c1941eff23ac0ad4e8014d62c1fc1390a0fba5ce2789df8e32d6cfc7ac9e48f1a4ac6e5e4a3656832fd111a1deeae09620ce03943b
-  data.tar.gz: 1cf6b7de896761c4a9963f2ff7df60f05db8bdabe68a4514ed37d2c87e54e4cbf8c07e0e1f91e8933adf200c115366a06f00296b5b7944d4b8cf4cbebf04b062
+  metadata.gz: 702fe66414e7f6126e094d5ca593d94a8f83c15b5b796767da270d98adb7fcefa5830abb007ae84baa75dee7980725eca42397efe6e5efe03618409c0d920dd2
+  data.tar.gz: fcc9eafd30c1d3deb81524873577a146a19604c74463105b2647cc9f49dee7422a1dde16d198719697821951e3949eb3c9bc08f22e3283e7a4dcd9cd317609d6

data/app/controllers/concerns/effective/crud_controller.rb

@@ -84,13 +84,19 @@ module Effective
     def resource_scope
       relation = effective_resource.relation
 
+      # This was explicitly set in the controller using resource_scope -> dsl
+      return relation if respond_to?(:resource_scope_relation)
+
+      # Otherwise, apply .jit_preload or .deep automatically
+
       # Apply jit_preloader if present
       if defined?(JitPreloader) && EffectiveResources.use_jit_preloader && relation.respond_to?(:includes_values)
         relation.includes_values = [] # Removes any previously defined .includes()
-        relation.jit_preload
-      else
-        (relation.try(:deep) || relation)
+        return relation.jit_preload
       end
+
+      # Try .deep or return original relation
+      (relation.try(:deep) || relation)
     end
 
     def resource_name # 'thing'

data/app/models/effective/resources/relation.rb

@@ -318,7 +318,11 @@ module Effective
                 relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", term, end_at)
               end
             elsif value.respond_to?(:strftime) && operation == :eq
-              relation.where(attribute.matches(value))
+              if as == :date
+                relation.where("#{sql_column} = ?", value)
+              else
+                relation.where("#{sql_column} >= ? AND #{sql_column} <= ?", value.beginning_of_day, value.end_of_day)
+              end
             end
 
           when :effective_obfuscation

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.19.1'.freeze
+  VERSION = '2.19.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.19.1
+  version: 2.19.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-04 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails