mug 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c1c6c199bc0b20f762e2ddc28c8e27d1afef202
-  data.tar.gz: fe61f0da462afe3afda46c1e4a7e1efe0567c55c
+  metadata.gz: ed5f24e06ddab5269fc3e36f7ad473aa0767c68e
+  data.tar.gz: 1d018601b7dc7f8012d08b21005f49bb6cf2fabc
 SHA512:
-  metadata.gz: 153d565d0327384349577c8860bd65b6535a08df5639f1a0f42b61fee9edb5f3d23ef70821921a64d8492ea6d1c697923214b673f6059d16512e1556e0bfbc8b
-  data.tar.gz: 8753cd45eaf6e9e05e6f60678f9c8dce87055de4c9be7b95b1c6a0f2be28d4cb6e93cba67045b5b7958e091c8e36c7650abf411944043e06f1446f57bbb91886
+  metadata.gz: e1f704861c0d8d01dc643d25e0b8d5bc3cbb3db3e9f19baa4e239c8e92b1fdabaaf7ea8f4498f66d89b2a24d2c2d7ca5055567794456ef86acef4955517224fe
+  data.tar.gz: 22736ef5315007ae6f140e9ecc50198518208fbf2f4d19eca219e3a4b56846f631044dab7f0b0975322a88c63bde7fb348345108e685e49dee438fa36886e53f

data/lib/mug.rb

@@ -6,6 +6,7 @@ require_relative 'mug/array/extend'
 require_relative 'mug/array/minus'
 require_relative 'mug/array/samples'
 require_relative 'mug/bool'
+require_relative 'mug/bittest'
 require_relative 'mug/clamp'
 require_relative 'mug/counts'
 require_relative 'mug/fragile-method-chain'

data/lib/mug/array/extend.rb

@@ -25,7 +25,7 @@ class Array
     raise ArgumentError, "wrong number of arguments (#{rest.length+1} for 1..2)" if rest.length > 1
 
     # Same logic as array.c/rb_ary_initialize
-    if rest.empty? && !size.is_a?(Fixnum)
+    if rest.empty? && !size.is_a?(Integer)
       warn 'warning: given block not used' if block_given?
       concat size.to_ary
       return self

data/lib/mug/bittest.rb

@@ -0,0 +1,72 @@
+
+class Integer
+
+  ##
+  # Tests common bits in +this+ AND +other+.
+  #
+  # test:
+  #   :any  => true if any bits are set
+  #   :all  => true if all bits are set
+  #
+  def and? other, test: :any
+    case test.to_sym
+    when :any
+      and_any? other
+    when :all
+      and_all? other
+    else
+      raise ArgumentError, "invalid value for 'test' (given #{test.inspect}, should be :any or :all)"
+    end
+  end
+
+  ##
+  # True if +this+ AND +other+ is non-zero.
+  #
+  # i.e. if any set bits in +other+ are set in +this+.
+  #
+  def and_any? other
+    return false if other.zero?
+    self & other != 0
+  end
+
+  ##
+  # True if +this+ AND +other+ is +other+.
+  #
+  # i.e. if all set bits in +other+ are set in +this+.
+  #
+  def and_all? other
+    return false if other.zero?
+    self & other == other
+  end
+
+  ##
+  # True if +this+ OR +other+ is non-zero.
+  #
+  def or? other
+    self | other != 0
+  end
+
+  ##
+  # True if +this+ XOR +other+ is non-zero.
+  #
+  def xor? other
+    self ^ other != 0
+  end
+
+end
+
+=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

data/test/test-array-samples.rb

@@ -7,12 +7,14 @@ $MIN = 4
 $MAX = 6
 
 class MyPRNG
-  def rand n
+  def rand n=1.0
     case n
     when Integer
       n - 1
     when Range
       n.max
+    when Float
+      n.prev_float
     end
   end
 end

data/test/test-bittest.rb

