xqsr3 0.32.3 → 0.33.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5362a61770df81001025713c2465c5ed9bea6a49
-  data.tar.gz: 70f643bccc5e09b76acf3a4944e02dbe0e763d6a
+  metadata.gz: '0873ccfa9e001a7bb29a4ef649e0f8859034943c'
+  data.tar.gz: 4ad53d843bf50bee3de784cd0d4f5a4c3a805ca2
 SHA512:
-  metadata.gz: 8cc83e03876a54224a4f4a28ea3ebf4ff289b2a4f8b11d1c727c41716a3ef68e670d10dd0f796d5b3273124b9308a0e4701fae02a030856f1183a2dafae3b2cb
-  data.tar.gz: 3b12d249383fddfde861575e9ed42a329220aba5b47f22204afdf0b5a3317290460004071e3c2d3a4c9590231b5eb61a01c38e1ca6f093ed2cd696ea7095469f
+  metadata.gz: 82bc550fbd48138ad719681c51eb82e6075a4878772154eb9daa190e78c745b70e0ace321e9c700fcaadbaec8eb7b707a484ac6e93e0fd531b777aa0b0a0be6e
+  data.tar.gz: f00c2be6e62d527c21ff3283004a1c0acdeccb65faec73af41fe74f471ef301bd3b7ac6fc23c6c1a107f4e7f5f09872dad5be0b50d6dcbe7ad00111743829721

data/lib/xqsr3/containers/frequency_map.rb

@@ -5,7 +5,7 @@
 # Purpose:      FrequencyMap container
 #
 # Created:      28th January 2005
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -77,6 +77,7 @@ class FrequencyMap
 	#    fm[:z]    # => 0
 	ByElement = Class.new do
 
+		# Create an instance of Xqsr3::FrequencyMap from an array
 		def self.[] *args
 
 			fm = FrequencyMap.new
@@ -180,12 +181,16 @@ class FrequencyMap
 
 		case	rhs
 		when	::NilClass
+
 			return false
 		when	::Hash
+
 			return rhs.size == @elements.size && rhs == @elements
 		when	self.class
+
 			return rhs.count == self.count && rhs == @elements
 		else
+
 			raise TypeError, "can compare #{self.class} only to instances of #{self.class} and #{::Hash}, but #{rhs.class} given"
 		end
 
@@ -407,6 +412,12 @@ class FrequencyMap
 
 	# Returns +true+ if an element with a count of the given +value+ is in the
 	# map; +false+ otherwise
+	#
+	# * *Parameters:*
+	#   - +value+ (Integer) The value of the count for which to search
+	#
+	# * *Exceptions:*
+	#   - +::TypeError+ if +value+ is not an Integer
 	def has_value? value
 
 		case	value
@@ -437,6 +448,8 @@ class FrequencyMap
 #
 #		@elements.keep_if
 #	end
+=begin
+=end
 
 	# Returns the element that has the given count, or +nil+ if none found
 	#
@@ -540,6 +553,8 @@ class FrequencyMap
 		self
 	end
 
+	# Removes a key-value pair from the instance and return as a two-item
+	# array
 	def shift
 
 		r = @elements.shift
@@ -589,11 +604,13 @@ class FrequencyMap
 		@elements.to_hash
 	end
 
+	# A string-form of the instance
 	def to_s
 
 		@elements.to_s
 	end
 
+	# An array of all frequencies (without element keys) in the instance
 	def values
 
 		@elements.values

data/lib/xqsr3/containers/multi_map.rb

@@ -5,7 +5,7 @@
 # Purpose:      multimap container
 #
 # Created:      21st March 2007
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -73,16 +73,16 @@ class MultiMap < ::Hash
 				return self.new
 			when	::Hash
 
-				fm = self.new
+				mm = self.new
 
 				arg.each do |k, v|
 
 					raise ArgumentError, "mapped elements in hashes must be arrays, #{v.class} given" unless v.kind_of? ::Array
 
-					fm.store k, *v
+					mm.store k, *v
 				end
 
-				return fm
+				return mm
 			when	::Array
 
 				# accepted forms:
@@ -133,6 +133,8 @@ class MultiMap < ::Hash
 	# Initialises an instance
 	def initialize
 
+		@merge_is_multi = true
+
 		@inner	=	Hash.new
 	end
 
@@ -143,6 +145,16 @@ class MultiMap < ::Hash
 		return @inner[key]
 	end
 
