mug 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e14ce5838a2c49e7ede7dba94a8aa1b330efba9ecec52261d611985d30bd47d
-  data.tar.gz: 89a7d9d6ddb730004f062f625d81301f1d9271759b8c5ab717e1a42407981b44
+  metadata.gz: c6a1368f80be0c11d5fc8614b1e9548dddef502fffd929bd6e01b6bc705737c8
+  data.tar.gz: 9a1bb6550a0ac33d484c2fd52fad34a82035ec6af4df4446ecfa099dd92b78d8
 SHA512:
-  metadata.gz: 5f3da00b7a7b2ba58dfcd8b5efaae57ccd035c9e36d90182a13204578089e071d0a6a614c031585eaf81f8f9bd4c06adbaf8d04a52159ad37951b396c0b73c08
-  data.tar.gz: 71c1e2a2cf4c87b0b4a4e13f837c36042c374b0b50a6d210d09b838b0470e87310765c57bee9ad02b711d4bc1287cd5856b0ef26ee2c2a2fbcee30a12f10e965
+  metadata.gz: bbf884f4d7b2e3dac6e0a4623d27a831430e9446be804cb99d0cb44fadd6d9de4eb7dc0bcc8f99c930d33b24702ea955d6c1be599f78baacd626f1b9eb829a88
+  data.tar.gz: 06dc7216fac287a0838c9efa7a477a9d83fc9957141c7da4f566ffa2e3a42c3a7b2c50abfe2eeb8e1433afa072caac832f46d963370ce95cb145a71fdc2216a2

data/lib/mug/and-or.rb

@@ -7,7 +7,7 @@ class Object
   # If a block is given, +obj+ is yielded to it; if it returns truthy,
   # +default+ is returned, otherwise +obj+ is returned.
   #
-  def and default
+  def and default, &_block
     if block_given?
       yield(self) ? default : self
     else
@@ -21,7 +21,7 @@ class Object
   # If a block is given, +obj+ is yielded to it; if it returns truthy,
   # +obj+ is returned, otherwise +default+ is returned.
   #
-  def or default
+  def or default, &_block
     if block_given?
       yield(self) ? self : default
     else
@@ -34,7 +34,7 @@ class Object
   #
   # Returns +obj+.
   #
-  def and_then &block
+  def and_then &_block
     yield self if self
     self
   end
@@ -44,7 +44,7 @@ class Object
   #
   # Returns +obj+.
   #
-  def or_then &block
+  def or_then &_block
     yield self unless self
     self
   end
@@ -52,7 +52,7 @@ class Object
 end
 
 =begin
-Copyright (c) 2017, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/array/delete_all.rb

@@ -10,7 +10,7 @@ class Array
   #
   # See #delete_if, #reject!
   #
-  def delete_all &block
+  def delete_all &_block
     return enum_for :delete_all unless block_given?
     [].tap do |removed|
       delete_if do |e|
@@ -25,7 +25,7 @@ class Array
 end
 
 =begin
-Copyright (c) 2017, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/bool.rb

@@ -33,7 +33,7 @@ class Numeric
   # Returns true if not zero.
   #
   def to_b
-    self != 0
+    !self.zero?
   end
 end
 
@@ -93,9 +93,10 @@ class Enumerator
   #
   # Converts enum to a boolean.
   # Returns true if there are any elements.
+  # An enumerator whose size cannot be calculated lazily is assumed to be true.
   #
   def to_b
-    size.to_b
+    (s = size).nil? || s.to_b
   end
 end
 end
@@ -111,7 +112,7 @@ class Exception
 end
 
 =begin
-Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/clamp.rb

@@ -33,9 +33,7 @@ class Range
 
     b = last
     if val >= b
-      if exclude_end?
-        raise ArgumentError, 'more than or equal to the exclusive range'
-      end
+      raise ArgumentError, 'greater than or equal to the exclusive range' if exclude_end?
       return b
     end
 
@@ -45,7 +43,7 @@ class Range
 end
 
 =begin
-Copyright (c) 2014, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/enumerable/chain.rb

@@ -9,11 +9,16 @@ module Enumerable
     def chain *enums
       return enum_for(:chain, *enums) unless block_given?
       enums.each do |enum|
-        enum.each {|*args| yield *args }
+        enum.each {|*args| yield(*args) }
       end
     end
   end
 
+  if RUBY_VERSION >= '2.6'
+    warn "warning: Enumerable\#chain defined since Ruby 2.6 is incompatible with this gem when used with args and a block"
+    undef chain
+  end
+
   #
   # Creates a chain of Enumerables following this one, and
   # invokes a block once for each element of each Enumerable.
@@ -21,7 +26,7 @@ module Enumerable
   def chain *enums
     return enum_for(:chain, *enums) unless block_given?
     [self, *enums].each do |enum|
-      enum.each {|*args| yield *args }
+      enum.each {|*args| yield(*args) }
     end
     nil
   end

data/lib/mug/enumerable/counts.rb

@@ -20,7 +20,7 @@ module Enumerable
   #
   # If no block is given, an enumerator is returned.
   #
-  def counts_by &block
+  def counts_by &_block
     return enum_for(:counts_by) unless block_given?
     hsh = Hash.new{|h,k| h[k] = 0 }
     each do |j|

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
 
@@ -133,6 +133,7 @@ module Enumerable
   end
   alias size length
 
+  undef member? # FIXME: do something about this? maybe warn?
   ##
   # Returns true if the given key is present in this enum.
   #

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/map.rb

@@ -7,7 +7,8 @@ class Hash
   #   {'a'=>1, 'b'=>2}.map_values { |v| v*2 } #=> {'a'=>2, 'b'=>4}
   #   {'a'=>1, 'b'=>2}.map_values { "cat" }   #=> {'a'=>"cat", 'b'=>"cat"}
   #
-  def map_values &block # :yields: value
+  def map_values &_block # :yields: value
+    return enum_for(:map_values) unless block_given?
     hsh = {}
     each do |k, v|
       hsh[k] = yield v
@@ -21,6 +22,7 @@ class Hash
   # See: #map_values
   #
   def map_values! &block # :yields: value
+    return enum_for(:map_values!) unless block_given?
     replace map_values(&block)
   end
 
@@ -34,7 +36,8 @@ class Hash
   #   {'a'=>1, 'b'=>2}.map_keys { |k| k*2 } #=> {'aa'=>1, 'bb'=>2}
   #   {'a'=>1, 'b'=>2}.map_keys { "cat" }   #=> {'cat'=>2}
   #
-  def map_keys &block # :yields: key
+  def map_keys &_block # :yields: key
+    return enum_for(:map_keys) unless block_given?
     hsh = {}
     each do |k, v|
       hsh[ yield k ] = v
@@ -50,6 +53,7 @@ class Hash
   # See: #map_keys
   #
   def map_keys! &block # :yields: key
+    return enum_for(:map_keys!) unless block_given?
     replace map_keys(&block)
   end
 
@@ -63,7 +67,8 @@ class Hash
   #   {'a'=>1, 'b'=>2}.map_pairs { |k,v| [k*2, v+1] } #=> {'aa'=>2, 'bb'=>3}
   #   {'a'=>1, 'b'=>2}.map_pairs { ["cat","dog"] }   #=> {'cat'=>'dog'}
   #
-  def map_pairs &block # :yields: key, value
+  def map_pairs &_block # :yields: key, value
+    return enum_for(:map_pairs) unless block_given?
     hsh = {}
     each do |k, v|
       a, b = yield k, v
@@ -73,17 +78,20 @@ class Hash
   end
 
   #
-  # Replaces the values in +hsh+ by running them each through +block+.
+  # Replaces the keys and values in +hsh+ by running them each through +block+.
   #
-  # See: #map_values
+  # If +block+ returns duplicate keys, they will be overwritten.
+  #
+  # See: #map_pairs
   #
   def map_pairs! &block # :yields: key, value
+    return enum_for(:map_pairs!) unless block_given?
     replace map_pairs(&block)
   end
 end
 
 =begin
-Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/merge.rb

@@ -1,19 +1,3 @@
-=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
 
@@ -55,3 +39,18 @@ class Hash
 
 end
 
+=begin
+Copyright (c) 2018, 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/iterator.rb

@@ -22,8 +22,8 @@ class Iterator < Enumerator
   # In the second, deprecated, form, a generated Iterator sends the
   # given method with any +args+ to the iterand.
   #
-  # Use of this form is discourages.  Use Object#iter_for or
-  # Object#to_iter instead.
+  # Use of this form is discouraged.  Use Object#iter_for or
+  # Method#to_iter instead.
   #
   # @call-seq new(initial, *args) { |obj, *args| ... }
   # @call-seq new(initial, method=:each, *args)

