mug 0.12.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ff9a23393c4c09db649abf58fa24b9e2dabcf1ff
-  data.tar.gz: e6b0b9b20a8997b0e4e90f4c1248eed93083b74c
+SHA256:
+  metadata.gz: fa82b3dcf328caf01f65d84a51ac4bdfdc186c91648f5b7843aa34531c4877ad
+  data.tar.gz: a33c8edf6d0d3359c9b7ce9592bee55f2cef5b2955e74f2c71913048bbe6d61b
 SHA512:
-  metadata.gz: 85e858d8ca69133e1a5aa15526dcf3278233340314c0240d4c6e4ff48a49030f9e17977b531985d1a0d8b7b5125de03caea8ec65337aff39eb5bada3cc3a51dd
-  data.tar.gz: 3611a88d38acbfbfbefc03d99398b1b695636d51f7c13505448d79820c589cd5dcb595f5bee2b8abe372fd4f4d861698d92d7f8aff5e75dd01d4cc19c382bd2b
+  metadata.gz: 77ab2daffae07f208c90b692afafd8287850fc57ddeade9fb363d517ff7844a921695aee7af8522b3dc66edc09540b408e1f9c0a20d345563cf23981f6cf7806
+  data.tar.gz: 5463372e8cb36dd4b92780354a08131b9fda6d5d34857c04dfc5e029a26b66682064b888c4b4e0b4a21b1b4ea7f1e2b7823091e80f8ec0ecba99bf1c47b7669a

data/lib/mug.rb

@@ -1,4 +1,5 @@
 
+require_relative 'mug/affix'
 require_relative 'mug/alias'
 require_relative 'mug/and-or'
 require_relative 'mug/any-and-all'
@@ -20,6 +21,7 @@ require_relative 'mug/hash/when'
 require_relative 'mug/iterator/for'
 require_relative 'mug/iterator/method'
 require_relative 'mug/loop-with'
+require_relative 'mug/main'
 require_relative 'mug/matchdata/each'
 require_relative 'mug/matchdata/hash'
 require_relative 'mug/maybe'

data/lib/mug/affix.rb

