pax_global_header00006660000000000000000000000064137541572630014527gustar00rootroot0000000000000052 comment=6658e4b68bfad9091f9f0bfbaa0a91efb637e4a3 raku-hash-merge-2.0.0/000077500000000000000000000000001375415726300145065ustar00rootroot00000000000000raku-hash-merge-2.0.0/.gitignore000066400000000000000000000000111375415726300164660ustar00rootroot00000000000000.precomp raku-hash-merge-2.0.0/.gitlab-ci.yml000066400000000000000000000012411375415726300171400ustar00rootroot00000000000000stages: - Test - Release # # Tests # Prove: stage: Test image: registry.gitlab.com/tyil/docker-perl6:debian-dev-latest cache: key: ${CI_COMMIT_REF_NAME} paths: - /usr/local/share/perl6/site before_script: - apt update - apt install -y build-essential - zef install App::Prove6 - zef install --deps-only --test-depends --/test . script: prove6 -l # # Release targets # Distribution: stage: Release only: refs: - tags - master image: rakudo-star script: - echo "NOOP" artifacts: name: App-CPAN-${CI_COMMIT_TAG} paths: - META6.json - lib - bin - t - resources raku-hash-merge-2.0.0/.travis.yml000066400000000000000000000007341375415726300166230ustar00rootroot00000000000000language: generic env: global: - PATH=/opt/rakudo-pkg/bin:$PATH matrix: - VERSION=2018.03-01 - VERSION=2018.02.1-01 TAG=v2018.02.1 os: - linux before_install: - cd $(mktemp -d) - wget "https://github.com/nxadm/rakudo-pkg/releases/download/${TAG:-v${VERSION}}/rakudo-pkg-Ubuntu14.04_${VERSION}_amd64.deb" && sudo dpkg -i *.deb - cd - install: - zef install --deps-only . script: AUTHOR_TESTING=1 prove -v -e "perl6 -Ilib" t/ # vim: et ts=2 sw=2 raku-hash-merge-2.0.0/CHANGELOG.md000066400000000000000000000030121375415726300163130ustar00rootroot00000000000000# Changelog All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). ## [2.0.0] - 2020-11-15 ### Added - A `gitlab-ci.yaml` has been added to ensure tests for this module are being ran when pushed to the GitLab mirror. It runs `prove6`, as well as queueing a build on rakudist.raku.org. ### Changed - `Hash::Merge` has been rewritten to accomodate my current knowledge on the Raku programming language. This additionaly brings in a small change in the merging functionality, making it so the first argument passed to `merge-hash` is no longer modified itself, which could cause some awkward bugs in other programs. - The README has been rewritten in Pod6. - Perl 6 references have been updated to Raku. - The main repository for this module has been moved from [GitHub](https://github.com/scriptkitties/p6-Hash-Merge.git) to [Sourcehut](https://git.sr.ht/~tyil/raku-hash-merge). ## [1.0.0] - 2018-03-28 ### Added - `:api` key in `META6.json` - New `Hash::Merge` that exposes subs instead of augmenting `Hash` ### Changed - Old `Hash::Merge` functionality moved to `Hash::Merge::Augment` ## [0.2.0] - 2018-03-14 ### Added - `LICENSE` file for Artistic License 2.0 ([GitHub#2](https://github.com/scriptkitties/p6-Hash-Merge/issues/2)) - `no precompilation` pragma ([GitHub#1](https://github.com/scriptkitties/p6-Hash-Merge/issues/1)) raku-hash-merge-2.0.0/LICENSE000066400000000000000000000213171375415726300155170ustar00rootroot00000000000000 The Artistic License 2.0 Copyright (c) 2000-2006, The Perl Foundation. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. Preamble This license establishes the terms under which a given free software Package may be copied, modified, distributed, and/or redistributed. The intent is that the Copyright Holder maintains some artistic control over the development of that Package while still keeping the Package available as open source and free software. You are always permitted to make arrangements wholly outside of this license directly with the Copyright Holder of a given Package. If the terms of this license do not permit the full use that you propose to make of the Package, you should contact the Copyright Holder and seek a different licensing arrangement. Definitions "Copyright Holder" means the individual(s) or organization(s) named in the copyright notice for the entire Package. "Contributor" means any party that has contributed code or other material to the Package, in accordance with the Copyright Holder's procedures. "You" and "your" means any person who would like to copy, distribute, or modify the Package. "Package" means the collection of files distributed by the Copyright Holder, and derivatives of that collection and/or of those files. A given Package may consist of either the Standard Version, or a Modified Version. "Distribute" means providing a copy of the Package or making it accessible to anyone else, or in the case of a company or organization, to others outside of your company or organization. "Distributor Fee" means any fee that you charge for Distributing this Package or providing support for this Package to another party. It does not mean licensing fees. "Standard Version" refers to the Package if it has not been modified, or has been modified only in ways explicitly requested by the Copyright Holder. "Modified Version" means the Package, if it has been changed, and such changes were not explicitly requested by the Copyright Holder. "Original License" means this Artistic License as Distributed with the Standard Version of the Package, in its current version or as it may be modified by The Perl Foundation in the future. "Source" form means the source code, documentation source, and configuration files for the Package. "Compiled" form means the compiled bytecode, object code, binary, or any other form resulting from mechanical transformation or translation of the Source form. Permission for Use and Modification Without Distribution (1) You are permitted to use the Standard Version and create and use Modified Versions for any purpose without restriction, provided that you do not Distribute the Modified Version. Permissions for Redistribution of the Standard Version (2) You may Distribute verbatim copies of the Source form of the Standard Version of this Package in any medium without restriction, either gratis or for a Distributor Fee, provided that you duplicate all of the original copyright notices and associated disclaimers. At your discretion, such verbatim copies may or may not include a Compiled form of the Package. (3) You may apply any bug fixes, portability changes, and other modifications made available from the Copyright Holder. The resulting Package will still be considered the Standard Version, and as such will be subject to the Original License. Distribution of Modified Versions of the Package as Source (4) You may Distribute your Modified Version as Source (either gratis or for a Distributor Fee, and with or without a Compiled form of the Modified Version) provided that you clearly document how it differs from the Standard Version, including, but not limited to, documenting any non-standard features, executables, or modules, and provided that you do at least ONE of the following: (a) make the Modified Version available to the Copyright Holder of the Standard Version, under the Original License, so that the Copyright Holder may include your modifications in the Standard Version. (b) ensure that installation of your Modified Version does not prevent the user installing or running the Standard Version. In addition, the Modified Version must bear a name that is different from the name of the Standard Version. (c) allow anyone who receives a copy of the Modified Version to make the Source form of the Modified Version available to others under (i) the Original License or (ii) a license that permits the licensee to freely copy, modify and redistribute the Modified Version using the same licensing terms that apply to the copy that the licensee received, and requires that the Source form of the Modified Version, and of any works derived from it, be made freely available in that license fees are prohibited but Distributor Fees are allowed. Distribution of Compiled Forms of the Standard Version or Modified Versions without the Source (5) You may Distribute Compiled forms of the Standard Version without the Source, provided that you include complete instructions on how to get the Source of the Standard Version. Such instructions must be valid at the time of your distribution. If these instructions, at any time while you are carrying out such distribution, become invalid, you must provide new instructions on demand or cease further distribution. If you provide valid instructions or cease distribution within thirty days after you become aware that the instructions are invalid, then you do not forfeit any of your rights under this license. (6) You may Distribute a Modified Version in Compiled form without the Source, provided that you comply with Section 4 with respect to the Source of the Modified Version. Aggregating or Linking the Package (7) You may aggregate the Package (either the Standard Version or Modified Version) with other packages and Distribute the resulting aggregation provided that you do not charge a licensing fee for the Package. Distributor Fees are permitted, and licensing fees for other components in the aggregation are permitted. The terms of this license apply to the use and Distribution of the Standard or Modified Versions as included in the aggregation. (8) You are permitted to link Modified and Standard Versions with other works, to embed the Package in a larger work of your own, or to build stand-alone binary or bytecode versions of applications that include the Package, and Distribute the result without restriction, provided the result does not expose a direct interface to the Package. Items That are Not Considered Part of a Modified Version (9) Works (including, but not limited to, modules and scripts) that merely extend or make use of the Package, do not, by themselves, cause the Package to be a Modified Version. In addition, such works are not considered parts of the Package itself, and are not subject to the terms of this license. General Provisions (10) Any use, modification, and distribution of the Standard or Modified Versions is governed by this Artistic License. By using, modifying or distributing the Package, you accept this license. Do not use, modify, or distribute the Package, if you do not accept this license. (11) If your Modified Version has been derived from a Modified Version made by someone other than you, you are nevertheless required to ensure that your Modified Version complies with the requirements of this license. (12) This license does not grant you the right to use any trademark, service mark, tradename, or logo of the Copyright Holder. (13) This license includes the non-exclusive, worldwide, free-of-charge patent license to make, have made, use, offer to sell, sell, import and otherwise transfer the Package with respect to any patent claims licensable by the Copyright Holder that are necessarily infringed by the Package. If you institute patent litigation (including a cross-claim or counterclaim) against any party alleging that the Package constitutes direct or contributory patent infringement, then this Artistic License to you shall terminate on the date that such litigation is filed. (14) Disclaimer of Warranty: THE PACKAGE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS' AND WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES. THE IMPLIED WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR NON-INFRINGEMENT ARE DISCLAIMED TO THE EXTENT PERMITTED BY YOUR LOCAL LAW. UNLESS REQUIRED BY LAW, NO COPYRIGHT HOLDER OR CONTRIBUTOR WILL BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING IN ANY WAY OUT OF THE USE OF THE PACKAGE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. raku-hash-merge-2.0.0/META6.json000066400000000000000000000011141375415726300162120ustar00rootroot00000000000000{ "api": "2", "auth": "github:scriptkitties", "authors": [ "Samantha McVey ", "Patrick Spek " ], "depends": [ ], "description": "Raku module to deep merge Hashes", "license": "Artistic-2.0", "name": "Hash::Merge", "perl": "6.d", "provides": { "Hash::Merge": "lib/Hash/Merge.rakumod", "Hash::Merge::Augment": "lib/Hash/Merge/Augment.rakumod" }, "source-url": "https://git.sr.ht/~tyil/raku-hash-merge", "tags": [ "hash", "utils" ], "test-depends": [ "Test::META" ], "version": "2.0.0" }raku-hash-merge-2.0.0/README.rakudoc000066400000000000000000000036701375415726300170230ustar00rootroot00000000000000=begin pod =NAME Hash::Merge =VERSION 2.0.0 =AUTHOR Patrick Spek =head1 Description A module for the Raku programming language to easily deep-merge two hashes. =head2 Usage Base usage requires you to C the module, and pass two Ces to the imported function, C. =begin code use Hash::Merge; my %alpha = a => 'b', c => { d => 'e', f => 'g', }, ; my %beta = z => 'y', c => { x => 'w', }, ; my %merged = merge-hash(%alpha, %beta); =end code There are two potential options to pass to C: =defn C When set to C, this will not deep merge the Ces. This means that the second C that is passed, will I C elements in the first C, instead of combining them. =defn C When set to C, this will not append C elements. This means that any C elements in the second C will I C elements in the first C. There is also a C in this module that allows you to call C<.merge> on existing C objects. This requires C. While this is a fancy way to work, it will break pre-compilation of whatever module is using it. =begin code use Hash::Merge::Augment my %alpha = a => 'b', c => { d => 'e', f => 'g', }, ; %alpha.merge({ z => 'y', c => { x => 'w', }, }); =end code =head2 Contributing The module's source code is available at the following locations: =item L =item L =item L If you have a change you would like to include, please send a patch to L. =head2 License This module is distributed under the terms of the Artistic License 2.0. For more information, consult the LICENSE file in the module's source code repository. =end pod raku-hash-merge-2.0.0/lib/000077500000000000000000000000001375415726300152545ustar00rootroot00000000000000raku-hash-merge-2.0.0/lib/Hash/000077500000000000000000000000001375415726300161375ustar00rootroot00000000000000raku-hash-merge-2.0.0/lib/Hash/Merge.rakumod000066400000000000000000000033631375415726300205670ustar00rootroot00000000000000#! /usr/bin/env false use v6.d; unit module Hash::Merge; #| Merge any number of Hashes together. sub merge-hashes ( #| Any number of Hashes to merge together. *@hashes, --> Hash ) is export { my %result = @hashes.shift; # Nothing to do if we only got 1 argument return %result unless @hashes.elems; for ^@hashes.elems { %result = merge-hash(%result, @hashes.shift); } %result; } #| Merge two hashes together. sub merge-hash ( #| The original Hash to merge the second Hash into. %first, #| The second hash, which will be merged into the first Hash. %second, #| Boolean to set whether Associative objects should be merged on their #| own. When set to False, Associative objects in %second will #| overwrite those from %first. Bool:D :$deep = True, #| Boolean to set whether Positional objects should be appended. When #| set to False, Positional objects in %second will overwrite those #| from %first. Bool:D :$positional-append = True, --> Hash ) is export { my %result = %first; for %second.keys -> $key { # If the key doesn't exist yet in %first, it can be inserted without worry. if (%first{$key}:!exists) { %result{$key} = %second{$key}; next; } given (%first{$key}) { # Associative objects need to be merged deeply. when Associative { %result{$key} = $deep ?? merge-hash(%first{$key}, %second{$key}, :$deep, :$positional-append) !! %second{$key} } # Positional objects can be merged or overwritten depending on $append-array. when Positional { %result{$key} = $positional-append ?? (|%first{$key}, |%second{$key}) !! %second{$key} } # Anything else will just overwrite. default { %result{$key} = %second{$key}; } } } %result; } # vim: ft=raku ts=4 sw=4 et raku-hash-merge-2.0.0/lib/Hash/Merge/000077500000000000000000000000001375415726300171765ustar00rootroot00000000000000raku-hash-merge-2.0.0/lib/Hash/Merge/Augment.rakumod000066400000000000000000000014041375415726300221610ustar00rootroot00000000000000#! /usr/bin/env false use v6.d; use MONKEY-TYPING; use Hash::Merge; # Don't use precompilation in order to not conflict with other MONKEY-TYPING # modules. no precompilation; augment class Hash { method merge ( Hash:D: #| The Hash to merge into this one. %hash, #| Boolean to set whether Associative objects should be merged on their #| own. When set to False, Associative objects in %second will #| overwrite those from %first. Bool:D :$deep = True, #| Boolean to set whether Positional objects should be appended. When #| set to False, Positional objects in %second will overwrite those #| from %first. Bool:D :$positional-append = True, ) { self = merge-hash(self, %hash, :$deep, :$positional-append); } } # vim: ft=raku ts=4 sw=4 et raku-hash-merge-2.0.0/t/000077500000000000000000000000001375415726300147515ustar00rootroot00000000000000raku-hash-merge-2.0.0/t/01-thing.rakutest000066400000000000000000000014771375415726300200750ustar00rootroot00000000000000#! /usr/bin/env raku use v6; use lib 'lib'; use Test; use Hash::Merge::Augment; my %a; my %b; %a = 1; %b = 2; %a = 2; %b = 1; my %b-orig = %b; my %a-orig = %a; %a.merge(%b); is-deeply %b, %b-orig; is-deeply %a, {:a(2), :b(1), :y(${:a(1), :z(2)})}; %a = %a-orig; %b = %b-orig; %a = "orig"; %b = "new"; %a.merge(%b); is-deeply %a, {Z => 'new', a => 2, b => 1, y => {a => 1, z => 2}}; { my (%z, %y); %z

