Skip to content

Fix fuzzy_compare to properly work with arrays. #5

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
modax wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix fuzzy_compare to properly work with arrays. #5

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
59 changes: 26 additions & 33 deletions lib/puppet-swagger-generator/files/swagger/fuzzy_compare.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,42 +9,35 @@ class Utils
def self.fuzzy_compare(existing, intended)
normalized_is = existing.symbolize_keys.fixnumify
normalized_should = intended.symbolize_keys.fixnumify
if normalized_is.respond_to? :all? and normalized_is.all? { |k,v| v.class == String }
diff = normalized_is.merge(normalized_should)
diff == normalized_is
elsif normalized_is == normalized_should
true
else
tests = test_complex_structure(normalized_should, normalized_is)
tests.flatten.compact.all?
end
do_compare(normalized_should, normalized_is)
end
def self.test_complex_structure(normalized_should, normalized_is)
normalized_should.keys.collect do |key|
klass = normalized_is[key].class
if [String, Fixnum].include? klass
normalized_is[key].to_s == normalized_should[key].to_s
elsif klass == Array
normalized_is[key].collect do |is_value|
normalized_should[key].collect do |should_value|
diff = if is_value.class == Hash
is_value.merge(should_value)
else
should_value
end
diff == is_value
end
end
elsif klass == Hash
diff = normalized_is[key].merge(normalized_should[key])
if diff == normalized_is[key]
true
else
normalized_should[key].keys.collect do |inner_key|
test_complex_structure(normalized_should[key][inner_key], normalized_is[key][inner_key])
end

private
def self.do_compare(normalized_should, normalized_is)
klass = normalized_should.class
if [String, Fixnum, TrueClass, FalseClass].include? klass
normalized_should.to_s == normalized_is.to_s
elsif klass == Array
if normalized_is.class != Array || normalized_should.length != normalized_is.length
false
else
# We want to check that both arrays have the same elements regardless of their order
should_matched = Array.new(normalized_should.length)
tests = normalized_is.collect do |is_value|
normalized_should.lazy.each_with_index.collect do |should_value, i|
should_matched[i] = should_matched[i] || do_compare(should_value, is_value)
end.any?
end
tests.flatten.compact.all?
end
elsif klass == Hash
if normalized_is.class != Hash
false
else
normalized_should.lazy.all? { |key, should_value| do_compare(should_value, normalized_is[key]) }
end
else
raise "Don't know how to compare object '#{normalized_should}' of class #{klass}"
end
end
end
Expand Down