jpie 2.1.3 → 2.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ff291316aa0dff52e52421edfb945d6c450224761af9552da4cf80c5d5939385
-  data.tar.gz: d20184a0ff94d93da07a167088fdd5ea12346698e5324554a9ee5b4e232784f6
+  metadata.gz: e03bce6fffc1ed66774e89f660afda17460b6d837b07f549b8c17698d252dccd
+  data.tar.gz: 7a8ea2397e9ebfab913bfd7a4e13cab637b4e7fcc7829e7e16e37da019c5fd3e
 SHA512:
-  metadata.gz: 5ef0a9f42b050d26a21545044b985d5deb9cd3417e073e5ec26d9fc462f954c687c547fd850f1a93b3bd7567d0d1b24418f289b61373792a5f6b7005af90885c
-  data.tar.gz: fa80175057fb038cc79ec2c3ee5fa01ac33758c72fd4f618369cd245f8dd3a4c2a2c8c7612ed2ff49f49374514aafb27abab55c801866821a92ae502582c2970
+  metadata.gz: 27dc32299a441b790c9ae4f3890ad5f12f492d5a2027f1f4a0929923a79cbbaf1b1d78746e29d033c2ee85e4d9bf5c1dae24051d2f447eff5bea50a2a36c28b9
+  data.tar.gz: 7fc2d6613e25d73ec7abaafc7dfe5066c9a7a4b79ea0ffc326964f114a3203909382ee68a62ee507617302309ad7517eb01f92ef4e28f2facd208e9cda769dad

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/bin/release

@@ -0,0 +1,32 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+VERSION_FILE = File.expand_path("../../lib/json_api/version.rb", __FILE__)
+
+bump_type = ARGV[0]
+
+unless %w[major minor patch].include?(bump_type)
+  abort "Usage: bin/release [major|minor|patch]"
+end
+
+content = File.read(VERSION_FILE)
+current = content.match(/VERSION\s*=\s*["'](.+?)["']/)[1]
+parts = current.split(".").map(&:to_i)
+
+new_version = case bump_type
+when "major" then [parts[0] + 1, 0, 0]
+when "minor" then [parts[0], parts[1] + 1, 0]
+when "patch" then [parts[0], parts[1], parts[2] + 1]
+end.join(".")
+
+File.write(VERSION_FILE, content.gsub(/VERSION\s*=\s*["'].+?["']/, %(VERSION = "#{new_version}")))
+
+puts "Bumped #{current} → #{new_version}"
+
+system("git add #{VERSION_FILE}")
+system(%(git commit -m "Bump version to #{new_version}"))
+
+print "OTP code: "
+ENV["GEM_HOST_OTP_CODE"] = $stdin.gets.strip
+
+exec("rake release")

data/lib/json_api/controllers/concerns/controller_helpers/parsing.rb

@@ -117,10 +117,8 @@ module JSONAPI
         end
       end
 
-      def valid_sort_fields_for_resource(resource_class, model_class)
-        model_columns = model_class.column_names.map(&:to_sym)
-        resource_sortable_fields = resource_class.permitted_sortable_fields.map(&:to_sym)
-        (model_columns + resource_sortable_fields).uniq.map(&:to_s)
+      def valid_sort_fields_for_resource(resource_class)
+        resource_class.permitted_sortable_fields.map(&:to_s)
       end
     end
   end

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
@@ -94,7 +92,7 @@ module JSONAPI
 
       def validate_sort_fields_for_association(sorts, association)
         resource_class = ResourceLoader.find_for_model(association.klass)
-        valid_fields = valid_sort_fields_for_resource(resource_class, association.klass)
+        valid_fields = valid_sort_fields_for_resource(resource_class)
         invalid_fields = invalid_sort_fields_for_columns(sorts, valid_fields)
         return if invalid_fields.empty?
 

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

@@ -17,7 +17,7 @@ module JSONAPI
         sorts = parse_sort_param
         return if sorts.empty?
 
-        valid = valid_sort_fields_for_resource(@resource_class, model_class)
+        valid = valid_sort_fields_for_resource(@resource_class)
         invalid = invalid_sort_fields_for_columns(sorts, valid)
         render_sort_errors(invalid) if invalid.any?
       end

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.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpie
 version: !ruby/object:Gem::Version
-  version: 2.1.3
+  version: 2.1.5
 platform: ruby
 authors:
 - Emil Kampp
@@ -103,6 +103,7 @@ files:
 - README.md
 - Rakefile
 - bin/console
+- bin/release
 - bin/setup
 - jpie.gemspec
 - lib/jpie.rb
@@ -192,6 +193,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