data/lib/mug/matchdata/each.rb

@@ -4,7 +4,7 @@ class MatchData
   # Iterates over each capture group in the MatchData object,
   # including +$&+ (the entire matched string), yielding the
   # captured string.
-  def each &b
+  def each &_b
     return enum_for(:each) unless block_given?
     to_a.each{|v| yield v }
   end
@@ -15,7 +15,7 @@ class MatchData
   # The capture positions are either all Strings or all Integers,
   # depending on whether the original Regexp had named capture
   # groups or not.
-  def each_capture &b
+  def each_capture &_b
     return enum_for(:each_capture) unless block_given?
     if names.empty?
       captures.each_with_index{|v,i| yield i+1, v }
@@ -26,7 +26,7 @@ class MatchData
 
   # Iterates over each named capture group in the MatchData object,
   # yielding the capture name and string.
-  def each_named_capture &b
+  def each_named_capture &_b
     return enum_for(:each_named_capture) unless block_given?
     names.each{|n| yield n, self[n] }
   end
@@ -39,7 +39,7 @@ class MatchData
   #
   # WARNING: if mixing named and positional captures, no positional
   # captures will be available using this method!
-  def each_positional_capture include_names: false, &b
+  def each_positional_capture include_names: false, &_b
     return enum_for(:each_positional_capture, include_names: include_names) unless block_given?
     return unless names.empty? || include_names
     captures.each_with_index{|v,i| yield i+1, v }
@@ -48,7 +48,7 @@ class MatchData
 end
 
 =begin
-Copyright (c) 2016, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/matchdata/hash.rb

@@ -14,10 +14,12 @@ class MatchData
     end
   end
 
+  if RUBY_VERSION < '2.4'
   # Returns a Hash object of capture name => captured string.
   def named_captures
     Hash[ names.map{|n| [n, self[n]] } ]
   end
+  end
 
   # Returns a Hash object of capture position => captured string.
   #
@@ -34,7 +36,7 @@ class MatchData
 end
 
 =begin
-Copyright (c) 2016, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/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/lib/mug/self.rb

@@ -6,7 +6,7 @@ class Object
   # If a block is given, this object is yielded to it, and the result
   # is returned.
   #
-  def self(&block)
+  def self(&_block)
     if block_given?
       yield self
     else
@@ -26,7 +26,7 @@ class Object
   # to a block. If no block is given, returns an
   # Enumerator.
   #
-  def revapply(*args, &block)
+  def revapply(*args, &_block)
     if block_given?
       yield self, *args
     else
@@ -37,7 +37,7 @@ class Object
 end
 
 =begin
-Copyright (c) 2017, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/top.rb

@@ -8,7 +8,7 @@ module Enumerable
   #
   # @see Enumerable#sort
   #
-  def top n=1, &blk
+  def top n=1, &_blk
     if block_given?
       sort{|x,y| yield y, x }[0...n]
     else
@@ -32,7 +32,7 @@ module Enumerable
   #
   # @see Enumerable#sort_by
   #
-  def top_by n=1, &blk
+  def top_by n=1, &_blk
     return enum_for(:top_by, n) unless block_given?
     chain = {}
     each do |x|
@@ -75,7 +75,7 @@ module Enumerable
   #
   # @see Enumerable#sort_by
   #
-  def bottom_by n=1, &blk
+  def bottom_by n=1, &_blk
     return enum_for(:bottom_by, n) unless block_given?
     chain = {}
     each do |x|
@@ -111,7 +111,7 @@ class Array
 end
 
 =begin
-Copyright (c) 2014-2017, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018, 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/with.rb

@@ -5,12 +5,13 @@ module Kernel
   #
   def with *args
     return enum_for(:with, *args) unless block_given?
-    yield *args
+    yield(*args)
   end
+  private :with
 end
 
 =begin
-Copyright (c) 2018, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2019, 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/2-6-test-clamp.rb

@@ -0,0 +1,17 @@
+class Test_clamp < Test::Unit::TestCase
+
+  def test_clamp__endless_range
+    rng = (1..)
+    assert_raise(RangeError) { 2.clamp(rng) }
+  end
+
+  def test_bound__endless
+    rng = (1..)
+    assert_raise(RangeError) { rng.bound(2) }
+
+    rng = (1...)
+    assert_raise(RangeError) { rng.bound(2) }
+  end
+
+end
+

data/test/2-7-test-clamp.rb

