refine-rails 2.13.8 → 2.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 52fd39463e007be7957c4402ac0f1843fdb5012e6dafde1d7c14f15a54b1788a
-  data.tar.gz: 2de904d1ed64b3183e4c9a2a0a3824495e76e745a24462d08500eb635091dbf8
+  metadata.gz: fcaec6a16a7f77268e6af7578a103cd32e51581ff47620a807c8041c41a30f9a
+  data.tar.gz: 61346cac343a3e2f434577d68620a62c40ea78d8f43626ba5a29d603901d27c1
 SHA512:
-  metadata.gz: 6619108c19f61b0fbf54b488ef0bc9111d009d596b4597d98a03d7647cc1ad1edeb6b817cb544c2bdc60437b4740c237760271088d42b87a4586a8d7e83f1963
-  data.tar.gz: '08dfb1cb2d1c3a81deb0290b1172b904f1b95529a7ac3dce901f5040f1f6ea74940297f5339be3423f026f8f55bb2d44ef552b2de5371d88ef46ca1248b4301a'
+  metadata.gz: fb8afe7f33ae5d300427183fd4d3735bb357666fc01629cf8e6b487bb3c3ea99eb4e257da928612f4276b9b213a536086b53a5845a6323e18d762a7c5206d820
+  data.tar.gz: d46eb10e4469431bf3fe4ec603755a84064da55127e4256cb6d2eb5a716730d7f04b603a99cb4b8a854fd5d4a4da18ef72b8b727fe3f9ea80db4761e33017db9

data/app/models/refine/filter.rb

@@ -6,7 +6,6 @@ module Refine
     include Stabilize
     include Internationalized
     include Inspector
-    include FlatQueryTools
     # This validation structure sents `initial_query` as the method to validate against
     define_model_callbacks :initialize, only: [:after]
     after_initialize :valid?
@@ -92,10 +91,10 @@ module Refine
 
     def get_query
       raise "Initial query must exist" if initial_query.nil?
-      if blueprint.present?
-        @relation.where(group(make_sub_query(blueprint)))
+      if self.class.included_modules.include?(Refine::FlatQueryTools) && can_use_flat_query?
+        get_flat_query
       else
-        @relation
+        get_complex_query
       end
     end
 
@@ -105,6 +104,14 @@ module Refine
       result
     end
 
+    def get_complex_query
+      if blueprint.present?
+        @relation.where(group(make_sub_query(blueprint)))
+      else
+        @relation
+      end
+    end
+
     def add_nodes_to_query(subquery:, nodes:, query_method:)
       # Apply existing nodes to existing subquery
       if subquery.present? && nodes.present?
@@ -213,6 +220,7 @@ module Refine
 
     def apply_condition(criterion)
       begin
+        condition = get_condition_for_criterion(criterion)
         get_condition_for_criterion(criterion)&.apply(criterion[:input], table, initial_query, false, nil)
       rescue Refine::Conditions::Errors::ConditionClauseError => e
         e.errors.each do |error|

data/app/models/refine/flat_query_tools.rb

@@ -47,7 +47,16 @@ module Refine
         else
           unless condition_already_applied?(criteria_or_conjunction)
             node = apply_flat_condition(criteria_or_conjunction)
-            @relation = @relation.where(Arel.sql(node.to_sql))
+            if node.is_a?(Arel::Nodes::Grouping)
+              @relation = @relation.where(node)
+            elsif node.is_a?(Array)
+              error = node.filter{ |n| n.is_a?(ActiveModel::Error) }.first
+              if error
+                filter.errors.add(:base, error.full_message)
+              end
+            else
+              @relation = @relation.where(Arel::Nodes::Grouping.new(node))
+            end
             track_condition_applied(criteria_or_conjunction)
           end
         end
@@ -84,7 +93,6 @@ module Refine
           end
           join_count += 1
         end
-
       end
     end
 
@@ -100,5 +108,10 @@ module Refine
       applied_conditions[criterion[:condition_id]] && 
         applied_conditions[criterion[:condition_id]].include?(criterion[:input])
     end
+
+    # Meant to be overridden by Filter classes to add or replace with custom logic
+    def can_use_flat_query?
+      !uses_or? && !uses_negative_clause? && !has_duplicate_conditions?
+    end
   end
 end

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.13.8"
+    VERSION = "2.14.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.13.8
+  version: 2.14.0
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-03-28 00:00:00.000000000 Z
+date: 2025-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails