mug 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b8aae970fd7b2f0d4ce63d9acd53ada600a0b9d946782d3fd099090cb885088a
-  data.tar.gz: 74abd8b7ca7cb86780d5739ec2c0bbc7fc2b0a12777f73ef5d84a1e1dc42f6b1
+  metadata.gz: 07d9d3f3a20cd20fcc6215086d2de4453052caacce79d03dfca21c779d362f30
+  data.tar.gz: 19b0ab7a8e6e64ada49eaebcc0412e3f6d50dc750a56b9393cb197a8610417cb
 SHA512:
-  metadata.gz: b0975b92d3a4e818eb6c0449bffc631d8d7f508884e481a9af9c377cbb0954fad9d4e845bd4e430459672154badc374179e365f786c4f8f8cb36b38f0d1aac88
-  data.tar.gz: 6a14bb22a3018b6ef8ef7e79baf65bcba07485c78e9d7cfc39be3ad6d9cfd59cb3097e0a97e12e5b8c0dc2c979a7c0700a5401fe5737dfedf4809fba49516423
+  metadata.gz: c87042f97f0e62885e891d47a28d2eef4453eda56fef0f9414b541536dfc0275fce0d69792cbb0cdc99dd35dd0fdcfa73246036f4b76dbe2c4483df1238b6fb1
+  data.tar.gz: 920b93e52a85d10ded07d19d88950b2a7c608379ef599f344d1291dc837acd13c5fb6f324bf77092fb3e9e19d4d60bcb6c5eab9b57e00c9f843ace7c4f14c4de

data/lib/mug.rb

@@ -17,6 +17,7 @@ require_relative 'mug/enumerable/chain'
 require_relative 'mug/enumerable/counts'
 require_relative 'mug/enumerable/hash-like'
 require_relative 'mug/fragile-method-chain'
+require_relative 'mug/hash/fetch-assign'
 require_relative 'mug/hash/map'
 require_relative 'mug/hash/merge'
 require_relative 'mug/hash/operations'

data/lib/mug/diggable.rb

@@ -11,8 +11,8 @@ module Diggable
   #
   def dig *idx
     inner = self[idx.shift]
-    return inner if idx.empty? or inner.nil?
-    inner.dig *idx
+    return inner if idx.empty? || inner.nil?
+    inner.dig(*idx)
   end
 end
 

data/lib/mug/hash.rb

@@ -1,3 +1,4 @@
+require_relative 'hash/fetch-assign'
 require_relative 'hash/map'
 require_relative 'hash/merge'
 require_relative 'hash/operations'

data/lib/mug/hash/fetch-assign.rb

@@ -0,0 +1,33 @@
+
+class Hash
+
+  #
+  # Returns a value from the hash for the given key. If the key can’t be
+  # found, there are several options: if default is given, then that will
+  # be stored and returned; if the optional code block is specified, then
+  # that will be run and its result stored and returned.
+  #
+  def fetch_assign key, *default
+    raise ArgumentError, "wrong number of arguments (given #{default.length + 1}, expected 1..2)" if default.length > 1
+    store key, (default.length == 1 ? default[0] : yield(key)) unless key? key
+    fetch key
+  end
+
+end
+
+=begin
+Copyright (c) 2020, 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
+

data/test/test-hashfetchassign.rb

@@ -0,0 +1,23 @@
+require 'test/unit'
+$VERBOSE = true
+
+require_relative '../lib/mug/hash/fetch-assign'
+class Test_hashfetchassign < Test::Unit::TestCase
+  def test_hashfetchassign
+    hsh = {}
+    assert_equal( 1, hsh.fetch_assign(:a, 1) )
+    assert_equal( {:a => 1}, hsh )
+    assert_equal( 1, hsh.fetch_assign(:a, 2) )
+    assert_equal( {:a => 1}, hsh )
+  end
+  def test_hashfetchassign_proc
+    hsh = {}
+    assert_equal( 1, hsh.fetch_assign(:a) { 1 } )
+    assert_equal( {:a => 1}, hsh )
+    assert_equal( 1, hsh.fetch_assign(:a) { 2 } )
+    assert_equal( {:a => 1}, hsh )
+    assert_equal( 'b', hsh.fetch_assign(:b) {|key| key.to_s } )
+    assert_equal( {:a => 1, :b => 'b'}, hsh )
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-19 00:00:00.000000000 Z
+date: 2020-11-26 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -46,6 +46,7 @@ files:
 - lib/mug/enumerable/hash-like.rb
 - lib/mug/fragile-method-chain.rb
 - lib/mug/hash.rb
+- lib/mug/hash/fetch-assign.rb
 - lib/mug/hash/map.rb
 - lib/mug/hash/merge.rb
 - lib/mug/hash/operations.rb
@@ -91,6 +92,7 @@ files:
 - test/test-enumerable-chain.rb
 - test/test-enumerable-hash-like.rb
 - test/test-fragile-method-chain.rb
+- test/test-hashfetchassign.rb
 - test/test-hashmap.rb
 - test/test-hashmerge.rb
 - test/test-hashop.rb
@@ -130,48 +132,49 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: 'MUG: Matty''s Ultimate Gem'
 test_files:
-- test/test-enumerable-hash-like.rb
-- test/test-clamp.rb
-- test/test-array-delete_all.rb
-- test/test-rexproc.rb
-- test/test-tau.rb
-- test/test-matchdata_each.rb
-- test/test-alias.rb
-- test/test-bittest.rb
-- test/test-iterator.rb
-- test/test-hashwhen.rb
-- test/test-matchdata_hash.rb
-- test/test-diggable.rb
-- test/test-not.rb
-- test/test-array-extend.rb
-- test/test-iterator-for.rb
 - test/2-6-test-clamp.rb
-- test/test-top.rb
-- test/test-and-or.rb
-- test/test-array-to_proc.rb
+- test/2-7-test-clamp.rb
 - test/test-affix.rb
-- test/test-hashmerge.rb
-- test/test-with.rb
+- test/test-alias.rb
+- test/test-and-or.rb
 - test/test-any-and-all.rb
-- test/test-self.rb
-- test/test-enumerable-chain.rb
-- test/test-time.rb
-- test/test-counts.rb
-- test/test-negativity.rb
+- test/test-apply.rb
+- test/test-array-delete_all.rb
+- test/test-array-extend.rb
+- test/test-array-minus.rb
+- test/test-array-samples.rb
+- test/test-array-to_proc.rb
+- test/test-bittest.rb
 - test/test-bool.rb
+- test/test-clamp.rb
+- test/test-counts.rb
+- test/test-diggable.rb
+- test/test-enumerable-chain.rb
+- test/test-enumerable-hash-like.rb
+- test/test-fragile-method-chain.rb
+- test/test-hashfetchassign.rb
 - test/test-hashmap.rb
-- test/test-loop-with.rb
-- test/test-maybe.rb
-- test/test-iff.rb
-- test/test-array-samples.rb
+- test/test-hashmerge.rb
 - test/test-hashop.rb
+- test/test-hashwhen.rb
+- test/test-iff.rb
+- test/test-iterator-for.rb
 - test/test-iterator-method.rb
-- test/test-apply.rb
-- test/test-array-minus.rb
-- test/2-7-test-clamp.rb
-- test/test-fragile-method-chain.rb
+- test/test-iterator.rb
+- test/test-loop-with.rb
+- test/test-matchdata_each.rb
+- test/test-matchdata_hash.rb
+- test/test-maybe.rb
+- test/test-negativity.rb
+- test/test-not.rb
+- test/test-rexproc.rb
+- test/test-self.rb
+- test/test-tau.rb
+- test/test-time.rb
+- test/test-top.rb
+- test/test-with.rb