suzanne.soy/travis-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v3: don't have recursive recursiveness trigger endless db queries, fixes travis-pro/team-teal#497

Browse Source
This commit is contained in:
Konstantin Haase 2015-10-05 17:49:10 +02:00
parent 3dc1c5b486
commit 716bd1f8e6
3 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/travis/api/v3/query.rb
View File

@ -54,7 +54,13 @@ module Travis::API::V3
def includes?(key)
@includes ||= @params['include'.freeze].to_s.split(?,.freeze)
key = key.to_s if key.is_a? Symbol
if key.is_a? String
key.include?(?.) ? @includes.include?(key) : @includes.any? { |k| k.start_with? key }
else
@includes.any? { |k| key === k }
end
end
def bool(value)

12
lib/travis/api/v3/renderer/collection_renderer.rb
View File

@ -21,13 +21,14 @@ module Travis::API::V3
available_attributes << value
end
attr_reader :href, :options, :list, :included, :meta_data
attr_reader :href, :options, :list, :included, :include, :meta_data
def initialize(list, href: nil, included: [], meta_data: {}, **options)
def initialize(list, href: nil, included: [], include: [], meta_data: {}, **options)
@href = href
@options = options
@list = list
@included = included
@include = include
@meta_data = meta_data
end
@ -49,13 +50,18 @@ module Travis::API::V3
result = fields
included = self.included.dup
result[collection_key] = list.map do |entry|
rendered = render_entry(entry, included: included, mode: representation, **options)
rendered = render_entry(entry, included: included, include: filtered_include, mode: representation, **options)
included << entry
rendered
end
result
end
def filtered_include
key = collection_key.to_s
include.reject { |entry| entry.split(?..freeze, 2).last == key }
end
def representation
:standard
end

6
spec/v3/services/repositories/for_current_user_spec.rb
View File

@ -89,6 +89,12 @@ describe Travis::API::V3::Services::Repositories::ForCurrentUser do
}}
end
describe "don't nest list of repositories inside a list of repositories even if the user asks for it. user has no idea what they are doing" do
before { get("/v3/repos?include=user.repositories", {}, headers) }
example { expect(last_response).to be_ok }
example { expect(JSON.load(body)['repositories'].first['owner']['repositories']).to be_nil }
end
describe "filter: private=false" do
before { get("/v3/repos", {"repository.private" => "false"}, headers) }
example { expect(last_response) .to be_ok }