xqsr3 0.19.3 → 0.20.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 77b11de6b0e214ce904216d2d6c1818e4d72e3cd
-  data.tar.gz: c383a8ddaab643a4d487d0fe44f37e794ae81217
+  metadata.gz: bde7d3536cc91501c44bf9692223a3ca08635a74
+  data.tar.gz: 3cb71b348ae5a121dc557b2a99d23398f4066479
 SHA512:
-  metadata.gz: 64e58c0bd8362c0971340a33cf2442f3eb78f0fbe81b76e04df28ea06c2bd738383238528251f0015810c0f6586b850731b4ba62b03ac943574e627299c8cd9d
-  data.tar.gz: 7ebf55437cd838b30620d950bf0f02c202c759022ab400ea046006b138ee95816ae3527cebd00bd881948b5be0df48af5f23adceff1df08e7df66b069f105b88
+  metadata.gz: 7b8080d46eab81546cb68608e76562253a9b97c8009910cb69c2d6bdbf4ebeb9f205a745676146b69c7b6be9bae078cfeb390e5596299a452951aa42af2ee02d
+  data.tar.gz: 7f76211a83a76ad171756da8ede38687348d5e478f809998a3917be4c03b6c239b6f55a4e6427a95b561ef71f131faff049a599e0bb3dda6970e655fa1b1a48e

data/lib/xqsr3/extensions/test/unit.rb

@@ -3,6 +3,7 @@ require 'xqsr3/extensions/test/unit/assert_eql'
 require 'xqsr3/extensions/test/unit/assert_false'
 require 'xqsr3/extensions/test/unit/assert_not'
 require 'xqsr3/extensions/test/unit/assert_not_eql'
+require 'xqsr3/extensions/test/unit/assert_raise_with_message'
 require 'xqsr3/extensions/test/unit/assert_subclass_of'
 require 'xqsr3/extensions/test/unit/assert_superclass_of'
 require 'xqsr3/extensions/test/unit/assert_true'

data/lib/xqsr3/extensions/test/unit/assert_raise_with_message.rb

@@ -0,0 +1,78 @@
+
+module Test
+module Unit
+
+module Assertions
+
+	unless respond_to? :assert_raise_with_message
+
+		def assert_raise_with_message(type_spec, message_spec, failure_message = nil)
+
+			unless block_given?
+
+				msg = "WARNING: no block_given to assert_raise_with_message() called from: #{caller[0]}"
+
+				warn "\n#{msg}"
+
+				assert false, msg
+			end
+
+			case type_spec
+			when ::Array, nil
+
+				;
+			else
+
+				type_spec = [ type_spec ]
+			end
+
+			case message_spec
+			when ::Array, nil
+
+				;
+			else
+
+				message_spec = [ message_spec ]
+			end
+
+
+			begin
+
+				yield
+
+				assert false, "expected did not throw an exception"
+			rescue Exception => x
+
+				if type_spec
+
+					assert false, "exception not of any of required types (#{type_spec.join(', ')}); #{x.class} given" unless type_spec.any? { |c| x.is_a? c}
+				end
+
+				if message_spec
+
+					assert false, "exception message not of any of required messages; '#{x.message}' given" unless message_spec.any? do |m|
+
+						case m
+						when ::Regexp
+
+							x.message =~ m
+						when ::String
+
+							x.message == m
+						else
+
+							warn "\nunsupported message_spec entry '#{m}' (#{m.class})"
+						end
+					end
+				end
+
+				assert true
+			end
+		end
+	end
+
+end # class Assertions
+end # module Unit
+end # module Test
+
+

data/lib/xqsr3/quality/parameter_checking.rb

@@ -5,13 +5,13 @@
 # Purpose:      Definition of the ParameterChecking module
 #
 # Created:      12th February 2015
-# Updated:      21st December 2017
+# Updated:      2nd January 2018
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2015-2017, Matthew Wilson and Synesis Software
+# Copyright (c) 2015-2018, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -256,7 +256,7 @@ module ParameterChecking
 			types		=	[value.class] if types.empty?
 
 			warn "#{self}::check_parameter: options[:types] of type #{types.class} - should be #{::Array}" unless types.is_a?(Array)
-			warn "#{self}::check_parameter: options[:types] should contain only classes or arrays of classes" if types.is_a?(::Array) && !types.all? { |c| ::Class === c || (::Array === c || c.all? { |c2| ::Class === c2 }) }
+			warn "#{self}::check_parameter: options[:types] - '#{options[:types]}' - should contain only classes or arrays of classes" if types.is_a?(::Array) && !types.all? { |c| ::Class === c || (::Array === c && c.all? { |c2| ::Class === c2 }) }
 
 			unless types.any? do |t|
 
