xqsr3 0.32.3 → 0.37.0

data/lib/xqsr3/quality.rb

@@ -1,3 +1,10 @@
 
-require 'xqsr3/quality/parameter_checking'
+%w{
+
+	parameter_checking
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'quality', name)
+end
+
 

data/lib/xqsr3/quality/parameter_checking.rb

@@ -5,7 +5,7 @@
 # Purpose:      Definition of the ParameterChecking module
 #
 # Created:      12th February 2015
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -59,7 +59,8 @@ module Quality
 module ParameterChecking
 
 	private
-	module Util_ # :nodoc:
+	# @!visibility private
+	module Util_ # :nodoc: all
 
 		def self.join_with_or a
 

data/lib/xqsr3/string_utilities.rb

@@ -0,0 +1,16 @@
+
+%w{
+
+	ends_with
+	nil_if_empty
+	nil_if_whitespace
+	quote_if
+	starts_with
+	to_symbol
+	truncate
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'string_utilities', name)
+end
+
+

data/lib/xqsr3/string_utilities/ends_with.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      13th April 2016
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -59,7 +59,8 @@ module StringUtilities
 module EndsWith
 
 	private
-	module EndsWith_Helper_ # :nodoc:
+	# @!visibility private
+	module EndsWith_Helper_ # :nodoc: all
 
 		def self.string_ends_with_helper_ s, prefix # :nodoc:
 

data/lib/xqsr3/string_utilities/nil_if_empty.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      25th January 2018
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -59,7 +59,8 @@ module StringUtilities
 module NilIfEmpty
 
 	private
-	module NilIfEmpty_Helper_ # :nodoc:
+	# @!visibility private
+	module NilIfEmpty_Helper_ # :nodoc: all
 
 		def self.string_nil_if_empty_array_ s # :nodoc:
 

data/lib/xqsr3/string_utilities/nil_if_whitespace.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      25th January 2018
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -59,7 +59,8 @@ module StringUtilities
 module NilIfWhitespace
 
 	private
-	module NilIfWhitespace_Helper_ # :nodoc:
+	# @!visibility private
+	module NilIfWhitespace_Helper_ # :nodoc: all
 
 		def self.string_nil_if_whitespace_array_ s # :nodoc:
 

data/lib/xqsr3/string_utilities/quote_if.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      3rd June 2017
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -58,10 +58,13 @@ module StringUtilities
 module QuoteIf
 
 	private
-	module QuoteIf_Helper_ # :nodoc:
+	# @!visibility private
+	module QuoteIf_Helper_ # :nodoc: all
 
 		def self.string_quote_if_array_ s, options # :nodoc:
 
+		#$stderr.puts "#{self}#{__method__}(s (#{s.class})='#{s}', options (#{options.class})='#{options}'"
+
 			s			=	s.to_s unless String === s
 
 			quotes		=	options[:quotes] || [ '"', '"' ]
@@ -69,6 +72,8 @@ module QuoteIf
 
 			quotables	=	options[:quotables] || /\s/
 
+#$stderr.puts "quotables (#{quotables.class}): [#{quotables}]"
+
 			case quotables
 			when ::String
 

data/lib/xqsr3/string_utilities/starts_with.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      13th April 2016
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -59,7 +59,8 @@ module StringUtilities
 module StartsWith
 
 	private
-	module StartsWith_Helper_ # :nodoc:
+	# @!visibility private
+	module StartsWith_Helper_ # :nodoc: all
 
 		def self.string_starts_with_helper_ s, prefix # :nodoc:
 

data/lib/xqsr3/string_utilities/to_symbol.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      14th April 2016
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -59,7 +59,8 @@ module StringUtilities
 module ToSymbol
 
 	private
-	module ToSymbol_Helper_ # :nodoc:
+	# @!visibility private
+	module ToSymbol_Helper_ # :nodoc: all
 
 		module Constants # :nodoc:
 

data/lib/xqsr3/string_utilities/truncate.rb

@@ -6,7 +6,7 @@
 #               module
 #
 # Created:      12th April 2018
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -59,7 +59,8 @@ module StringUtilities
 module Truncate
 
 	private
-	module Truncate_Helper_ # :nodoc:
+	# @!visibility private
+	module Truncate_Helper_ # :nodoc: all
 
 		def self.string_truncate_with_options_ s, width, options # :nodoc:
 

