@ahukkanen care to check this out? 🙏

This needs to be backported to 0.24.

Looks good @mrcasals, your fix works fine!

I think this could've also been solved just by changing the order of these lines:

To:

decrypted_value = decrypt_value(value)

next decrypted_value unless decrypted_value.is_a?(String)

This actually originates from this line which returns nil:

I was actually thinking whether it's safe to return nil there but I didn't dare to change the behavior from the original one which also returned nil in case the value is blank:

I think this could've also been solved just by changing the order of these lines:

I tried that, but then I get an error in the specs:

     Failure/Error: expect(subject.metadata).to eq(deep_metadata)

       expected: {"extras"=>{"foo"=>{"bar"=>"baz"}}, "foobar"=>"", "location"=>{"Country"=>{"Province"=>{"Region"=>{"Sub-region"=>{"Municipality"=>{"Quarter"=>{"Block"=>"Street"}}}}}}}}
            got: {"extras"=>{"foo"=>{"bar"=>"baz"}}, "foobar"=>nil, "location"=>{"Country"=>{"Province"=>{"Region"=>{"Sub-region"=>{"Municipality"=>{"Quarter"=>{"Block"=>"Street"}}}}}}}}

       (compared using ==)

       Diff:
       @@ -1,4 +1,4 @@
        "extras" => {"foo"=>{"bar"=>"baz"}},
       -"foobar" => "",
       +"foobar" => nil,
        "location" => {"Country"=>{"Province"=>{"Region"=>{"Sub-region"=>{"Municipality"=>{"Quarter"=>{"Block"=>"Street"}}}}}}},

And I didn't want the signature to change, that's why I left it as a rescue, although I'm not really happy about it...

I think in this case it is fine to change the expectation if we want the values to be changed to nil when they are empty as in:

Or you could just return an empty string here but I'm not sure if it has some other consequences as I mentioned above...

Either way is fine, your solution is also good!