Holger Just da1999dba3 Unify the conflict resolution behavior of merge! and deep_merge! in Rackstash::Fields::Hash ...

When setting `force: true` (the default), in both cases we not raise an
ArgumentError when setting a forbidden field and overwrite existing
fields. When setting it to `false`, we ignore forbidden or existing
fields in both cases.

We also allow a custom conflict resolution block to be passed to both
methods. In the case of deep_merge! and deep_merge, this applies to all
(potentially deeply nested) fields. Compatible objects, i.e. Hashes and
Arrays are still always merged without calling the block.

2017-07-11 22:23:19 +02:00

..

rackstash

Unify the conflict resolution behavior of merge! and deep_merge! in Rackstash::Fields::Hash

2017-07-11 22:23:19 +02:00

rackstash_spec.rb

Add Rubocop config and resolve most style issues

2017-02-16 22:47:17 +01:00

spec_helper.rb

Check code coverage of tests using coveralls

2017-02-16 23:26:24 +01:00