refine-rails 2.9.3 → 2.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0c511b1d652c0c97df24249a54ff96afcf0857129194e6babd19207cf6418dec
-  data.tar.gz: 3ffebe81b88605d56aec0bcea24b79b1b3c181228bec5d06bea8c33a16a445c7
+  metadata.gz: 40c314d4829c5c14ed3734c58f3fa00f6d48dffdb792c653f7be6baae19047a7
+  data.tar.gz: '096fbf9bc50779fa1cfd216f1e47d8f7429d0e1971c1516209a50759ab4774dd'
 SHA512:
-  metadata.gz: 53db67c1486011495f1efbe6cccd3a8508697d23eea902c738277a5b55f3cc1ef460bf54960bff7dc40b6db7d75daa4b6a895430c81a6034daf80a1bfd13393b
-  data.tar.gz: 7dc1a7a8d51967bdb15f33b074a4564690b80be1902ab35bd67526dc9fbf2f492f34db3d6513987f9a620eeb16cf839ea4931f052e299ca8bf3a048ef39dc638
+  metadata.gz: 63b4ea7e912c91fe2c360ad3aea673b8d5312d8a5ae8217749547e4e85f06d161e6dbf52c7489693a93ed35b639862464d59153ea2ba4d4c20e836e1e0ef3e36
+  data.tar.gz: ac9045b44e88dcdd2d98643d832fe7ffd03c7bebf1e1c7d853f06604a37a5144ef8ff55d735cbdd170661d6f8e43066109a125b3c43507ffdfd0610f0cdf331e

data/app/controllers/refine/inline/criteria_controller.rb

@@ -123,7 +123,8 @@ class Refine::Inline::CriteriaController < ApplicationController
           :clause,
           :date1,
           :date2,
-          :days
+          :days,
+          :modifier
         ]
       ]
     )

data/app/models/refine/filters/blueprint_editor.rb

@@ -15,6 +15,7 @@ class Refine::Filters::BlueprintEditor
     value1
     value2
     count_refinement
+    date_refinement
   ].freeze
 
   def initialize(blueprint)

data/app/models/refine/filters/criterion.rb

@@ -23,7 +23,6 @@ class Refine::Filters::Criterion
   end
 
   def validate!
-    return if (input&.has_key?(:count_refinement) || input&.has_key?(:date_refinement))
     errors.clear
     return true if type == "conjunction"
     begin
@@ -31,7 +30,7 @@ class Refine::Filters::Criterion
       condition&.apply(input, filter.table, query_for_validate)
     rescue Refine::Conditions::Errors::ConditionClauseError => e
       e.errors.each do |error|
-        errors.add(:base, error.full_message)
+        errors.add(:base, :invalid, message: error.full_message)
       end
     end
   end

data/app/models/refine/inline/criteria/date_refinement.rb

@@ -1,14 +1,15 @@
 class Refine::Inline::Criteria::DateRefinement
   include ActiveModel::Model
 
-  attr_accessor :clause, :date1, :date2, :days
+  attr_accessor :clause, :date1, :date2, :days, :modifier
 
   def attributes
     {
       clause: clause,
       date1: date1,
       date2: date2,
-      days: days
+      days: days,
+      modifier: modifier
     }.compact
   end
 end

data/app/models/refine/inline/criteria/input.rb

@@ -29,8 +29,8 @@ class Refine::Inline::Criteria::Input
       value: value,
       value1: value1,
       value2: value2,
-      count_refinement_attributes: count_refinement_attributes.presence,
-      date_refinement_attributes: date_refinement_attributes.presence
+      count_refinement: count_refinement_attributes.presence,
+      date_refinement: date_refinement_attributes.presence
     }.compact
   end
 

data/app/models/refine/inline/criterion.rb

@@ -93,8 +93,7 @@ class Refine::Inline::Criterion
     result = attributes.slice(:condition_id, :input_attributes)
     result[:input] = result.delete(:input_attributes)
     if input_attrs = result[:input]
-      input_attrs[:count_refinement] = input_attrs.delete(:count_refinement_attributes)
-      input_attrs[:date_refinement] = input_attrs.delete(:date_refinement_attributes)
+      result[:input] = input_attrs
     end
     result
   end

data/lib/refine/rails/version.rb

@@ -1,5 +1,5 @@
 module Refine
   module Rails
-    VERSION = "2.9.3"
+    VERSION = "2.9.5"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refine-rails
 version: !ruby/object:Gem::Version
-  version: 2.9.3
+  version: 2.9.5
 platform: ruby
 authors:
 - Colleen Schnettler
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-02-20 00:00:00.000000000 Z
+date: 2024-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails