Merge pull request #1002 from rfb/resource_sortable_field

Give resource more control over sortable fields

Author: lgebhardt

lib/jsonapi/request_parser.rb

@@ -426,9 +426,8 @@ def parse_sort_criteria(resource_klass, sort_criteria)
 
     def check_sort_criteria(resource_klass, sort_criteria)
       sort_field = sort_criteria[:field]
-      sortable_fields = resource_klass.sortable_fields(context)
 
-      unless sortable_fields.include? sort_field.to_sym
+      unless resource_klass.sortable_field?(sort_field.to_sym, context)
         @errors.concat(JSONAPI::Exceptions::InvalidSortCriteria
                            .new(format_key(resource_klass._type), sort_field).errors)
       end

lib/jsonapi/resource.rb

@@ -607,6 +607,10 @@ def sortable_fields(_context = nil)
         _attributes.keys
       end
 
+      def sortable_field?(key, context = nil)
+        sortable_fields(context).include? key.to_sym
+      end
+
       def fields
         _relationships.keys | _attributes.keys
       end

test/unit/jsonapi_request/jsonapi_request_test.rb

@@ -14,6 +14,12 @@ def self.sortable_fields(context)
   end
 end
 
+class TreeResource < JSONAPI::Resource
+  def self.sortable_field?(key, context)
+    key =~ /^sort\d+/
+  end
+end
+
 class JSONAPIRequestTest < ActiveSupport::TestCase
   def test_parse_includes_underscored
     params = ActionController::Parameters.new(
@@ -211,6 +217,15 @@ def test_parse_sort_with_valid_sorts
     assert_equal(sort_criteria, [{:field=>"name", :direction=>:desc}])
   end
 
+  def test_parse_sort_with_resource_validated_sorts
+    setup_request
+    sort_criteria = @request.parse_sort_criteria(TreeResource, "sort66,name")
+    assert_equal(@request.errors.count, 1)
+    assert_equal(@request.errors.first.title, "Invalid sort criteria")
+    assert_equal(@request.errors.first.detail, "name is not a valid sort criteria for trees")
+    assert_equal(sort_criteria, [{:field=>"sort66", :direction=>:asc}, {:field=>"name", :direction=>:asc}])
+  end
+
   def test_parse_sort_with_relationships
     setup_request
     sort_criteria = @request.parse_sort_criteria(CatResource, "-mother.name")

test/unit/resource/resource_test.rb

@@ -689,4 +689,10 @@ def test_readonly_attribute
     refute_includes(PostWithReadonlyAttributesResource.creatable_fields, :author)
     refute_includes(PostWithReadonlyAttributesResource.updatable_fields, :author)
   end
+
+  def test_sortable_field?
+    assert(PostResource.sortable_field?(:title))
+    assert(PostResource.sortable_field?(:body))
+    refute(PostResource.sortable_field?(:color))
+  end
 end