data/lib/xqsr3/version.rb

@@ -5,12 +5,13 @@
 # Purpose:      Version for Xqsr3 library
 #
 # Created:      3rd April 2016
-# Updated:      12th April 2019
+# Updated:      20th April 2021
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
 # Author:       Matthew Wilson
 #
+# Copyright (c) 2019-2021, Matthew Wilson and Synesis Information Systems
 # Copyright (c) 2016-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
@@ -50,7 +51,7 @@
 module Xqsr3
 
 	# Current version of the Xqsr3 library
-	VERSION				=	'0.32.3'
+	VERSION				=	'0.37.0'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/unit/containers/tc_multi_map.rb

@@ -481,7 +481,7 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 
 		assert_not mm.has_key? :abc
 
-		mm.push :abc
+		mm.push :abc, *[ :v1, :v2 ]
 
 		assert mm.has_key? :abc
 
@@ -494,15 +494,37 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 
 		mm = MultiMap.new
 
-		assert_not mm.has_value? []
+		assert_not mm.has_value? :abc
+
+		mm.push :abc, *[ :v1, :v2 ]
+
+		assert mm.has_value? :v1
+		assert mm.has_value? :v2
+		assert_not mm.has_value? :v3
+
+		mm.delete :abc
+
+		assert_not mm.has_value? :abc
+	end
+
+	def test_has_values?
+
+		mm = MultiMap.new
+
+		assert_not mm.has_values? []
 
 		mm.push :abc
 
-		assert mm.has_value? []
+		assert mm.has_values? []
+
+		mm.push :abc, * [ :v1, :v2 ]
+
+		assert_not mm.has_values? []
+		assert mm.has_values? [ :v1, :v2 ]
 
 		mm.delete :abc
 
-		assert_not mm.has_value? []
+		assert_not mm.has_values? []
 	end
 
 	def test_key
@@ -512,13 +534,43 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 		assert_nil mm.key []
 		assert_nil mm.key :not_defined
 
-		mm.push :abc
+		mm.push :abc, :v1
 
-		assert_equal :abc, mm.key([])
+		assert_equal :abc, mm.key(:v1)
+		assert_nil mm.key(:v2)
 
-		mm.push :abc, 1
+		mm.push :abc, :v2
+
+		assert_equal :abc, mm.key(:v1)
+		assert_equal :abc, mm.key(:v2)
+		assert_equal :abc, mm.key(:v1, :v2)
+		assert_nil mm.key(:v2, :v1)
+		assert_nil mm.key([:v1, :v2])
+
+		mm.delete :abc
+
+		mm.push :def, :v2, :v1
+
+		assert_equal :def, mm.key(:v2, :v1)
+		assert_nil mm.key(:v1, :v2)
+		assert_equal :def, mm.key(:v1)
+		assert_equal :def, mm.key(:v2)
+
+		mm.delete :def
+
+		mm.push :ghi, [ :v2, :v1 ]
+
+		assert_equal :ghi, mm.key([:v2, :v1])
+		assert_nil mm.key([:v1, :v2])
+		assert_nil mm.key(:v1)
+		assert_nil mm.key(:v2)
+
+		mm.push :ghi, :v1
 
-		assert_equal :abc, mm.key([ 1 ])
+		assert_equal :ghi, mm.key([:v2, :v1])
+		assert_nil mm.key([:v1, :v2])
+		assert_equal :ghi, mm.key(:v1)
+		assert_nil mm.key(:v2)
 	end
 
 	def test_length_and_size
@@ -549,7 +601,7 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 		test_length_and_size
 	end
 
-	def test_merge
+	def test_multi_merge
 
 		mm1 = MultiMap.new
 
@@ -562,12 +614,42 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 		mm2.push :abc, 4, 5
 		mm2.push :def, 'a'
 
-		mm3 = mm1.merge mm2
+		mm3 = mm1.multi_merge mm2
 
