xqsr3 0.30.3 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0aae760822aa8749a7caeb361cc3c40fd3d374d
-  data.tar.gz: 223189ea29f2c140cc2a866b6cc0872f18f8a9fe
+  metadata.gz: bb8664aa1ee309ca837b32e7aa3fbdca6dfaa1da
+  data.tar.gz: c180d98128e7c011ad1c58f5808413389eccfe10
 SHA512:
-  metadata.gz: f190ff85d37defc8e7a9b7927a4cfea44945bb071f3d01a7090489fdbcc3dc365ad7f27970b5696096db37daa924376c8f1402aa51758f9b0220ba10a8d7a088
-  data.tar.gz: 75ab4d3ae800bf45f54de072b845a556c8edbd9d87198340a098e0f44cdb06681f0ffcd197ede43763de670c9d754aed08cf8df28f9de6369c9c497a1fd86184
+  metadata.gz: ba17becb2b869398fe39914bd7f0f3701fc3410612090690a3886486cfefaf015393712ec4421fab9e605e71b009348a67b24c62a92e14a141c4028dc384b0f6
+  data.tar.gz: 263f3ff72a18fdc7558c85ad52f4f07957c2d10b2d77bbec145c40235d20431ee9276a2f0a5c0cf98d17f77360b116b77e4871e74d871acdd0c8533b95f2bcb4

data/README.md

@@ -35,7 +35,9 @@ Install using `gem install xqsr3` or add it to your `Gemfile`.
 * IO
 * Quality
 * String Utilities
