xqsr3 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: 4e3f5e422b5b6d6f88ee0c0eb620f38ce468ef54e1cf9d55ab41f24e909c897b
-  data.tar.gz: 80f3675582a96f52a108687c4a77911691972dd0a2167138ffa0c9992c13e3ed
+SHA1:
+  metadata.gz: '048dfbb7beeff5b7e90df73f59be96e686611f91'
+  data.tar.gz: 815facf131a846b49eec30be5e45bf369383d52d
 SHA512:
-  metadata.gz: 41b2ac34f613f74b684223073ff61c3350b8433bda18520bb0af25db2464a22ed1be8fe53859eaf37f60d366d7053d8cab77d653b45b33a57ebd1a619b6186c6
-  data.tar.gz: 28d271b3501677420540ec6a55b1bf69bedf398dc422362ff7ca5e50e1d827d4f4fccc45c73eece170949bab755a47472d78f207a0b7c992cb942b13d368be76
+  metadata.gz: e77733d055c75114bcd38811e5af5f89726c563976d49b8d197246309ac6a2c92ade6cf66e812f81a02b17f682f530b870441fc9f8436b499179dee2165d539c
+  data.tar.gz: 38743b47b07c1b1876d680a759e6c9ec3e9aac7ef6482305a2dbe452fa5d1f28e0bb3b5921653778feb94b76a8f884f90eb03dbae7bad9dd6d5815fad9902308

data/lib/xqsr3/extensions/hash.rb

@@ -1,5 +1,6 @@
 
 require 'xqsr3/extensions/hash/deep_transform'
+require 'xqsr3/extensions/hash/except'
 require 'xqsr3/extensions/hash/has_match'
 require 'xqsr3/extensions/hash/match'
 

data/lib/xqsr3/extensions/hash/except.rb

@@ -0,0 +1,26 @@
+
+unless Hash.instance_methods.include? :except
+
+	class Hash
+
+		# Removes from the instance any key-value pairs matching the
+		# keys specified in +keys_to_delete+
+		def except!(*keys_to_delete)
+
+			keys_to_delete.each do |key|
+
+				self.delete key
+			end
+
+			self
+		end
+
+		# Obtains a copy of the instance wherein any key-value pairs
+		# matching the keys specified in +keys_to_delete+ are removed
+		def except(*keys_to_delete)
+
+			self.dup.except!(*keys_to_delete)
+		end
+	end
+end
+

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

@@ -11,9 +11,11 @@ module X_assert_raise_with_message_ # :nodoc: all
 
 	if TestUnitVersion_.is_at_least? [ 3, 0, 8 ]
 
+		# @!visibility private
 		AssertionFailedError_	=	Test::Unit::AssertionFailedError # :nodoc:
 	else
 
+		# @!visibility private
 		class AssertionFailedError_	< ArgumentError; end # :nodoc:
 	end
 

data/lib/xqsr3/string_utilities/quote_if.rb

@@ -63,6 +63,8 @@ module QuoteIf
 
 		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] || [ '"', '"' ]
@@ -70,6 +72,8 @@ module QuoteIf
 
 			quotables	=	options[:quotables] || /\s/
 
+#$stderr.puts "quotables (#{quotables.class}): [#{quotables}]"
+
 			case quotables
 			when ::String
 

data/lib/xqsr3/version.rb

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

data/test/unit/diagnostics/tc_exception_utilities.rb

@@ -10,6 +10,9 @@ class Test_ExceptionUtilities_raise_with_options < Test::Unit::TestCase
 
 	include ::Xqsr3::Diagnostics
 
+	OS_IS_WINDOWS	=	(RUBY_PLATFORM =~ /(mswin|mingw|bccwin|wince)/i) ? true : false
+	LINE_NUM_RE		=	OS_IS_WINDOWS ? /.+:(\d+):/ : /^[^:]+:(\d+)/
+
 	class ArgumentErrorWithOptions < ArgumentError
 		def initialize(message = nil, **options)
 			super(message)
@@ -25,7 +28,7 @@ class Test_ExceptionUtilities_raise_with_options < Test::Unit::TestCase
 
 			msg		||=	self.message
 			options	||= {}
-			r = self.class.new msg, self.options.merge(options)
+			r = self.class.new msg, **self.options.merge(options)
 			r
 		end
 	end
@@ -192,7 +195,8 @@ class Test_ExceptionUtilities_raise_with_options < Test::Unit::TestCase
 			assert_kind_of(ArgumentError, x)
 			assert_equal "abc", x.message
 
-			assert $@[0] =~ /^[^:]+:(\d+)/
+
+			assert $@[0] =~ LINE_NUM_RE
 			assert_equal line_number.to_s, $1.to_s
 		end
 
@@ -213,7 +217,7 @@ class Test_ExceptionUtilities_raise_with_options < Test::Unit::TestCase
 			assert_equal "abc", x.message
 			assert_equal ({ :blah => :blech, :id => 23 }), x.options
 
-			assert $@[0] =~ /^[^:]+:(\d+)/
+			assert $@[0] =~ LINE_NUM_RE
 			assert_equal line_number.to_s, $1.to_s
 		end
 	end

data/test/unit/extensions/hash/tc_deep_transform.rb

@@ -46,4 +46,3 @@ class Test_Hash_deep_transform < Test::Unit::TestCase
 end
 
 
