mug 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21d1b6c8247c41a14924f50e55653bfe7bb87493
-  data.tar.gz: 37d41621cb3ca18807a2c936493c785c7ed63dd7
+  metadata.gz: 62f380b7208bcca73fc03c01f9e768635cd86db6
+  data.tar.gz: 5c6fda3e95d3b1cf91a433e598bcccbe435647a2
 SHA512:
-  metadata.gz: 66dcd7f92b6bd1d1130f36df8283d05e7b0c7b5d7ebb9bc8d9d11c8d01fb65b4b6b6afa584a5f83c762b9fa8d3c39258c8accbdb533f507307b21efb516858e1
-  data.tar.gz: bc82837df41887914560e947239fe2499737fbf82afa5dc2ea717466dc69cd135a7ac804e5aba5bb3da015b6570defea49336df3bb893aded73b9d4d869c833e
+  metadata.gz: ecb3583f89035c101ef30645cd188c2d1927901dbb4e0ab6f3e3db8d924e053b28de09ffc82834fa3300b18ff158958515c0c45a6240d039294006abf53c01b5
+  data.tar.gz: 55c48683d37e24b974982e5bd4f039e63df00b04fe7427b172932385f1df94001e829407f87446d29c8272b682fb4dc3946aa253761d85ab0265f1201df647bc

data/lib/mug.rb

@@ -9,6 +9,7 @@ require_relative 'mug/clamp'
 require_relative 'mug/counts'
 require_relative 'mug/fragile-method-chain'
 require_relative 'mug/hash/map'
+require_relative 'mug/hash/merge'
 require_relative 'mug/hash/operations'
 require_relative 'mug/iterator/for'
 require_relative 'mug/iterator/method'

data/lib/mug/hash.rb

@@ -1,2 +1,3 @@
 require_relative 'hash/map'
+require_relative 'hash/merge'
 require_relative 'hash/operations'

data/lib/mug/hash/merge.rb

@@ -0,0 +1,57 @@
+=begin
+Copyright (c) 2016, Matthew Kerwin <matthew@kerwin.net.au>
+
+Permission to use, copy, modify, and/or distribute this software for any
+purpose with or without fee is hereby granted, provided that the above
+copyright notice and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+=end
+
+
+class Hash
+
+  #
+  # Returns a new hash containing the contents of +other_hash+ and the
+  # contents of +hsh+. The value for each duplicate key is the value in
+  # +hsh+ when it exists.
+  #
+  def merge_left other_hash
+    merge(other_hash) {|key, left, right| left.nil? ? right : left }
+  end
+
+  #
+  # Returns a new hash containing the contents of +other_hash+ and the
+  # contents of +hsh+. The value for each duplicate key is the value in
+  # +other_hash+ when it exists.
+  #
+  def merge_right other_hash
+    merge(other_hash) {|key, left, right| right.nil? ? left : right }
+  end
+
+  #
+  # Adds the contents of +other_hash+ to +hsh+. Entries with duplicate
+  # keys are overwritten with the values from +other_hash+ if the
+  # values in +hsh+ are +nil+.
+  #
+  def merge_left! other_hash
+    merge!(other_hash) {|key, left, right| left.nil? ? right : left }
+  end
+
+  #
+  # Adds the contents of +other_hash+ to +hsh+. Entries with duplicate
+  # keys are overwritten with the values from +other_hash+ unless the
+  # values in +other_hash+ are +nil+.
+  #
+  def merge_right! other_hash
+    merge!(other_hash) {|key, left, right| right.nil? ? left : right }
+  end
+
+end
+

data/test/test-hashmerge.rb

@@ -0,0 +1,39 @@
+require 'test/unit'
+$VERBOSE = true
+
+$coercable = Object.new
+def $coercable.to_h
+  {:a=>0, :z=>99}
+end
+
+require_relative '../lib/mug/hash/merge'
+class Test_hashop < Test::Unit::TestCase
+  def test_hash_merge_left
+    l = { :a => 1, :b => 1,          :d => nil, :e => 1 }
+    r = { :a => 2,          :c => 2, :d => 2,   :e => nil}
+    x = { :a => 1, :b => 1, :c => 2, :d => 2,   :e => 1 }
+    assert_equal( x, l.merge_left(r) )
+  end
+  def test_hash_merge_right
+    l = { :a => 1, :b => 1,          :d => nil, :e => 1 }
+    r = { :a => 2,          :c => 2, :d => 2,   :e => nil}
+    x = { :a => 2, :b => 1, :c => 2, :d => 2,   :e => 1 }
+    assert_equal( x, l.merge_right(r) )
+  end
+  def test_hash_merge_left_bang
+    l = { :a => 1, :b => 1,          :d => nil, :e => 1 }
+    r = { :a => 2,          :c => 2, :d => 2,   :e => nil}
+    x = { :a => 1, :b => 1, :c => 2, :d => 2,   :e => 1 }
+    l.merge_left! r
+    assert_equal( x, l )
+  end
+  def test_hash_merge_right_bang
+    l = { :a => 1, :b => 1,          :d => nil, :e => 1 }
+    r = { :a => 2,          :c => 2, :d => 2,   :e => nil}
+    x = { :a => 2, :b => 1, :c => 2, :d => 2,   :e => 1 }
+    l.merge_right! r
+    assert_equal( x, l )
+  end
+end
+
+

metadata

@@ -1,21 +1,21 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
 
   A collection of wonders to astound the mind!!
 
-  See the documentation at <https://github.com/phluid61/mug>.
+  See the documentation at https://github.com/phluid61/mug
 email:
 - matthew@kerwin.net.au
 executables: []
@@ -35,6 +35,7 @@ files:
 - lib/mug/fragile-method-chain.rb
 - lib/mug/hash.rb
 - lib/mug/hash/map.rb
+- lib/mug/hash/merge.rb
 - lib/mug/hash/operations.rb
 - lib/mug/hashmap.rb
 - lib/mug/hashop.rb
@@ -65,6 +66,7 @@ files:
 - test/test-counts.rb
 - test/test-fragile-method-chain.rb
 - test/test-hashmap.rb
+- test/test-hashmerge.rb
 - test/test-hashop.rb
 - test/test-iterator-for.rb
 - test/test-iterator-method.rb
@@ -99,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.2
 signing_key: 
 specification_version: 4
 summary: 'MUG: Matty''s Ultimate Gem'
@@ -114,6 +116,7 @@ test_files:
 - test/test-iterator-for.rb
 - test/test-top.rb
 - test/test-and-or.rb
+- test/test-hashmerge.rb
 - test/test-any-and-all.rb
 - test/test-self.rb
 - test/test-time.rb