@@ -0,0 +1,17 @@
+class Test_clamp < Test::Unit::TestCase
+
+  def test_clamp__beginless_range
+    rng = (..3)
+    assert_raise(RangeError) { 2.clamp(rng) }
+  end
+
+  def test_bound__beginless
+    rng = (..3)
+    assert_raise(RangeError) { rng.bound(2) }
+
+    rng = (...3)
+    assert_raise(RangeError) { rng.bound(2) }
+  end
+
+end
+

data/test/test-alias.rb

@@ -1,54 +1,54 @@
 require 'test/unit'
 $VERBOSE = true
 
-class ::DummyClass
-  def self.dummy_method
-    :ok
-  end
-  def self.clobber_method
-    :original
-  end
-end
-
 require_relative '../lib/mug/alias'
 class Test_alias < Test::Unit::TestCase
 
+  class DummyClass
+    def self.dummy_method
+      :ok
+    end
+    def self.clobber_method
+      :original
+    end
+  end
+
   def test_alias
-    assert_equal( :ok, ::DummyClass.dummy_method )
-    assert_raise(NoMethodError) { ::DummyClass.aliased_method }
+    assert_equal( :ok, DummyClass.dummy_method )
+    assert_raise(NoMethodError) { DummyClass.aliased_method }
 
-    ::DummyClass.instance_eval do
+    DummyClass.instance_eval do
       alias_singleton_method :aliased_method, :dummy_method
     end
 
-    assert_equal( :ok, ::DummyClass.dummy_method )
-    assert_equal( :ok, ::DummyClass.aliased_method )
+    assert_equal( :ok, DummyClass.dummy_method )
+    assert_equal( :ok, DummyClass.aliased_method )
   end
 
   def test_alias_safe
-    assert_equal( :original, ::DummyClass.clobber_method )
+    assert_equal( :original, DummyClass.clobber_method )
 
-    ::DummyClass.instance_eval do
+    DummyClass.instance_eval do
       alias_singleton_method :unclobbered_method, :clobber_method
       def self.clobber_method
         :clobbered
       end
     end
 
-    assert_equal( :clobbered, ::DummyClass.clobber_method )
-    assert_equal( :original, ::DummyClass.unclobbered_method )
+    assert_equal( :clobbered, DummyClass.clobber_method )
+    assert_equal( :original, DummyClass.unclobbered_method )
   end
 
   def test_alias_return
     result = nil
-    ::DummyClass.instance_eval do
+    DummyClass.instance_eval do
       result = alias_singleton_method :aliased_method2, :dummy_method
     end
-    assert_equal( ::DummyClass, result )
+    assert_equal( DummyClass, result )
   end
 
   def test_alias_private
-    assert_raise(NoMethodError) { ::DummyClass.alias_singleton_method :aliased_method3, :dummy_method }
+    assert_raise(NoMethodError) { DummyClass.alias_singleton_method :aliased_method3, :dummy_method }
   end
 
 end

data/test/test-apply.rb

@@ -1,14 +1,15 @@
 require 'test/unit'
 $VERBOSE = true
 
-class Foo
-  def bar a, b
-    (a||0) + (b||0)
-  end
-end
-
 require_relative '../lib/mug/apply'
 class Test_apply < Test::Unit::TestCase
+
+  class Foo
+    def bar a, b
+      (a||0) + (b||0)
+    end
+  end
+
   def test_apply_proc
     prc = proc{|a,b,*c| (a||0) + (b||0) + c.inject(0, &:+) }
     p1 = prc.apply(1)

data/test/test-array-samples.rb

@@ -1,29 +1,30 @@
 require 'test/unit'
 $VERBOSE = true
 
-$ARRAY = proc { 8.times.to_a }
-$TRIES = 40320 # 8 factorial
-$MIN = 4
-$MAX = 6
+require_relative '../lib/mug/array/samples'
+class Test_array_extend < Test::Unit::TestCase
 
-class MyPRNG
-  def rand n=1.0
-    case n
-    when Integer
-      n - 1
-    when Range
-      n.max
-    when Float
-      n.prev_float
+  class MyPRNG
+    def rand n=1.0
+      case n
+      when Integer
+        n - 1
+      when Range
+        n.max
+      when Float
+        n.prev_float
+      end
     end
   end
-end
 
-require_relative '../lib/mug/array/samples'
-class Test_array_extend < Test::Unit::TestCase
+  ARRAY = proc { 8.times.to_a }
+  TRIES = 40320 # 8 factorial
+  MIN = 4
+  MAX = 6
+
   def test_samples
-    a = $ARRAY.call
-    $TRIES.times do
+    a = ARRAY.call
+    TRIES.times do
       s = a.samples
       assert( s.length >= 1 )
       assert( s.length <= a.length )
@@ -32,11 +33,11 @@ class Test_array_extend < Test::Unit::TestCase
     end
   end
   def test_samples_min
-    a = $ARRAY.call
+    a = ARRAY.call
     # successes
-    $TRIES.times do
-      s = a.samples( :min => $MIN )
-      assert( s.length >= $MIN )
+    TRIES.times do
+      s = a.samples( :min => MIN )
+      assert( s.length >= MIN )
       assert( s.length <= a.length )
       assert( s.uniq == s )
       assert( s.all? {|n| a.include? n } )
@@ -45,12 +46,12 @@ class Test_array_extend < Test::Unit::TestCase
     assert_raise( ArgumentError ) { a.samples( :min => -1 ) }
   end
   def test_samples_max
-    a = $ARRAY.call
+    a = ARRAY.call
     # successes
-    $TRIES.times do
-      s = a.samples( :max => $MAX )
+    TRIES.times do
+      s = a.samples( :max => MAX )
       assert( s.length >= 1 )
-      assert( s.length <= $MAX )
+      assert( s.length <= MAX )
       assert( s.uniq == s )
       assert( s.all? {|n| a.include? n } )
     end
@@ -58,21 +59,21 @@ class Test_array_extend < Test::Unit::TestCase
     assert_raise( ArgumentError ) { a.samples( :max => -1 ) }
   end
   def test_samples_minmax
-    a = $ARRAY.call
+    a = ARRAY.call
     # successes
-    $TRIES.times do
-      s = a.samples( :min => $MIN, :max => $MAX )
-      assert( s.length >= $MIN )
-      assert( s.length <= $MAX )
+    TRIES.times do
+      s = a.samples( :min => MIN, :max => MAX )
+      assert( s.length >= MIN )
+      assert( s.length <= MAX )
       assert( s.uniq == s )
       assert( s.all? {|n| a.include? n } )
     end
     # failures
-    assert_raise( ArgumentError ) { a.samples( :min => $MAX, :max => $MIN ) }
+    assert_raise( ArgumentError ) { a.samples( :min => MAX, :max => MIN ) }
   end
   def test_samples_random
-    a = $ARRAY.call
-    $TRIES.times do
+    a = ARRAY.call
+    TRIES.times do
       s = a.samples( :random => Random.new )
       assert( s.length >= 1 )
       assert( s.length <= a.length )
@@ -81,8 +82,8 @@ class Test_array_extend < Test::Unit::TestCase
     end
   end
   def test_samples_random2
-    a = $ARRAY.call
-    $TRIES.times do
+    a = ARRAY.call
+    TRIES.times do
       s = a.samples( :random => MyPRNG.new )
       assert( s.length >= 1 )
       assert( s.length <= a.length )

data/test/test-bool.rb

@@ -1,23 +1,23 @@
 require 'test/unit'
 $VERBOSE = true
 
-class MyEnum
-  include Enumerable
-  def initialize(*a) @a=a; end
-  def each(&b) @a.each(&b); end
-end
-
-if RUBY_VERSION.to_i >= 2
-$truthy = [ 1, 1.0, Float::INFINITY, -Float::INFINITY, (1<<100).coerce(1).first, Rational(1,1), "x", [1], {1=>1}, MyEnum.new(1), [1].each ]
-$falsy  = [ 0, 0.0, -0.0, Float::NAN, (1<<100).coerce(0).first, Rational(0,1), "", [], {}, MyEnum.new, [].each, RuntimeError.new ]
-else
-$truthy = [ 1, 1.0, Float::INFINITY, -Float::INFINITY, (1<<100).coerce(1).first, Rational(1,1), "x", [1], {1=>1}, MyEnum.new(1) ]
-$falsy  = [ 0, 0.0, -0.0, Float::NAN, (1<<100).coerce(0).first, Rational(0,1), "", [], {}, MyEnum.new, RuntimeError.new ]
-end
-
 require_relative '../lib/mug/bool'
 class Test_bool < Test::Unit::TestCase
 