@@ -269,7 +269,7 @@ module ParameterChecking
 
 						# the (presumed) vector argument's elements are the
 						# possible types
-						value.all? { |v| t.any? { |t2| v.is_a?(t2) }}
+						value.all? { |v| t.any? { |t2| v.is_a?(t2) }} if ::Array === value
 					end
 				end
 

data/lib/xqsr3/version.rb

@@ -5,13 +5,13 @@
 # Purpose:      Version for Xqsr3 library
 #
 # Created:      3rd April 2016
-# Updated:      21st December 2017
+# Updated:      8th January 2018
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2016-2017, Matthew Wilson and Synesis Software
+# Copyright (c) 2016-2018, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -50,7 +50,7 @@
 module Xqsr3
 
 	# Current version of the Xqsr3 library
-	VERSION				=	'0.19.3'
+	VERSION				=	'0.20.3'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/unit/extensions/test/unit/tc_assert_raise_with_message.rb

@@ -0,0 +1,33 @@
+#! /usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), *(['..']*5), 'lib')
+
+require 'xqsr3/extensions/test/unit/assert_raise_with_message'
+
+require 'test/unit'
+
+class Test_assert_raise_with_message < Test::Unit::TestCase
+
+	def test_no_class_and_specific_message
+
+		assert_raise_with_message(nil, 'the-message') { raise ArgumentError, 'the-message' }
+	end
+
+	def test_no_class_and_message_list
+
+		assert_raise_with_message(nil, [ 'first-message', 'a-message', 'the-message', 'last-message' ]) { raise ArgumentError, 'the-message' }
+	end
+
+	def test_specific_class_and_no_message
+
+		assert_raise_with_message(::ArgumentError, nil) { raise ::ArgumentError, 'the-message' }
+	end
+
+	def test_class_list_and_no_message
+
+		assert_raise_with_message([ ::ArgumentError, ::SystemExit ], nil) { raise ::ArgumentError, 'the-message' }
+		assert_raise_with_message([ ::SystemExit, ::ArgumentError ], nil) { raise ::ArgumentError, 'the-message' }
+	end
+end
+
+

data/test/unit/quality/tc_parameter_checking.rb

@@ -108,6 +108,9 @@ class Test_parameter_checks_as_included_module < Test::Unit::TestCase
 		end
 		assert_equal true, check_method_2(true, [ ::TrueClass ], nothrow: true)
 		assert_nil check_method_2(true, [ ::FalseClass ], nothrow: true)
+		assert_nil check_method_2('abc', [ ::Symbol, ::Regexp ], nothrow: true)
+		assert_nil check_method_2([ 'abc' ], [ [ ::Symbol ], ::Regexp ], nothrow: true)
+		assert_not_nil check_method_2([ 'abc' ], [ [ ::String ], ::Regexp ], nothrow: true)
 	end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xqsr3
 version: !ruby/object:Gem::Version
-  version: 0.19.3
+  version: 0.20.3
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-12-21 00:00:00.000000000 Z
+date: 2018-01-08 00:00:00.000000000 Z
 dependencies: []
 description: |
   eXtensions by fine Quantum for Standard Ruby and 3rd-party libraries is a
@@ -52,6 +52,7 @@ files:
 - lib/xqsr3/extensions/test/unit/assert_false.rb
 - lib/xqsr3/extensions/test/unit/assert_not.rb
 - lib/xqsr3/extensions/test/unit/assert_not_eql.rb
+- lib/xqsr3/extensions/test/unit/assert_raise_with_message.rb
 - lib/xqsr3/extensions/test/unit/assert_subclass_of.rb
 - lib/xqsr3/extensions/test/unit/assert_superclass_of.rb
 - lib/xqsr3/extensions/test/unit/assert_true.rb
@@ -99,6 +100,7 @@ files:
 - test/unit/extensions/string/tc_to_symbol.rb
 - test/unit/extensions/string/ts_all.rb
 - test/unit/extensions/test/ts_all.rb
+- test/unit/extensions/test/unit/tc_assert_raise_with_message.rb
 - test/unit/extensions/test/unit/tc_assert_subclass_of.rb
 - test/unit/extensions/test/unit/tc_assert_superclass_of.rb
 - test/unit/extensions/test/unit/ts_all.rb