mug 1.6.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb47a83a5fb85778ecfb6ad294b1ccd86711c5c62047881ce4851c5fe8a2c7f9
-  data.tar.gz: ff2b7714c8285e757facbe0f02f95e52aaca8f44a9f5b6b062b0efaeb8937ada
+  metadata.gz: 036ea8685c77415a45fcc3403839d6aac7c10143ab56a69a362ae66c810aa783
+  data.tar.gz: b7bd3023df0304c0b14e9d8339b04a6822ffd4ad082a2793c9c51a52025c1e6d
 SHA512:
-  metadata.gz: 074d7c49a03c63b511e106e557f9c25f4a49b74a670d36775bb9332036199cf49d8af169fe21a2e23fe87ca4454934d4cc2cba4b5a104d726def4854c913b162
-  data.tar.gz: 9aca8c3fe9266d1333c8e18ef8a4eb054031a4830e1e9f2ccf736009468cf29c9721abfd490504063dcca33eb6895354688bc84c22db214256e8eae88a37c569
+  metadata.gz: 627990b12891667c1f062c50f6c8e0807481c5ebc9ab0c0771d61ba639ffb20ddd3118664079ec08ba504c960a06d774c401fc5d50c46fa51bfe54339d512af2
+  data.tar.gz: '09e2e5a7068f1d4e4ff43fab783b387d0b1c8d02871e4b7ba9d5a161fee55f543d261ee837c1c23122f66bd179e885608aefe85131d7c0b52cd14a4c6ebe3a40'

data/lib/mug/apply.rb

@@ -8,29 +8,12 @@ class Proc
   # arguments.
   #
   def apply(*args)
-    curry.call(*args)
+    n = arity < 0 ? -arity - 1 : arity
+    curry(n).call(*args)
   end
 end
 
 class Method
-  if RUBY_VERSION < '2.2'
-    #
-    # Returns a curried proc. If the optional arity argument is given,
-    # it determines the number of arguments. A curried proc receives
-    # some arguments. If a sufficient number of arguments are supplied,
-    # it passes the supplied arguments to the original proc and returns
-    # the result. Otherwise, returns another curried proc that takes the
-    # rest of arguments.
-    #
-    def curry(n=nil)
-      if n
-        to_proc.curry n
-      else
-        to_proc.curry
-      end
-    end
-  end
-
   #
   # Curries this Method and partially applies parameters.
   # If a sufficient number of arguments are supplied, it passes the
@@ -39,12 +22,13 @@ class Method
   # arguments.
   #
   def apply(*args)
-    curry.call(*args)
+    n = arity < 0 ? -arity - 1 : arity
+    curry(n).call(*args)
   end
 end
 
 =begin
-Copyright (c) 2014, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2014-2026, 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/extend.rb

@@ -45,14 +45,14 @@ class Array
   end
 
   # @see #extend!
-  def extend *args, &block
-    dup.extend!(*args, &block)
+  def extend(...)
+    dup.extend!(...)
   end
 
 end
 
 =begin
-Copyright (c) 2014-17, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2014-2026, 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

@@ -88,7 +88,6 @@ module Enumerable
   end
 end
 
-if RUBY_VERSION.to_i >= 2
 class Enumerator
   #
   # Converts enum to a boolean.
@@ -99,7 +98,6 @@ class Enumerator
     (s = size).nil? || s.to_b
   end
 end
-end
 
 class Exception
   #
@@ -112,7 +110,7 @@ class Exception
 end
 
 =begin
-Copyright (c) 2018, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018-2026, 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

@@ -1,22 +1,4 @@
 
-class Numeric
-
-  #
-  # Clamps num so that lower <= new_num <= higher.
-  #
-  # Returns lower when num < lower, higher when num > higher, otherwise
-  # num itself.
-  #
-  # Raises an exception if lower > higher
-  #
-  def clamp lower, higher=nil
-    return lower.bound(self) if lower.is_a?(Range) && higher.nil?
-    raise ArgumentError, 'range must not be negative' if lower > higher
-    [[lower, self].max, higher].min
-  end
-
-end
-
 class Range
 
   #
@@ -43,7 +25,7 @@ class Range
 end
 
 =begin
-Copyright (c) 2018, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018-2026, 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

@@ -14,27 +14,10 @@ module Enumerable
     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.
-  #
-  def chain *enums
-    return enum_for(:chain, *enums) unless block_given?
-    [self, *enums].each do |enum|
-      enum.each {|*args| yield(*args) }
-    end
-    nil
-  end
-
 end
 
 =begin
-Copyright (c) 2018, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018-2026, 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

@@ -8,19 +8,12 @@ class MatchData
   # groups or not.
   def to_h
     if names.empty?
-      Hash[ captures.each_with_index.map{|v,i| [i+1, v] } ]
+      captures.each_with_index.to_h{|v,i| [i+1, v] }
     else
-      Hash[ names.map{|n| [n, self[n]] } ]
+      names.to_h{|n| [n, self[n]] }
     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.
   #
   # If +include_names+ is given and true, treats named captures
@@ -30,13 +23,13 @@ class MatchData
   # captures will be available using this method!
   def positional_captures include_names: false
     return {} unless names.empty? || include_names
-    Hash[ captures.each_with_index.map{|v,i| [i+1, v] } ]
+    captures.each_with_index.to_h{|v,i| [i+1, v] }
   end
 
 end
 
 =begin
-Copyright (c) 2018, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2018-2026, 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/negativity.rb

@@ -1,37 +1,53 @@
 
 class Numeric
 
-  if RUBY_VERSION < '2.3'
-    def negative?
-      self < 0 ? self : nil
-    end
+  def negative?
+    self < 0
+  end
 