+  class MyEnum
+    include Enumerable
+    def initialize(*a) @a=a; end
+    def each(&b) @a.each(&b); end
+  end
+
+  if RUBY_VERSION.to_i >= 2
+    TRUTHY = [ 1, 1.0, Float::INFINITY, -Float::INFINITY, (1<<100).coerce(1).first, Rational(1,1), "x", [1], {1=>1}, MyEnum.new(1), [1].each ]
+    FALSY  = [ 0, 0.0, -0.0, Float::NAN, (1<<100).coerce(0).first, Rational(0,1), "", [], {}, MyEnum.new, [].each, RuntimeError.new ]
+  else
+    TRUTHY = [ 1, 1.0, Float::INFINITY, -Float::INFINITY, (1<<100).coerce(1).first, Rational(1,1), "x", [1], {1=>1}, MyEnum.new(1) ]
+    FALSY  = [ 0, 0.0, -0.0, Float::NAN, (1<<100).coerce(0).first, Rational(0,1), "", [], {}, MyEnum.new, RuntimeError.new ]
+  end
+
   alias assert_true assert
   def assert_false val, msg=UNASSIGNED
     assert !val, msg
@@ -35,10 +35,10 @@ class Test_bool < Test::Unit::TestCase
     assert_true( Bool(true), true_msg(true) )
     assert_false( Bool(false), false_msg(false) )
     assert_false( Bool(nil), false_msg(false) )
-    $truthy.each do |o|
+    TRUTHY.each do |o|
       assert_true( Bool(o), true_msg(o) )
     end
-    $falsy.each do |o|
+    FALSY.each do |o|
       assert_true( Bool(o), true_msg(o) )
     end
   end
@@ -47,10 +47,10 @@ class Test_bool < Test::Unit::TestCase
     assert_true( true.to_bool, true_msg(true,'to_bool') )
     assert_false( false.to_bool, false_msg(false,'to_bool') )
     assert_false( nil.to_bool, false_msg(nil,'to_bool') )
-    $truthy.each do |o|
+    TRUTHY.each do |o|
       assert_true( o.to_bool, true_msg(o,'to_bool') )
     end
-    $falsy.each do |o|
+    FALSY.each do |o|
       assert_true( o.to_bool, true_msg(o,'to_bool') )
     end
   end
@@ -59,10 +59,10 @@ class Test_bool < Test::Unit::TestCase
     assert_true( true.to_b, true_msg(true,'to_b') )
     assert_false( false.to_b, false_msg(false,'to_b') )
     assert_false( nil.to_b, false_msg(nil,'to_b') )
-    $truthy.each do |o|
+    TRUTHY.each do |o|
       assert_true( o.to_b, true_msg(o,'to_b') )
     end
-    $falsy.each do |o|
+    FALSY.each do |o|
       assert_false( o.to_b, false_msg(o,'to_b') )
     end
   end

data/test/test-clamp.rb

@@ -46,6 +46,13 @@ class Test_clamp < Test::Unit::TestCase
     assert_raise(ArgumentError) { rng.bound(5) }
     assert_raise(ArgumentError) { rng.bound(6) }
   end
+end
+
+if RUBY_VERSION.to_f >= 2.6
+  require_relative '2-6-test-clamp'
+end
 
+if RUBY_VERSION.to_f >= 2.7
+  require_relative '2-7-test-clamp'
 end
 

data/test/test-enumerable-chain.rb

@@ -14,8 +14,8 @@ class Test_enumerable_chain < Test::Unit::TestCase
     ]
 
     result = []
-    a.chain(b, c) do |*a|
-      result << a
+    a.chain(b, c) do |*x|
+      result << x
     end
 
     assert_equal( expect, result )
@@ -35,8 +35,8 @@ class Test_enumerable_chain < Test::Unit::TestCase
     assert_kind_of( Enumerator, enum )
 
     result = []
-    enum.each do |*a|
-      result << a
+    enum.each do |*x|
+      result << x
     end
 
     assert_equal( expect, result )
@@ -51,8 +51,8 @@ class Test_enumerable_chain < Test::Unit::TestCase
     ]
 
     result = []
-    Enumerable.chain(a, b) do |*a|
-      result << a
+    Enumerable.chain(a, b) do |*x|
+      result << x
     end
 
     assert_equal( expect, result )
@@ -70,8 +70,8 @@ class Test_enumerable_chain < Test::Unit::TestCase
     assert_kind_of( Enumerator, enum )
 
     result = []
