Skip to content
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.

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

Sort HTTP methods, response status codes, and contents lexicographically #163

Merged
merged 4 commits into from
Dec 14, 2023
Merged
Show file tree
Hide file tree
Changes from 2 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
1 change: 1 addition & 0 deletions lib/rspec/openapi.rb
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
require 'rspec/openapi/schema_file'
require 'rspec/openapi/schema_merger'
require 'rspec/openapi/schema_cleaner'
require 'rspec/openapi/schema_sorter'

require 'rspec/openapi/minitest_hooks' if Object.const_defined?('Minitest')
require 'rspec/openapi/rspec_hooks' if ENV['OPENAPI'] && Object.const_defined?('RSpec')
Expand Down
2 changes: 1 addition & 1 deletion lib/rspec/openapi/result_recorder.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def record_results!
RSpec::OpenAPI::SchemaCleaner.cleanup!(spec, new_from_zero)
RSpec::OpenAPI::ComponentsUpdater.update!(spec, new_from_zero)
RSpec::OpenAPI::SchemaCleaner.cleanup_empty_required_array!(spec)
RSpec::OpenAPI::SchemaCleaner.sort_paths!(spec)
RSpec::OpenAPI::SchemaSorter.deep_sort!(spec)
end
end
end
Expand Down
7 changes: 0 additions & 7 deletions lib/rspec/openapi/schema_cleaner.rb
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,6 @@ def cleanup_empty_required_array!(base)
end
end

# Sort "paths" lexicographically to make the order more predictable
#
# @param [Hash] #
def sort_paths!(spec)
spec['paths'] = spec['paths']&.entries&.sort_by! { |path, _| path }.to_h
end

private

def cleanup_array!(base, spec, selector, fields_for_identity = [])
Expand Down
37 changes: 37 additions & 0 deletions lib/rspec/openapi/schema_sorter.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
# frozen_string_literal: true

class << RSpec::OpenAPI::SchemaSorter = Object.new
# Sort some unpredictably ordered properties in a lexicographical manner to make the order more predictable.
#
# @param [Hash|Array]
def deep_sort!(spec)
# paths
deep_sort_by_selector!(spec, 'paths')

# methods
deep_sort_by_selector!(spec, 'paths.*')

# response status code
deep_sort_by_selector!(spec, 'paths.*.*.responses')

# content-type
deep_sort_by_selector!(spec, 'paths.*.*.responses.*.content')
end

private

# @param [Hash] base
# @param [String] selector
def deep_sort_by_selector!(base, selector)
RSpec::OpenAPI::HashHelper.matched_paths(base, selector).each do |paths|
deep_sort_hash!(base.dig(*paths))
end
end

def deep_sort_hash!(v)
Fixed Show fixed Hide fixed
if v.is_a?(Hash)
Fixed Show fixed Hide fixed
sorted = v.entries.sort_by { |k,v| k }.to_h
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
Fixed Show fixed Hide fixed
v.replace(sorted)
end
end
end
Loading