-    def positive?
-      self > 0 ? self : nil
-    end
+  def positive?
+    self > 0
   end
 
   def nonnegative?
-    self < 0 ? nil : self
+    self >= 0
   end
 
   def nonpositive?
-    self > 0 ? nil : self
+    self <= 0
+  end
+
+  def negative!
+    self < 0 ? self : nil
+  end
+
+  def positive!
+    self > 0 ? self : nil
+  end
+
+  def nonnegative!
+    self >= 0 ? self : nil
+  end
+
+  def nonpositive!
+    self <= 0 ? self : nil
   end
 
 end
 
 class Complex
-  if RUBY_VERSION < '2.3'
-    undef :negative?
-    undef :positive?
-  end
+  undef :negative? if method_defined?(:negative?)
+  undef :positive? if method_defined?(:positive?)
   undef :nonnegative?
   undef :nonpositive?
+  undef :negative!
+  undef :positive!
+  undef :nonnegative!
+  undef :nonpositive!
 end
 
 =begin
-Copyright (c) 2015, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2015-2026, 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

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

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

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

data/test/test-array-extend.rb

@@ -1,14 +1,6 @@
 require 'test/unit'
 $VERBOSE = true
 
-if RUBY_VERSION.to_f < 1.9
-  class Symbol
-    def next
-      to_s.next.to_sym
-    end
-  end
-end
-
 require_relative '../lib/mug/array/extend'
 class Test_array_extend < Test::Unit::TestCase
 

data/test/test-bool.rb

@@ -10,13 +10,8 @@ class Test_bool < Test::Unit::TestCase
     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
+  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 ]
 
   alias assert_true assert
   def assert_false val, msg=UNASSIGNED

data/test/test-clamp.rb

@@ -22,11 +22,6 @@ class Test_clamp < Test::Unit::TestCase
     assert_equal( 3, 2.clamp(rng) )
     assert_equal( 4, 4.clamp(rng) )
     assert_equal( 5, 6.clamp(rng) )
-
-    rng = 3...5
-    assert_equal( 3, 2.clamp(rng) )
-    assert_equal( 4, 4.clamp(rng) )
-    assert_raise(ArgumentError) { 6.clamp(rng) }
   end
 
   def test_bound__inclusive
@@ -48,11 +43,6 @@ class Test_clamp < Test::Unit::TestCase
   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
+require_relative '2-6-test-clamp'
+require_relative '2-7-test-clamp'
 

data/test/test-enumerable-chain.rb

@@ -3,23 +3,6 @@ $VERBOSE = true
 
 require_relative '../lib/mug/enumerable/chain'
 class Test_enumerable_chain < Test::Unit::TestCase
-  def test_chain
-    a = [1, 2, 3, 4].each_with_index
-    b = [5, 6].each_with_index
-    c = [7, 8].each_with_index
-    expect = [
-      [1,0], [2,1], [3,2], [4,3],
-      [5,0], [6,1],
-      [7,0], [8,1],
-    ]
-
-    result = []
-    a.chain(b, c) do |*x|
-      result << x
-    end
-
-    assert_equal( expect, result )
-  end
 
   def test_chain__noblock
     a = [1, 2, 3, 4].each_with_index
@@ -32,7 +15,8 @@ class Test_enumerable_chain < Test::Unit::TestCase
     ]
 
     enum = a.chain(b, c)
-    assert_kind_of( Enumerator, enum )
+    assert( enum.kind_of?(Enumerator) || enum.kind_of?(Enumerator::Chain),
+            "expected Enumerator or Enumerator::Chain, got #{enum.class}" )
 
     result = []
     enum.each do |*x|

data/test/test-hashmap.rb

@@ -1,14 +1,6 @@
 require 'test/unit'
 $VERBOSE = true
 
-if RUBY_VERSION.to_f < 1.9
-  class Symbol
-    def next
-      to_s.next.to_sym
-    end
-  end
-end
-
 require_relative '../lib/mug/hash/map'
 class Test_hashmap < Test::Unit::TestCase
   def test_hashmap

data/test/test-self.rb

@@ -19,10 +19,6 @@ class Test_self < Test::Unit::TestCase
     p = proc {|*args| args }
     assert_equal( [1], 1.revapply(&p) )
     assert_equal( [1,2,3], 1.revapply(2,3,&p) )
-    if RUBY_VERSION.to_i >= 2
-      assert_equal( 3, 1.revapply(2,3).size )
-    else
-      assert_equal( [1,2,3], 1.revapply(2,3).first )
-    end
+    assert_equal( 3, 1.revapply(2,3).size )
   end
 end

data/test/test-tau.rb

@@ -12,8 +12,8 @@ class Test_tau < Test::Unit::TestCase
 
   include BigMath
   def test_TAU
-    assert_equal(TAU(1).round(1).to_s('F'), '6.3')
-    assert_equal(TAU(100).truncate(100).to_s('F'), '6.2831853071795864769252867665590057683943387987502116419498891846156328125724179972560696506842341359')
+    assert_equal(TAU(3).round(1).to_s('F'), '6.3')
+    assert_equal(TAU(102).truncate(100).to_s('F'), '6.2831853071795864769252867665590057683943387987502116419498891846156328125724179972560696506842341359')
     assert_raise(ArgumentError) { TAU(0) }
     assert_raise(ArgumentError) { TAU(-3) }
     assert_raise(ArgumentError) { TAU('barf') }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Matthew Kerwin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-12-07 00:00:00.000000000 Z
+date: 2026-04-23 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -117,7 +117,7 @@ homepage: http://phluid61.github.com/mug
 licenses:
 - ISC
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,15 +125,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
-signing_key: 
+rubygems_version: 3.3.15
+signing_key:
 specification_version: 4
 summary: 'MUG: Matty''s Ultimate Gem'
 test_files: