mug 1.2.4 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 986518f2bdb9b2e66fa37baefbf2bb63a191dd6e97626e7626c5475cea9c674d
-  data.tar.gz: 0ed805639f4a57ba0a361dcd010d86ba240e31df4d0beef3209d782c8d663986
+  metadata.gz: eb47a83a5fb85778ecfb6ad294b1ccd86711c5c62047881ce4851c5fe8a2c7f9
+  data.tar.gz: ff2b7714c8285e757facbe0f02f95e52aaca8f44a9f5b6b062b0efaeb8937ada
 SHA512:
-  metadata.gz: d03ef238645b74dff18bc5daa037403c14963406f6c2875b757543ba2acbeb219bdf70ea1fd54f228d10ceff3f21cb4325ece5f9b34dcef78cb261d01aa7b718
-  data.tar.gz: 5dee2f65ab4aa79e6b7d425cf5512cefb601d329884c9ae512dd450240a430ed78186c5c64d7ec7f8e59e589beb94fd877f4c2b865091655c072dae8dc4b334a
+  metadata.gz: 074d7c49a03c63b511e106e557f9c25f4a49b74a670d36775bb9332036199cf49d8af169fe21a2e23fe87ca4454934d4cc2cba4b5a104d726def4854c913b162
+  data.tar.gz: 9aca8c3fe9266d1333c8e18ef8a4eb054031a4830e1e9f2ccf736009468cf29c9721abfd490504063dcca33eb6895354688bc84c22db214256e8eae88a37c569

data/lib/mug.rb

@@ -11,11 +11,13 @@ require_relative 'mug/array/to_proc'
 require_relative 'mug/bool'
 require_relative 'mug/bittest'
 require_relative 'mug/clamp'
+require_relative 'mug/diggable'
 require_relative 'mug/enumerable/any-and-all'
 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/array/to_proc.rb

@@ -7,13 +7,13 @@ class Array
   # The Proc's parameter is used as an index into this array.
   #
   def to_proc
-    proc {|i| self[i] }
+    method(:slice).to_proc
   end
 
 end
 
 =begin
-Copyright (c) 2017, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2017-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

data/lib/mug/diggable.rb

@@ -0,0 +1,34 @@
+
+#
+# Extend any class or object that implements a #[] method, to
+# also have #dig
+#
+module Diggable
+  #
+  # Extracts the nested value specified by the sequence of +idx+ objects by
+  # calling +dig+ at each step, returning +nil+ if any intermediate step is
+  # +nil+.
+  #
+  def dig *idx
+    inner = self[idx.shift]
+    return inner if idx.empty? || inner.nil?
+    inner.dig(*idx)
+  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/lib/mug/enumerable/hash-like.rb

@@ -47,7 +47,7 @@ module Enumerable
       return v if k == key
     end
     if args.length > 1
-      return default
+      default
     elsif block_given?
       yield key
     else
@@ -78,12 +78,12 @@ module Enumerable
       break if remain < 1
 
       key_indices = key_map[k]
-      if key_indices
-        key_indices.each do |key_index|
-          result[key_index] = v
-          define[key_index] = true
-          remain -= 1
-        end
+      next unless key_indices
+
+      key_indices.each do |key_index|
+        result[key_index] = v
+        define[key_index] = true
+        remain -= 1
       end
     end
 

data/lib/mug/fragile-method-chain.rb

@@ -34,6 +34,16 @@ class FragileMethodChain
     self
   end
 
+  # If the object is resolved, defer. Otherwise, sure, I
+  # respond to anything, I guess.
+  def respond_to_missing? meth, priv
+    if __defer?
+      @o.respond_to_missing? meth, priv
+    else
+      true
+    end
+  end
+
   # Explicitly invoke :_? as a method in the chain.
   def _? #:nodoc:
     # Unconditionally invoke it, so the eventual _! doesn't fail
@@ -60,7 +70,7 @@ class Object
 end
 
 =begin
-Copyright (c) 2013,2016, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2013,2016,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

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,34 @@
+
+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
+  alias compute_if_absent fetch_assign
+
+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/lib/mug/maybe.rb

@@ -21,6 +21,15 @@ class MaybeDelegator
   def method_missing *a, &b #:nodoc:
     @o && @o.send(*a, &b)
   end
+
+  # This is a bit flakey, but I think it's meaningful.
+  def respond_to_missing? meth, priv
+    if @o
+      @o.repond_to_missing? meth, priv
+    else
+      true
+    end
+  end
 end
 
 class Object
@@ -42,7 +51,7 @@ class Object
 end
 
 =begin
-Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2013,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

data/test/test-array-to_proc.rb

@@ -10,6 +10,8 @@ class Test_array_to_proc < Test::Unit::TestCase
     assert_equal( p[3], a[3] )
     assert_equal( p[-1], a[-1] )
     assert_equal( p[0..-1], a )
+    assert_equal( p[0,1], a[0,1] )
+    assert_equal( p[1,2], a[1,2] )
     assert_raise(TypeError) { p['not-a-number'] }
   end
 end

data/test/test-diggable.rb

@@ -0,0 +1,42 @@
+require 'test/unit'
+$VERBOSE = true
+
+require_relative '../lib/mug/diggable'
+class Test_digabble < Test::Unit::TestCase
+
+  class DiggyClass
+    include Diggable
+
+    def initialize *args
+      @array = args
+    end
+
+    def [] idx
+      @array[idx]
+    end
+  end
+
+  def test_diggable_mid
+    z = [99]
+    y = DiggyClass.new 0, z
+    x = [nil, nil, y]
+
+    path = [2, 1, 0]
+    assert_equal( 99, x.dig(*path) )
+  end
+  def test_diggable_end
+    z = [99]
+    y = DiggyClass.new 0, z
+    x = [nil, nil, y]
+
+    path = [2, 1]
+    assert_equal( z, x.dig(*path) )
+  end
+  def test_diggable_nil
+    y = DiggyClass.new 0, nil
+    x = [nil, nil, y]
+
+    path = [2, 1, 0]
+    assert_equal( nil, x.dig(*path) )
+  end
+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.2.4
+  version: 1.6.0
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-11 00:00:00.000000000 Z
+date: 2020-12-07 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -38,6 +38,7 @@ files:
 - lib/mug/bool.rb
 - lib/mug/clamp.rb
 - lib/mug/counts.rb
+- lib/mug/diggable.rb
 - lib/mug/enumerable.rb
 - lib/mug/enumerable/any-and-all.rb
 - lib/mug/enumerable/chain.rb
@@ -45,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
@@ -86,9 +88,11 @@ files:
 - 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-hashmerge.rb
 - test/test-hashop.rb
@@ -128,47 +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-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