+	# Adds/assigns a new key+values pair. Equivalent to
+	#
+	#   store(key, *values)
+	#
+	# * *Parameters:*
+	#   - +key+ The element key
+	#   - +values+ (Array) The values to be associated with the key
+	#
+	# * *Exceptions:*
+	#   - +::TypeError+ if +values+ is not an array
 	def []= key, values
 
 		values = [] if values.nil?
@@ -203,9 +215,17 @@ class MultiMap < ::Hash
 		@inner.delete key
 	end
 
+	# Calls _block_ once for each key-value pair, passing the key and each
+	# of its values in turn. If the values for a given key are empty and
+	# +defaults+ is not empty, the block is invoked for that key (with
+	# +defaults[0]+) once
+	#
+	# * *Exceptions:*
+	#   - +ArgumentError+ if more than 1 +defaults+ is provided, or no block is given
 	def each *defaults
 
 		raise ArgumentError, "may only supply 0 or 1 defaults" if defaults.size > 1
+		raise ArgumentError, 'block is required' unless block_given?
 
 		@inner.each do |key, values|
 
@@ -220,8 +240,8 @@ class MultiMap < ::Hash
 		end
 	end
 
-	# Calls _block_ once for each element in the instance, passing the
-	# key. If no block is provided, an enumerator is returned
+	# Calls _block_ once for each key in the instance, passing the key. If no
+	# block is provided, an enumerator is returned
 	def each_key
 
 		return @inner.each_key unless block_given?
@@ -229,26 +249,46 @@ class MultiMap < ::Hash
 		@inner.each_key { |key| yield key }
 	end
 
+	# Calls _block_ once for each key-values pair, passing the key and its
+	# values array. If no block is provided, an enumerator is returned
 	def each_unflattened
 
+		return @inner.each unless block_given?
+
 		@inner.each { |key, value| yield key, value }
 	end
 
+	# Calls _block_ once for each key-values pair, passing the key and its
+	# values array and a key index. If no block is provided, an enumerator
+	# is returned
 	def each_unflattened_with_index
 
+		return @inner.each_with_index unless block_given?
+
 		@inner.each_with_index { |kv, index| yield kv, index }
 	end
 
+	# Calls _block_ once for each value in the instance, passing the value.
+	# If no block is provided, an enumerator is returned
 	def each_value
 
+		return @inner.each_value unless block_given?
+
 		@inner.each do |key, values|
 
 			values.each { |value| yield value }
 		end
 	end
 
+	# Calls _block_ once for each key-values, passing the key and each of its
+	# values and a value index
+	#
+	# * *Exceptions:*
+	#   - +ArgumentError+ if no block is given
 	def each_with_index
 
+		raise ArgumentError, 'block is required' unless block_given?
+
 		index = 0
 		self.each do |key, value|
 
@@ -276,18 +316,26 @@ class MultiMap < ::Hash
 		end
 	end
 
-	def fetch key, default = nil, &block
+	# Returns the values associated with the given key
+	#
+	# * *Parameters:*
+	#   - +key+ The key
+	#   - +default+ The default value
+	def fetch key, default = (default_parameter_defaulted_ = true; nil), &block
 
-		case	default
-		when	::NilClass, ::Array
-			;
-		else
-			raise TypeError, "default parameter ('#{default}') must be of type #{::Array}, but was of type #{default.class}"
+		unless default_parameter_defaulted_
+
+			case	default
+			when	::NilClass, ::Array
+				;
+			else
+				raise TypeError, "default parameter ('#{default}') must be of type #{::Array}, but was of type #{default.class}"
+			end
 		end
 
 		unless @inner.has_key? key
 
-			return default unless default.nil?
+			return default unless default_parameter_defaulted_
 
 			if block_given?
 
@@ -349,31 +397,127 @@ class MultiMap < ::Hash
 		@inner.has_key? key
 	end
 
+	# Returns +true+ if any key has the given +value+; +false+ otherwise
+	#
+	# * *Parameters:*
+	#   - +value+ The value for which to search
 	def has_value? value
 
-		@inner.has_value? value
+		@inner.each do |k, vals|
+
+			return true if vals.include? value
+		end
+
+		false
+	end
+
+	# Returns +true+ if any key has the given +values+; +false+ otherwise
+	#
+	# * *Parameters:*
+	#   - +values+ (Array) The values for which to search
+	#
+	# * *Exceptions:*
+	#   - +::TypeError+ if +value+ is not an Array
+	def has_values? values
+
+		raise TypeError, "'values' parameter must be of type #{::Array}" unless Array === values
+
+		@inner.has_value? values
 	end
 