-		assert_equal [ :abc, 1, :abc, 2, :abc, 3, :abc, 4, :abc, 5, :def, 'a' ], mm3.flatten
+		h = Hash.new
+
+		h.store :ghi, 'x'
+
+		mm4 = mm3.multi_merge h
+
+		assert_equal [ :abc, 1, :abc, 2, :abc, 3, :abc, 4, :abc, 5, :def, 'a', :ghi, 'x' ], mm4.flatten
+	end
+
+	def test_multi_merge!
+
+		mm1 = MultiMap.new
+
+		mm1.push :abc, 1, 2, 3
+
+		assert_equal [ :abc, 1, :abc, 2, :abc, 3 ], mm1.flatten
+
+		mm2 = MultiMap.new
+
+		mm2.push :abc, 4, 5
+		mm2.push :def, 'a'
+
+		mm1.multi_merge! mm2
+
+		h = Hash.new
+
+		h.store :ghi, 'x'
+
+		mm1.multi_merge! h
+
+		assert_equal [ :abc, 1, :abc, 2, :abc, 3, :abc, 4, :abc, 5, :def, 'a', :ghi, 'x' ], mm1.flatten
 	end
 
-	def test_merge!
+	def test_strict_merge
 
 		mm1 = MultiMap.new
 
@@ -580,9 +662,39 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 		mm2.push :abc, 4, 5
 		mm2.push :def, 'a'
 
-		mm1.merge! mm2
+		mm3 = mm1.strict_merge mm2
+
+		h = Hash.new
+
+		h.store :ghi, 'x'
+
+		mm4 = mm3.strict_merge h
 
-		assert_equal [ :abc, 1, :abc, 2, :abc, 3, :abc, 4, :abc, 5, :def, 'a' ], mm1.flatten
+		assert_equal [ :abc, 4, :abc, 5, :def, 'a', :ghi, 'x' ], mm4.flatten
+	end
+
+	def test_strict_merge!
+
+		mm1 = MultiMap.new
+
+		mm1.push :abc, 1, 2, 3
+
+		assert_equal [ :abc, 1, :abc, 2, :abc, 3 ], mm1.flatten
+
+		mm2 = MultiMap.new
+
+		mm2.push :abc, 4, 5
+		mm2.push :def, 'a'
+
+		mm1.strict_merge! mm2
+
+		h = Hash.new
+
+		h.store :ghi, 'x'
+
+		mm1.strict_merge! h
+
+		assert_equal [ :abc, 4, :abc, 5, :def, 'a', :ghi, 'x' ], mm1.flatten
 	end
 
 	def test_push
@@ -698,6 +810,25 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 		assert_equal ({ abc: [ 1, 2, 3, 4, 5 ], def: [] }), mm.to_h
 	end
 
+	def test_values_unflattened
+
+		mm = MultiMap.new
+
+		assert_equal [], mm.values_unflattened
+
+		mm.store :abc
+
+		assert_equal [ [] ], mm.values_unflattened
+
+		mm.store :abc, 1, 2, '3', nil, false
+
+		assert_equal [ [ 1, 2, '3', nil, false ] ], mm.values_unflattened
+
+		mm.store :def, true
+
+		assert_equal [ [ 1, 2, '3', nil, false ], [ true ] ], mm.values_unflattened
+	end
+
 	def test_values
 
 		mm = MultiMap.new
@@ -706,11 +837,38 @@ class Test_Xqsr3_Containers_MultiMap < Test::Unit::TestCase
 
 		mm.store :abc
 
-		assert_equal [ [] ], mm.values
+		assert_equal [], mm.values
 
 		mm.store :abc, 1, 2, '3', nil, false
 
-		assert_equal [ [ 1, 2, '3', nil, false ] ], mm.values
+		assert_equal [ 1, 2, '3', nil, false ], mm.values
+
+		mm.store :def, true
+
+		assert_equal [ 1, 2, '3', nil, false, true ], mm.values
+	end
+
+	def test_to_s
+
+		mm = MultiMap[]
+
+		assert_equal "{}", mm.to_s
+
+		mm.store :abc
+
+		assert_equal "{:abc=>[]}", mm.to_s
+
+		mm.store :abc, 1
+
+		assert_equal "{:abc=>[1]}", mm.to_s
+
+		mm.store :abc, 1, 23
+
+		assert_equal "{:abc=>[1, 23]}", mm.to_s
+
+		mm.store :def, *(0...10).to_a
+
+		assert_equal "{:abc=>[1, 23], :def=>[0, 1, 2, 3, 4, 5, 6, 7, 8, 9]}", mm.to_s
 	end
 end