= (1,2,3,4); %y

= (5,4,6,7); %z.merge(%y); is %z, {y => {p => [1, 2, 3, 4, 5, 4, 6, 7]}}, "appends arrays"; } { my (%z, %y); %z

= (1,2,3,4); %y

= (5,4,6,7); %z.merge(%y, :!positional-append); is-deeply %z, ${:y(${:p($(5, 4, 6, 7))})}, ":!positional-append makes lists overwrite"; } done-testing; # vim: ft=raku ts=4 sw=4 et raku-hash-merge-2.0.0/t/02-empty-source.rakutest000066400000000000000000000004001375415726300214020ustar00rootroot00000000000000#! /usr/bin/env raku use v6.d; use Test; use Hash::Merge::Augment; plan 1; my %hash = a => "a", b => { c => "c" }, ; my %empty; %empty.merge(%hash); is-deeply %empty, %hash, "Merge into empty hash"; # vim: ft=raku ts=4 sw=4 et raku-hash-merge-2.0.0/t/03-unit.rakutest000066400000000000000000000022421375415726300177340ustar00rootroot00000000000000#! /usr/bin/env raku use v6.c; use Hash::Merge; use Test; plan 2; subtest "merge-hash" => { plan 2; my %original = a => "a", b => { c => "c" } ; my %result = a => "a", b => { c => "c", d => "d", }, ; is-deeply merge-hash(%original, %(b => %(d => "d"))), %result, "Hash merges correctly"; is-deeply merge-hash(%original, %()), %original, "Empty Hash doesn't affect original"; } subtest "merge-hashes" => { plan 4; my %original = a => "a", b => { c => "c" } ; my %result = a => "a", b => { c => "c", d => "d", }, ; is-deeply merge-hashes(%original), %original, "Single argument returns original"; is-deeply merge-hashes(%original, %(b => %(d => "d"))), %result, "Hash merges correctly"; is-deeply merge-hashes(%original, %()), %original, "Empty Hash doesn't affect original"; %result = "e"; is-deeply merge-hashes(%original, %(b => %(d => "d")), %(b => %(e => "e"))), %result, "Hash merges correctly"; } # vim: ft=raku ts=4 sw=4 et