-	def key value
+	# Returns the key for the given value(s)
+	#
+	# * *Parameters:*
+	#   - +values+ (Array) The value(s) for which to search
+	#
+	# If a single value is specified, the entries in the instance are
+	# searched first for an exact match to all (1) value(s); if that fails,
+	# then the first key with a values containing the given value is
+	# returned
+	def key *values
+
+		case values.size
+		when 0
+
+			return nil
+		when 1
+
+			i = nil
+
+			@inner.each do |k, vals|
+
+				return k if vals == values
+
+				if i.nil?
+
+					i = k if vals.include? values[0]
+				end
+			end
+
+			return i
+		else
+
+			@inner.each do |key, vals|
+
+				return key if vals == values
+			end
 
-		@inner.key value
+			return nil
+		end
 	end
 
-	def merge fm
+	# The number of elements in the map
+	def length
 
-		raise TypeError, "parameter must be an instance of type #{self.class}" unless fm.instance_of? self.class
+		@inner.size
+	end
 
-		fm_new = self.class.new
+	# Returns a new instance containing a merging of the current instance and
+	# the +other+ instance
+	#
+	# NOTE: where any key is found in both merging instances the values
+	# resulting will be a concatenation of the sets of values
+	#
+	# * *Parameters:*
+	#   - +other+ (MultiMap, Hash) The instance from which to merge
+	#
+	# * *Exceptions:*
+	#   - +TypeError+ Raised if +other+ is not a MultiMap or a Hash
+	def multi_merge other
 
-		fm_new.merge! self
-		fm_new.merge! fm
+		mm = self.class.new
 
-		fm_new
+		mm.merge! self
+		mm.merge! other
+
+		mm
 	end
 
-	def merge! fm
+	# Merges the contents of +other+ into the current instance
+	#
+	# NOTE: where any key is found in both merging instances the values
+	# resulting will be a concatenation of the sets of values
+	#
+	# * *Parameters:*
+	#   - +other+ (MultiMap, Hash) The instance from which to merge
+	#
+	# * *Exceptions:*
+	#   - +TypeError+ Raised if +other+ is not a MultiMap or a Hash
+	def multi_merge! other
+
+		case other
+		when self.class
+
+			;
+		when ::Hash
 
-		fm.each do |k, v|
+			;
+		else
+
+			raise TypeError, "parameter must be an instance of #{self.class} or #{Hash}"
+		end
+
+		other.each do |k, v|
 
 			self.push k, v
 		end
@@ -381,6 +525,96 @@ class MultiMap < ::Hash
 		self
 	end
 
+	# Returns a new instance containing a merging of the current instance and
+	# the +other+ instance
+	#
+	# NOTE: where any key is found in both merging instances the values from
+	# +other+ will be used
+	#
+	# * *Parameters:*
+	#   - +other+ (MultiMap, Hash) The instance from which to merge
+	#
+	# * *Exceptions:*
+	#   - +TypeError+ Raised if +other+ is not a MultiMap or a Hash
+	def strict_merge other
+
+		mm = self.class.new
+
+		mm.strict_merge! self
+		mm.strict_merge! other
+
+		mm
+	end
+
+	# Merges the contents of +other+ into the current instance
+	#
+	# NOTE: where any key is found in both merging instances the values from
+	# +other+ will be used
+	#
+	# * *Parameters:*
+	#   - +other+ (MultiMap, Hash) The instance from which to merge
+	#
+	# * *Exceptions:*
+	#   - +TypeError+ Raised if +other+ is not a MultiMap or a Hash
+	def strict_merge! other
+
+		case other
+		when self.class
+
+			other.each_unflattened do |k, vals|
+
+				self.store k, *vals
+			end
+		when ::Hash
+
+			other.each do |k, v|
+
+				self.store k, v
+			end
+		else
+
+			raise TypeError, "parameter must be an instance of #{self.class} or #{Hash}"
+		end
+
+		self
+	end
+
+	# See #merge
+	def merge other
+
+		if @merge_is_multi
+
+			multi_merge other
+		else
+
+			strict_merge other
+		end
+	end
+
+	# See #merge!
+	def merge! other
+
+		if @merge_is_multi
+
+			multi_merge! other
+		else
+
+			strict_merge! other
+		end
+	end
+
+	# Pushes the given +key+ and +values+. If the +key+ is already in the
+	# map then the +values+ will be concatenated with those already present
+	#
+	# === Signature
+	#
+	# * *Parameters:*
+	#   - +key+ The element key
+	#   - +values+ (*Array) The value(s) to be pushed
+	#
+	# === Exceptions
+	#  - +::RangeError+ raised if the value of +count+ results in a negative count for the given element
+	#  - +::TypeError+ if +count+ is not an +::Integer+
 	def push key, *values
 
 		@inner[key] = [] unless @inner.has_key? key
