Merge branch 'master' into field_condition_blocks_fix

CHANGELOG.md

@@ -1,5 +1,12 @@
 graphiti changelog
 
+## [1.7.6](https://github.com/graphiti-api/graphiti/compare/v1.7.5...v1.7.6) (2024-11-06)
+
+
+### Bug Fixes
+
+* Gem version check ([#483](https://github.com/graphiti-api/graphiti/issues/483)) ([68e2492](https://github.com/graphiti-api/graphiti/commit/68e2492032692d8bb928a733f8b0f8710be31c49))
+
 ## [1.7.5](https://github.com/graphiti-api/graphiti/compare/v1.7.4...v1.7.5) (2024-09-16)
 
 

lib/graphiti/adapters/active_record.rb

@@ -304,7 +304,7 @@ def destroy(model_instance)
       end
 
       def close
-        if ::ActiveRecord.version > "7.2"
+        if ::ActiveRecord.version > Gem::Version.new("7.2")
           ::ActiveRecord::Base.connection_handler.clear_active_connections!
         else
           ::ActiveRecord::Base.clear_active_connections!

lib/graphiti/serializer.rb

@@ -13,8 +13,7 @@ class Serializer < JSONAPI::Serializable::Resource
     class_attribute :attributes_applied_via_resource
     class_attribute :extra_attributes_applied_via_resource
     class_attribute :relationship_condition_blocks
-    class_attribute :field_condition_blocks
-    self.field_condition_blocks ||= {}
+
     self.attributes_applied_via_resource = []
     self.extra_attributes_applied_via_resource = []
     # See #requested_relationships
@@ -25,6 +24,8 @@ def self.inherited(klass)
       klass.class_eval do
         extend JSONAPI::Serializable::Resource::ConditionalFields
 
+        self.field_condition_blocks ||= {}
+
         # See #requested_relationships
         def self.relationship(name, options = {}, &block)
           prev = Util::Hash.deep_dup(field_condition_blocks)

spec/schema_diff_spec.rb

@@ -490,9 +490,15 @@ def self.name
       end
 
       it "returns error" do
-        expect(diff).to eq([
-          'SchemaDiff::EmployeeResource: default sort changed from [{:foo=>"asc"}] to [{:foo=>"desc"}].'
-        ])
+        if RUBY_VERSION >= "3.4"
+          expect(diff).to eq([
+            'SchemaDiff::EmployeeResource: default sort changed from [{foo: "asc"}] to [{foo: "desc"}].'
+          ])
+        else
+          expect(diff).to eq([
+            'SchemaDiff::EmployeeResource: default sort changed from [{:foo=>"asc"}] to [{:foo=>"desc"}].'
+          ])
+        end
       end
     end
 
@@ -1204,9 +1210,15 @@ def self.name
         end
 
         it "returns error" do
-          expect(diff).to eq([
-            'Endpoint "/schema_diff/employees" had incompatible sideload allowlist. Was [{:positions=>"department"}, "same"], now ["positions", "same"].'
-          ])
+          if RUBY_VERSION >= "3.4"
+            expect(diff).to eq([
+              'Endpoint "/schema_diff/employees" had incompatible sideload allowlist. Was [{positions: "department"}, "same"], now ["positions", "same"].'
+            ])
+          else
+            expect(diff).to eq([
+              'Endpoint "/schema_diff/employees" had incompatible sideload allowlist. Was [{:positions=>"department"}, "same"], now ["positions", "same"].'
+            ])
+          end
         end
       end
     end