@@ -0,0 +1,88 @@
+
+class String
+
+  def affix prefix, suffix=nil
+    suffix = prefix if suffix.nil?
+    "#{prefix}#{self}#{suffix}"
+  end
+
+  def prefix str
+    "#{str}#{self}"
+  end
+
+  def suffix str
+    "#{self}#{str}"
+  end
+
+
+
+  def affix! prefix, suffix=nil
+    replace affix(prefix, suffix)
+  end
+
+  def prefix! str
+    replace prefix(str)
+  end
+
+  def suffix! str
+    replace suffix(str)
+  end
+
+
+
+  def affix? prefix, suffix=nil
+    suffix = prefix if suffix.nil?
+    if Regexp === prefix
+      md = match(/\A#{prefix}/)
+      if md
+        rest = md.post_match
+      else
+        return false
+      end
+    else
+      prefix = prefix.to_s
+      if start_with? prefix
+        i = prefix.length
+        rest = self[i..-1]
+      else
+        return false
+      end
+    end
+    rest.suffix? suffix
+  end
+
+  def prefix? pattern
+    if Regexp === pattern
+      #match?(/\A#{pattern}/)
+      !!(self =~ /\A#{pattern}/)
+    else
+      start_with? pattern.to_s
+    end
+  end
+
+  def suffix? pattern
+    if Regexp === pattern
+      #match?(/#{pattern}\z/)
+      !!(self =~ /#{pattern}\z/)
+    else
+      end_with? pattern.to_s
+    end
+  end
+
+end
+
+=begin
+Copyright (c) 2017, 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/array/extend.rb

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

@@ -17,7 +17,7 @@ class Hash
   #     /bar/ => "BAR",
   #   }
   #   h.default = "DEFAULT"
-  #   h[key]
+  #   h.when key
   #
   def when o
     each_pair do |k, v|

data/lib/mug/iterator/for.rb

@@ -8,11 +8,11 @@ class Object
   def iter_for meth, *args
     Iterator.new self, meth, *args
   end
-  alias :to_iter :iter_for
+  alias to_iter iter_for
 end
 
 =begin
-Copyright (c) 2013, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2013-2017, 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/loop-with.rb

@@ -6,7 +6,7 @@ module Kernel
   # an Enumerator.
   #
   def loop_with_index(offset=0)
-    return c=enum_for(:loop_with_index, offset) unless block_given?
+    return enum_for(:loop_with_index, offset) unless block_given?
     c = 0 + offset
     begin
       while true

data/lib/mug/main.rb

@@ -0,0 +1,38 @@
+
+module Kernel
+
+  ##
+  # Compares the calling source filename with `$PROGRAM_NAME` (`$0`).
+  #
+  # Returns a falsey value if the calling context is not in the 'main' file.
+  #
+  # If called without a block, and the calling context is in the 'main' file,
+  # returns +true+.
+  #
+  # If called with a block, and the calling context is in the 'main' file, the
+  # block is executed and the result is returned.
+  #
+  def __main__
+    cloc = caller_locations(1, 1)[0]
+    return if cloc.nil?
+    return unless File.absolute_path($0) == cloc.absolute_path
+    block_given? ? (yield) : true
+  end
+
+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/self.rb

@@ -13,7 +13,7 @@ class Object
       self
     end
   end
-  alias :itself :self
+  alias itself self
 
   # Deprecated alias for #self
   def yield(&block) #:nodoc:
@@ -33,7 +33,7 @@ class Object
       enum_for(:revapply, *args) { args.length + 1 }
     end
   end
-  alias :cede :revapply
+  alias cede revapply
 end
 
 =begin

data/lib/mug/time.rb

@@ -21,7 +21,7 @@ class Time
   # Returns the number of seconds until the time represented by
   # this Time object.
   #
-  #     target = Time.new 2017, 1, 1, 0, 0, 0
+  #     target = Time.new 2117, 1, 1, 0, 0, 0
   #     sleep target.from_now
   #
   def from_now

data/lib/mug/top.rb

@@ -95,23 +95,23 @@ end
 
 class Array
   def top! n=1, &blk
-    replace(top n, &blk)
+    replace top(n, &blk)
   end
   def top_by! n=1, &blk
     return enum_for(:top_by!, n) unless block_given?
-    replace(top_by n, &blk)
+    replace top_by(n, &blk)
   end
   def bottom! n=1, &blk
-    replace(bottom n, &blk)
+    replace bottom(n, &blk)
   end
   def bottom_by! n=1, &blk
     return enum_for(:bottom_by!, n) unless block_given?
-    replace(bottom_by n, &blk)
+    replace bottom_by(n, &blk)
   end
 end
 
 =begin
-Copyright (c) 2014, Matthew Kerwin <matthew@kerwin.net.au>
+Copyright (c) 2014-2017, 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-affix.rb

@@ -0,0 +1,135 @@
+require 'test/unit'
+$VERBOSE = true
+
+require_relative '../lib/mug/affix'
+class Test_affix < Test::Unit::TestCase
+
+  def test_affix
+    str = 'XXX'
+    pre = '+++'
+    suf = '---'
+
+    a = "#{pre}#{str}#{suf}"
+    b = "#{pre}#{str}"
+    c =       "#{str}#{suf}"
+    d = "#{pre}#{str}#{pre}"
+
+    assert_equal( a, str.affix(pre, suf) )
+    assert_equal( b, str.prefix(pre) )
+    assert_equal( c, str.suffix(suf) )
+    assert_equal( d, str.affix(pre) )
+  end
+
+  def test_affix_bang
+    str = ''
+    pre = '+'
+    suf = '-'
+
+    3.times do |i|
+      numpre = i * 2
+      numsuf = i * 2
+
+      str.affix! pre, suf
+      numpre += 1
+      numsuf += 1
+      assert_equal( "#{pre * numpre}#{suf * numsuf}", str )
+
+      str.prefix! pre
+      numpre += 1
+      assert_equal( "#{pre * numpre}#{suf * numsuf}", str )
+
+      str.suffix! suf
+      numsuf += 1
+      assert_equal( "#{pre * numpre}#{suf * numsuf}", str )
+    end
+  end
+
+  def test_affix_bang2
+    str = ''
+    pre = '+'
+
+    3.times do |i|
+      n = i * 2
+
+      str.affix! pre
+      n += 2
+      assert_equal( "#{pre * n}", str )
+    end
+  end
+
+  def test_affix?
+    str = "abc"
+    [
+      # obvious cases
+      [ 'a', 'c',  true],
+      [ /a/, /c/,  true],
+      [/^a/, /c$/, true],
+      # expected edges
+      ['','', true],
+      ['abc','', true],
+      ['','abc', true],
+      # failures
+      ['x','c', false],
+      ['a','x', false],
+      ['ab','bc', false],
+      [/../,/../, false],
+    ].each do |p, s, x|
+      assert_equal( x, str.affix?(p, s) )
+    end
+
+    str = "xyx"
+    [
+      # obvious cases
+      [ 'x', true],
+      [ /x/, true],
+      # expected edges
+      ['', true],
+      [/^x|x$/, true],
+      # failures
+      ['a', false],
+      [/../, false],
+    ].each do |p, x|
+      assert_equal( x, str.affix?(p) )
+    end
+  end
+
+  def test_prefix?
+    str = "abc"
+    [
+      # obvious cases
+      [ 'a', true],
+      [ /a/, true],
+      [/^a/, true],
+      # expected edges
+      ['', true],
+      ['abc', true],
+      # failures
+      ['x', false],
+      ['abcd', false],
+      [/..../, false],
+    ].each do |p, x|
+      assert_equal( x, str.prefix?(p) )
+    end
+  end
+
+  def test_suffix?
+    str = "abc"
+    [
+      # obvious cases
+      ['c',  true],
+      [/c/,  true],
+      [/c$/, true],
+      # expected edges
+      ['', true],
+      ['abc', true],
+      # failures
+      ['x', false],
+      ['zabc', false],
+      [/..../, false],
+    ].each do |s, x|
+      assert_equal( x, str.suffix?(s) )
+    end
+  end
+
+end
+

data/test/test-array-delete_all.rb

@@ -2,7 +2,7 @@ require 'test/unit'
 $VERBOSE = true
 
 ARRAY = proc { [1,2,3,4,5,6] }
-EVEN  = proc { |i| i % 2 == 0 }
+EVEN  = proc { |i| i.even? }
 E = [2,4,6]
 O = [1,3,5]
 
@@ -10,7 +10,7 @@ require_relative '../lib/mug/array/delete_all'
 class Test_array_delete_all < Test::Unit::TestCase
   def test_delete_all__block
     a = ARRAY.call
-    result = a.delete_all &EVEN
+    result = a.delete_all(&EVEN)
     assert_equal( result, E )
     assert_equal( a, O )
   end
@@ -19,19 +19,19 @@ class Test_array_delete_all < Test::Unit::TestCase
     enum = a.delete_all
     assert( enum.is_a? Enumerator )
 
-    result = enum.each &EVEN
+    result = enum.each(&EVEN)
     assert_equal( result, E )
     assert_equal( a, O )
   end
   def test_delete_all__all
     a = E.dup
-    result = a.delete_all &EVEN
+    result = a.delete_all(&EVEN)
     assert_equal( result, E )
     assert( a.empty? )
   end
   def test_delete_all__none
     a = O.dup
-    result = a.delete_all &EVEN
+    result = a.delete_all(&EVEN)
     assert( result.empty? )
     assert_equal( a, O )
   end

data/test/test-bool.rb

@@ -18,7 +18,7 @@ end
 require_relative '../lib/mug/bool'
 class Test_bool < Test::Unit::TestCase
 
-  alias :assert_true :assert
+  alias assert_true assert
   def assert_false val, msg=UNASSIGNED
     assert !val, msg
   end

data/test/test-hashwhen.rb

@@ -15,7 +15,7 @@ class Test_hashwhen < Test::Unit::TestCase
     assert_equal( 'DEFAULT', h.when("qux") )
   end
   def test_hashwhen_proc
-    h = Hash.new {|h,k| k.to_s.upcase }
+    h = Hash.new {|_,k| k.to_s.upcase }
     h[/foo/] = 'FOO'
     h[/bar/] = 'BAR'
 

data/test/test-negativity.rb

@@ -11,7 +11,7 @@ $err = [ Complex(1,1) ]
 require_relative '../lib/mug/negativity'
 class Test_negativity < Test::Unit::TestCase
 
-  alias :assert_true :assert
+  alias assert_true assert
   def assert_false val, msg=UNASSIGNED
     assert !val, msg
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 0.12.0
+  version: 0.13.0
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-06 00:00:00.000000000 Z
+date: 2018-03-05 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -23,6 +23,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/mug.rb
+- lib/mug/affix.rb
 - lib/mug/alias.rb
 - lib/mug/and-or.rb
 - lib/mug/any-and-all.rb
@@ -50,6 +51,7 @@ files:
 - lib/mug/iterator/method.rb
 - lib/mug/iterator_c.rb
 - lib/mug/loop-with.rb
+- lib/mug/main.rb
 - lib/mug/matchdata.rb
 - lib/mug/matchdata/each.rb
 - lib/mug/matchdata/hash.rb
@@ -62,6 +64,7 @@ files:
 - lib/mug/time.rb
 - lib/mug/to_h.rb
 - lib/mug/top.rb
+- test/test-affix.rb
 - test/test-alias.rb
 - test/test-and-or.rb
 - test/test-any-and-all.rb
@@ -113,7 +116,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.7.3
 signing_key: 
 specification_version: 4
 summary: 'MUG: Matty''s Ultimate Gem'
@@ -133,6 +136,7 @@ test_files:
 - 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