-* XML Utilities
+* ~~XML Utilities~~ **NOTE**: The **XML** components formerly in **xqsr3** in
+   versions **0.29**-**0.30** are now contained in the separate project
+   [**xqsr3-xml**](https://github.com/synesissoftware.com/xqsr3-xml/).
 
 and extensions to the following standard library components:
 
@@ -62,11 +64,12 @@ Defect reports, feature requests, and pull requests are welcome on https://githu
 **xqsr3** is a runtime dependency in:
 
 * the **[libCLImate.Ruby](https://github.com/synesissoftware/libCLImate.Ruby)** library;
+* the [**xqsr3-xml**](https://github.com/synesissoftware.com/xqsr3-xml/) library.
 
 and a development dependency in:
 
 * the **[CLASP.Ruby](https://github.com/synesissoftware/CLASP.Ruby)** library;
-* the **[Pantheios.Ruby](https://github.com/synesissoftware/Pantheios.Ruby)** library;
+* the **[Pantheios.Ruby](https://github.com/synesissoftware/Pantheios.Ruby)** library.
 
 ### License
 

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

@@ -1,79 +1,95 @@
 
+require 'xqsr3/internal_/test_unit_version_'
+
+module Xqsr3
+module Internal_ # :nodoc:
+module X_assert_raise_with_message_ # :nodoc:
+
+	if TestUnitVersion_.is_at_least? [ 3, 0, 8 ]
+
+		AssertionFailedError_	=	Test::Unit::AssertionFailedError
+	else
+
+		class AssertionFailedError_	< ArgumentError; end
+	end
+
+end # module X_assert_raise_with_message_
+end # module Internal_
+end # module Xqsr3
+
 module Test
 module Unit
 
 module Assertions
 
-	unless respond_to? :assert_raise_with_message
+	undef :assert_raise_with_message if respond_to? :assert_raise_with_message
 
-		def assert_raise_with_message(type_spec, message_spec, failure_message = nil)
+	def assert_raise_with_message(type_spec, message_spec, failure_message = nil, &block)
 
-			unless block_given?
+		unless block_given?
 
-				msg = "WARNING: no block_given to assert_raise_with_message() called from: #{caller[0]}"
+			msg = "WARNING: no block_given to assert_raise_with_message() called from: #{caller[0]}"
 
-				warn "\n#{msg}"
+			warn "\n#{msg}"
 
-				assert false, msg
-			end
+			assert false, msg
+		end
 
-			case type_spec
-			when ::Array, nil
+		case type_spec
+		when ::Array, nil
 
-				;
-			else
+			;
+		else
 
-				type_spec = [ type_spec ]
-			end
+			type_spec = [ type_spec ]
+		end
 
-			case message_spec
-			when ::Array, nil
+		case message_spec
+		when ::Array, nil
 
-				;
-			else
+			;
+		else
 
-				message_spec = [ message_spec ]
-			end
+			message_spec = [ message_spec ]
+		end
 
 
-			begin
+		begin
 
-				yield
+			yield
 
-				assert false, 'the block did not throw an exception as was expected'
-			rescue Test::Unit::AssertionFailedError
+			assert false, 'the block did not throw an exception as was expected'
+		rescue ::Xqsr3::Internal_::X_assert_raise_with_message_::AssertionFailedError_
 
-				raise
-			rescue Exception => x
+			raise
+		rescue Exception => x
 
-				if type_spec
+			if type_spec
 
-					assert false, "exception (#{x.class}) - message: '#{x.message}' - not of any of required types (#{type_spec.join(', ')}); #{x.class} given" unless type_spec.any? { |c| x.is_a? c}
-				end
+				assert false, "exception (#{x.class}) - message: '#{x.message}' - 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
+			if message_spec
 
-					assert false, "exception message not of any of required messages; '#{x.message}' given" unless message_spec.any? do |m|
+				assert false, "exception message not of any of required messages; '#{x.message}' given" unless message_spec.any? do |m|
 
-						case m
-						when ::Regexp
+					case m
+					when ::Regexp
 
-							x.message =~ m
-						when ::String
+						x.message =~ m
+					when ::String
 
-							x.message == m
-						else
+						x.message == m
+					else
 
-							warn "\nunsupported message_spec entry '#{m}' (#{m.class})"
-						end
+						warn "\nunsupported message_spec entry '#{m}' (#{m.class})"
 					end
 				end
-
-				assert true
 			end
+
+			assert true
 		end
 	end
-
 end # class Assertions
 end # module Unit
 end # module Test

data/lib/xqsr3/internal_/test_unit_version_.rb

@@ -0,0 +1,114 @@
+
+# provides reliable mechanism for checking the version of the
+# Test::Unit module
+
+require 'test/unit'
+begin
+
+	require 'test/unit/version'
+
+	module Xqsr3
+	module Internal_
+	module TestUnitVersion_
+
+		TEST_UNIT_VERSION_	=	Test::Unit::VERSION # :nodoc:
+	end # module TestUnitVersion_
+	end # module Internal_
+	end # module Xqsr3
+rescue LoadError
+
+	module Xqsr3
+	module Internal_
+	module TestUnitVersion_
+
+		TEST_UNIT_VERSION_	=	:not_found # :nodoc:
+	end # module TestUnitVersion_
+	end # module Internal_
+	end # module Xqsr3
+end
+
+module Xqsr3
+module Internal_ # :nodoc:
+module TestUnitVersion_ # :nodoc:
+
+	if TEST_UNIT_VERSION_ == :not_found
+
+		TEST_UNIT_VERSION_PARTS_	=	[]
+
+		TEST_UNIT_VERSION_MAJOR_	=	nil # :nodoc:
+		TEST_UNIT_VERSION_MINOR_	=	nil # :nodoc:
+		TEST_UNIT_VERSION_PATCH_	=	nil # :nodoc:
+	else
+
+		TEST_UNIT_VERSION_PARTS_	=	TEST_UNIT_VERSION_.split(/[.]/).collect { |n| n.to_i } # :nodoc:
+
+		TEST_UNIT_VERSION_MAJOR_	=	TEST_UNIT_VERSION_PARTS_[0] # :nodoc:
+		TEST_UNIT_VERSION_MINOR_	=	TEST_UNIT_VERSION_PARTS_[1] # :nodoc:
+		TEST_UNIT_VERSION_PATCH_	=	TEST_UNIT_VERSION_PARTS_[2] # :nodoc:
+	end
+
+	def self.less_ a1, a2 # :nodoc:
+
+		n_common	=	a1.size < a2.size ? a1.size : a2.size
+
+		(0...n_common).each do |ix|
+
+			v1	=	a1[ix]
+			v2	=	a2[ix]
+
+			if v1 == v2
+
+				next
+			end
+
+			if v1 < v2
+
+				return true
+			else
+
+				return false
+			end
+		end
+
+		if n_common != a2.size
+
+			return true
+		else
+
+			return false
+		end
+	end
+
+	def self.is_major_at_least? j # :nodoc:
+
+		return unless TEST_UNIT_VERSION_MAJOR_
+
+		return j >= TEST_UNIT_VERSION_MAJOR_
+	end
+
+	def self.is_minor_at_least? n # :nodoc:
+
+		return unless TEST_UNIT_VERSION_MINOR_
+
+		return n >= TEST_UNIT_VERSION_MINOR_
+	end
+
+	def self.is_at_least? v # :nodoc:
+
+		v	=	v.split(/\./).collect { |n| n.to_i } if String === v
+
+		return !less_(TEST_UNIT_VERSION_PARTS_, v)
+	end
+
+	def self.is_less? v # :nodoc:
+
+		v	=	v.split(/\./).collect { |n| n.to_i } if String === v
+
+		return less_(TEST_UNIT_VERSION_PARTS_, v)
+	end
+
+end # module TestUnitVersion_
+end # module Internal_
+end # module Xqsr3
+
+

data/lib/xqsr3/version.rb

@@ -50,7 +50,7 @@
 module Xqsr3
 
 	# Current version of the Xqsr3 library
-	VERSION				=	'0.30.3'
+	VERSION				=	'0.31.0'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/scratch/test_assert_raise_with_message.rb

@@ -0,0 +1,31 @@
+#!/usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '../../lib')
+
+require 'xqsr3/extensions/test/unit/assert_raise_with_message'
+
+require 'test/unit'
+
+class Test_assert_raise_with_message < Test::Unit::TestCase
+
+	class UnusedException < RuntimeError; end
+
+	class TestException < RuntimeError; end
+
+	def test_1
+
+		assert_raise_with_message(UnusedException, "abc") { raise TestException, 'abc' }
+	end
+
+	def test_2
+
+		assert_raise_with_message(TestException, "abcd") { raise TestException, 'abc' }
+	end
+
+	def test_3
+
+		assert_raise_with_message(TestException, /abc$/) { raise TestException, 'abcd' }
+	end
+end
+
+

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

@@ -28,6 +28,11 @@ class Test_assert_raise_with_message < Test::Unit::TestCase
 		assert_raise_with_message([ ::ArgumentError, ::SystemExit ], nil) { raise ::ArgumentError, 'the-message' }
 		assert_raise_with_message([ ::SystemExit, ::ArgumentError ], nil) { raise ::ArgumentError, 'the-message' }
 	end
+
+	def test_class_and_regex_message
+
+		assert_raise_with_message(::RuntimeError, /the.*message/) { raise 'the-longer-message' }
+	end
 end
 
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xqsr3
 version: !ruby/object:Gem::Version
-  version: 0.30.3
+  version: 0.31.0
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-02 00:00:00.000000000 Z
 dependencies: []
 description: |
   eXtensions by fine Quantum for Standard Ruby and 3rd-party libraries is a
@@ -67,6 +67,7 @@ files:
 - lib/xqsr3/extensions/test/unit/assert_type_has_instance_methods.rb
 - lib/xqsr3/hash_utilities/deep_transform.rb
 - lib/xqsr3/hash_utilities/key_matching.rb
+- lib/xqsr3/internal_/test_unit_version_.rb
 - lib/xqsr3/io/writelines.rb
 - lib/xqsr3/quality.rb
 - lib/xqsr3/quality/parameter_checking.rb
@@ -78,9 +79,8 @@ files:
 - lib/xqsr3/string_utilities/to_symbol.rb
 - lib/xqsr3/string_utilities/truncate.rb
 - lib/xqsr3/version.rb
-- lib/xqsr3/xml/utilities/compare.rb
-- lib/xqsr3/xml/utilities/navigation.rb
 - test/performance/frequency_map.rb
+- test/scratch/test_assert_raise_with_message.rb
 - test/unit/array_utilities/tc_join_with_or.rb
 - test/unit/array_utilities/ts_all.rb
 - test/unit/command_line_utilities/tc_map_option_string.rb
@@ -135,10 +135,6 @@ files:
 - test/unit/string_utilities/ts_all.rb
 - test/unit/tc_version.rb
 - test/unit/ts_all.rb
-- test/unit/xml/ts_all.rb
-- test/unit/xml/utilities/tc_compare.rb
-- test/unit/xml/utilities/tc_navigation.rb
-- test/unit/xml/utilities/ts_all.rb
 homepage: http://github.com/synesissoftware/xqsr3
 licenses:
 - BSD-3-Clause
@@ -159,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.14.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: xqsr3