jpie 2.1.3 → 2.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff291316aa0dff52e52421edfb945d6c450224761af9552da4cf80c5d5939385
-  data.tar.gz: d20184a0ff94d93da07a167088fdd5ea12346698e5324554a9ee5b4e232784f6
+  metadata.gz: 23a1e7f0dd69ee73d5a8f684ac39005fca7081222517086e5f708ffd8ca7815b
+  data.tar.gz: c2ae85e3db1522db8891a6ec0cba3956af94993e1658bdbe0e2a517af9954740
 SHA512:
-  metadata.gz: 5ef0a9f42b050d26a21545044b985d5deb9cd3417e073e5ec26d9fc462f954c687c547fd850f1a93b3bd7567d0d1b24418f289b61373792a5f6b7005af90885c
-  data.tar.gz: fa80175057fb038cc79ec2c3ee5fa01ac33758c72fd4f618369cd245f8dd3a4c2a2c8c7612ed2ff49f49374514aafb27abab55c801866821a92ae502582c2970
+  metadata.gz: 2fa70259c383d4f694f0071384f3b9a8f6f46e3b26765644bbaa45045c4be86454ba9a934b1ec79f9571f1846ae54cdd3b61ec439ba9c000155ee74feaeef1f8
+  data.tar.gz: 3b00c7a05a52bc30b81109a09e95c65cdd6602facba9e8c92b0011ca3a6b3cc0eecb4da2b15704a5d2df03325b70f3aed474988034cefdd7111089815eab8e39

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jpie (2.1.3)
+    jpie (2.1.4)
       actionpack (~> 8.1, >= 8.1.0)
       pg_query (>= 4)
       prosopite (>= 1)

data/lib/json_api/controllers/concerns/relationships/sorting.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "json_api/support/sort_value_comparison"
+
 module JSONAPI
   module Relationships
     module Sorting
@@ -75,11 +77,7 @@ module JSONAPI
       end
 
       def compare_values(value_a, value_b)
-        return 0 if value_a.nil? && value_b.nil?
-        return -1 if value_a.nil?
-        return 1 if value_b.nil?
-
-        value_a <=> value_b
+        JSONAPI::Support::SortValueComparison.compare(value_a, value_b)
       end
 
       def validate_sort_param

data/lib/json_api/controllers/concerns/resource_actions/include_preloading.rb

@@ -19,6 +19,7 @@ module JSONAPI
       def scope_with_includes(scope)
         includes = parse_include_param
         return scope unless includes.any?
+        return scope if scope.is_a?(Array)
 
         inc_hash = includes_to_hash(includes)
         hash_contains_polymorphic?(inc_hash, model_class) ? scope.preload(inc_hash) : scope.includes(inc_hash)

data/lib/json_api/support/concerns/sorting.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "json_api/support/sort_value_comparison"
+
 module JSONAPI
   module Support
     module Sorting
@@ -77,11 +79,7 @@ module JSONAPI
       end
 
       def compare_values(value_a, value_b)
-        return 0 if value_a.nil? && value_b.nil?
-        return -1 if value_a.nil?
-        return 1 if value_b.nil?
-
-        value_a <=> value_b
+        SortValueComparison.compare(value_a, value_b)
       end
     end
   end

data/lib/json_api/support/sort_value_comparison.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module JSONAPI
+  module Support
+    # Compares two values for stable sort ordering. Ruby 3.4+ TrueClass#<=> returns nil
+    # when operands differ (true <=> false), so booleans are normalized before <=>.
+    module SortValueComparison
+      module_function
+
+      def compare(value_a, value_b)
+        return 0 if value_a.nil? && value_b.nil?
+        return -1 if value_a.nil?
+        return 1 if value_b.nil?
+
+        value_a = value_a ? 1 : 0 if value_a in TrueClass | FalseClass
+        value_b = value_b ? 1 : 0 if value_b in TrueClass | FalseClass
+
+        result = value_a <=> value_b
+        return result unless result.nil?
+
+        detail = "#{value_a.class.name} (#{value_a.inspect}), #{value_b.class.name} (#{value_b.inspect})"
+        raise ArgumentError, "incomparable sort values: #{detail}"
+      end
+    end
+  end
+end

data/lib/json_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module JSONAPI
-  VERSION = "2.1.3"
+  VERSION = "2.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpie
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.4
 platform: ruby
 authors:
 - Emil Kampp
@@ -192,6 +192,7 @@ files:
 - lib/json_api/support/resource_identifier.rb
 - lib/json_api/support/responders.rb
 - lib/json_api/support/sort_parsing.rb
+- lib/json_api/support/sort_value_comparison.rb
 - lib/json_api/support/type_conversion.rb
 - lib/json_api/testing.rb
 - lib/json_api/testing/rspec.rb