Only flatten first level to preserve nested

[miharekar]

Motivation / Background

I just tried edge Rails to see what breaks in my app, and this was the first thing that broke 😅

I have a hash of hashes for which I use in_order_of, and since this change I don't get ordered array of hashes, but I get a longer array of flattened values.

The actual object:

{:closed=>{:value=>0, :status=>"Closed"},
 :opened=>{:value=>1, :status=>"Opened"},
 :temporarily_closed=>{:value=>2, :status=>"Temporarily closed"},
 :recommended=>{:value=>3, :status=>"Recommended"},
 :declined=>{:value=>4, :status=>"Declined"},
 :submitted=>{:value=>5, :status=>"Submitted"},
 :invited=>{:value=>6, :status=>"Invited"}}

Before:

irb(main):001:0> Cafe.symbolized_status_map.in_order_of(:first, [:opened, :submitted, :recommended, :invited, :temporarily_closed, :closed, :decline
d])
[[:opened, {:value=>1, :status=>"Opened"}],
 [:submitted, {:value=>5, :status=>"Submitted"}],
 [:recommended, {:value=>3, :status=>"Recommended"}],
 [:invited, {:value=>6, :status=>"Invited"}],
 [:temporarily_closed, {:value=>2, :status=>"Temporarily closed"}],
 [:closed, {:value=>0, :status=>"Closed"}],
 [:declined, {:value=>4, :status=>"Declined"}]]

Currently:

irb(main):001:0> Cafe.symbolized_status_map.in_order_of(:first, [:opened, :submitted, :recommended, :invited, :temporarily_closed, :closed, :decline
d])
=>
[:opened,
 {:value=>1, :status=>"Opened"},
 :submitted,
 {:value=>5, :status=>"Submitted"},
 :recommended,
 {:value=>3, :status=>"Recommended"},
 :invited,
 {:value=>6, :status=>"Invited"},
 :temporarily_closed,
 {:value=>2, :status=>"Temporarily closed"},
 :closed,
 {:value=>0, :status=>"Closed"},
 :declined,
 {:value=>4, :status=>"Declined"}]

And it broke, because I'm using it like so:

<% Cafe.symbolized_status_map.in_order_of(:first, [:opened, :submitted, :recommended, :invited, :temporarily_closed, :closed, :declined]).each do |sym, info| %>

and now of course the info is nil 😅

This PR fixes it so the behavior stays the same.

Detail

This Pull Request changes improves the implementation of #47805.

Additional information

Asked if this is intended behavior or a broken thing on Discord, and got instructed to open a PR so here we are 😄

Checklist

Before submitting the PR make sure the following are checked:

• This Pull Request is related to one change. Changes that are unrelated should be opened in separate PRs.
• Commit message has a detailed description of what changed and why. If this PR fixes a related issue include it in the commit message. Ex: [Fix #issue-number]
• Tests are added or updated if you fix a bug or add a feature.
• CHANGELOG files are updated for the changed libraries if there is a behavior change or additional feature. Minor bug fixes and documentation changes should not be included.

[miharekar]

@rafaelfranca Hey, what's the reason this was omitted from the 7.0.5 release?

The #47805 was included but this wasn't so 7.0.5 broke my app 😅

[byroot]

It's because I didn't backport that commit as it wasn't requested and the PR didn't indicate the issue was existing on 7.0.

I can backport it now.

[byroot]

Done: 90474c6

[miharekar]

@byroot yeah, there was no issue on 7.0. The problem got introduced with #47805.

Thanks! ❤️