Make json api adapter 'include' option accept an array, accommodate comma delimited string for legacy reasons

This commit is contained in:
Robbie Pitts
2015-01-12 14:54:06 -05:00
parent b8df4b57a1
commit ad5677c4ec
6 changed files with 144 additions and 105 deletions

View File

@@ -121,7 +121,9 @@ module ActiveModel
end
def check_assoc(assoc)
@options[:include].split(',').any? do |s|
include_opt = @options[:include]
include_opt = include_opt.split(',') if include_opt.is_a?(String)
include_opt.any? do |s|
s.match(/^#{assoc.gsub('.', '\.')}/)
end
end