@@ -0,0 +1,121 @@
+require 'test/unit'
+$VERBOSE = true
+
+$and_any = [
+  [0b00,0b00,false],
+  [0b00,0b01,false],
+  [0b00,0b10,false],
+  [0b00,0b11,false],
+  [0b01,0b00,false],
+  [0b01,0b01,true],
+  [0b01,0b10,false],
+  [0b01,0b11,true],
+  [0b10,0b00,false],
+  [0b10,0b01,false],
+  [0b10,0b10,true],
+  [0b10,0b11,true],
+  [0b11,0b00,false],
+  [0b11,0b01,true],
+  [0b11,0b10,true],
+  [0b11,0b11,true],
+]
+$and_all = [
+  [0b00,0b00,false],
+  [0b00,0b01,false],
+  [0b00,0b10,false],
+  [0b00,0b11,false],
+  [0b01,0b00,false],
+  [0b01,0b01,true],
+  [0b01,0b10,false],
+  [0b01,0b11,false],
+  [0b10,0b00,false],
+  [0b10,0b01,false],
+  [0b10,0b10,true],
+  [0b10,0b11,false],
+  [0b11,0b00,false],
+  [0b11,0b01,true],
+  [0b11,0b10,true],
+  [0b11,0b11,true],
+]
+$or = [
+  [0b00,0b00,false],
+  [0b00,0b01,true],
+  [0b00,0b10,true],
+  [0b00,0b11,true],
+  [0b01,0b00,true],
+  [0b01,0b01,true],
+  [0b01,0b10,true],
+  [0b01,0b11,true],
+  [0b10,0b00,true],
+  [0b10,0b01,true],
+  [0b10,0b10,true],
+  [0b10,0b11,true],
+  [0b11,0b00,true],
+  [0b11,0b01,true],
+  [0b11,0b10,true],
+  [0b11,0b11,true],
+]
+$xor = [
+  [0b00,0b00,false],
+  [0b00,0b01,true],
+  [0b00,0b10,true],
+  [0b00,0b11,true],
+  [0b01,0b00,true],
+  [0b01,0b01,false],
+  [0b01,0b10,true],
+  [0b01,0b11,true],
+  [0b10,0b00,true],
+  [0b10,0b01,true],
+  [0b10,0b10,false],
+  [0b10,0b11,true],
+  [0b11,0b00,true],
+  [0b11,0b01,true],
+  [0b11,0b10,true],
+  [0b11,0b11,false],
+]
+
+require_relative '../lib/mug/bittest'
+class Test_bittest < Test::Unit::TestCase
+
+  def test_and?
+    $and_any.each do |l,r,x|
+      assert_equal( x, l.and?(r), "#{l} & #{r} #{x ? '=' : '!'}= 0" )
+    end
+    assert_raise( ArgumentError ) { 1.and?(0, :test=>:invalid) }
+  end
+  def test_and_any
+    $and_any.each do |l,r,x|
+      assert_equal( x, l.and?(r, :test=>:any), "#{l} & #{r} #{x ? '!' : '='}= 0" )
+    end
+  end
+  def test_and_all
+    $and_all.each do |l,r,x|
+      assert_equal( x, l.and?(r, :test=>:all), "#{l} & #{r} #{x ? '=' : '!'}= #{r}" )
+    end
+  end
+
+  def test_and_any?
+    $and_any.each do |l,r,x|
+      assert_equal( x, l.and_any?(r), "#{l} & #{r} #{x ? '!' : '='}= 0" )
+    end
+  end
+  def test_and_all?
+    $and_all.each do |l,r,x|
+      assert_equal( x, l.and_all?(r), "#{l} & #{r} #{x ? '=' : '!'}= #{r}" )
+    end
+  end
+
+  def test_or?
+    $or.each do |l,r,x|
+      assert_equal( x, l.or?(r), "#{l} | #{r} #{x ? '=' : '!'}= 0" )
+    end
+  end
+
+  def test_xor?
+    $xor.each do |l,r,x|
+      assert_equal( x, l.xor?(r), "#{l} ^ #{r} #{x ? '!' : '='}= 0" )
+    end
+  end
+
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mug
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Matthew Kerwin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-01 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies: []
 description: |
   == MUG: Matty's Ultimate Gem
@@ -30,6 +30,7 @@ files:
 - lib/mug/array/extend.rb
 - lib/mug/array/minus.rb
 - lib/mug/array/samples.rb
+- lib/mug/bittest.rb
 - lib/mug/bool.rb
 - lib/mug/clamp.rb
 - lib/mug/counts.rb
@@ -63,6 +64,7 @@ files:
 - test/test-array-extend.rb
 - test/test-array-minus.rb
 - test/test-array-samples.rb
+- test/test-bittest.rb
 - test/test-bool.rb
 - test/test-clamp.rb
 - test/test-counts.rb
@@ -112,6 +114,7 @@ test_files:
 - test/test-rexproc.rb
 - test/test-tau.rb
 - test/test-matchdata_each.rb
+- test/test-bittest.rb
 - test/test-matchdata_hash.rb
 - test/test-not.rb
 - test/test-array-extend.rb