mug 1.2.3 → 1.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 336091bdd667f90f8f3bc7e18ebdbebd6d2b9e1ff834421c9cad1f5ed12e0c8f
-  data.tar.gz: dbbcb45a242ac384202cf5924656be9b56d91d245a91c8202dfe0946a0abcf69
+  metadata.gz: 986518f2bdb9b2e66fa37baefbf2bb63a191dd6e97626e7626c5475cea9c674d
+  data.tar.gz: 0ed805639f4a57ba0a361dcd010d86ba240e31df4d0beef3209d782c8d663986
 SHA512:
-  metadata.gz: bfd557d429b67a7f03634ff6075013b63c9f8e9efcce33f6504811c85f3b34b45c76d1ceb096645c42b700e5de9ae68bb29f6fed0e9b01129a5a1b62463e1860
-  data.tar.gz: 227a68842c9a147deaf47cb958c11929c7739b762fb4888e85551d317eea7f7078603004b1df4ec76840e303936e82c4e57111bfeb00b0788ed70fd7c8564c59
+  metadata.gz: d03ef238645b74dff18bc5daa037403c14963406f6c2875b757543ba2acbeb219bdf70ea1fd54f228d10ceff3f21cb4325ece5f9b34dcef78cb261d01aa7b718
+  data.tar.gz: 5dee2f65ab4aa79e6b7d425cf5512cefb601d329884c9ae512dd450240a430ed78186c5c64d7ec7f8e59e589beb94fd877f4c2b865091655c072dae8dc4b334a

data/lib/mug/hash/map.rb

@@ -78,9 +78,11 @@ 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?

data/lib/mug/iterator.rb

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

data/lib/mug/with.rb

@@ -5,7 +5,7 @@ module Kernel
   #
   def with *args
     return enum_for(:with, *args) unless block_given?
-    yield *args
+    yield(*args)
   end
   private :with
 end

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-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-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-with.rb

@@ -1,15 +1,6 @@
 require 'test/unit'
 $VERBOSE = true
 
-class ::DummyClass
-  def self.dummy_method
-    :ok
-  end
-  def self.clobber_method
-    :original
-  end
-end
-
 require_relative '../lib/mug/with'
 class Test_with < Test::Unit::TestCase
 
@@ -39,7 +30,7 @@ class Test_with < Test::Unit::TestCase
   end
 
   def test_with__private
-    assert_raise(NoMethodError) { self.with }
+    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.3
+  version: 1.2.4
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-15 00:00:00.000000000 Z
+date: 2020-11-11 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
@@ -126,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: 'MUG: Matty''s Ultimate Gem'
@@ -145,6 +147,7 @@ test_files:
 - 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
@@ -167,4 +170,5 @@ test_files:
 - 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