-    enum.each do |*a|
-      result << a
+    enum.each do |*x|
+      result << x
     end
 
     assert_equal( expect, result )

data/test/test-enumerable-hash-like.rb

@@ -1,19 +1,20 @@
 require 'test/unit'
 $VERBOSE = true
 
-class HashLikeEnum
-  def each
-    return enum_for(:each) unless block_given?
-    yield 'a'
-    yield 'b'
-    yield 'c'
-    yield 'd'
-  end
-  include Enumerable
-end
-
 require_relative '../lib/mug/enumerable/hash-like'
 class Test_hashlike < Test::Unit::TestCase
+
+  class HashLikeEnum
+    def each
+      return enum_for(:each) unless block_given?
+      yield 'a'
+      yield 'b'
+      yield 'c'
+      yield 'd'
+    end
+    include Enumerable
+  end
+
   def test__each_pair__block
     my_enum = HashLikeEnum.new
     expect = [[0, 'a'], [1, 'b'], [2, 'c'], [3, 'd']]

data/test/test-fragile-method-chain.rb

@@ -1,28 +1,38 @@
 require 'test/unit'
 $VERBOSE = true
 
-module FMCTest
-  class A
-    def initialize; @b = B.new; end
-    attr_accessor :b
-  end
+require_relative '../lib/mug/fragile-method-chain'
+class Test_fmc < Test::Unit::TestCase
 
-  class B
-    def initialize; @c = C.new; end
-    attr_accessor :c
-  end
+  module FMCTest
+    class A
+      def initialize; @b = B.new; end
+      attr_accessor :b
+    end
+
+    class B
+      def initialize; @c = C.new; end
+      attr_accessor :c
+    end
 
-  class C
-    def to_i; 1; end
+    class C
+      def to_i; 1; end
+    end
   end
-end
 
-def false.c
-  2
-end
+  def self.startup
+    class << false
+      def c
+        2
+      end
+    end
+  end
+  def self.shutdown
+    class << false
+      undef c
+    end
+  end
 
-require_relative '../lib/mug/fragile-method-chain'
-class Test_fmc < Test::Unit::TestCase
   def test_fmc_nil
     a = FMCTest::A.new
     assert_equal( 1, a._?.b.c.to_i._! )

data/test/test-loop-with.rb

@@ -7,7 +7,7 @@ class Test_loop_with < Test::Unit::TestCase
   def test_loop_with_index__block
     a = []
     b = []
-    x = loop_with_index do |i|
+    _x = loop_with_index do |i|
       a << i
       break if a.length >= 3
     end
@@ -22,7 +22,7 @@ class Test_loop_with < Test::Unit::TestCase
   def test_loop_with_index__block_offset
     a = []
     b = []
-    x = loop_with_index(10) do |i|
+    _x = loop_with_index(10) do |i|
       a << i
       break if a.length >= 3
     end
@@ -40,7 +40,7 @@ class Test_loop_with < Test::Unit::TestCase
 
     a = []
     b = []
-    x = enum.each do |i|
+    _x = enum.each do |i|
       a << i
       break if a.length >= 3
     end
@@ -58,7 +58,7 @@ class Test_loop_with < Test::Unit::TestCase
 
     a = []
     b = []
-    x = enum.each do |i|
+    _x = enum.each do |i|
       a << i
       break if a.length >= 3
     end
@@ -75,7 +75,7 @@ class Test_loop_with < Test::Unit::TestCase
     o = "x"
     a = []
     b = []
-    x = loop_with_object(o) do |e|
+    _x = loop_with_object(o) do |e|
       a << e
       break if a.length >= 3
     end
@@ -94,7 +94,7 @@ class Test_loop_with < Test::Unit::TestCase
 
     a = []
     b = []
-    x = enum.each do |e|
+    _x = enum.each do |e|
       a << e
       break if a.length >= 3
     end

data/test/test-maybe.rb

@@ -1,28 +1,38 @@
 require 'test/unit'
 $VERBOSE = true
 
-module MaybeTest
-  class A
-    def initialize; @b = B.new; end
-    attr_accessor :b
-  end
+require_relative '../lib/mug/maybe'
+class Test_maybe < Test::Unit::TestCase
 
-  class B
-    def initialize; @c = C.new; end
-    attr_accessor :c
-  end
+  module MaybeTest
+    class A
+      def initialize; @b = B.new; end
+      attr_accessor :b
+    end
+
+    class B
+      def initialize; @c = C.new; end
+      attr_accessor :c
+    end
 