@@ -388,33 +622,60 @@ class MultiMap < ::Hash
 		@inner[key].push(*values)
 	end
 
+	# Removes a key-value pair from the instance and return as a two-item
+	# array
 	def shift
 
 		@inner.shift
 	end
 
-	def size
-
-		@inner.size
-	end
+	alias size length
 
+	# Causes an element with the given +key+ and +values+ to be stored. If an
+	# element with the given +key+ already exists, its values will b
+	# replaced
 	def store key, *values
 
 		@inner[key] = values
 	end
 
+	# Converts instance to an array of +[key,value]+ pairs
 	def to_a
 
 		self.flatten
 	end
 
+	# Obtains reference to internal hash instance (which must *not* be modified)
 	def to_h
 
-		@inner.dup
+		@inner.to_h
 	end
 
+	# Obtains equivalent hash to instance
+	def to_hash
+
+		@elements.to_hash
+	end
+
+	# A string-form of the instance
+	def to_s
+
+		@inner.to_s
+	end
+
+	# An array of all values in the instance
 	def values
 
+		r	=	[]
+
+		@inner.values.each  { |vals| r += vals }
+
+		r
+	end
+
+	# An array of all sets of values in the instance
+	def values_unflattened
+
 		@inner.values
 	end
 end # class MultiMap

data/lib/xqsr3/diagnostics/inspect_builder.rb

@@ -54,8 +54,10 @@ module Diagnostics
 
 module InspectBuilder
 
-	module InspectBuilder_Utilities
+	# @!visibility private
+	module InspectBuilder_Utilities # :nodoc: all
 
+		# @!visibility private
 		NORMALISE_FUNCTION	=	lambda { |ar| ar.map { |v| v.to_s }.map { |v| '@' == v[0] ? v : "@#{v}" } }
 	end # module InspectBuilder_Utilities
 
@@ -157,6 +159,8 @@ module InspectBuilder
 	end
 
 	# Creates an inspect string from self
+	#
+	# see InspectBuilder::make_inspect
 	def make_inspect **options
 
 		::Xqsr3::Diagnostics::InspectBuilder.make_inspect self, **options

data/lib/xqsr3/hash_utilities/key_matching.rb

@@ -6,13 +6,13 @@
 #               module
 #
 # Created:      15th November 2017
-# Updated:      15th November 2017
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2017, Matthew Wilson and Synesis Software
+# Copyright (c) 2017-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -56,10 +56,12 @@ require 'xqsr3/quality/parameter_checking'
 module Xqsr3
 module HashUtilities
 
+# +include+-able module that provides ::has_match?, #has_match?, ::match,
+# and #match methods
 module KeyMatching
 
 	private
-	def self.do_match_ h, re, **options
+	def self.do_match_ h, re, **options # :nodoc:
 
 		::Xqsr3::Quality::ParameterChecking.check_parameter h, 'h', responds_to: [ :[], :has_key?, :each ]
 
@@ -97,7 +99,7 @@ module KeyMatching
 		nil
 	end
 
-	def self.do_has_match_ h, re, **options
+	def self.do_has_match_ h, re, **options # :nodoc:
 
 		::Xqsr3::Quality::ParameterChecking.check_parameter h, 'h', responds_to: [ :[], :has_key?, :each ]
 

data/lib/xqsr3/internal_/test_unit_version_.rb

@@ -3,30 +3,46 @@
 # Test::Unit module
 
 require 'test/unit'
+
 begin
 
 	require 'test/unit/version'
 
+	# :stopdoc:
+	# @!visibility private
 	module Xqsr3
+	# @!visibility private
 	module Internal_ # :nodoc:
+	# @!visibility private
 	module TestUnitVersion_ # :nodoc:
 
