ceedling 0.20.3 → 0.21.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Gemfile +3 -0
- data/Gemfile.lock +1 -0
- data/Rakefile +1 -0
- data/bin/ceedling +79 -26
- data/lib/ceedling/configurator_plugins.rb +0 -18
- data/lib/ceedling/rules_cmock.rake +1 -1
- data/lib/ceedling/tasks_base.rake +5 -1
- data/lib/ceedling/tasks_tests.rake +12 -9
- data/lib/ceedling/version.rb +1 -1
- data/lib/ceedling/version.rb.erb +1 -1
- data/plugins/fake_function_framework/README.md +250 -0
- data/plugins/fake_function_framework/Rakefile +19 -0
- data/plugins/fake_function_framework/examples/fff_example/project.yml +71 -0
- data/plugins/fake_function_framework/examples/fff_example/rakefile.rb +7 -0
- data/plugins/fake_function_framework/examples/fff_example/src/bar.c +1 -0
- data/plugins/fake_function_framework/examples/fff_example/src/bar.h +13 -0
- data/plugins/fake_function_framework/examples/fff_example/src/custom_types.h +6 -0
- data/plugins/fake_function_framework/examples/fff_example/src/display.c +7 -0
- data/plugins/fake_function_framework/examples/fff_example/src/display.h +16 -0
- data/plugins/fake_function_framework/examples/fff_example/src/event_processor.c +92 -0
- data/plugins/fake_function_framework/examples/fff_example/src/event_processor.h +11 -0
- data/plugins/fake_function_framework/examples/fff_example/src/foo.c +16 -0
- data/plugins/fake_function_framework/examples/fff_example/src/foo.h +8 -0
- data/plugins/fake_function_framework/examples/fff_example/src/subfolder/zzz.c +1 -0
- data/plugins/fake_function_framework/examples/fff_example/src/subfolder/zzz.h +6 -0
- data/plugins/fake_function_framework/examples/fff_example/test/test_event_processor.c +155 -0
- data/plugins/fake_function_framework/examples/fff_example/test/test_foo.c +47 -0
- data/plugins/fake_function_framework/lib/fake_function_framework.rb +87 -0
- data/plugins/fake_function_framework/lib/fff_mock_generator.rb +159 -0
- data/plugins/fake_function_framework/spec/fff_mock_generator_spec.rb +464 -0
- data/plugins/fake_function_framework/spec/spec_helper.rb +96 -0
- data/plugins/fake_function_framework/src/fff_unity_helper.h +33 -0
- data/plugins/fake_function_framework/vendor/fff/LICENSE +25 -0
- data/plugins/fake_function_framework/vendor/fff/Makefile +10 -0
- data/plugins/fake_function_framework/vendor/fff/README.md +454 -0
- data/plugins/fake_function_framework/vendor/fff/buildandtest +15 -0
- data/plugins/fake_function_framework/vendor/fff/examples/Makefile +7 -0
- data/plugins/fake_function_framework/vendor/fff/examples/driver_testing/Makefile +64 -0
- data/plugins/fake_function_framework/vendor/fff/examples/driver_testing/driver.c +24 -0
- data/plugins/fake_function_framework/vendor/fff/examples/driver_testing/driver.h +11 -0
- data/plugins/fake_function_framework/vendor/fff/examples/driver_testing/driver.test.cpp +50 -0
- data/plugins/fake_function_framework/vendor/fff/examples/driver_testing/driver.test.fff.cpp +62 -0
- data/plugins/fake_function_framework/vendor/fff/examples/driver_testing/hardware_abstraction.h +15 -0
- data/plugins/fake_function_framework/vendor/fff/examples/driver_testing/registers.h +13 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/DISPLAY.h +17 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/Kata.txt +25 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/Makefile +67 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/SYSTEM.h +21 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/UI.c +48 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/UI.h +12 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/UI_test_ansic.c +183 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/UI_test_cpp.cpp +136 -0
- data/plugins/fake_function_framework/vendor/fff/examples/embedded_ui/test_suite_template.c +34 -0
- data/plugins/fake_function_framework/vendor/fff/fakegen.rb +420 -0
- data/plugins/fake_function_framework/vendor/fff/fff.h +5112 -0
- data/plugins/fake_function_framework/vendor/fff/gtest/Makefile +22 -0
- data/plugins/fake_function_framework/vendor/fff/gtest/gtest-all.cc +9118 -0
- data/plugins/fake_function_framework/vendor/fff/gtest/gtest-main.cc +6 -0
- data/plugins/fake_function_framework/vendor/fff/gtest/gtest.h +19537 -0
- data/plugins/fake_function_framework/vendor/fff/test/Makefile +81 -0
- data/plugins/fake_function_framework/vendor/fff/test/c_test_framework.h +15 -0
- data/plugins/fake_function_framework/vendor/fff/test/fff_test_c.c +108 -0
- data/plugins/fake_function_framework/vendor/fff/test/fff_test_cpp.cpp +45 -0
- data/plugins/fake_function_framework/vendor/fff/test/fff_test_global_c.c +76 -0
- data/plugins/fake_function_framework/vendor/fff/test/fff_test_global_cpp.cpp +23 -0
- data/plugins/fake_function_framework/vendor/fff/test/global_fakes.c +13 -0
- data/plugins/fake_function_framework/vendor/fff/test/global_fakes.h +37 -0
- data/plugins/fake_function_framework/vendor/fff/test/test_cases.include +276 -0
- data/plugins/gcov/README.md +9 -0
- data/plugins/gcov/{template.erb → assets/template.erb} +1 -1
- data/plugins/gcov/{defaults.yml → config/defaults.yml} +10 -1
- data/plugins/gcov/gcov.rake +20 -8
- data/plugins/gcov/{gcov.rb → lib/gcov.rb} +13 -24
- data/plugins/module_generator/module_generator.rake +3 -3
- data/plugins/warnings_report/lib/warnings_report.rb +69 -0
- data/plugins/xml_tests_report/lib/xml_tests_report.rb +108 -0
- data/spec/spec_system_helper.rb +1 -1
- data/vendor/c_exception/lib/CException.h +1 -1
- data/vendor/c_exception/vendor/unity/auto/generate_module.rb +16 -16
- data/vendor/c_exception/vendor/unity/auto/generate_test_runner.rb +61 -21
- data/vendor/c_exception/vendor/unity/auto/stylize_as_junit.rb +5 -1
- data/vendor/c_exception/vendor/unity/auto/unity_to_junit.py +146 -0
- data/vendor/c_exception/vendor/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf +0 -0
- data/vendor/c_exception/vendor/unity/docs/UnityAssertionsReference.pdf +0 -0
- data/vendor/c_exception/vendor/unity/docs/UnityConfigurationGuide.pdf +0 -0
- data/vendor/c_exception/vendor/unity/docs/UnityGettingStartedGuide.pdf +0 -0
- data/vendor/c_exception/vendor/unity/docs/UnityHelperScriptsGuide.pdf +0 -0
- data/vendor/c_exception/vendor/unity/examples/example_1/makefile +1 -1
- data/vendor/c_exception/vendor/unity/examples/example_1/src/ProductionCode.c +7 -7
- data/vendor/c_exception/vendor/unity/examples/example_1/src/ProductionCode2.c +2 -2
- data/vendor/c_exception/vendor/unity/examples/example_1/test/TestProductionCode.c +14 -14
- data/vendor/c_exception/vendor/unity/examples/example_1/test/TestProductionCode2.c +2 -2
- data/vendor/c_exception/vendor/unity/examples/example_1/test/test_runners/TestProductionCode2_Runner.c +5 -5
- data/vendor/c_exception/vendor/unity/examples/example_1/test/test_runners/TestProductionCode_Runner.c +5 -5
- data/vendor/c_exception/vendor/unity/examples/unity_config.h +257 -0
- data/vendor/c_exception/vendor/unity/extras/fixture/src/unity_fixture.c +9 -8
- data/vendor/c_exception/vendor/unity/extras/fixture/src/unity_fixture_internals.h +1 -0
- data/vendor/c_exception/vendor/unity/extras/fixture/test/Makefile +28 -8
- data/vendor/c_exception/vendor/unity/extras/fixture/test/unity_fixture_Test.c +57 -17
- data/vendor/c_exception/vendor/unity/extras/fixture/test/unity_fixture_TestRunner.c +3 -0
- data/vendor/c_exception/vendor/unity/extras/fixture/test/unity_output_Spy.c +2 -3
- data/vendor/c_exception/vendor/unity/extras/fixture/test/unity_output_Spy.h +1 -1
- data/vendor/c_exception/vendor/unity/release/version.info +1 -1
- data/vendor/c_exception/vendor/unity/src/unity.c +336 -191
- data/vendor/c_exception/vendor/unity/src/unity.h +73 -69
- data/vendor/c_exception/vendor/unity/src/unity_internals.h +119 -90
- data/vendor/c_exception/vendor/unity/test/Makefile +51 -0
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_cmd.c +5 -5
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_def.c +5 -5
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_head1.c +5 -5
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_cmd.c +6 -6
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_def.c +6 -6
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_head1.c +6 -6
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_new1.c +6 -6
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_new2.c +8 -8
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_param.c +6 -6
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_run1.c +6 -6
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_run2.c +8 -8
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_yaml.c +7 -7
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_new1.c +5 -5
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_new2.c +7 -7
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_param.c +5 -5
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_run1.c +5 -5
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_run2.c +7 -7
- data/vendor/c_exception/vendor/unity/test/expectdata/testsample_yaml.c +6 -6
- data/vendor/c_exception/vendor/unity/test/rakefile +5 -0
- data/vendor/c_exception/vendor/unity/test/rakefile_helper.rb +9 -7
- data/vendor/c_exception/vendor/unity/test/targets/clang_file.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/clang_strict.yml +3 -0
- data/vendor/c_exception/vendor/unity/test/targets/gcc_32.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/gcc_64.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/gcc_auto_limits.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/gcc_auto_sizeof.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/gcc_auto_stdint.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/gcc_manual_math.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/iar_arm_v4.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/iar_arm_v5.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/iar_arm_v5_3.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/iar_cortexm3_v5.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/iar_msp430.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/targets/iar_sh2a_v6.yml +1 -0
- data/vendor/c_exception/vendor/unity/test/testdata/CException.h +11 -0
- data/vendor/c_exception/vendor/unity/test/testdata/Defs.h +8 -0
- data/vendor/c_exception/vendor/unity/test/testdata/cmock.h +14 -0
- data/vendor/c_exception/vendor/unity/test/testdata/mockMock.h +13 -0
- data/vendor/c_exception/vendor/unity/test/testdata/testRunnerGenerator.c +183 -0
- data/vendor/c_exception/vendor/unity/test/testdata/testRunnerGeneratorSmall.c +65 -0
- data/vendor/c_exception/vendor/unity/test/testdata/testRunnerGeneratorWithMocks.c +192 -0
- data/vendor/c_exception/vendor/unity/test/tests/test_generate_test_runner.rb +1221 -71
- data/vendor/c_exception/vendor/unity/test/tests/testparameterized.c +1 -1
- data/vendor/c_exception/vendor/unity/test/tests/testunity.c +127 -5
- data/vendor/cmock/docs/CMock_Summary.md +1 -1
- data/vendor/cmock/lib/cmock_generator.rb +7 -2
- data/vendor/cmock/lib/cmock_header_parser.rb +29 -9
- data/vendor/cmock/scripts/create_mock.rb +1 -1
- data/vendor/cmock/test/system/test_compilation/const.h +15 -0
- data/vendor/cmock/test/unit/cmock_generator_main_test.rb +4 -4
- data/vendor/cmock/test/unit/cmock_header_parser_test.rb +136 -73
- data/vendor/cmock/vendor/c_exception/lib/CException.h +1 -1
- data/vendor/cmock/vendor/c_exception/vendor/unity/auto/generate_module.rb +16 -16
- data/vendor/cmock/vendor/c_exception/vendor/unity/auto/generate_test_runner.rb +61 -21
- data/vendor/cmock/vendor/c_exception/vendor/unity/auto/stylize_as_junit.rb +5 -1
- data/vendor/cmock/vendor/c_exception/vendor/unity/auto/unity_to_junit.py +146 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf +0 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/UnityAssertionsReference.pdf +0 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/UnityConfigurationGuide.pdf +0 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/UnityGettingStartedGuide.pdf +0 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/UnityHelperScriptsGuide.pdf +0 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/example_1/makefile +1 -1
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/example_1/src/ProductionCode.c +7 -7
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/example_1/src/ProductionCode2.c +2 -2
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/example_1/test/TestProductionCode.c +14 -14
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/example_1/test/TestProductionCode2.c +2 -2
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/example_1/test/test_runners/TestProductionCode2_Runner.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/example_1/test/test_runners/TestProductionCode_Runner.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/examples/unity_config.h +257 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/extras/fixture/src/unity_fixture.c +9 -8
- data/vendor/cmock/vendor/c_exception/vendor/unity/extras/fixture/src/unity_fixture_internals.h +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/extras/fixture/test/Makefile +28 -8
- data/vendor/cmock/vendor/c_exception/vendor/unity/extras/fixture/test/unity_fixture_Test.c +57 -17
- data/vendor/cmock/vendor/c_exception/vendor/unity/extras/fixture/test/unity_fixture_TestRunner.c +3 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/extras/fixture/test/unity_output_Spy.c +2 -3
- data/vendor/cmock/vendor/c_exception/vendor/unity/extras/fixture/test/unity_output_Spy.h +1 -1
- data/vendor/cmock/vendor/c_exception/vendor/unity/release/version.info +1 -1
- data/vendor/cmock/vendor/c_exception/vendor/unity/src/unity.c +336 -191
- data/vendor/cmock/vendor/c_exception/vendor/unity/src/unity.h +73 -69
- data/vendor/cmock/vendor/c_exception/vendor/unity/src/unity_internals.h +119 -90
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/Makefile +51 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_cmd.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_def.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_head1.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_cmd.c +6 -6
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_def.c +6 -6
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_head1.c +6 -6
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_new1.c +6 -6
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_new2.c +8 -8
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_param.c +6 -6
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_run1.c +6 -6
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_run2.c +8 -8
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_mock_yaml.c +7 -7
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_new1.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_new2.c +7 -7
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_param.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_run1.c +5 -5
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_run2.c +7 -7
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/expectdata/testsample_yaml.c +6 -6
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/rakefile +5 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/rakefile_helper.rb +9 -7
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/clang_file.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/clang_strict.yml +3 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/gcc_32.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/gcc_64.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/gcc_auto_limits.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/gcc_auto_sizeof.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/gcc_auto_stdint.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/gcc_manual_math.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/iar_arm_v4.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/iar_arm_v5.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/iar_arm_v5_3.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/iar_cortexm3_v5.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/iar_msp430.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/targets/iar_sh2a_v6.yml +1 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/CException.h +11 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/Defs.h +8 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/cmock.h +14 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/mockMock.h +13 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/testRunnerGenerator.c +183 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/testRunnerGeneratorSmall.c +65 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/testRunnerGeneratorWithMocks.c +192 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/tests/test_generate_test_runner.rb +1221 -71
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/tests/testparameterized.c +1 -1
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/tests/testunity.c +127 -5
- data/vendor/cmock/vendor/unity/auto/generate_module.rb +16 -16
- data/vendor/cmock/vendor/unity/auto/generate_test_runner.rb +61 -21
- data/vendor/cmock/vendor/unity/auto/stylize_as_junit.rb +5 -1
- data/vendor/cmock/vendor/unity/auto/unity_to_junit.py +146 -0
- data/vendor/cmock/vendor/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf +0 -0
- data/vendor/cmock/vendor/unity/docs/UnityAssertionsReference.pdf +0 -0
- data/vendor/cmock/vendor/unity/docs/UnityConfigurationGuide.pdf +0 -0
- data/vendor/cmock/vendor/unity/docs/UnityGettingStartedGuide.pdf +0 -0
- data/vendor/cmock/vendor/unity/docs/UnityHelperScriptsGuide.pdf +0 -0
- data/vendor/cmock/vendor/unity/examples/example_1/makefile +1 -1
- data/vendor/cmock/vendor/unity/examples/example_1/src/ProductionCode.c +7 -7
- data/vendor/cmock/vendor/unity/examples/example_1/src/ProductionCode2.c +2 -2
- data/vendor/cmock/vendor/unity/examples/example_1/test/TestProductionCode.c +14 -14
- data/vendor/cmock/vendor/unity/examples/example_1/test/TestProductionCode2.c +2 -2
- data/vendor/cmock/vendor/unity/examples/example_1/test/test_runners/TestProductionCode2_Runner.c +5 -5
- data/vendor/cmock/vendor/unity/examples/example_1/test/test_runners/TestProductionCode_Runner.c +5 -5
- data/vendor/cmock/vendor/unity/examples/unity_config.h +257 -0
- data/vendor/cmock/vendor/unity/extras/fixture/src/unity_fixture.c +3 -0
- data/vendor/cmock/vendor/unity/extras/fixture/test/unity_fixture_Test.c +5 -2
- data/vendor/cmock/vendor/unity/extras/fixture/test/unity_output_Spy.c +1 -2
- data/vendor/cmock/vendor/unity/extras/fixture/test/unity_output_Spy.h +1 -1
- data/vendor/cmock/vendor/unity/src/unity.c +329 -186
- data/vendor/cmock/vendor/unity/src/unity.h +73 -69
- data/vendor/cmock/vendor/unity/src/unity_internals.h +119 -94
- data/vendor/cmock/vendor/unity/test/Makefile +4 -5
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_cmd.c +5 -5
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_def.c +5 -5
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_head1.c +5 -5
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_cmd.c +6 -6
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_def.c +6 -6
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_head1.c +6 -6
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_new1.c +6 -6
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_new2.c +8 -8
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_param.c +6 -6
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_run1.c +6 -6
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_run2.c +8 -8
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_mock_yaml.c +7 -7
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_new1.c +5 -5
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_new2.c +7 -7
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_param.c +5 -5
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_run1.c +5 -5
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_run2.c +7 -7
- data/vendor/cmock/vendor/unity/test/expectdata/testsample_yaml.c +6 -6
- data/vendor/cmock/vendor/unity/test/rakefile +5 -0
- data/vendor/cmock/vendor/unity/test/rakefile_helper.rb +9 -7
- data/vendor/cmock/vendor/unity/test/targets/clang_file.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/clang_strict.yml +3 -0
- data/vendor/cmock/vendor/unity/test/targets/gcc_32.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/gcc_64.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/gcc_auto_limits.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/gcc_auto_sizeof.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/gcc_auto_stdint.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/gcc_manual_math.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/iar_arm_v4.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/iar_arm_v5.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/iar_arm_v5_3.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/iar_cortexm3_v5.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/iar_msp430.yml +1 -0
- data/vendor/cmock/vendor/unity/test/targets/iar_sh2a_v6.yml +1 -0
- data/vendor/cmock/vendor/unity/test/testdata/CException.h +11 -0
- data/vendor/cmock/vendor/unity/test/testdata/Defs.h +8 -0
- data/vendor/cmock/vendor/unity/test/testdata/cmock.h +14 -0
- data/vendor/cmock/vendor/unity/test/testdata/mockMock.h +13 -0
- data/vendor/cmock/vendor/unity/test/testdata/testRunnerGenerator.c +183 -0
- data/vendor/cmock/vendor/unity/test/testdata/testRunnerGeneratorSmall.c +65 -0
- data/vendor/cmock/vendor/unity/test/testdata/testRunnerGeneratorWithMocks.c +192 -0
- data/vendor/cmock/vendor/unity/test/tests/test_generate_test_runner.rb +1221 -71
- data/vendor/cmock/vendor/unity/test/tests/testparameterized.c +1 -1
- data/vendor/cmock/vendor/unity/test/tests/testunity.c +104 -7
- data/vendor/deep_merge/README +94 -94
- data/vendor/deep_merge/Rakefile +28 -28
- data/vendor/deep_merge/lib/deep_merge.rb +211 -211
- data/vendor/deep_merge/test/test_deep_merge.rb +553 -553
- data/vendor/unity/auto/generate_module.rb +16 -16
- data/vendor/unity/auto/generate_test_runner.rb +61 -21
- data/vendor/unity/auto/stylize_as_junit.rb +5 -1
- data/vendor/unity/auto/unity_to_junit.py +146 -0
- data/vendor/unity/docs/UnityAssertionsCheatSheetSuitableforPrintingandPossiblyFraming.pdf +0 -0
- data/vendor/unity/docs/UnityAssertionsReference.pdf +0 -0
- data/vendor/unity/docs/UnityConfigurationGuide.pdf +0 -0
- data/vendor/unity/docs/UnityGettingStartedGuide.pdf +0 -0
- data/vendor/unity/docs/UnityHelperScriptsGuide.pdf +0 -0
- data/vendor/unity/examples/example_1/makefile +1 -1
- data/vendor/unity/examples/example_1/src/ProductionCode.c +7 -7
- data/vendor/unity/examples/example_1/src/ProductionCode2.c +2 -2
- data/vendor/unity/examples/example_1/test/TestProductionCode.c +14 -14
- data/vendor/unity/examples/example_1/test/TestProductionCode2.c +2 -2
- data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode2_Runner.c +5 -5
- data/vendor/unity/examples/example_1/test/test_runners/TestProductionCode_Runner.c +5 -5
- data/vendor/unity/examples/unity_config.h +257 -0
- data/vendor/unity/extras/fixture/src/unity_fixture.c +3 -0
- data/vendor/unity/extras/fixture/test/unity_fixture_Test.c +5 -2
- data/vendor/unity/extras/fixture/test/unity_output_Spy.c +1 -2
- data/vendor/unity/extras/fixture/test/unity_output_Spy.h +1 -1
- data/vendor/unity/src/unity.c +329 -186
- data/vendor/unity/src/unity.h +73 -69
- data/vendor/unity/src/unity_internals.h +119 -94
- data/vendor/unity/test/Makefile +4 -5
- data/vendor/unity/test/expectdata/testsample_cmd.c +5 -5
- data/vendor/unity/test/expectdata/testsample_def.c +5 -5
- data/vendor/unity/test/expectdata/testsample_head1.c +5 -5
- data/vendor/unity/test/expectdata/testsample_mock_cmd.c +6 -6
- data/vendor/unity/test/expectdata/testsample_mock_def.c +6 -6
- data/vendor/unity/test/expectdata/testsample_mock_head1.c +6 -6
- data/vendor/unity/test/expectdata/testsample_mock_new1.c +6 -6
- data/vendor/unity/test/expectdata/testsample_mock_new2.c +8 -8
- data/vendor/unity/test/expectdata/testsample_mock_param.c +6 -6
- data/vendor/unity/test/expectdata/testsample_mock_run1.c +6 -6
- data/vendor/unity/test/expectdata/testsample_mock_run2.c +8 -8
- data/vendor/unity/test/expectdata/testsample_mock_yaml.c +7 -7
- data/vendor/unity/test/expectdata/testsample_new1.c +5 -5
- data/vendor/unity/test/expectdata/testsample_new2.c +7 -7
- data/vendor/unity/test/expectdata/testsample_param.c +5 -5
- data/vendor/unity/test/expectdata/testsample_run1.c +5 -5
- data/vendor/unity/test/expectdata/testsample_run2.c +7 -7
- data/vendor/unity/test/expectdata/testsample_yaml.c +6 -6
- data/vendor/unity/test/rakefile +5 -0
- data/vendor/unity/test/rakefile_helper.rb +9 -7
- data/vendor/unity/test/targets/clang_file.yml +1 -0
- data/vendor/unity/test/targets/clang_strict.yml +3 -0
- data/vendor/unity/test/targets/gcc_32.yml +1 -0
- data/vendor/unity/test/targets/gcc_64.yml +1 -0
- data/vendor/unity/test/targets/gcc_auto_limits.yml +1 -0
- data/vendor/unity/test/targets/gcc_auto_sizeof.yml +1 -0
- data/vendor/unity/test/targets/gcc_auto_stdint.yml +1 -0
- data/vendor/unity/test/targets/gcc_manual_math.yml +1 -0
- data/vendor/unity/test/targets/iar_arm_v4.yml +1 -0
- data/vendor/unity/test/targets/iar_arm_v5.yml +1 -0
- data/vendor/unity/test/targets/iar_arm_v5_3.yml +1 -0
- data/vendor/unity/test/targets/iar_armcortex_LM3S9B92_v5_4.yml +1 -0
- data/vendor/unity/test/targets/iar_cortexm3_v5.yml +1 -0
- data/vendor/unity/test/targets/iar_msp430.yml +1 -0
- data/vendor/unity/test/targets/iar_sh2a_v6.yml +1 -0
- data/vendor/unity/test/testdata/CException.h +11 -0
- data/vendor/unity/test/testdata/Defs.h +8 -0
- data/vendor/unity/test/testdata/cmock.h +14 -0
- data/vendor/unity/test/testdata/mockMock.h +13 -0
- data/vendor/unity/test/testdata/testRunnerGenerator.c +183 -0
- data/vendor/unity/test/testdata/testRunnerGeneratorSmall.c +65 -0
- data/vendor/unity/test/testdata/testRunnerGeneratorWithMocks.c +192 -0
- data/vendor/unity/test/tests/test_generate_test_runner.rb +1221 -71
- data/vendor/unity/test/tests/testparameterized.c +1 -1
- data/vendor/unity/test/tests/testunity.c +104 -7
- metadata +124 -32
- data/plugins/gcov/readme.txt +0 -0
- data/plugins/warnings_report/warnings_report.rb +0 -71
- data/plugins/xml_tests_report/xml_tests_report.rb +0 -110
- data/vendor/c_exception/vendor/unity/docs/Unity Summary.odt +0 -0
- data/vendor/c_exception/vendor/unity/docs/Unity Summary.pdf +0 -0
- data/vendor/c_exception/vendor/unity/docs/Unity Summary.txt +0 -224
- data/vendor/c_exception/vendor/unity/test/testdata/mocksample.c +0 -51
- data/vendor/c_exception/vendor/unity/test/testdata/sample.yml +0 -9
- data/vendor/c_exception/vendor/unity/test/testdata/testsample.c +0 -68
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/Unity Summary.odt +0 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/Unity Summary.pdf +0 -0
- data/vendor/cmock/vendor/c_exception/vendor/unity/docs/Unity Summary.txt +0 -224
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/mocksample.c +0 -51
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/sample.yml +0 -9
- data/vendor/cmock/vendor/c_exception/vendor/unity/test/testdata/testsample.c +0 -68
- data/vendor/cmock/vendor/unity/docs/Unity Summary.odt +0 -0
- data/vendor/cmock/vendor/unity/docs/Unity Summary.pdf +0 -0
- data/vendor/cmock/vendor/unity/docs/Unity Summary.txt +0 -224
- data/vendor/cmock/vendor/unity/test/testdata/mocksample.c +0 -51
- data/vendor/cmock/vendor/unity/test/testdata/sample.yml +0 -9
- data/vendor/cmock/vendor/unity/test/testdata/testsample.c +0 -68
- data/vendor/unity/docs/Unity Summary.odt +0 -0
- data/vendor/unity/docs/Unity Summary.pdf +0 -0
- data/vendor/unity/docs/Unity Summary.txt +0 -224
- data/vendor/unity/test/testdata/mocksample.c +0 -51
- data/vendor/unity/test/testdata/sample.yml +0 -9
- data/vendor/unity/test/testdata/testsample.c +0 -68
@@ -1,211 +1,211 @@
|
|
1
|
-
module DeepMerge
|
2
|
-
|
3
|
-
MAJOR_VERSION = 0
|
4
|
-
MINOR_VERSION = 1
|
5
|
-
FIX_VERSION = 0
|
6
|
-
VERSION = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{FIX_VERSION}"
|
7
|
-
|
8
|
-
class InvalidParameter < StandardError; end
|
9
|
-
|
10
|
-
DEFAULT_FIELD_KNOCKOUT_PREFIX = '--'
|
11
|
-
|
12
|
-
module DeepMergeHash
|
13
|
-
# ko_hash_merge! will merge and knockout elements prefixed with DEFAULT_FIELD_KNOCKOUT_PREFIX
|
14
|
-
def ko_deep_merge!(source, options = {})
|
15
|
-
default_opts = {:knockout_prefix => "--", :preserve_unmergeables => false}
|
16
|
-
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
|
17
|
-
end
|
18
|
-
|
19
|
-
# deep_merge! will merge and overwrite any unmergeables in destination hash
|
20
|
-
def deep_merge!(source, options = {})
|
21
|
-
default_opts = {:preserve_unmergeables => false}
|
22
|
-
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
|
23
|
-
end
|
24
|
-
|
25
|
-
# deep_merge will merge and skip any unmergeables in destination hash
|
26
|
-
def deep_merge(source, options = {})
|
27
|
-
default_opts = {:preserve_unmergeables => true}
|
28
|
-
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
|
29
|
-
end
|
30
|
-
|
31
|
-
end # DeepMergeHashExt
|
32
|
-
|
33
|
-
# Deep Merge core documentation.
|
34
|
-
# deep_merge! method permits merging of arbitrary child elements. The two top level
|
35
|
-
# elements must be hashes. These hashes can contain unlimited (to stack limit) levels
|
36
|
-
# of child elements. These child elements to not have to be of the same types.
|
37
|
-
# Where child elements are of the same type, deep_merge will attempt to merge them together.
|
38
|
-
# Where child elements are not of the same type, deep_merge will skip or optionally overwrite
|
39
|
-
# the destination element with the contents of the source element at that level.
|
40
|
-
# So if you have two hashes like this:
|
41
|
-
# source = {:x => [1,2,3], :y => 2}
|
42
|
-
# dest = {:x => [4,5,'6'], :y => [7,8,9]}
|
43
|
-
# dest.deep_merge!(source)
|
44
|
-
# Results: {:x => [1,2,3,4,5,'6'], :y => 2}
|
45
|
-
# By default, "deep_merge!" will overwrite any unmergeables and merge everything else.
|
46
|
-
# To avoid this, use "deep_merge" (no bang/exclamation mark)
|
47
|
-
#
|
48
|
-
# Options:
|
49
|
-
# Options are specified in the last parameter passed, which should be in hash format:
|
50
|
-
# hash.deep_merge!({:x => [1,2]}, {:knockout_prefix => '--'})
|
51
|
-
# :preserve_unmergeables DEFAULT: false
|
52
|
-
# Set to true to skip any unmergeable elements from source
|
53
|
-
# :knockout_prefix DEFAULT: nil
|
54
|
-
# Set to string value to signify prefix which deletes elements from existing element
|
55
|
-
# :sort_merged_arrays DEFAULT: false
|
56
|
-
# Set to true to sort all arrays that are merged together
|
57
|
-
# :unpack_arrays DEFAULT: nil
|
58
|
-
# Set to string value to run "Array::join" then "String::split" against all arrays
|
59
|
-
# :merge_debug DEFAULT: false
|
60
|
-
# Set to true to get console output of merge process for debugging
|
61
|
-
#
|
62
|
-
# Selected Options Details:
|
63
|
-
# :knockout_prefix => The purpose of this is to provide a way to remove elements
|
64
|
-
# from existing Hash by specifying them in a special way in incoming hash
|
65
|
-
# source = {:x => ['--1', '2']}
|
66
|
-
# dest = {:x => ['1', '3']}
|
67
|
-
# dest.ko_deep_merge!(source)
|
68
|
-
# Results: {:x => ['2','3']}
|
69
|
-
# Additionally, if the knockout_prefix is passed alone as a string, it will cause
|
70
|
-
# the entire element to be removed:
|
71
|
-
# source = {:x => '--'}
|
72
|
-
# dest = {:x => [1,2,3]}
|
73
|
-
# dest.ko_deep_merge!(source)
|
74
|
-
# Results: {:x => ""}
|
75
|
-
# :unpack_arrays => The purpose of this is to permit compound elements to be passed
|
76
|
-
# in as strings and to be converted into discrete array elements
|
77
|
-
# irsource = {:x => ['1,2,3', '4']}
|
78
|
-
# dest = {:x => ['5','6','7,8']}
|
79
|
-
# dest.deep_merge!(source, {:unpack_arrays => ','})
|
80
|
-
# Results: {:x => ['1','2','3','4','5','6','7','8'}
|
81
|
-
# Why: If receiving data from an HTML form, this makes it easy for a checkbox
|
82
|
-
# to pass multiple values from within a single HTML element
|
83
|
-
#
|
84
|
-
# There are many tests for this library - and you can learn more about the features
|
85
|
-
# and usages of deep_merge! by just browsing the test examples
|
86
|
-
def DeepMerge.deep_merge!(source, dest, options = {})
|
87
|
-
# turn on this line for stdout debugging text
|
88
|
-
merge_debug = options[:merge_debug] || false
|
89
|
-
overwrite_unmergeable = !options[:preserve_unmergeables]
|
90
|
-
knockout_prefix = options[:knockout_prefix] || nil
|
91
|
-
if knockout_prefix == "" then raise InvalidParameter, "knockout_prefix cannot be an empty string in deep_merge!"; end
|
92
|
-
if knockout_prefix && !overwrite_unmergeable then raise InvalidParameter, "overwrite_unmergeable must be true if knockout_prefix is specified in deep_merge!"; end
|
93
|
-
# if present: we will split and join arrays on this char before merging
|
94
|
-
array_split_char = options[:unpack_arrays] || false
|
95
|
-
# request that we sort together any arrays when they are merged
|
96
|
-
sort_merged_arrays = options[:sort_merged_arrays] || false
|
97
|
-
di = options[:debug_indent] || ''
|
98
|
-
# do nothing if source is nil
|
99
|
-
if source.nil? || (source.respond_to?(:blank?) && source.blank?) then return dest; end
|
100
|
-
# if dest doesn't exist, then simply copy source to it
|
101
|
-
if dest.nil? && overwrite_unmergeable then dest = source; return dest; end
|
102
|
-
|
103
|
-
puts "#{di}Source class: #{source.class.inspect} :: Dest class: #{dest.class.inspect}" if merge_debug
|
104
|
-
if source.kind_of?(Hash)
|
105
|
-
puts "#{di}Hashes: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
106
|
-
source.each do |src_key, src_value|
|
107
|
-
if dest.kind_of?(Hash)
|
108
|
-
puts "#{di} looping: #{src_key.inspect} => #{src_value.inspect} :: #{dest.inspect}" if merge_debug
|
109
|
-
if not dest[src_key].nil?
|
110
|
-
puts "#{di} ==>merging: #{src_key.inspect} => #{src_value.inspect} :: #{dest[src_key].inspect}" if merge_debug
|
111
|
-
dest[src_key] = deep_merge!(src_value, dest[src_key], options.merge(:debug_indent => di + ' '))
|
112
|
-
else # dest[src_key] doesn't exist so we want to create and overwrite it (but we do this via deep_merge!)
|
113
|
-
puts "#{di} ==>merging over: #{src_key.inspect} => #{src_value.inspect}" if merge_debug
|
114
|
-
# note: we rescue here b/c some classes respond to "dup" but don't implement it (Numeric, TrueClass, FalseClass, NilClass among maybe others)
|
115
|
-
begin
|
116
|
-
src_dup = src_value.dup # we dup src_value if possible because we're going to merge into it (since dest is empty)
|
117
|
-
rescue TypeError
|
118
|
-
src_dup = src_value
|
119
|
-
end
|
120
|
-
dest[src_key] = deep_merge!(src_value, src_dup, options.merge(:debug_indent => di + ' '))
|
121
|
-
end
|
122
|
-
else # dest isn't a hash, so we overwrite it completely (if permitted)
|
123
|
-
if overwrite_unmergeable
|
124
|
-
puts "#{di} overwriting dest: #{src_key.inspect} => #{src_value.inspect} -over-> #{dest.inspect}" if merge_debug
|
125
|
-
dest = overwrite_unmergeables(source, dest, options)
|
126
|
-
end
|
127
|
-
end
|
128
|
-
end
|
129
|
-
elsif source.kind_of?(Array)
|
130
|
-
puts "#{di}Arrays: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
131
|
-
# if we are instructed, join/split any source arrays before processing
|
132
|
-
if array_split_char
|
133
|
-
puts "#{di} split/join on source: #{source.inspect}" if merge_debug
|
134
|
-
source = source.join(array_split_char).split(array_split_char)
|
135
|
-
if dest.kind_of?(Array) then dest = dest.join(array_split_char).split(array_split_char); end
|
136
|
-
end
|
137
|
-
# if there's a naked knockout_prefix in source, that means we are to truncate dest
|
138
|
-
if source.index(knockout_prefix) then dest = clear_or_nil(dest); source.delete(knockout_prefix); end
|
139
|
-
if dest.kind_of?(Array)
|
140
|
-
if knockout_prefix
|
141
|
-
print "#{di} knocking out: " if merge_debug
|
142
|
-
# remove knockout prefix items from both source and dest
|
143
|
-
source.delete_if do |ko_item|
|
144
|
-
retval = false
|
145
|
-
item = ko_item.respond_to?(:gsub) ? ko_item.gsub(%r{^#{knockout_prefix}}, "") : ko_item
|
146
|
-
if item != ko_item
|
147
|
-
print "#{ko_item} - " if merge_debug
|
148
|
-
dest.delete(item)
|
149
|
-
dest.delete(ko_item)
|
150
|
-
retval = true
|
151
|
-
end
|
152
|
-
retval
|
153
|
-
end
|
154
|
-
puts if merge_debug
|
155
|
-
end
|
156
|
-
puts "#{di} merging arrays: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
157
|
-
dest = dest | source
|
158
|
-
if sort_merged_arrays then dest.sort!; end
|
159
|
-
elsif overwrite_unmergeable
|
160
|
-
puts "#{di} overwriting dest: #{source.inspect} -over-> #{dest.inspect}" if merge_debug
|
161
|
-
dest = overwrite_unmergeables(source, dest, options)
|
162
|
-
end
|
163
|
-
else # src_hash is not an array or hash, so we'll have to overwrite dest
|
164
|
-
puts "#{di}Others: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
165
|
-
dest = overwrite_unmergeables(source, dest, options)
|
166
|
-
end
|
167
|
-
puts "#{di}Returning #{dest.inspect}" if merge_debug
|
168
|
-
dest
|
169
|
-
end # deep_merge!
|
170
|
-
|
171
|
-
# allows deep_merge! to uniformly handle overwriting of unmergeable entities
|
172
|
-
def DeepMerge::overwrite_unmergeables(source, dest, options)
|
173
|
-
merge_debug = options[:merge_debug] || false
|
174
|
-
overwrite_unmergeable = !options[:preserve_unmergeables]
|
175
|
-
knockout_prefix = options[:knockout_prefix] || false
|
176
|
-
di = options[:debug_indent] || ''
|
177
|
-
if knockout_prefix && overwrite_unmergeable
|
178
|
-
if source.kind_of?(String) # remove knockout string from source before overwriting dest
|
179
|
-
src_tmp = source.gsub(%r{^#{knockout_prefix}},"")
|
180
|
-
elsif source.kind_of?(Array) # remove all knockout elements before overwriting dest
|
181
|
-
src_tmp = source.delete_if {|ko_item| ko_item.kind_of?(String) && ko_item.match(%r{^#{knockout_prefix}}) }
|
182
|
-
else
|
183
|
-
src_tmp = source
|
184
|
-
end
|
185
|
-
if src_tmp == source # if we didn't find a knockout_prefix then we just overwrite dest
|
186
|
-
puts "#{di}#{src_tmp.inspect} -over-> #{dest.inspect}" if merge_debug
|
187
|
-
dest = src_tmp
|
188
|
-
else # if we do find a knockout_prefix, then we just delete dest
|
189
|
-
puts "#{di}\"\" -over-> #{dest.inspect}" if merge_debug
|
190
|
-
dest = ""
|
191
|
-
end
|
192
|
-
elsif overwrite_unmergeable
|
193
|
-
dest = source
|
194
|
-
end
|
195
|
-
dest
|
196
|
-
end
|
197
|
-
|
198
|
-
def DeepMerge::clear_or_nil(obj)
|
199
|
-
if obj.respond_to?(:clear)
|
200
|
-
obj.clear
|
201
|
-
else
|
202
|
-
obj = nil
|
203
|
-
end
|
204
|
-
obj
|
205
|
-
end
|
206
|
-
|
207
|
-
end # module DeepMerge
|
208
|
-
|
209
|
-
class Hash
|
210
|
-
include DeepMerge::DeepMergeHash
|
211
|
-
end
|
1
|
+
module DeepMerge
|
2
|
+
|
3
|
+
MAJOR_VERSION = 0
|
4
|
+
MINOR_VERSION = 1
|
5
|
+
FIX_VERSION = 0
|
6
|
+
VERSION = "#{MAJOR_VERSION}.#{MINOR_VERSION}.#{FIX_VERSION}"
|
7
|
+
|
8
|
+
class InvalidParameter < StandardError; end
|
9
|
+
|
10
|
+
DEFAULT_FIELD_KNOCKOUT_PREFIX = '--'
|
11
|
+
|
12
|
+
module DeepMergeHash
|
13
|
+
# ko_hash_merge! will merge and knockout elements prefixed with DEFAULT_FIELD_KNOCKOUT_PREFIX
|
14
|
+
def ko_deep_merge!(source, options = {})
|
15
|
+
default_opts = {:knockout_prefix => "--", :preserve_unmergeables => false}
|
16
|
+
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
|
17
|
+
end
|
18
|
+
|
19
|
+
# deep_merge! will merge and overwrite any unmergeables in destination hash
|
20
|
+
def deep_merge!(source, options = {})
|
21
|
+
default_opts = {:preserve_unmergeables => false}
|
22
|
+
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
|
23
|
+
end
|
24
|
+
|
25
|
+
# deep_merge will merge and skip any unmergeables in destination hash
|
26
|
+
def deep_merge(source, options = {})
|
27
|
+
default_opts = {:preserve_unmergeables => true}
|
28
|
+
DeepMerge::deep_merge!(source, self, default_opts.merge(options))
|
29
|
+
end
|
30
|
+
|
31
|
+
end # DeepMergeHashExt
|
32
|
+
|
33
|
+
# Deep Merge core documentation.
|
34
|
+
# deep_merge! method permits merging of arbitrary child elements. The two top level
|
35
|
+
# elements must be hashes. These hashes can contain unlimited (to stack limit) levels
|
36
|
+
# of child elements. These child elements to not have to be of the same types.
|
37
|
+
# Where child elements are of the same type, deep_merge will attempt to merge them together.
|
38
|
+
# Where child elements are not of the same type, deep_merge will skip or optionally overwrite
|
39
|
+
# the destination element with the contents of the source element at that level.
|
40
|
+
# So if you have two hashes like this:
|
41
|
+
# source = {:x => [1,2,3], :y => 2}
|
42
|
+
# dest = {:x => [4,5,'6'], :y => [7,8,9]}
|
43
|
+
# dest.deep_merge!(source)
|
44
|
+
# Results: {:x => [1,2,3,4,5,'6'], :y => 2}
|
45
|
+
# By default, "deep_merge!" will overwrite any unmergeables and merge everything else.
|
46
|
+
# To avoid this, use "deep_merge" (no bang/exclamation mark)
|
47
|
+
#
|
48
|
+
# Options:
|
49
|
+
# Options are specified in the last parameter passed, which should be in hash format:
|
50
|
+
# hash.deep_merge!({:x => [1,2]}, {:knockout_prefix => '--'})
|
51
|
+
# :preserve_unmergeables DEFAULT: false
|
52
|
+
# Set to true to skip any unmergeable elements from source
|
53
|
+
# :knockout_prefix DEFAULT: nil
|
54
|
+
# Set to string value to signify prefix which deletes elements from existing element
|
55
|
+
# :sort_merged_arrays DEFAULT: false
|
56
|
+
# Set to true to sort all arrays that are merged together
|
57
|
+
# :unpack_arrays DEFAULT: nil
|
58
|
+
# Set to string value to run "Array::join" then "String::split" against all arrays
|
59
|
+
# :merge_debug DEFAULT: false
|
60
|
+
# Set to true to get console output of merge process for debugging
|
61
|
+
#
|
62
|
+
# Selected Options Details:
|
63
|
+
# :knockout_prefix => The purpose of this is to provide a way to remove elements
|
64
|
+
# from existing Hash by specifying them in a special way in incoming hash
|
65
|
+
# source = {:x => ['--1', '2']}
|
66
|
+
# dest = {:x => ['1', '3']}
|
67
|
+
# dest.ko_deep_merge!(source)
|
68
|
+
# Results: {:x => ['2','3']}
|
69
|
+
# Additionally, if the knockout_prefix is passed alone as a string, it will cause
|
70
|
+
# the entire element to be removed:
|
71
|
+
# source = {:x => '--'}
|
72
|
+
# dest = {:x => [1,2,3]}
|
73
|
+
# dest.ko_deep_merge!(source)
|
74
|
+
# Results: {:x => ""}
|
75
|
+
# :unpack_arrays => The purpose of this is to permit compound elements to be passed
|
76
|
+
# in as strings and to be converted into discrete array elements
|
77
|
+
# irsource = {:x => ['1,2,3', '4']}
|
78
|
+
# dest = {:x => ['5','6','7,8']}
|
79
|
+
# dest.deep_merge!(source, {:unpack_arrays => ','})
|
80
|
+
# Results: {:x => ['1','2','3','4','5','6','7','8'}
|
81
|
+
# Why: If receiving data from an HTML form, this makes it easy for a checkbox
|
82
|
+
# to pass multiple values from within a single HTML element
|
83
|
+
#
|
84
|
+
# There are many tests for this library - and you can learn more about the features
|
85
|
+
# and usages of deep_merge! by just browsing the test examples
|
86
|
+
def DeepMerge.deep_merge!(source, dest, options = {})
|
87
|
+
# turn on this line for stdout debugging text
|
88
|
+
merge_debug = options[:merge_debug] || false
|
89
|
+
overwrite_unmergeable = !options[:preserve_unmergeables]
|
90
|
+
knockout_prefix = options[:knockout_prefix] || nil
|
91
|
+
if knockout_prefix == "" then raise InvalidParameter, "knockout_prefix cannot be an empty string in deep_merge!"; end
|
92
|
+
if knockout_prefix && !overwrite_unmergeable then raise InvalidParameter, "overwrite_unmergeable must be true if knockout_prefix is specified in deep_merge!"; end
|
93
|
+
# if present: we will split and join arrays on this char before merging
|
94
|
+
array_split_char = options[:unpack_arrays] || false
|
95
|
+
# request that we sort together any arrays when they are merged
|
96
|
+
sort_merged_arrays = options[:sort_merged_arrays] || false
|
97
|
+
di = options[:debug_indent] || ''
|
98
|
+
# do nothing if source is nil
|
99
|
+
if source.nil? || (source.respond_to?(:blank?) && source.blank?) then return dest; end
|
100
|
+
# if dest doesn't exist, then simply copy source to it
|
101
|
+
if dest.nil? && overwrite_unmergeable then dest = source; return dest; end
|
102
|
+
|
103
|
+
puts "#{di}Source class: #{source.class.inspect} :: Dest class: #{dest.class.inspect}" if merge_debug
|
104
|
+
if source.kind_of?(Hash)
|
105
|
+
puts "#{di}Hashes: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
106
|
+
source.each do |src_key, src_value|
|
107
|
+
if dest.kind_of?(Hash)
|
108
|
+
puts "#{di} looping: #{src_key.inspect} => #{src_value.inspect} :: #{dest.inspect}" if merge_debug
|
109
|
+
if not dest[src_key].nil?
|
110
|
+
puts "#{di} ==>merging: #{src_key.inspect} => #{src_value.inspect} :: #{dest[src_key].inspect}" if merge_debug
|
111
|
+
dest[src_key] = deep_merge!(src_value, dest[src_key], options.merge(:debug_indent => di + ' '))
|
112
|
+
else # dest[src_key] doesn't exist so we want to create and overwrite it (but we do this via deep_merge!)
|
113
|
+
puts "#{di} ==>merging over: #{src_key.inspect} => #{src_value.inspect}" if merge_debug
|
114
|
+
# note: we rescue here b/c some classes respond to "dup" but don't implement it (Numeric, TrueClass, FalseClass, NilClass among maybe others)
|
115
|
+
begin
|
116
|
+
src_dup = src_value.dup # we dup src_value if possible because we're going to merge into it (since dest is empty)
|
117
|
+
rescue TypeError
|
118
|
+
src_dup = src_value
|
119
|
+
end
|
120
|
+
dest[src_key] = deep_merge!(src_value, src_dup, options.merge(:debug_indent => di + ' '))
|
121
|
+
end
|
122
|
+
else # dest isn't a hash, so we overwrite it completely (if permitted)
|
123
|
+
if overwrite_unmergeable
|
124
|
+
puts "#{di} overwriting dest: #{src_key.inspect} => #{src_value.inspect} -over-> #{dest.inspect}" if merge_debug
|
125
|
+
dest = overwrite_unmergeables(source, dest, options)
|
126
|
+
end
|
127
|
+
end
|
128
|
+
end
|
129
|
+
elsif source.kind_of?(Array)
|
130
|
+
puts "#{di}Arrays: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
131
|
+
# if we are instructed, join/split any source arrays before processing
|
132
|
+
if array_split_char
|
133
|
+
puts "#{di} split/join on source: #{source.inspect}" if merge_debug
|
134
|
+
source = source.join(array_split_char).split(array_split_char)
|
135
|
+
if dest.kind_of?(Array) then dest = dest.join(array_split_char).split(array_split_char); end
|
136
|
+
end
|
137
|
+
# if there's a naked knockout_prefix in source, that means we are to truncate dest
|
138
|
+
if source.index(knockout_prefix) then dest = clear_or_nil(dest); source.delete(knockout_prefix); end
|
139
|
+
if dest.kind_of?(Array)
|
140
|
+
if knockout_prefix
|
141
|
+
print "#{di} knocking out: " if merge_debug
|
142
|
+
# remove knockout prefix items from both source and dest
|
143
|
+
source.delete_if do |ko_item|
|
144
|
+
retval = false
|
145
|
+
item = ko_item.respond_to?(:gsub) ? ko_item.gsub(%r{^#{knockout_prefix}}, "") : ko_item
|
146
|
+
if item != ko_item
|
147
|
+
print "#{ko_item} - " if merge_debug
|
148
|
+
dest.delete(item)
|
149
|
+
dest.delete(ko_item)
|
150
|
+
retval = true
|
151
|
+
end
|
152
|
+
retval
|
153
|
+
end
|
154
|
+
puts if merge_debug
|
155
|
+
end
|
156
|
+
puts "#{di} merging arrays: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
157
|
+
dest = dest | source
|
158
|
+
if sort_merged_arrays then dest.sort!; end
|
159
|
+
elsif overwrite_unmergeable
|
160
|
+
puts "#{di} overwriting dest: #{source.inspect} -over-> #{dest.inspect}" if merge_debug
|
161
|
+
dest = overwrite_unmergeables(source, dest, options)
|
162
|
+
end
|
163
|
+
else # src_hash is not an array or hash, so we'll have to overwrite dest
|
164
|
+
puts "#{di}Others: #{source.inspect} :: #{dest.inspect}" if merge_debug
|
165
|
+
dest = overwrite_unmergeables(source, dest, options)
|
166
|
+
end
|
167
|
+
puts "#{di}Returning #{dest.inspect}" if merge_debug
|
168
|
+
dest
|
169
|
+
end # deep_merge!
|
170
|
+
|
171
|
+
# allows deep_merge! to uniformly handle overwriting of unmergeable entities
|
172
|
+
def DeepMerge::overwrite_unmergeables(source, dest, options)
|
173
|
+
merge_debug = options[:merge_debug] || false
|
174
|
+
overwrite_unmergeable = !options[:preserve_unmergeables]
|
175
|
+
knockout_prefix = options[:knockout_prefix] || false
|
176
|
+
di = options[:debug_indent] || ''
|
177
|
+
if knockout_prefix && overwrite_unmergeable
|
178
|
+
if source.kind_of?(String) # remove knockout string from source before overwriting dest
|
179
|
+
src_tmp = source.gsub(%r{^#{knockout_prefix}},"")
|
180
|
+
elsif source.kind_of?(Array) # remove all knockout elements before overwriting dest
|
181
|
+
src_tmp = source.delete_if {|ko_item| ko_item.kind_of?(String) && ko_item.match(%r{^#{knockout_prefix}}) }
|
182
|
+
else
|
183
|
+
src_tmp = source
|
184
|
+
end
|
185
|
+
if src_tmp == source # if we didn't find a knockout_prefix then we just overwrite dest
|
186
|
+
puts "#{di}#{src_tmp.inspect} -over-> #{dest.inspect}" if merge_debug
|
187
|
+
dest = src_tmp
|
188
|
+
else # if we do find a knockout_prefix, then we just delete dest
|
189
|
+
puts "#{di}\"\" -over-> #{dest.inspect}" if merge_debug
|
190
|
+
dest = ""
|
191
|
+
end
|
192
|
+
elsif overwrite_unmergeable
|
193
|
+
dest = source
|
194
|
+
end
|
195
|
+
dest
|
196
|
+
end
|
197
|
+
|
198
|
+
def DeepMerge::clear_or_nil(obj)
|
199
|
+
if obj.respond_to?(:clear)
|
200
|
+
obj.clear
|
201
|
+
else
|
202
|
+
obj = nil
|
203
|
+
end
|
204
|
+
obj
|
205
|
+
end
|
206
|
+
|
207
|
+
end # module DeepMerge
|
208
|
+
|
209
|
+
class Hash
|
210
|
+
include DeepMerge::DeepMergeHash
|
211
|
+
end
|
@@ -1,553 +1,553 @@
|
|
1
|
-
require 'test/unit'
|
2
|
-
require '../lib/deep_merge.rb'
|
3
|
-
|
4
|
-
class TestDeepMerge < Test::Unit::TestCase
|
5
|
-
|
6
|
-
def setup
|
7
|
-
end
|
8
|
-
|
9
|
-
# show that Hash object has deep merge capabilities in form of three methods:
|
10
|
-
# ko_deep_merge! # uses '--' knockout and overwrites unmergeable
|
11
|
-
# deep_merge! # overwrites unmergeable
|
12
|
-
# deep_merge # skips unmergeable
|
13
|
-
def test_hash_deep_merge
|
14
|
-
x = {}
|
15
|
-
assert x.respond_to?('deep_merge!'.to_sym)
|
16
|
-
hash_src = {'id' => [3,4,5]}
|
17
|
-
hash_dest = {'id' => [1,2,3]}
|
18
|
-
assert hash_dest.ko_deep_merge!(hash_src)
|
19
|
-
assert_equal({'id' => [1,2,3,4,5]}, hash_dest)
|
20
|
-
|
21
|
-
hash_src = {'id' => [3,4,5]}
|
22
|
-
hash_dest = {'id' => [1,2,3]}
|
23
|
-
assert hash_dest.deep_merge!(hash_src)
|
24
|
-
assert_equal({'id' => [1,2,3,4,5]}, hash_dest)
|
25
|
-
|
26
|
-
hash_src = {'id' => 'xxx'}
|
27
|
-
hash_dest = {'id' => [1,2,3]}
|
28
|
-
assert hash_dest.deep_merge(hash_src)
|
29
|
-
assert_equal({'id' => [1,2,3]}, hash_dest)
|
30
|
-
end
|
31
|
-
|
32
|
-
FIELD_KNOCKOUT_PREFIX = DeepMerge::DEFAULT_FIELD_KNOCKOUT_PREFIX
|
33
|
-
|
34
|
-
# tests DeepMerge::deep_merge! function
|
35
|
-
def test_deep_merge
|
36
|
-
# merge tests (moving from basic to more complex)
|
37
|
-
|
38
|
-
# test merging an hash w/array into blank hash
|
39
|
-
hash_src = {'id' => '2'}
|
40
|
-
hash_dst = {}
|
41
|
-
DeepMerge::deep_merge!(hash_src.dup, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
42
|
-
assert_equal hash_src, hash_dst
|
43
|
-
|
44
|
-
# test merging an hash w/array into blank hash
|
45
|
-
hash_src = {'region' => {'id' => ['227', '2']}}
|
46
|
-
hash_dst = {}
|
47
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
48
|
-
assert_equal hash_src, hash_dst
|
49
|
-
|
50
|
-
# merge from empty hash
|
51
|
-
hash_src = {}
|
52
|
-
hash_dst = {"property" => ["2","4"]}
|
53
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
54
|
-
assert_equal({"property" => ["2","4"]}, hash_dst)
|
55
|
-
|
56
|
-
# merge to empty hash
|
57
|
-
hash_src = {"property" => ["2","4"]}
|
58
|
-
hash_dst = {}
|
59
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
60
|
-
assert_equal({"property" => ["2","4"]}, hash_dst)
|
61
|
-
|
62
|
-
# simple string overwrite
|
63
|
-
hash_src = {"name" => "value"}
|
64
|
-
hash_dst = {"name" => "value1"}
|
65
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
66
|
-
assert_equal({"name" => "value"}, hash_dst)
|
67
|
-
|
68
|
-
# simple string overwrite of empty hash
|
69
|
-
hash_src = {"name" => "value"}
|
70
|
-
hash_dst = {}
|
71
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
72
|
-
assert_equal(hash_src, hash_dst)
|
73
|
-
|
74
|
-
# hashes holding array
|
75
|
-
hash_src = {"property" => ["1","3"]}
|
76
|
-
hash_dst = {"property" => ["2","4"]}
|
77
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
78
|
-
assert_equal(["2","4","1","3"], hash_dst['property'])
|
79
|
-
|
80
|
-
# hashes holding array (sorted)
|
81
|
-
hash_src = {"property" => ["1","3"]}
|
82
|
-
hash_dst = {"property" => ["2","4"]}
|
83
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:sort_merged_arrays => true})
|
84
|
-
assert_equal(["1","2","3","4"].sort, hash_dst['property'])
|
85
|
-
|
86
|
-
# hashes holding hashes holding arrays (array with duplicate elements is merged with dest then src
|
87
|
-
hash_src = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["1", "4+"]}}
|
88
|
-
hash_dst = {"property" => {"bedroom_count" => ["3", "2"], "bathroom_count" => ["2"]}}
|
89
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
90
|
-
assert_equal({"property" => {"bedroom_count" => ["3","2","1"], "bathroom_count" => ["2", "1", "4+"]}}, hash_dst)
|
91
|
-
|
92
|
-
# hash holding hash holding array v string (string is overwritten by array)
|
93
|
-
hash_src = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["1", "4+"]}}
|
94
|
-
hash_dst = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["2"]}}
|
95
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
96
|
-
assert_equal({"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
97
|
-
|
98
|
-
# hash holding hash holding array v string (string is NOT overwritten by array)
|
99
|
-
hash_src = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["1", "4+"]}}
|
100
|
-
hash_dst = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["2"]}}
|
101
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
102
|
-
assert_equal({"property" => {"bedroom_count" => "3", "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
103
|
-
|
104
|
-
# hash holding hash holding string v array (array is overwritten by string)
|
105
|
-
hash_src = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["1", "4+"]}}
|
106
|
-
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
107
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
108
|
-
assert_equal({"property" => {"bedroom_count" => "3", "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
109
|
-
|
110
|
-
# hash holding hash holding string v array (array does NOT overwrite string)
|
111
|
-
hash_src = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["1", "4+"]}}
|
112
|
-
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
113
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
114
|
-
assert_equal({"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
115
|
-
|
116
|
-
# hash holding hash holding hash v array (array is overwritten by hash)
|
117
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["1", "4+"]}}
|
118
|
-
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
119
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
120
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
121
|
-
|
122
|
-
# hash holding hash holding hash v array (array is NOT overwritten by hash)
|
123
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["1", "4+"]}}
|
124
|
-
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
125
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
126
|
-
assert_equal({"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
127
|
-
|
128
|
-
# 3 hash layers holding integers (integers are overwritten by source)
|
129
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["1", "4+"]}}
|
130
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => 2, "queen_bed" => 4}, "bathroom_count" => ["2"]}}
|
131
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
132
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
133
|
-
|
134
|
-
# 3 hash layers holding arrays of int (arrays are merged)
|
135
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3], "queen_bed" => [1]}, "bathroom_count" => ["1", "4+"]}}
|
136
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
137
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
138
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4,1]}, "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
139
|
-
|
140
|
-
# 1 hash overwriting 3 hash layers holding arrays of int
|
141
|
-
hash_src = {"property" => "1"}
|
142
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
143
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
144
|
-
assert_equal({"property" => "1"}, hash_dst)
|
145
|
-
|
146
|
-
# 1 hash NOT overwriting 3 hash layers holding arrays of int
|
147
|
-
hash_src = {"property" => "1"}
|
148
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
149
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
150
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}, hash_dst)
|
151
|
-
|
152
|
-
# 3 hash layers holding arrays of int (arrays are merged) but second hash's array is overwritten
|
153
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3], "queen_bed" => [1]}, "bathroom_count" => "1"}}
|
154
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
155
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
156
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4,1]}, "bathroom_count" => "1"}}, hash_dst)
|
157
|
-
|
158
|
-
# 3 hash layers holding arrays of int (arrays are merged) but second hash's array is NOT overwritten
|
159
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3], "queen_bed" => [1]}, "bathroom_count" => "1"}}
|
160
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
161
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
162
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4,1]}, "bathroom_count" => ["2"]}}, hash_dst)
|
163
|
-
|
164
|
-
# 3 hash layers holding arrays of int, but one holds int. This one overwrites, but the rest merge
|
165
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => [1]}, "bathroom_count" => ["1"]}}
|
166
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
167
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
168
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => [4,1]}, "bathroom_count" => ["2","1"]}}, hash_dst)
|
169
|
-
|
170
|
-
# 3 hash layers holding arrays of int, but source is incomplete.
|
171
|
-
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3]}, "bathroom_count" => ["1"]}}
|
172
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
173
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
174
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4]}, "bathroom_count" => ["2","1"]}}, hash_dst)
|
175
|
-
|
176
|
-
# 3 hash layers holding arrays of int, but source is shorter and has new 2nd level ints.
|
177
|
-
hash_src = {"property" => {"bedroom_count" => {2=>3, "king_bed" => [3]}, "bathroom_count" => ["1"]}}
|
178
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
179
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
180
|
-
assert_equal({"property" => {"bedroom_count" => {2=>3, "king_bed" => [2,3], "queen_bed" => [4]}, "bathroom_count" => ["2","1"]}}, hash_dst)
|
181
|
-
|
182
|
-
# 3 hash layers holding arrays of int, but source is empty
|
183
|
-
hash_src = {}
|
184
|
-
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
185
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
186
|
-
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}, hash_dst)
|
187
|
-
|
188
|
-
# 3 hash layers holding arrays of int, but dest is empty
|
189
|
-
hash_src = {"property" => {"bedroom_count" => {2=>3, "king_bed" => [3]}, "bathroom_count" => ["1"]}}
|
190
|
-
hash_dst = {}
|
191
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
192
|
-
assert_equal({"property" => {"bedroom_count" => {2=>3, "king_bed" => [3]}, "bathroom_count" => ["1"]}}, hash_dst)
|
193
|
-
|
194
|
-
# test parameter management for knockout_prefix and overwrite unmergable
|
195
|
-
assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => ""})}
|
196
|
-
assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => ""})}
|
197
|
-
assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => "--"})}
|
198
|
-
assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => "--"})}
|
199
|
-
assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst)}
|
200
|
-
assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})}
|
201
|
-
|
202
|
-
# hash holding arrays of arrays
|
203
|
-
hash_src = {["1", "2", "3"] => ["1", "2"]}
|
204
|
-
hash_dst = {["4", "5"] => ["3"]}
|
205
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
206
|
-
assert_equal({["1","2","3"] => ["1", "2"], ["4", "5"] => ["3"]}, hash_dst)
|
207
|
-
|
208
|
-
# test merging of hash with blank hash, and make sure that source array split still functions
|
209
|
-
hash_src = {'property' => {'bedroom_count' => ["1","2,3"]}}
|
210
|
-
hash_dst = {}
|
211
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
212
|
-
assert_equal({'property' => {'bedroom_count' => ["1","2","3"]}}, hash_dst)
|
213
|
-
|
214
|
-
# test merging of hash with blank hash, and make sure that source array split does not function when turned off
|
215
|
-
hash_src = {'property' => {'bedroom_count' => ["1","2,3"]}}
|
216
|
-
hash_dst = {}
|
217
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
218
|
-
assert_equal({'property' => {'bedroom_count' => ["1","2,3"]}}, hash_dst)
|
219
|
-
|
220
|
-
# test merging into a blank hash with overwrite_unmergeables turned on
|
221
|
-
hash_src = {"action"=>"browse", "controller"=>"results"}
|
222
|
-
hash_dst = {}
|
223
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
224
|
-
assert_equal hash_src, hash_dst
|
225
|
-
|
226
|
-
# KNOCKOUT_PREFIX testing
|
227
|
-
# the next few tests are looking for correct behavior from specific real-world params/session merges
|
228
|
-
# using the custom modifiers built for param/session merges
|
229
|
-
|
230
|
-
[nil, ","].each do |ko_split|
|
231
|
-
# typical params/session style hash with knockout_merge elements
|
232
|
-
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
233
|
-
hash_session = {"property"=>{"bedroom_count"=>["1", "2", "3"]}}
|
234
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
235
|
-
assert_equal({"property"=>{"bedroom_count"=>["2", "3"]}}, hash_session)
|
236
|
-
|
237
|
-
# typical params/session style hash with knockout_merge elements
|
238
|
-
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
239
|
-
hash_session = {"property"=>{"bedroom_count"=>["3"]}}
|
240
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
241
|
-
assert_equal({"property"=>{"bedroom_count"=>["3","2"]}}, hash_session)
|
242
|
-
|
243
|
-
# typical params/session style hash with knockout_merge elements
|
244
|
-
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
245
|
-
hash_session = {"property"=>{"bedroom_count"=>["4"]}}
|
246
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
247
|
-
assert_equal({"property"=>{"bedroom_count"=>["4","2","3"]}}, hash_session)
|
248
|
-
|
249
|
-
# typical params/session style hash with knockout_merge elements
|
250
|
-
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
251
|
-
hash_session = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "4"]}}
|
252
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
253
|
-
assert_equal({"property"=>{"bedroom_count"=>["4","2","3"]}}, hash_session)
|
254
|
-
|
255
|
-
# typical params/session style hash with knockout_merge elements
|
256
|
-
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1", FIELD_KNOCKOUT_PREFIX+"2", "3", "4"]}}
|
257
|
-
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
258
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
259
|
-
assert_equal({"amenity"=>{"id"=>["3","4"]}}, hash_session)
|
260
|
-
end
|
261
|
-
|
262
|
-
# special params/session style hash with knockout_merge elements in form src: ["1","2"] dest:["--1,--2", "3,4"]
|
263
|
-
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1,"+FIELD_KNOCKOUT_PREFIX+"2", "3,4"]}}
|
264
|
-
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
265
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
266
|
-
assert_equal({"amenity"=>{"id"=>["3","4"]}}, hash_session)
|
267
|
-
|
268
|
-
# same as previous but without ko_split value, this merge should fail
|
269
|
-
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1,"+FIELD_KNOCKOUT_PREFIX+"2", "3,4"]}}
|
270
|
-
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
271
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
272
|
-
assert_equal({"amenity"=>{"id"=>["1","2","3,4"]}}, hash_session)
|
273
|
-
|
274
|
-
# special params/session style hash with knockout_merge elements in form src: ["1","2"] dest:["--1,--2", "3,4"]
|
275
|
-
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1,2", "3,4", "--5", "6"]}}
|
276
|
-
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
277
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
278
|
-
assert_equal({"amenity"=>{"id"=>["2","3","4","6"]}}, hash_session)
|
279
|
-
|
280
|
-
# special params/session style hash with knockout_merge elements in form src: ["--1,--2", "3,4", "--5", "6"] dest:["1,2", "3,4"]
|
281
|
-
hash_params = {"amenity"=>{"id"=>["#{FIELD_KNOCKOUT_PREFIX}1,#{FIELD_KNOCKOUT_PREFIX}2", "3,4", "#{FIELD_KNOCKOUT_PREFIX}5", "6"]}}
|
282
|
-
hash_session = {"amenity"=>{"id"=>["1", "2", "3", "4"]}}
|
283
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
284
|
-
assert_equal({"amenity"=>{"id"=>["3","4","6"]}}, hash_session)
|
285
|
-
|
286
|
-
|
287
|
-
hash_src = {"url_regions"=>[], "region"=>{"ids"=>["227,233"]}, "action"=>"browse", "task"=>"browse", "controller"=>"results"}
|
288
|
-
hash_dst = {"region"=>{"ids"=>["227"]}}
|
289
|
-
DeepMerge::deep_merge!(hash_src.dup, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
290
|
-
assert_equal({"url_regions"=>[], "region"=>{"ids"=>["227","233"]}, "action"=>"browse", "task"=>"browse", "controller"=>"results"}, hash_dst)
|
291
|
-
|
292
|
-
hash_src = {"region"=>{"ids"=>["--","227"], "id"=>"230"}}
|
293
|
-
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
294
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
295
|
-
assert_equal({"region"=>{"ids"=>["227"], "id"=>"230"}}, hash_dst)
|
296
|
-
|
297
|
-
hash_src = {"region"=>{"ids"=>["--","227", "232", "233"], "id"=>"232"}}
|
298
|
-
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
299
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
300
|
-
assert_equal({"region"=>{"ids"=>["227", "232", "233"], "id"=>"232"}}, hash_dst)
|
301
|
-
|
302
|
-
hash_src = {"region"=>{"ids"=>["--,227,232,233"], "id"=>"232"}}
|
303
|
-
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
304
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
305
|
-
assert_equal({"region"=>{"ids"=>["227", "232", "233"], "id"=>"232"}}, hash_dst)
|
306
|
-
|
307
|
-
hash_src = {"region"=>{"ids"=>["--,227,232","233"], "id"=>"232"}}
|
308
|
-
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
309
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
310
|
-
assert_equal({"region"=>{"ids"=>["227", "232", "233"], "id"=>"232"}}, hash_dst)
|
311
|
-
|
312
|
-
hash_src = {"region"=>{"ids"=>["--,227"], "id"=>"230"}}
|
313
|
-
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
314
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
315
|
-
assert_equal({"region"=>{"ids"=>["227"], "id"=>"230"}}, hash_dst)
|
316
|
-
|
317
|
-
hash_src = {"region"=>{"ids"=>["--,227"], "id"=>"230"}}
|
318
|
-
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}, "action"=>"browse", "task"=>"browse", "controller"=>"results", "property_order_by"=>"property_type.descr"}
|
319
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
320
|
-
assert_equal({"region"=>{"ids"=>["227"], "id"=>"230"}, "action"=>"browse", "task"=>"browse",
|
321
|
-
"controller"=>"results", "property_order_by"=>"property_type.descr"}, hash_dst)
|
322
|
-
|
323
|
-
hash_src = {"query_uuid"=>"6386333d-389b-ab5c-8943-6f3a2aa914d7", "region"=>{"ids"=>["--,227"], "id"=>"230"}}
|
324
|
-
hash_dst = {"query_uuid"=>"6386333d-389b-ab5c-8943-6f3a2aa914d7", "url_regions"=>[], "region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}, "action"=>"browse", "task"=>"browse", "controller"=>"results", "property_order_by"=>"property_type.descr"}
|
325
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
326
|
-
assert_equal({"query_uuid" => "6386333d-389b-ab5c-8943-6f3a2aa914d7", "url_regions"=>[],
|
327
|
-
"region"=>{"ids"=>["227"], "id"=>"230"}, "action"=>"browse", "task"=>"browse",
|
328
|
-
"controller"=>"results", "property_order_by"=>"property_type.descr"}, hash_dst)
|
329
|
-
|
330
|
-
# knock out entire dest hash if "--" is passed for source
|
331
|
-
hash_params = {'amenity' => "--"}
|
332
|
-
hash_session = {"amenity" => "1"}
|
333
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
334
|
-
assert_equal({'amenity' => ""}, hash_session)
|
335
|
-
|
336
|
-
# knock out entire dest hash if "--" is passed for source
|
337
|
-
hash_params = {'amenity' => ["--"]}
|
338
|
-
hash_session = {"amenity" => "1"}
|
339
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
340
|
-
assert_equal({'amenity' => []}, hash_session)
|
341
|
-
|
342
|
-
# knock out entire dest hash if "--" is passed for source
|
343
|
-
hash_params = {'amenity' => "--"}
|
344
|
-
hash_session = {"amenity" => ["1"]}
|
345
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
346
|
-
assert_equal({'amenity' => ""}, hash_session)
|
347
|
-
|
348
|
-
# knock out entire dest hash if "--" is passed for source
|
349
|
-
hash_params = {'amenity' => ["--"]}
|
350
|
-
hash_session = {"amenity" => ["1"]}
|
351
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
352
|
-
assert_equal({'amenity' => []}, hash_session)
|
353
|
-
|
354
|
-
# knock out entire dest hash if "--" is passed for source
|
355
|
-
hash_params = {'amenity' => ["--"]}
|
356
|
-
hash_session = {"amenity" => "1"}
|
357
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
358
|
-
assert_equal({'amenity' => []}, hash_session)
|
359
|
-
|
360
|
-
# knock out entire dest hash if "--" is passed for source
|
361
|
-
hash_params = {'amenity' => ["--", "2"]}
|
362
|
-
hash_session = {'amenity' => ["1", "3", "7+"]}
|
363
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
364
|
-
assert_equal({'amenity' => ["2"]}, hash_session)
|
365
|
-
|
366
|
-
# knock out entire dest hash if "--" is passed for source
|
367
|
-
hash_params = {'amenity' => ["--", "2"]}
|
368
|
-
hash_session = {'amenity' => "5"}
|
369
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
370
|
-
assert_equal({'amenity' => ['2']}, hash_session)
|
371
|
-
|
372
|
-
# knock out entire dest hash if "--" is passed for source
|
373
|
-
hash_params = {'amenity' => "--"}
|
374
|
-
hash_session = {"amenity"=>{"id"=>["1", "2", "3", "4"]}}
|
375
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
376
|
-
assert_equal({'amenity' => ""}, hash_session)
|
377
|
-
|
378
|
-
# knock out entire dest hash if "--" is passed for source
|
379
|
-
hash_params = {'amenity' => ["--"]}
|
380
|
-
hash_session = {"amenity"=>{"id"=>["1", "2", "3", "4"]}}
|
381
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
382
|
-
assert_equal({'amenity' => []}, hash_session)
|
383
|
-
|
384
|
-
# knock out dest array if "--" is passed for source
|
385
|
-
hash_params = {"region" => {'ids' => FIELD_KNOCKOUT_PREFIX}}
|
386
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"]}}
|
387
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
388
|
-
assert_equal({'region' => {'ids' => ""}}, hash_session)
|
389
|
-
|
390
|
-
# knock out dest array but leave other elements of hash intact
|
391
|
-
hash_params = {"region" => {'ids' => FIELD_KNOCKOUT_PREFIX}}
|
392
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
393
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
394
|
-
assert_equal({'region' => {'ids' => "", 'id'=>'11'}}, hash_session)
|
395
|
-
|
396
|
-
# knock out entire tree of dest hash
|
397
|
-
hash_params = {"region" => FIELD_KNOCKOUT_PREFIX}
|
398
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
399
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
400
|
-
assert_equal({'region' => ""}, hash_session)
|
401
|
-
|
402
|
-
# knock out entire tree of dest hash - retaining array format
|
403
|
-
hash_params = {"region" => {'ids' => [FIELD_KNOCKOUT_PREFIX]}}
|
404
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
405
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
406
|
-
assert_equal({'region' => {'ids' => [], 'id'=>'11'}}, hash_session)
|
407
|
-
|
408
|
-
# knock out entire tree of dest hash & replace with new content
|
409
|
-
hash_params = {"region" => {'ids' => ["2", FIELD_KNOCKOUT_PREFIX, "6"]}}
|
410
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
411
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
412
|
-
assert_equal({'region' => {'ids' => ["2", "6"], 'id'=>'11'}}, hash_session)
|
413
|
-
|
414
|
-
# knock out entire tree of dest hash & replace with new content
|
415
|
-
hash_params = {"region" => {'ids' => ["7", FIELD_KNOCKOUT_PREFIX, "6"]}}
|
416
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
417
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
418
|
-
assert_equal({'region' => {'ids' => ["7", "6"], 'id'=>'11'}}, hash_session)
|
419
|
-
|
420
|
-
# edge test: make sure that when we turn off knockout_prefix that all values are processed correctly
|
421
|
-
hash_params = {"region" => {'ids' => ["7", "--", "2", "6,8"]}}
|
422
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
423
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:unpack_arrays => ","})
|
424
|
-
assert_equal({'region' => {'ids' => ["1", "2", "3", "4", "7", "--", "6", "8"], 'id'=>'11'}}, hash_session)
|
425
|
-
|
426
|
-
# edge test 2: make sure that when we turn off source array split that all values are processed correctly
|
427
|
-
hash_params = {"region" => {'ids' => ["7", "3", "--", "6,8"]}}
|
428
|
-
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
429
|
-
DeepMerge::deep_merge!(hash_params, hash_session)
|
430
|
-
assert_equal({'region' => {'ids' => ["1", "2", "3", "4", "7", "--", "6,8"], 'id'=>'11'}}, hash_session)
|
431
|
-
|
432
|
-
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
433
|
-
hash_params = {"amenity"=>"--1"}
|
434
|
-
hash_session = {"amenity"=>"1"}
|
435
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
436
|
-
assert_equal({"amenity"=>""}, hash_session)
|
437
|
-
|
438
|
-
# Example: src = {'key' => "--1"}, dst = {'key' => "2"} -> merges to {'key' => ""}
|
439
|
-
hash_params = {"amenity"=>"--1"}
|
440
|
-
hash_session = {"amenity"=>"2"}
|
441
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
442
|
-
assert_equal({"amenity"=>""}, hash_session)
|
443
|
-
|
444
|
-
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
445
|
-
hash_params = {"amenity"=>["--1"]}
|
446
|
-
hash_session = {"amenity"=>"1"}
|
447
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
448
|
-
assert_equal({"amenity"=>[]}, hash_session)
|
449
|
-
|
450
|
-
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
451
|
-
hash_params = {"amenity"=>["--1"]}
|
452
|
-
hash_session = {"amenity"=>["1"]}
|
453
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
454
|
-
assert_equal({"amenity"=>[]}, hash_session)
|
455
|
-
|
456
|
-
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
457
|
-
hash_params = {"amenity"=>"--1"}
|
458
|
-
hash_session = {}
|
459
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
460
|
-
assert_equal({"amenity"=>""}, hash_session)
|
461
|
-
|
462
|
-
|
463
|
-
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
464
|
-
hash_params = {"amenity"=>"--1"}
|
465
|
-
hash_session = {"amenity"=>["1"]}
|
466
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
467
|
-
assert_equal({"amenity"=>""}, hash_session)
|
468
|
-
|
469
|
-
#are unmerged hashes passed unmodified w/out :unpack_arrays?
|
470
|
-
hash_params = {"amenity"=>{"id"=>["26,27"]}}
|
471
|
-
hash_session = {}
|
472
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
473
|
-
assert_equal({"amenity"=>{"id"=>["26,27"]}}, hash_session)
|
474
|
-
|
475
|
-
#hash should be merged
|
476
|
-
hash_params = {"amenity"=>{"id"=>["26,27"]}}
|
477
|
-
hash_session = {}
|
478
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
479
|
-
assert_equal({"amenity"=>{"id"=>["26","27"]}}, hash_session)
|
480
|
-
|
481
|
-
# second merge of same values should result in no change in output
|
482
|
-
hash_params = {"amenity"=>{"id"=>["26,27"]}}
|
483
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
484
|
-
assert_equal({"amenity"=>{"id"=>["26","27"]}}, hash_session)
|
485
|
-
|
486
|
-
#hashes with knockout values are suppressed
|
487
|
-
hash_params = {"amenity"=>{"id"=>["#{FIELD_KNOCKOUT_PREFIX}26,#{FIELD_KNOCKOUT_PREFIX}27,28"]}}
|
488
|
-
hash_session = {}
|
489
|
-
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
490
|
-
assert_equal({"amenity"=>{"id"=>["28"]}}, hash_session)
|
491
|
-
|
492
|
-
hash_src= {'region' =>{'ids'=>['--']}, 'query_uuid' => 'zzz'}
|
493
|
-
hash_dst= {'region' =>{'ids'=>['227','2','3','3']}, 'query_uuid' => 'zzz'}
|
494
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
495
|
-
assert_equal({'region' =>{'ids'=>[]}, 'query_uuid' => 'zzz'}, hash_dst)
|
496
|
-
|
497
|
-
hash_src= {'region' =>{'ids'=>['--']}, 'query_uuid' => 'zzz'}
|
498
|
-
hash_dst= {'region' =>{'ids'=>['227','2','3','3'], 'id' => '3'}, 'query_uuid' => 'zzz'}
|
499
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
500
|
-
assert_equal({'region' =>{'ids'=>[], 'id'=>'3'}, 'query_uuid' => 'zzz'}, hash_dst)
|
501
|
-
|
502
|
-
hash_src= {'region' =>{'ids'=>['--']}, 'query_uuid' => 'zzz'}
|
503
|
-
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
504
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
505
|
-
assert_equal({'region' =>{'muni_city_id' => '2244', 'ids'=>[], 'id'=>'3'}, 'query_uuid' => 'zzz'}, hash_dst)
|
506
|
-
|
507
|
-
hash_src= {'region' =>{'ids'=>['--'], 'id' => '5'}, 'query_uuid' => 'zzz'}
|
508
|
-
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
509
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
510
|
-
assert_equal({'region' =>{'muni_city_id' => '2244', 'ids'=>[], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
511
|
-
|
512
|
-
hash_src= {'region' =>{'ids'=>['--', '227'], 'id' => '5'}, 'query_uuid' => 'zzz'}
|
513
|
-
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
514
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
515
|
-
assert_equal({'region' =>{'muni_city_id' => '2244', 'ids'=>['227'], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
516
|
-
|
517
|
-
hash_src= {'region' =>{'muni_city_id' => '--', 'ids'=>'--', 'id'=>'5'}, 'query_uuid' => 'zzz'}
|
518
|
-
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
519
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
520
|
-
assert_equal({'region' =>{'muni_city_id' => '', 'ids'=>'', 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
521
|
-
|
522
|
-
hash_src= {'region' =>{'muni_city_id' => '--', 'ids'=>['--'], 'id'=>'5'}, 'query_uuid' => 'zzz'}
|
523
|
-
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
524
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
525
|
-
assert_equal({'region' =>{'muni_city_id' => '', 'ids'=>[], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
526
|
-
|
527
|
-
hash_src= {'region' =>{'muni_city_id' => '--', 'ids'=>['--','227'], 'id'=>'5'}, 'query_uuid' => 'zzz'}
|
528
|
-
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
529
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
530
|
-
assert_equal({'region' =>{'muni_city_id' => '', 'ids'=>['227'], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
531
|
-
|
532
|
-
hash_src = {"muni_city_id"=>"--", "id"=>""}
|
533
|
-
hash_dst = {"muni_city_id"=>"", "id"=>""}
|
534
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
535
|
-
assert_equal({"muni_city_id"=>"", "id"=>""}, hash_dst)
|
536
|
-
|
537
|
-
hash_src = {"region"=>{"muni_city_id"=>"--", "id"=>""}}
|
538
|
-
hash_dst = {"region"=>{"muni_city_id"=>"", "id"=>""}}
|
539
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
540
|
-
assert_equal({"region"=>{"muni_city_id"=>"", "id"=>""}}, hash_dst)
|
541
|
-
|
542
|
-
hash_src = {"query_uuid"=>"a0dc3c84-ec7f-6756-bdb0-fff9157438ab", "url_regions"=>[], "region"=>{"muni_city_id"=>"--", "id"=>""}, "property"=>{"property_type_id"=>"", "search_rate_min"=>"", "search_rate_max"=>""}, "task"=>"search", "run_query"=>"Search"}
|
543
|
-
hash_dst = {"query_uuid"=>"a0dc3c84-ec7f-6756-bdb0-fff9157438ab", "url_regions"=>[], "region"=>{"muni_city_id"=>"", "id"=>""}, "property"=>{"property_type_id"=>"", "search_rate_min"=>"", "search_rate_max"=>""}, "task"=>"search", "run_query"=>"Search"}
|
544
|
-
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
545
|
-
assert_equal({"query_uuid"=>"a0dc3c84-ec7f-6756-bdb0-fff9157438ab", "url_regions"=>[], "region"=>{"muni_city_id"=>"", "id"=>""}, "property"=>{"property_type_id"=>"", "search_rate_min"=>"", "search_rate_max"=>""}, "task"=>"search", "run_query"=>"Search"}, hash_dst)
|
546
|
-
|
547
|
-
# hash of array of hashes
|
548
|
-
hash_src = {"item" => [{"1" => "3"}, {"2" => "4"}]}
|
549
|
-
hash_dst = {"item" => [{"3" => "5"}]}
|
550
|
-
DeepMerge::deep_merge!(hash_src, hash_dst)
|
551
|
-
assert_equal({"item" => [{"3" => "5"}, {"1" => "3"}, {"2" => "4"}]}, hash_dst)
|
552
|
-
end # test_deep_merge
|
553
|
-
end
|
1
|
+
require 'test/unit'
|
2
|
+
require '../lib/deep_merge.rb'
|
3
|
+
|
4
|
+
class TestDeepMerge < Test::Unit::TestCase
|
5
|
+
|
6
|
+
def setup
|
7
|
+
end
|
8
|
+
|
9
|
+
# show that Hash object has deep merge capabilities in form of three methods:
|
10
|
+
# ko_deep_merge! # uses '--' knockout and overwrites unmergeable
|
11
|
+
# deep_merge! # overwrites unmergeable
|
12
|
+
# deep_merge # skips unmergeable
|
13
|
+
def test_hash_deep_merge
|
14
|
+
x = {}
|
15
|
+
assert x.respond_to?('deep_merge!'.to_sym)
|
16
|
+
hash_src = {'id' => [3,4,5]}
|
17
|
+
hash_dest = {'id' => [1,2,3]}
|
18
|
+
assert hash_dest.ko_deep_merge!(hash_src)
|
19
|
+
assert_equal({'id' => [1,2,3,4,5]}, hash_dest)
|
20
|
+
|
21
|
+
hash_src = {'id' => [3,4,5]}
|
22
|
+
hash_dest = {'id' => [1,2,3]}
|
23
|
+
assert hash_dest.deep_merge!(hash_src)
|
24
|
+
assert_equal({'id' => [1,2,3,4,5]}, hash_dest)
|
25
|
+
|
26
|
+
hash_src = {'id' => 'xxx'}
|
27
|
+
hash_dest = {'id' => [1,2,3]}
|
28
|
+
assert hash_dest.deep_merge(hash_src)
|
29
|
+
assert_equal({'id' => [1,2,3]}, hash_dest)
|
30
|
+
end
|
31
|
+
|
32
|
+
FIELD_KNOCKOUT_PREFIX = DeepMerge::DEFAULT_FIELD_KNOCKOUT_PREFIX
|
33
|
+
|
34
|
+
# tests DeepMerge::deep_merge! function
|
35
|
+
def test_deep_merge
|
36
|
+
# merge tests (moving from basic to more complex)
|
37
|
+
|
38
|
+
# test merging an hash w/array into blank hash
|
39
|
+
hash_src = {'id' => '2'}
|
40
|
+
hash_dst = {}
|
41
|
+
DeepMerge::deep_merge!(hash_src.dup, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
42
|
+
assert_equal hash_src, hash_dst
|
43
|
+
|
44
|
+
# test merging an hash w/array into blank hash
|
45
|
+
hash_src = {'region' => {'id' => ['227', '2']}}
|
46
|
+
hash_dst = {}
|
47
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
48
|
+
assert_equal hash_src, hash_dst
|
49
|
+
|
50
|
+
# merge from empty hash
|
51
|
+
hash_src = {}
|
52
|
+
hash_dst = {"property" => ["2","4"]}
|
53
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
54
|
+
assert_equal({"property" => ["2","4"]}, hash_dst)
|
55
|
+
|
56
|
+
# merge to empty hash
|
57
|
+
hash_src = {"property" => ["2","4"]}
|
58
|
+
hash_dst = {}
|
59
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
60
|
+
assert_equal({"property" => ["2","4"]}, hash_dst)
|
61
|
+
|
62
|
+
# simple string overwrite
|
63
|
+
hash_src = {"name" => "value"}
|
64
|
+
hash_dst = {"name" => "value1"}
|
65
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
66
|
+
assert_equal({"name" => "value"}, hash_dst)
|
67
|
+
|
68
|
+
# simple string overwrite of empty hash
|
69
|
+
hash_src = {"name" => "value"}
|
70
|
+
hash_dst = {}
|
71
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
72
|
+
assert_equal(hash_src, hash_dst)
|
73
|
+
|
74
|
+
# hashes holding array
|
75
|
+
hash_src = {"property" => ["1","3"]}
|
76
|
+
hash_dst = {"property" => ["2","4"]}
|
77
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
78
|
+
assert_equal(["2","4","1","3"], hash_dst['property'])
|
79
|
+
|
80
|
+
# hashes holding array (sorted)
|
81
|
+
hash_src = {"property" => ["1","3"]}
|
82
|
+
hash_dst = {"property" => ["2","4"]}
|
83
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:sort_merged_arrays => true})
|
84
|
+
assert_equal(["1","2","3","4"].sort, hash_dst['property'])
|
85
|
+
|
86
|
+
# hashes holding hashes holding arrays (array with duplicate elements is merged with dest then src
|
87
|
+
hash_src = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["1", "4+"]}}
|
88
|
+
hash_dst = {"property" => {"bedroom_count" => ["3", "2"], "bathroom_count" => ["2"]}}
|
89
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
90
|
+
assert_equal({"property" => {"bedroom_count" => ["3","2","1"], "bathroom_count" => ["2", "1", "4+"]}}, hash_dst)
|
91
|
+
|
92
|
+
# hash holding hash holding array v string (string is overwritten by array)
|
93
|
+
hash_src = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["1", "4+"]}}
|
94
|
+
hash_dst = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["2"]}}
|
95
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
96
|
+
assert_equal({"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
97
|
+
|
98
|
+
# hash holding hash holding array v string (string is NOT overwritten by array)
|
99
|
+
hash_src = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["1", "4+"]}}
|
100
|
+
hash_dst = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["2"]}}
|
101
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
102
|
+
assert_equal({"property" => {"bedroom_count" => "3", "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
103
|
+
|
104
|
+
# hash holding hash holding string v array (array is overwritten by string)
|
105
|
+
hash_src = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["1", "4+"]}}
|
106
|
+
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
107
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
108
|
+
assert_equal({"property" => {"bedroom_count" => "3", "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
109
|
+
|
110
|
+
# hash holding hash holding string v array (array does NOT overwrite string)
|
111
|
+
hash_src = {"property" => {"bedroom_count" => "3", "bathroom_count" => ["1", "4+"]}}
|
112
|
+
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
113
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
114
|
+
assert_equal({"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
115
|
+
|
116
|
+
# hash holding hash holding hash v array (array is overwritten by hash)
|
117
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["1", "4+"]}}
|
118
|
+
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
119
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
120
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
121
|
+
|
122
|
+
# hash holding hash holding hash v array (array is NOT overwritten by hash)
|
123
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["1", "4+"]}}
|
124
|
+
hash_dst = {"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2"]}}
|
125
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
126
|
+
assert_equal({"property" => {"bedroom_count" => ["1", "2"], "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
127
|
+
|
128
|
+
# 3 hash layers holding integers (integers are overwritten by source)
|
129
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["1", "4+"]}}
|
130
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => 2, "queen_bed" => 4}, "bathroom_count" => ["2"]}}
|
131
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
132
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => 1}, "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
133
|
+
|
134
|
+
# 3 hash layers holding arrays of int (arrays are merged)
|
135
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3], "queen_bed" => [1]}, "bathroom_count" => ["1", "4+"]}}
|
136
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
137
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
138
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4,1]}, "bathroom_count" => ["2","1","4+"]}}, hash_dst)
|
139
|
+
|
140
|
+
# 1 hash overwriting 3 hash layers holding arrays of int
|
141
|
+
hash_src = {"property" => "1"}
|
142
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
143
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
144
|
+
assert_equal({"property" => "1"}, hash_dst)
|
145
|
+
|
146
|
+
# 1 hash NOT overwriting 3 hash layers holding arrays of int
|
147
|
+
hash_src = {"property" => "1"}
|
148
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
149
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
150
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}, hash_dst)
|
151
|
+
|
152
|
+
# 3 hash layers holding arrays of int (arrays are merged) but second hash's array is overwritten
|
153
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3], "queen_bed" => [1]}, "bathroom_count" => "1"}}
|
154
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
155
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
156
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4,1]}, "bathroom_count" => "1"}}, hash_dst)
|
157
|
+
|
158
|
+
# 3 hash layers holding arrays of int (arrays are merged) but second hash's array is NOT overwritten
|
159
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3], "queen_bed" => [1]}, "bathroom_count" => "1"}}
|
160
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
161
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})
|
162
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4,1]}, "bathroom_count" => ["2"]}}, hash_dst)
|
163
|
+
|
164
|
+
# 3 hash layers holding arrays of int, but one holds int. This one overwrites, but the rest merge
|
165
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => [1]}, "bathroom_count" => ["1"]}}
|
166
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
167
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
168
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => 3, "queen_bed" => [4,1]}, "bathroom_count" => ["2","1"]}}, hash_dst)
|
169
|
+
|
170
|
+
# 3 hash layers holding arrays of int, but source is incomplete.
|
171
|
+
hash_src = {"property" => {"bedroom_count" => {"king_bed" => [3]}, "bathroom_count" => ["1"]}}
|
172
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
173
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
174
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2,3], "queen_bed" => [4]}, "bathroom_count" => ["2","1"]}}, hash_dst)
|
175
|
+
|
176
|
+
# 3 hash layers holding arrays of int, but source is shorter and has new 2nd level ints.
|
177
|
+
hash_src = {"property" => {"bedroom_count" => {2=>3, "king_bed" => [3]}, "bathroom_count" => ["1"]}}
|
178
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
179
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
180
|
+
assert_equal({"property" => {"bedroom_count" => {2=>3, "king_bed" => [2,3], "queen_bed" => [4]}, "bathroom_count" => ["2","1"]}}, hash_dst)
|
181
|
+
|
182
|
+
# 3 hash layers holding arrays of int, but source is empty
|
183
|
+
hash_src = {}
|
184
|
+
hash_dst = {"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}
|
185
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
186
|
+
assert_equal({"property" => {"bedroom_count" => {"king_bed" => [2], "queen_bed" => [4]}, "bathroom_count" => ["2"]}}, hash_dst)
|
187
|
+
|
188
|
+
# 3 hash layers holding arrays of int, but dest is empty
|
189
|
+
hash_src = {"property" => {"bedroom_count" => {2=>3, "king_bed" => [3]}, "bathroom_count" => ["1"]}}
|
190
|
+
hash_dst = {}
|
191
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
192
|
+
assert_equal({"property" => {"bedroom_count" => {2=>3, "king_bed" => [3]}, "bathroom_count" => ["1"]}}, hash_dst)
|
193
|
+
|
194
|
+
# test parameter management for knockout_prefix and overwrite unmergable
|
195
|
+
assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => ""})}
|
196
|
+
assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => ""})}
|
197
|
+
assert_raise(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true, :knockout_prefix => "--"})}
|
198
|
+
assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => "--"})}
|
199
|
+
assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst)}
|
200
|
+
assert_nothing_raised(DeepMerge::InvalidParameter) {DeepMerge::deep_merge!(hash_src, hash_dst, {:preserve_unmergeables => true})}
|
201
|
+
|
202
|
+
# hash holding arrays of arrays
|
203
|
+
hash_src = {["1", "2", "3"] => ["1", "2"]}
|
204
|
+
hash_dst = {["4", "5"] => ["3"]}
|
205
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
206
|
+
assert_equal({["1","2","3"] => ["1", "2"], ["4", "5"] => ["3"]}, hash_dst)
|
207
|
+
|
208
|
+
# test merging of hash with blank hash, and make sure that source array split still functions
|
209
|
+
hash_src = {'property' => {'bedroom_count' => ["1","2,3"]}}
|
210
|
+
hash_dst = {}
|
211
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
212
|
+
assert_equal({'property' => {'bedroom_count' => ["1","2","3"]}}, hash_dst)
|
213
|
+
|
214
|
+
# test merging of hash with blank hash, and make sure that source array split does not function when turned off
|
215
|
+
hash_src = {'property' => {'bedroom_count' => ["1","2,3"]}}
|
216
|
+
hash_dst = {}
|
217
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
218
|
+
assert_equal({'property' => {'bedroom_count' => ["1","2,3"]}}, hash_dst)
|
219
|
+
|
220
|
+
# test merging into a blank hash with overwrite_unmergeables turned on
|
221
|
+
hash_src = {"action"=>"browse", "controller"=>"results"}
|
222
|
+
hash_dst = {}
|
223
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
224
|
+
assert_equal hash_src, hash_dst
|
225
|
+
|
226
|
+
# KNOCKOUT_PREFIX testing
|
227
|
+
# the next few tests are looking for correct behavior from specific real-world params/session merges
|
228
|
+
# using the custom modifiers built for param/session merges
|
229
|
+
|
230
|
+
[nil, ","].each do |ko_split|
|
231
|
+
# typical params/session style hash with knockout_merge elements
|
232
|
+
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
233
|
+
hash_session = {"property"=>{"bedroom_count"=>["1", "2", "3"]}}
|
234
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
235
|
+
assert_equal({"property"=>{"bedroom_count"=>["2", "3"]}}, hash_session)
|
236
|
+
|
237
|
+
# typical params/session style hash with knockout_merge elements
|
238
|
+
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
239
|
+
hash_session = {"property"=>{"bedroom_count"=>["3"]}}
|
240
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
241
|
+
assert_equal({"property"=>{"bedroom_count"=>["3","2"]}}, hash_session)
|
242
|
+
|
243
|
+
# typical params/session style hash with knockout_merge elements
|
244
|
+
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
245
|
+
hash_session = {"property"=>{"bedroom_count"=>["4"]}}
|
246
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
247
|
+
assert_equal({"property"=>{"bedroom_count"=>["4","2","3"]}}, hash_session)
|
248
|
+
|
249
|
+
# typical params/session style hash with knockout_merge elements
|
250
|
+
hash_params = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "2", "3"]}}
|
251
|
+
hash_session = {"property"=>{"bedroom_count"=>[FIELD_KNOCKOUT_PREFIX+"1", "4"]}}
|
252
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
253
|
+
assert_equal({"property"=>{"bedroom_count"=>["4","2","3"]}}, hash_session)
|
254
|
+
|
255
|
+
# typical params/session style hash with knockout_merge elements
|
256
|
+
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1", FIELD_KNOCKOUT_PREFIX+"2", "3", "4"]}}
|
257
|
+
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
258
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ko_split})
|
259
|
+
assert_equal({"amenity"=>{"id"=>["3","4"]}}, hash_session)
|
260
|
+
end
|
261
|
+
|
262
|
+
# special params/session style hash with knockout_merge elements in form src: ["1","2"] dest:["--1,--2", "3,4"]
|
263
|
+
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1,"+FIELD_KNOCKOUT_PREFIX+"2", "3,4"]}}
|
264
|
+
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
265
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
266
|
+
assert_equal({"amenity"=>{"id"=>["3","4"]}}, hash_session)
|
267
|
+
|
268
|
+
# same as previous but without ko_split value, this merge should fail
|
269
|
+
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1,"+FIELD_KNOCKOUT_PREFIX+"2", "3,4"]}}
|
270
|
+
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
271
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
272
|
+
assert_equal({"amenity"=>{"id"=>["1","2","3,4"]}}, hash_session)
|
273
|
+
|
274
|
+
# special params/session style hash with knockout_merge elements in form src: ["1","2"] dest:["--1,--2", "3,4"]
|
275
|
+
hash_params = {"amenity"=>{"id"=>[FIELD_KNOCKOUT_PREFIX+"1,2", "3,4", "--5", "6"]}}
|
276
|
+
hash_session = {"amenity"=>{"id"=>["1", "2"]}}
|
277
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
278
|
+
assert_equal({"amenity"=>{"id"=>["2","3","4","6"]}}, hash_session)
|
279
|
+
|
280
|
+
# special params/session style hash with knockout_merge elements in form src: ["--1,--2", "3,4", "--5", "6"] dest:["1,2", "3,4"]
|
281
|
+
hash_params = {"amenity"=>{"id"=>["#{FIELD_KNOCKOUT_PREFIX}1,#{FIELD_KNOCKOUT_PREFIX}2", "3,4", "#{FIELD_KNOCKOUT_PREFIX}5", "6"]}}
|
282
|
+
hash_session = {"amenity"=>{"id"=>["1", "2", "3", "4"]}}
|
283
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
284
|
+
assert_equal({"amenity"=>{"id"=>["3","4","6"]}}, hash_session)
|
285
|
+
|
286
|
+
|
287
|
+
hash_src = {"url_regions"=>[], "region"=>{"ids"=>["227,233"]}, "action"=>"browse", "task"=>"browse", "controller"=>"results"}
|
288
|
+
hash_dst = {"region"=>{"ids"=>["227"]}}
|
289
|
+
DeepMerge::deep_merge!(hash_src.dup, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
290
|
+
assert_equal({"url_regions"=>[], "region"=>{"ids"=>["227","233"]}, "action"=>"browse", "task"=>"browse", "controller"=>"results"}, hash_dst)
|
291
|
+
|
292
|
+
hash_src = {"region"=>{"ids"=>["--","227"], "id"=>"230"}}
|
293
|
+
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
294
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
295
|
+
assert_equal({"region"=>{"ids"=>["227"], "id"=>"230"}}, hash_dst)
|
296
|
+
|
297
|
+
hash_src = {"region"=>{"ids"=>["--","227", "232", "233"], "id"=>"232"}}
|
298
|
+
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
299
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
300
|
+
assert_equal({"region"=>{"ids"=>["227", "232", "233"], "id"=>"232"}}, hash_dst)
|
301
|
+
|
302
|
+
hash_src = {"region"=>{"ids"=>["--,227,232,233"], "id"=>"232"}}
|
303
|
+
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
304
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
305
|
+
assert_equal({"region"=>{"ids"=>["227", "232", "233"], "id"=>"232"}}, hash_dst)
|
306
|
+
|
307
|
+
hash_src = {"region"=>{"ids"=>["--,227,232","233"], "id"=>"232"}}
|
308
|
+
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
309
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
310
|
+
assert_equal({"region"=>{"ids"=>["227", "232", "233"], "id"=>"232"}}, hash_dst)
|
311
|
+
|
312
|
+
hash_src = {"region"=>{"ids"=>["--,227"], "id"=>"230"}}
|
313
|
+
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}}
|
314
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
315
|
+
assert_equal({"region"=>{"ids"=>["227"], "id"=>"230"}}, hash_dst)
|
316
|
+
|
317
|
+
hash_src = {"region"=>{"ids"=>["--,227"], "id"=>"230"}}
|
318
|
+
hash_dst = {"region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}, "action"=>"browse", "task"=>"browse", "controller"=>"results", "property_order_by"=>"property_type.descr"}
|
319
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
320
|
+
assert_equal({"region"=>{"ids"=>["227"], "id"=>"230"}, "action"=>"browse", "task"=>"browse",
|
321
|
+
"controller"=>"results", "property_order_by"=>"property_type.descr"}, hash_dst)
|
322
|
+
|
323
|
+
hash_src = {"query_uuid"=>"6386333d-389b-ab5c-8943-6f3a2aa914d7", "region"=>{"ids"=>["--,227"], "id"=>"230"}}
|
324
|
+
hash_dst = {"query_uuid"=>"6386333d-389b-ab5c-8943-6f3a2aa914d7", "url_regions"=>[], "region"=>{"ids"=>["227", "233", "324", "230", "230"], "id"=>"230"}, "action"=>"browse", "task"=>"browse", "controller"=>"results", "property_order_by"=>"property_type.descr"}
|
325
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:overwrite_unmergeables => true, :knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
326
|
+
assert_equal({"query_uuid" => "6386333d-389b-ab5c-8943-6f3a2aa914d7", "url_regions"=>[],
|
327
|
+
"region"=>{"ids"=>["227"], "id"=>"230"}, "action"=>"browse", "task"=>"browse",
|
328
|
+
"controller"=>"results", "property_order_by"=>"property_type.descr"}, hash_dst)
|
329
|
+
|
330
|
+
# knock out entire dest hash if "--" is passed for source
|
331
|
+
hash_params = {'amenity' => "--"}
|
332
|
+
hash_session = {"amenity" => "1"}
|
333
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
334
|
+
assert_equal({'amenity' => ""}, hash_session)
|
335
|
+
|
336
|
+
# knock out entire dest hash if "--" is passed for source
|
337
|
+
hash_params = {'amenity' => ["--"]}
|
338
|
+
hash_session = {"amenity" => "1"}
|
339
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
340
|
+
assert_equal({'amenity' => []}, hash_session)
|
341
|
+
|
342
|
+
# knock out entire dest hash if "--" is passed for source
|
343
|
+
hash_params = {'amenity' => "--"}
|
344
|
+
hash_session = {"amenity" => ["1"]}
|
345
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
346
|
+
assert_equal({'amenity' => ""}, hash_session)
|
347
|
+
|
348
|
+
# knock out entire dest hash if "--" is passed for source
|
349
|
+
hash_params = {'amenity' => ["--"]}
|
350
|
+
hash_session = {"amenity" => ["1"]}
|
351
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
352
|
+
assert_equal({'amenity' => []}, hash_session)
|
353
|
+
|
354
|
+
# knock out entire dest hash if "--" is passed for source
|
355
|
+
hash_params = {'amenity' => ["--"]}
|
356
|
+
hash_session = {"amenity" => "1"}
|
357
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
358
|
+
assert_equal({'amenity' => []}, hash_session)
|
359
|
+
|
360
|
+
# knock out entire dest hash if "--" is passed for source
|
361
|
+
hash_params = {'amenity' => ["--", "2"]}
|
362
|
+
hash_session = {'amenity' => ["1", "3", "7+"]}
|
363
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
364
|
+
assert_equal({'amenity' => ["2"]}, hash_session)
|
365
|
+
|
366
|
+
# knock out entire dest hash if "--" is passed for source
|
367
|
+
hash_params = {'amenity' => ["--", "2"]}
|
368
|
+
hash_session = {'amenity' => "5"}
|
369
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
370
|
+
assert_equal({'amenity' => ['2']}, hash_session)
|
371
|
+
|
372
|
+
# knock out entire dest hash if "--" is passed for source
|
373
|
+
hash_params = {'amenity' => "--"}
|
374
|
+
hash_session = {"amenity"=>{"id"=>["1", "2", "3", "4"]}}
|
375
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
376
|
+
assert_equal({'amenity' => ""}, hash_session)
|
377
|
+
|
378
|
+
# knock out entire dest hash if "--" is passed for source
|
379
|
+
hash_params = {'amenity' => ["--"]}
|
380
|
+
hash_session = {"amenity"=>{"id"=>["1", "2", "3", "4"]}}
|
381
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => "--", :unpack_arrays => ","})
|
382
|
+
assert_equal({'amenity' => []}, hash_session)
|
383
|
+
|
384
|
+
# knock out dest array if "--" is passed for source
|
385
|
+
hash_params = {"region" => {'ids' => FIELD_KNOCKOUT_PREFIX}}
|
386
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"]}}
|
387
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
388
|
+
assert_equal({'region' => {'ids' => ""}}, hash_session)
|
389
|
+
|
390
|
+
# knock out dest array but leave other elements of hash intact
|
391
|
+
hash_params = {"region" => {'ids' => FIELD_KNOCKOUT_PREFIX}}
|
392
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
393
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
394
|
+
assert_equal({'region' => {'ids' => "", 'id'=>'11'}}, hash_session)
|
395
|
+
|
396
|
+
# knock out entire tree of dest hash
|
397
|
+
hash_params = {"region" => FIELD_KNOCKOUT_PREFIX}
|
398
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
399
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
400
|
+
assert_equal({'region' => ""}, hash_session)
|
401
|
+
|
402
|
+
# knock out entire tree of dest hash - retaining array format
|
403
|
+
hash_params = {"region" => {'ids' => [FIELD_KNOCKOUT_PREFIX]}}
|
404
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
405
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
406
|
+
assert_equal({'region' => {'ids' => [], 'id'=>'11'}}, hash_session)
|
407
|
+
|
408
|
+
# knock out entire tree of dest hash & replace with new content
|
409
|
+
hash_params = {"region" => {'ids' => ["2", FIELD_KNOCKOUT_PREFIX, "6"]}}
|
410
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
411
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
412
|
+
assert_equal({'region' => {'ids' => ["2", "6"], 'id'=>'11'}}, hash_session)
|
413
|
+
|
414
|
+
# knock out entire tree of dest hash & replace with new content
|
415
|
+
hash_params = {"region" => {'ids' => ["7", FIELD_KNOCKOUT_PREFIX, "6"]}}
|
416
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
417
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
418
|
+
assert_equal({'region' => {'ids' => ["7", "6"], 'id'=>'11'}}, hash_session)
|
419
|
+
|
420
|
+
# edge test: make sure that when we turn off knockout_prefix that all values are processed correctly
|
421
|
+
hash_params = {"region" => {'ids' => ["7", "--", "2", "6,8"]}}
|
422
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
423
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:unpack_arrays => ","})
|
424
|
+
assert_equal({'region' => {'ids' => ["1", "2", "3", "4", "7", "--", "6", "8"], 'id'=>'11'}}, hash_session)
|
425
|
+
|
426
|
+
# edge test 2: make sure that when we turn off source array split that all values are processed correctly
|
427
|
+
hash_params = {"region" => {'ids' => ["7", "3", "--", "6,8"]}}
|
428
|
+
hash_session = {"region"=>{"ids"=>["1", "2", "3", "4"], 'id'=>'11'}}
|
429
|
+
DeepMerge::deep_merge!(hash_params, hash_session)
|
430
|
+
assert_equal({'region' => {'ids' => ["1", "2", "3", "4", "7", "--", "6,8"], 'id'=>'11'}}, hash_session)
|
431
|
+
|
432
|
+
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
433
|
+
hash_params = {"amenity"=>"--1"}
|
434
|
+
hash_session = {"amenity"=>"1"}
|
435
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
436
|
+
assert_equal({"amenity"=>""}, hash_session)
|
437
|
+
|
438
|
+
# Example: src = {'key' => "--1"}, dst = {'key' => "2"} -> merges to {'key' => ""}
|
439
|
+
hash_params = {"amenity"=>"--1"}
|
440
|
+
hash_session = {"amenity"=>"2"}
|
441
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
442
|
+
assert_equal({"amenity"=>""}, hash_session)
|
443
|
+
|
444
|
+
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
445
|
+
hash_params = {"amenity"=>["--1"]}
|
446
|
+
hash_session = {"amenity"=>"1"}
|
447
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
448
|
+
assert_equal({"amenity"=>[]}, hash_session)
|
449
|
+
|
450
|
+
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
451
|
+
hash_params = {"amenity"=>["--1"]}
|
452
|
+
hash_session = {"amenity"=>["1"]}
|
453
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
454
|
+
assert_equal({"amenity"=>[]}, hash_session)
|
455
|
+
|
456
|
+
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
457
|
+
hash_params = {"amenity"=>"--1"}
|
458
|
+
hash_session = {}
|
459
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
460
|
+
assert_equal({"amenity"=>""}, hash_session)
|
461
|
+
|
462
|
+
|
463
|
+
# Example: src = {'key' => "--1"}, dst = {'key' => "1"} -> merges to {'key' => ""}
|
464
|
+
hash_params = {"amenity"=>"--1"}
|
465
|
+
hash_session = {"amenity"=>["1"]}
|
466
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
467
|
+
assert_equal({"amenity"=>""}, hash_session)
|
468
|
+
|
469
|
+
#are unmerged hashes passed unmodified w/out :unpack_arrays?
|
470
|
+
hash_params = {"amenity"=>{"id"=>["26,27"]}}
|
471
|
+
hash_session = {}
|
472
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX})
|
473
|
+
assert_equal({"amenity"=>{"id"=>["26,27"]}}, hash_session)
|
474
|
+
|
475
|
+
#hash should be merged
|
476
|
+
hash_params = {"amenity"=>{"id"=>["26,27"]}}
|
477
|
+
hash_session = {}
|
478
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
479
|
+
assert_equal({"amenity"=>{"id"=>["26","27"]}}, hash_session)
|
480
|
+
|
481
|
+
# second merge of same values should result in no change in output
|
482
|
+
hash_params = {"amenity"=>{"id"=>["26,27"]}}
|
483
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
484
|
+
assert_equal({"amenity"=>{"id"=>["26","27"]}}, hash_session)
|
485
|
+
|
486
|
+
#hashes with knockout values are suppressed
|
487
|
+
hash_params = {"amenity"=>{"id"=>["#{FIELD_KNOCKOUT_PREFIX}26,#{FIELD_KNOCKOUT_PREFIX}27,28"]}}
|
488
|
+
hash_session = {}
|
489
|
+
DeepMerge::deep_merge!(hash_params, hash_session, {:knockout_prefix => FIELD_KNOCKOUT_PREFIX, :unpack_arrays => ","})
|
490
|
+
assert_equal({"amenity"=>{"id"=>["28"]}}, hash_session)
|
491
|
+
|
492
|
+
hash_src= {'region' =>{'ids'=>['--']}, 'query_uuid' => 'zzz'}
|
493
|
+
hash_dst= {'region' =>{'ids'=>['227','2','3','3']}, 'query_uuid' => 'zzz'}
|
494
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
495
|
+
assert_equal({'region' =>{'ids'=>[]}, 'query_uuid' => 'zzz'}, hash_dst)
|
496
|
+
|
497
|
+
hash_src= {'region' =>{'ids'=>['--']}, 'query_uuid' => 'zzz'}
|
498
|
+
hash_dst= {'region' =>{'ids'=>['227','2','3','3'], 'id' => '3'}, 'query_uuid' => 'zzz'}
|
499
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
500
|
+
assert_equal({'region' =>{'ids'=>[], 'id'=>'3'}, 'query_uuid' => 'zzz'}, hash_dst)
|
501
|
+
|
502
|
+
hash_src= {'region' =>{'ids'=>['--']}, 'query_uuid' => 'zzz'}
|
503
|
+
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
504
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
505
|
+
assert_equal({'region' =>{'muni_city_id' => '2244', 'ids'=>[], 'id'=>'3'}, 'query_uuid' => 'zzz'}, hash_dst)
|
506
|
+
|
507
|
+
hash_src= {'region' =>{'ids'=>['--'], 'id' => '5'}, 'query_uuid' => 'zzz'}
|
508
|
+
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
509
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
510
|
+
assert_equal({'region' =>{'muni_city_id' => '2244', 'ids'=>[], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
511
|
+
|
512
|
+
hash_src= {'region' =>{'ids'=>['--', '227'], 'id' => '5'}, 'query_uuid' => 'zzz'}
|
513
|
+
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
514
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
515
|
+
assert_equal({'region' =>{'muni_city_id' => '2244', 'ids'=>['227'], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
516
|
+
|
517
|
+
hash_src= {'region' =>{'muni_city_id' => '--', 'ids'=>'--', 'id'=>'5'}, 'query_uuid' => 'zzz'}
|
518
|
+
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
519
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
520
|
+
assert_equal({'region' =>{'muni_city_id' => '', 'ids'=>'', 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
521
|
+
|
522
|
+
hash_src= {'region' =>{'muni_city_id' => '--', 'ids'=>['--'], 'id'=>'5'}, 'query_uuid' => 'zzz'}
|
523
|
+
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
524
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
525
|
+
assert_equal({'region' =>{'muni_city_id' => '', 'ids'=>[], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
526
|
+
|
527
|
+
hash_src= {'region' =>{'muni_city_id' => '--', 'ids'=>['--','227'], 'id'=>'5'}, 'query_uuid' => 'zzz'}
|
528
|
+
hash_dst= {'region' =>{'muni_city_id' => '2244', 'ids'=>['227','2','3','3'], 'id'=>'3'}, 'query_uuid' => 'zzz'}
|
529
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
530
|
+
assert_equal({'region' =>{'muni_city_id' => '', 'ids'=>['227'], 'id'=>'5'}, 'query_uuid' => 'zzz'}, hash_dst)
|
531
|
+
|
532
|
+
hash_src = {"muni_city_id"=>"--", "id"=>""}
|
533
|
+
hash_dst = {"muni_city_id"=>"", "id"=>""}
|
534
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
535
|
+
assert_equal({"muni_city_id"=>"", "id"=>""}, hash_dst)
|
536
|
+
|
537
|
+
hash_src = {"region"=>{"muni_city_id"=>"--", "id"=>""}}
|
538
|
+
hash_dst = {"region"=>{"muni_city_id"=>"", "id"=>""}}
|
539
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
540
|
+
assert_equal({"region"=>{"muni_city_id"=>"", "id"=>""}}, hash_dst)
|
541
|
+
|
542
|
+
hash_src = {"query_uuid"=>"a0dc3c84-ec7f-6756-bdb0-fff9157438ab", "url_regions"=>[], "region"=>{"muni_city_id"=>"--", "id"=>""}, "property"=>{"property_type_id"=>"", "search_rate_min"=>"", "search_rate_max"=>""}, "task"=>"search", "run_query"=>"Search"}
|
543
|
+
hash_dst = {"query_uuid"=>"a0dc3c84-ec7f-6756-bdb0-fff9157438ab", "url_regions"=>[], "region"=>{"muni_city_id"=>"", "id"=>""}, "property"=>{"property_type_id"=>"", "search_rate_min"=>"", "search_rate_max"=>""}, "task"=>"search", "run_query"=>"Search"}
|
544
|
+
DeepMerge::deep_merge!(hash_src, hash_dst, {:knockout_prefix => '--', :unpack_arrays => ","})
|
545
|
+
assert_equal({"query_uuid"=>"a0dc3c84-ec7f-6756-bdb0-fff9157438ab", "url_regions"=>[], "region"=>{"muni_city_id"=>"", "id"=>""}, "property"=>{"property_type_id"=>"", "search_rate_min"=>"", "search_rate_max"=>""}, "task"=>"search", "run_query"=>"Search"}, hash_dst)
|
546
|
+
|
547
|
+
# hash of array of hashes
|
548
|
+
hash_src = {"item" => [{"1" => "3"}, {"2" => "4"}]}
|
549
|
+
hash_dst = {"item" => [{"3" => "5"}]}
|
550
|
+
DeepMerge::deep_merge!(hash_src, hash_dst)
|
551
|
+
assert_equal({"item" => [{"3" => "5"}, {"1" => "3"}, {"2" => "4"}]}, hash_dst)
|
552
|
+
end # test_deep_merge
|
553
|
+
end
|