Merge pull request #613 from kenzai/filter-apply-verify-symbol

Verify and apply filters using a callback name

Author: lgebhardt

lib/jsonapi/resource.rb

@@ -540,7 +540,11 @@ def apply_filter(records, filter, value, options = {})
         strategy = _allowed_filters.fetch(filter.to_sym, Hash.new)[:apply]
 
         if strategy
-          strategy.call(records, value, options)
+          if strategy.is_a?(Symbol) || strategy.is_a?(String)
+            send(strategy, records, value, options)
+          else
+            strategy.call(records, value, options)
+          end
         else
           records.where(filter => value)
         end
@@ -639,7 +643,12 @@ def verify_filter(filter, raw, context = nil)
         strategy = _allowed_filters.fetch(filter, Hash.new)[:verify]
 
         if strategy
-          [filter, strategy.call(filter_values, context)]
+          if strategy.is_a?(Symbol) || strategy.is_a?(String)
+            values = send(strategy, filter_values, context)
+          else
+            values = strategy.call(filter_values, context)
+          end
+          [filter, values]
         else
           if is_filter_relationship?(filter)
             verify_relationship_filter(filter, filter_values, context)

test/fixtures/active_record.rb

@@ -804,14 +804,17 @@ class PersonResource < BaseResource
   has_one :preferences
   has_one :hair_cut
 
-  filter :name, verify: ->(values, _context) {
+  filter :name, verify: :verify_name_filter
+
+  def self.verify_name_filter(values, _context)
     values.each do |value|
       if value.length < 3
         raise JSONAPI::Exceptions::InvalidFilterValue.new(:name, value)
       end
     end
     return values
-  }
+  end
+
 end
 
 class SpecialBaseResource < BaseResource
@@ -1280,15 +1283,7 @@ class BookResource < JSONAPI::Resource
       has_many :aliased_comments, class_name: 'BookComments', relation_name: :approved_book_comments
 
       filters :book_comments
-      filter :banned, apply: ->(records, value, options) {
-        context = options[:context]
-        current_user = context ? context[:current_user] : nil
-
-        # Only book admins my filter for banned books
-        if current_user && current_user.book_admin
-          records.where('books.banned = ?', value[0] == 'true')
-        end
-      }
+      filter :banned, apply: :apply_filter_banned
 
       class << self
         def books
@@ -1310,6 +1305,17 @@ def records(options = {})
           end
           records
         end
+
+        def apply_filter_banned(records, value, options)
+          context = options[:context]
+          current_user = context ? context[:current_user] : nil
+
+          # Only book admins might filter for banned books
+          if current_user && current_user.book_admin
+            records.where('books.banned = ?', value[0] == 'true')
+          end
+        end
+
       end
     end