+		# @!visibility private
 		TEST_UNIT_VERSION_	=	Test::Unit::VERSION # :nodoc:
 	end # module TestUnitVersion_
 	end # module Internal_
 	end # module Xqsr3
+
+	# :startdoc:
 rescue LoadError
 
+	# @!visibility private
 	module Xqsr3
+	# @!visibility private
 	module Internal_ # :nodoc:
+	# @!visibility private
 	module TestUnitVersion_ # :nodoc:
 
+		# @!visibility private
 		TEST_UNIT_VERSION_	=	:not_found # :nodoc:
 	end # module TestUnitVersion_
 	end # module Internal_
 	end # module Xqsr3
+
+	# :startdoc:
 end
 
+# :stopdoc:
+
 module Xqsr3
 module Internal_ # :nodoc:
 module TestUnitVersion_ # :nodoc:
@@ -47,6 +63,7 @@ module TestUnitVersion_ # :nodoc:
 		TEST_UNIT_VERSION_PATCH_	=	TEST_UNIT_VERSION_PARTS_[2] # :nodoc:
 	end
 
+	# @!visibility private
 	def self.less_ a1, a2 # :nodoc:
 
 		n_common	=	a1.size < a2.size ? a1.size : a2.size
@@ -79,6 +96,7 @@ module TestUnitVersion_ # :nodoc:
 		end
 	end
 
+	# @!visibility private
 	def self.is_major_at_least? j # :nodoc:
 
 		return unless TEST_UNIT_VERSION_MAJOR_
@@ -86,6 +104,7 @@ module TestUnitVersion_ # :nodoc:
 		return j >= TEST_UNIT_VERSION_MAJOR_
 	end
 
+	# @!visibility private
 	def self.is_minor_at_least? n # :nodoc:
 
 		return unless TEST_UNIT_VERSION_MINOR_
@@ -93,6 +112,7 @@ module TestUnitVersion_ # :nodoc:
 		return n >= TEST_UNIT_VERSION_MINOR_
 	end
 
+	# @!visibility private
 	def self.is_at_least? v # :nodoc:
 
 		v	=	v.split(/\./).collect { |n| n.to_i } if String === v
@@ -100,6 +120,7 @@ module TestUnitVersion_ # :nodoc:
 		return !less_(TEST_UNIT_VERSION_PARTS_, v)
 	end
 
+	# @!visibility private
 	def self.is_less? v # :nodoc:
 
 		v	=	v.split(/\./).collect { |n| n.to_i } if String === v
@@ -111,4 +132,6 @@ end # module TestUnitVersion_
 end # module Internal_
 end # module Xqsr3
 
+# :startdoc:
+
 

data/lib/xqsr3/version.rb

@@ -5,7 +5,7 @@
 # Purpose:      Version for Xqsr3 library
 #
 # Created:      3rd April 2016
-# Updated:      12th April 2019
+# Updated:      15th April 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -50,7 +50,7 @@
 module Xqsr3
 
 	# Current version of the Xqsr3 library
-	VERSION				=	'0.32.3'
+	VERSION				=	'0.33.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,43 @@ 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
+#$stderr.puts "mm1(#{mm1.class})=#{mm1}"
+
+		assert_equal [ :abc, 1, :abc, 2, :abc, 3 ], mm1.flatten
+
+		mm2 = MultiMap.new
+
+		mm2.push :abc, 4, 5
+		mm2.push :def, 'a'
+#$stderr.puts "mm2(#{mm2.class})=#{mm2}"
+
+		mm1.strict_merge! mm2
+#$stderr.puts "mm1(#{mm1.class})=#{mm1}"
+
+		h = Hash.new
+
+		h.store :ghi, 'x'
+
+		mm1.strict_merge! h
+#$stderr.puts "mm1(#{mm1.class})=#{mm1}"
+
+		assert_equal [ :abc, 4, :abc, 5, :def, 'a', :ghi, 'x' ], mm1.flatten
 	end
 
 	def test_push
@@ -698,6 +814,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 +841,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
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xqsr3
 version: !ruby/object:Gem::Version
-  version: 0.32.3
+  version: 0.33.0
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-12 00:00:00.000000000 Z
+date: 2019-04-15 00:00:00.000000000 Z
 dependencies: []
 description: |
   eXtensions by fine Quantum for Standard Ruby and 3rd-party libraries is a
@@ -157,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: xqsr3