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
42 changes: 22 additions & 20 deletions hacks/patch-nodatetime.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,29 +17,31 @@

api["components"]["schemas"].each do |call_name, call|
#puts key
call["properties"].each do |arg_name,arg_info|
#print arg_name, ": ", arg_info.key?("oneOf"), "\n"
if arg_info.key?("oneOf") then
arg_info["oneOf"][0].each do |key, val|
arg_info[key] = val
if call.key?("properties") then
call["properties"].each do |arg_name,arg_info|
#print arg_name, ": ", arg_info.key?("oneOf"), "\n"
if arg_info.key?("oneOf") then
arg_info["oneOf"][0].each do |key, val|
arg_info[key] = val
end
arg_info.delete("oneOf")
elsif arg_info.key?("items") and arg_info["items"].key?("oneOf") then
arg_info["items"] = arg_info["items"]["oneOf"][0]
arg_info["items"].delete("oneOf")
end
arg_info.delete("oneOf")
elsif arg_info.key?("items") and arg_info["items"].key?("oneOf") then
arg_info["items"] = arg_info["items"]["oneOf"][0]
arg_info["items"].delete("oneOf")
end
if old_schema.key?(call_name) then
old_arg_prop = old_schema[call_name]["properties"]
if old_arg_prop.key?(arg_name) then
if old_arg_prop[arg_name].key?("format") then
arg_info["format"] = old_arg_prop[arg_name]["format"]
elsif old_arg_prop[arg_name].key?("items") then
arg_info["items"] = old_arg_prop[arg_name]["items"]
if old_schema.key?(call_name) then
old_arg_prop = old_schema[call_name]["properties"]
if old_arg_prop.key?(arg_name) then
if old_arg_prop[arg_name].key?("format") then
arg_info["format"] = old_arg_prop[arg_name]["format"]
elsif old_arg_prop[arg_name].key?("items") then
arg_info["items"] = old_arg_prop[arg_name]["items"]
end
end
end
end
if arg_info["format"] == "date-time" then
arg_info.delete("format")
if arg_info["format"] == "date-time" then
arg_info.delete("format")
end
end
end
end
Expand Down
18 changes: 10 additions & 8 deletions hacks/patch-nooneof.rb
Original file line number Diff line number Diff line change
Expand Up @@ -13,15 +13,17 @@
api = Psych.load_file(ARGV[0])

api["components"]["schemas"].each do |call_name, call|
call["properties"].each do |arg_name,arg_info|
if arg_info.key?("oneOf") then
arg_info["oneOf"][0].each do |key, val|
arg_info[key] = val
if call.key?("properties") then
call["properties"].each do |arg_name,arg_info|
if arg_info.key?("oneOf") then
arg_info["oneOf"][0].each do |key, val|
arg_info[key] = val
end
arg_info.delete("oneOf")
elsif arg_info.key?("items") and arg_info["items"].key?("oneOf") then
arg_info["items"] = arg_info["items"]["oneOf"][0]
arg_info["items"].delete("oneOf")
end
arg_info.delete("oneOf")
elsif arg_info.key?("items") and arg_info["items"].key?("oneOf") then
arg_info["items"] = arg_info["items"]["oneOf"][0]
arg_info["items"].delete("oneOf")
end
end
end
Expand Down
37 changes: 19 additions & 18 deletions hacks/patch.rb
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,29 @@

api["components"]["schemas"].each do |call_name, call|
#puts key
call["properties"].each do |arg_name,arg_info|
#print arg_name, ": ", arg_info.key?("oneOf"), "\n"
if arg_info.key?("oneOf") then
arg_info["oneOf"][0].each do |key, val|
arg_info[key] = val
if call.key?("properties") then
call["properties"].each do |arg_name,arg_info|
#print arg_name, ": ", arg_info.key?("oneOf"), "\n"
if arg_info.key?("oneOf") then
arg_info["oneOf"][0].each do |key, val|
arg_info[key] = val
end
arg_info.delete("oneOf")
elsif arg_info.key?("items") and arg_info["items"].key?("oneOf") then
arg_info["items"] = arg_info["items"]["oneOf"][0]
arg_info["items"].delete("oneOf")
end
arg_info.delete("oneOf")
elsif arg_info.key?("items") and arg_info["items"].key?("oneOf") then
arg_info["items"] = arg_info["items"]["oneOf"][0]
arg_info["items"].delete("oneOf")
end
if old_schema.key?(call_name) then
old_arg_prop = old_schema[call_name]["properties"]
if old_arg_prop.key?(arg_name) then
if old_arg_prop[arg_name].key?("format") then
arg_info["format"] = old_arg_prop[arg_name]["format"]
elsif old_arg_prop[arg_name].key?("items") then
arg_info["items"] = old_arg_prop[arg_name]["items"]
if old_schema.key?(call_name) then
old_arg_prop = old_schema[call_name]["properties"]
if old_arg_prop.key?(arg_name) then
if old_arg_prop[arg_name].key?("format") then
arg_info["format"] = old_arg_prop[arg_name]["format"]
elsif old_arg_prop[arg_name].key?("items") then
arg_info["items"] = old_arg_prop[arg_name]["items"]
end
end
end
end

end
end

Expand Down