mug 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e14ce5838a2c49e7ede7dba94a8aa1b330efba9ecec52261d611985d30bd47d
-  data.tar.gz: 89a7d9d6ddb730004f062f625d81301f1d9271759b8c5ab717e1a42407981b44
+  metadata.gz: c21f58658e25bbdc5ffa1d9fc3b5a80ba7da9c4a49348681523a034e21d6972e
+  data.tar.gz: 2db7532d87137ca0bf31ac1d460b7bf487ee15abdbc8e09f5d32310e8a5bd8d5
 SHA512:
-  metadata.gz: 5f3da00b7a7b2ba58dfcd8b5efaae57ccd035c9e36d90182a13204578089e071d0a6a614c031585eaf81f8f9bd4c06adbaf8d04a52159ad37951b396c0b73c08
-  data.tar.gz: 71c1e2a2cf4c87b0b4a4e13f837c36042c374b0b50a6d210d09b838b0470e87310765c57bee9ad02b711d4bc1287cd5856b0ef26ee2c2a2fbcee30a12f10e965
+  metadata.gz: 96db9c590c28244950a74746f680549234780c34a259819991b3efccc78cc2fb5294f3b9655fe3f428b50805d472b67c43c86ad7c60608e80b039cbd8f34ddc8
+  data.tar.gz: e57ca3a0fa44884f06fb5bfc3a7b1a26d5055b1e1b6ccdcf7832df86d7c39f18d5dfad512c4666d1f466f5c0fe5ffbd76a69fee3d7482d00b853b6ed74070a0b

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,12 @@ 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
 
+  undef chain if RUBY_VERSION >= '2.6'
   #
   # Creates a chain of Enumerables following this one, and
   # invokes a block once for each element of each Enumerable.
@@ -21,7 +22,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

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

@@ -7,7 +7,7 @@ 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
     hsh = {}
     each do |k, v|
       hsh[k] = yield v
@@ -34,7 +34,7 @@ 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
     hsh = {}
     each do |k, v|
       hsh[ yield k ] = v
@@ -63,7 +63,7 @@ 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
     hsh = {}
     each do |k, v|
       a, b = yield k, v
@@ -83,7 +83,7 @@ class Hash
 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/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/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/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-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-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'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-24 00:00:00.000000000 Z
+date: 2018-11-30 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -131,39 +131,39 @@ 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/test-top.rb
+- test/test-and-or.rb
 - test/test-array-to_proc.rb
+- test/test-affix.rb
+- test/test-hashmerge.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/test-fragile-method-chain.rb