Skip to content

9 endless recursion fix #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Haniyya wants to merge 8 commits into
base: master
Choose a base branch
from
Open

9 endless recursion fix #10

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b315e75
Extended example to hold another object in its anyOf that has null:
Haniyya Mar 5, 2019
9deb7cf
Moved the adding of null option from extract_types to initialization to
Haniyya Mar 5, 2019
850f939
Cleaned up Entity#extract_types a bit
Haniyya Mar 5, 2019
c2889a1
Added expand null spec
Haniyya Mar 5, 2019
b035060
Removed as_json as its not necessary here.
Haniyya Mar 6, 2019
5954a26
Added building of any_of options to initialize children so that the o…
Haniyya Mar 6, 2019
14bdad2
Added buggy example.
Haniyya Mar 29, 2019
d7fe1e6
Added horrible hack to fix the issue.
Haniyya Apr 1, 2019
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
16 changes: 10 additions & 6 deletions lib/json/schema_builder/entity.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ def initialize(name, opts = { }, &block)
initialize_parent_with opts
initialize_with opts
eval_block &block
any_of(null) if @nullable
extract_types
@initialized = true
end
Expand Down Expand Up @@ -138,13 +139,16 @@ def _reset_fragments
end

def extract_types
any_of(null) if @nullable
if any_of.present?
everything_else = schema.data.reject { |k, v| k == "anyOf" }
return unless everything_else.present?
schema.data.select! { |k, v| k == "anyOf" }
schema.data["anyOf"].unshift everything_else
return unless any_of.present?
everything_else = schema.data.reject { |k, v| k == "anyOf" }
return unless everything_else.present?
schema.data.select! { |k, v| k == "anyOf" }
if initial = schema.data['anyOf'].find { |opt| opt.as_json.try(:[], 'type') == 'object' }
Copy link
Copy Markdown
Author

@Haniyya Haniyya Mar 5, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I assume that, when some is extending this, they intend to extend the object, not the null, so I extract the initial definition and extend it here. This is really ugly right now though and probably won't work in some cases. Happy for any comments here.

initial.deep_merge! everything_else.as_json
else
schema.data["anyOf"].unshift everything_else
end
schema.data["anyOf"].uniq!
end

def initialize_parent_with(opts)
Expand Down
15 changes: 15 additions & 0 deletions spec/integration/builder_initialization_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,21 @@
}
}
},
target: {
anyOf: [
{
type: :object,
properties: {
id: {
type: :number
}
}
},
{
type: :null
}
]
},
preferences: {
anyOf: [
{
Expand Down
15 changes: 15 additions & 0 deletions spec/integration/builder_reopening_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,21 @@
}
}
},
target: {
anyOf: [
{
type: :object,
properties: {
id: {
type: :number
}
}
},
{
type: :null
}
]
},
preferences: {
anyOf: [
{
Expand Down
7 changes: 7 additions & 0 deletions spec/support/examples/builder_initialization.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,18 @@ def example
obj = object
obj.string :name
settings_for(obj)
target_for(obj)
preferences_for(obj)
add_ids_to(obj)
obj
end

def target_for(obj)
target = obj.object :target, null: true
target.number :id
target
end

def settings_for(obj)
settings = obj.object :settings
settings.string :email
Expand Down