-

data/test/unit/extensions/hash/tc_except.rb

@@ -0,0 +1,67 @@
+#! /usr/bin/env ruby
+
+$:.unshift File.join(File.dirname(__FILE__), '../../../../lib')
+
+require 'xqsr3/extensions/hash/except'
+
+require 'xqsr3/extensions/test/unit'
+require 'test/unit'
+
+require 'stringio'
+
+class Test_Hash_except < Test::Unit::TestCase
+
+	def test_no_pairs_empty_keys
+
+		h = {}
+
+		assert_equal h, h.except([])
+
+		i = {}
+
+		i.except! *[]
+
+		assert_equal h, i
+	end
+
+	def test_no_pairs_some_keys
+
+		h = {}
+
+		assert_equal h, h.except('a', :b)
+
+		i = {}
+
+		i.except! 'a', :b
+
+		assert_equal h, i
+	end
+
+	def test_no_pairs_some_non_matching_keys
+
+		h = { a: 'a', 'b' => :b }
+
+		assert_equal h, h.except('a', :b)
+
+		i = h.dup
+
+		i.except! 'a', :b
+
+		assert_equal h, i
+	end
+
+	def test_no_pairs_some_matching_keys
+
+		h = { a: 'a', 'b' => :b }
+
+		assert_equal ({ 'b' => :b }), h.except(:a, :b, :c)
+
+		i = h.dup
+
+		i.except! :a, :b, :c
+
+		assert_equal ({ 'b' => :b }), i
+	end
+end
+
+

data/test/unit/extensions/kernel/tc_raise_with_options.rb

@@ -8,6 +8,9 @@ require 'test/unit'
 
 class Test_X_Kernel_raise_with_options < Test::Unit::TestCase
 
+	OS_IS_WINDOWS	=	(RUBY_PLATFORM =~ /(mswin|mingw|bccwin|wince)/i) ? true : false
+	LINE_NUM_RE		=	OS_IS_WINDOWS ? /.+:(\d+):/ : /^[^:]+:(\d+)/
+
 	class ArgumentErrorWithOptions < ArgumentError
 
 		def initialize(message = nil, **options)
@@ -25,7 +28,7 @@ class Test_X_Kernel_raise_with_options < Test::Unit::TestCase
 
 			msg		||=	self.message
 			options	||= {}
-			r = self.class.new msg, self.options.merge(options)
+			r = self.class.new msg, **self.options.merge(options)
 			r
 		end
 	end
@@ -207,7 +210,7 @@ class Test_X_Kernel_raise_with_options < Test::Unit::TestCase
 			assert_kind_of(ArgumentError, x)
 			assert_equal "abc", x.message
 
-			assert $@[0] =~ /^[^:]+:(\d+)/
+			assert $@[0] =~ LINE_NUM_RE
 			assert_equal line_number.to_s, $1.to_s
 		end
 
@@ -231,7 +234,7 @@ class Test_X_Kernel_raise_with_options < Test::Unit::TestCase
 			assert_equal "abc", x.message
 			assert_equal ({ :blah => :blech, :id => 23 }), x.options
 
-			assert $@[0] =~ /^[^:]+:(\d+)/
+			assert $@[0] =~ LINE_NUM_RE
 			assert_equal line_number.to_s, $1.to_s
 		end
 	end

data/test/unit/tc_version.rb

@@ -30,7 +30,7 @@ class Test_version < Test::Unit::TestCase
 
 	def test_VERSION_has_consistent_format
 
-		assert_equal Xqsr3::VERSION, "#{Xqsr3::VERSION_MAJOR}.#{Xqsr3::VERSION_MINOR}.#{Xqsr3::VERSION_REVISION}"
+		assert_equal Xqsr3::VERSION.split('.')[0..2].join('.'), "#{Xqsr3::VERSION_MAJOR}.#{Xqsr3::VERSION_MINOR}.#{Xqsr3::VERSION_REVISION}"
 	end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xqsr3
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - Matt Wilson
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-05-26 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies: []
 description: |
   eXtensions by fine Quantum for Standard Ruby and 3rd-party libraries is a
@@ -48,6 +48,7 @@ files:
 - lib/xqsr3/extensions/enumerable/unique.rb
 - lib/xqsr3/extensions/hash.rb
 - lib/xqsr3/extensions/hash/deep_transform.rb
+- lib/xqsr3/extensions/hash/except.rb
 - lib/xqsr3/extensions/hash/has_match.rb
 - lib/xqsr3/extensions/hash/match.rb
 - lib/xqsr3/extensions/hash/slice.rb
@@ -113,6 +114,7 @@ files:
 - test/unit/extensions/enumerable/tc_unique.rb
 - test/unit/extensions/enumerable/ts_all.rb
 - test/unit/extensions/hash/tc_deep_transform.rb
+- test/unit/extensions/hash/tc_except.rb
 - test/unit/extensions/hash/tc_hash.rb
 - test/unit/extensions/hash/tc_slice.rb
 - test/unit/extensions/hash/ts_all.rb
@@ -154,7 +156,7 @@ homepage: http://github.com/synesissoftware/xqsr3
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -169,9 +171,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.6.14.3
+signing_key:
 specification_version: 4
 summary: xqsr3
 test_files: []