-  class C
-    def to_i; 1; end
+    class C
+      def to_i; 1; end
+    end
   end
-end
 
-def false.c
-  2
-end
+  def self.startup
+    class << false
+      def c
+        2
+      end
+    end
+  end
+  def self.shutdown
+    class << false
+      undef c
+    end
+  end
 
-require_relative '../lib/mug/maybe'
-class Test_maybe < Test::Unit::TestCase
   def test_maybe_block_nil
     a = MaybeTest::A.new
     assert_equal( 1, a.maybe{ b.maybe{ c } }.to_i )

data/test/test-negativity.rb

@@ -3,9 +3,9 @@ $VERBOSE = true
 
 require 'bigdecimal'
 
-$neg = [ -1, -(2**65), -3.14, Rational(-1,2), BigDecimal.new('-1') ]
-$pos = [ +1, +(2**65), +3.14, Rational(+1,2), BigDecimal.new('+1') ]
-$zer = [  0, 0.0, BigDecimal.new('0') ]
+$neg = [ -1, -(2**65), -3.14, Rational(-1,2), BigDecimal('-1') ]
+$pos = [ +1, +(2**65), +3.14, Rational(+1,2), BigDecimal('+1') ]
+$zer = [  0, 0.0, BigDecimal('0') ]
 $err = [ Complex(1,1) ]
 
 require_relative '../lib/mug/negativity'

data/test/test-with.rb

@@ -0,0 +1,37 @@
+require 'test/unit'
+$VERBOSE = true
+
+require_relative '../lib/mug/with'
+class Test_with < Test::Unit::TestCase
+
+  def test_with
+    input = [1, 'two', :three]
+    output = nil
+
+    with(*input) do |a, b, c|
+      output = [a, b, c]
+    end
+
+    assert_equal( output, input )
+  end
+
+  def test_with__noblock
+    input = [1, 'two', :three]
+    output = nil
+
+    enum = with(*input)
+    assert_kind_of( Enumerator, enum )
+
+    enum.each do |a, b, c|
+      output = [a, b, c]
+    end
+
+    assert_equal( output, input )
+  end
+
+  def test_with__private
+    assert_raise(NoMethodError) { Object.new.with }
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2020-11-19 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -70,6 +70,8 @@ files:
 - lib/mug/to_h.rb
 - lib/mug/top.rb
 - lib/mug/with.rb
+- test/2-6-test-clamp.rb
+- test/2-7-test-clamp.rb
 - test/test-affix.rb
 - test/test-alias.rb
 - test/test-and-or.rb
@@ -106,6 +108,7 @@ files:
 - test/test-tau.rb
 - test/test-time.rb
 - test/test-top.rb
+- test/test-with.rb
 homepage: http://phluid61.github.com/mug
 licenses:
 - ISC
@@ -125,45 +128,47 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 'MUG: Matty''s Ultimate Gem'
 test_files:
-- test/test-fragile-method-chain.rb
-- test/test-maybe.rb
-- test/test-hashop.rb
-- test/test-not.rb
-- test/test-enumerable-chain.rb
-- test/test-loop-with.rb
-- test/test-counts.rb
-- test/test-array-minus.rb
-- test/test-iff.rb
-- test/test-affix.rb
-- test/test-bool.rb
-- test/test-alias.rb
+- test/test-enumerable-hash-like.rb
+- test/test-clamp.rb
+- test/test-array-delete_all.rb
 - test/test-rexproc.rb
-- test/test-hashmerge.rb
-- test/test-array-samples.rb
 - test/test-tau.rb
-- test/test-apply.rb
-- test/test-any-and-all.rb
-- test/test-clamp.rb
-- test/test-iterator-for.rb
+- test/test-matchdata_each.rb
+- test/test-alias.rb
 - test/test-bittest.rb
-- test/test-hashwhen.rb
-- test/test-negativity.rb
-- test/test-array-delete_all.rb
 - test/test-iterator.rb
+- test/test-hashwhen.rb
 - test/test-matchdata_hash.rb
-- test/test-self.rb
-- test/test-and-or.rb
-- test/test-hashmap.rb
-- test/test-enumerable-hash-like.rb
-- test/test-time.rb
-- test/test-matchdata_each.rb
-- test/test-iterator-method.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/test-affix.rb
+- test/test-hashmerge.rb
+- test/test-with.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-bool.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-hashop.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