Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/jsonapi/resource.rb
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,9 @@ def is_filter_relationship?(filter)

def verify_filter(filter, raw, context = nil)
filter_values = []
filter_values += CSV.parse_line(raw) unless raw.nil? || raw.empty?
if raw.present?
filter_values += raw.is_a?(String) ? CSV.parse_line(raw) : [raw]
end

strategy = _allowed_filters.fetch(filter, Hash.new)[:verify]

Expand Down
7 changes: 7 additions & 0 deletions test/controllers/controller_test.rb
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,13 @@ def test_index_filter_by_title
assert_equal 1, json_response['data'].size
end

def test_index_filter_with_hash_values
get :index, {filter: {search: {title: 'New post'}}}
assert_response :success
assert json_response['data'].is_a?(Array)
assert_equal 1, json_response['data'].size
end

def test_index_filter_by_ids
get :index, {filter: {ids: '1,2'}}
assert_response :success
Expand Down
8 changes: 8 additions & 0 deletions test/fixtures/active_record.rb
Original file line number Diff line number Diff line change
Expand Up @@ -945,6 +945,14 @@ def title=(title)
records.where('id IN (?)', value)
}

filter :search,
verify: ->(values, context) {
values.all?{|v| v.is_a?(Hash) } && values
},
apply: -> (records, values, _options) {
records.where(title: values.first['title'])
}

def self.updatable_fields(context)
super(context) - [:author, :subject]
end
Expand Down