fix failing tests to filter by _count attributes and other

Author: fluxsaas

lib/jsonapi/filtering.rb

@@ -8,16 +8,19 @@ module Filtering
     #
     # @param requested_field [String] the field to parse
     # @return [Array] with the fields and the predicate
-    def self.extract_attributes_and_predicates(requested_field)
+    def self.extract_attributes_and_predicates(requested_field, allowed_fields)
       predicates = []
       field_name = requested_field.to_s.dup
 
       while Ransack::Predicate.detect_from_string(field_name).present? do
+        # break if we have an exect match with an allowed_fields
+        # we do not want to pick apart the string further
+        break if allowed_fields.include?(field_name)
+
         predicate = Ransack::Predicate
           .detect_and_strip_from_string!(field_name)
         predicates << Ransack::Predicate.named(predicate)
       end
-
       [field_name.split(/_and_|_or_/), predicates.reverse]
     end
 
@@ -54,7 +57,7 @@ def jsonapi_filter_params(allowed_fields)
 
       requested.each_pair do |requested_field, to_filter|
         field_names, predicates = JSONAPI::Filtering
-          .extract_attributes_and_predicates(requested_field)
+          .extract_attributes_and_predicates(requested_field, allowed_fields)
 
         wants_array = predicates.any? && predicates.map(&:wants_array).any?
 
@@ -88,7 +91,7 @@ def jsonapi_sort_params(allowed_fields, options = {})
         end
 
         field_names, predicates = JSONAPI::Filtering
-          .extract_attributes_and_predicates(requested_field)
+          .extract_attributes_and_predicates(requested_field, allowed_fields)
 
         next unless (field_names - allowed_fields).empty?
         next if !options[:sort_with_expressions] && predicates.any?

spec/filtering_spec.rb

@@ -4,8 +4,11 @@
   describe '#extract_attributes_and_predicate' do
     context 'mixed attributes (and/or)' do
       it 'extracts ANDs' do
-        attributes, predicates = JSONAPI::Filtering
-          .extract_attributes_and_predicates('attr1_and_attr2_eq')
+        attributes, predicates =
+          JSONAPI::Filtering.extract_attributes_and_predicates(
+            'attr1_and_attr2_eq',
+            ['attr1', 'attr2']
+          )
         expect(attributes).to eq(['attr1', 'attr2'])
         expect(predicates.size).to eq(1)
         expect(predicates[0].name).to eq('eq')
@@ -15,7 +18,7 @@
     context 'handle attributes with underscore in name' do
       it 'detect _' do
         attributes, predicates = JSONAPI::Filtering
-          .extract_attributes_and_predicates('notes_count_eq')
+          .extract_attributes_and_predicates('notes_count_eq', ['notes_count'])
         expect(attributes).to eq(['notes_count'])
         expect(predicates.size).to eq(1)
         expect(predicates[0].name).to eq('eq')
@@ -25,7 +28,7 @@
     context 'mixed predicates' do
       it 'extracts in order' do
         attributes, predicates = JSONAPI::Filtering
-          .extract_attributes_and_predicates('attr1_sum_eq')
+          .extract_attributes_and_predicates('attr1_sum_eq', ['attr1'])
         expect(attributes).to eq(['attr1'])
         expect(predicates.size).to eq(2)
         expect(predicates[0].name).to eq('sum')