xqsr3 0.34.0 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: '08b7e3524dc96db46918345f810db795701f4a10'
-  data.tar.gz: 05baa4102344c3fc236af32c03a596e592f6537d
+SHA256:
+  metadata.gz: 4e3f5e422b5b6d6f88ee0c0eb620f38ce468ef54e1cf9d55ab41f24e909c897b
+  data.tar.gz: 80f3675582a96f52a108687c4a77911691972dd0a2167138ffa0c9992c13e3ed
 SHA512:
-  metadata.gz: a4be49e79a61c9e44f12de294a1553f1cadc1e089bcda0b8defd567752716cface3e7b25e9a3699b584f305d94e9a5e6b848369a3fb10f6256b7c74f580ecbe0
-  data.tar.gz: cf295f1ea20af9bff3ebe1a2e457c4ac2dd4b440dc0a84f9310e5c3980e4994b65ddb17edf533a646cdf7ae18a23fe9ed493fc600e26d833f01cca3d732209a8
+  metadata.gz: 41b2ac34f613f74b684223073ff61c3350b8433bda18520bb0af25db2464a22ed1be8fe53859eaf37f60d366d7053d8cab77d653b45b33a57ebd1a619b6186c6
+  data.tar.gz: 28d271b3501677420540ec6a55b1bf69bedf398dc422362ff7ca5e50e1d827d4f4fccc45c73eece170949bab755a47472d78f207a0b7c992cb942b13d368be76

data/lib/xqsr3/all_extensions.rb

@@ -0,0 +1,6 @@
+
+require File.join(File.dirname(__FILE__), 'extensions')
+
+require File.join(File.dirname(__FILE__), 'extensions', 'test', 'unit')
+
+

data/lib/xqsr3/array_utilities.rb

@@ -0,0 +1,10 @@
+
+%w{
+
+	join_with_or
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'array_utilities', name)
+end
+
+

data/lib/xqsr3/command_line_utilities.rb

@@ -0,0 +1,10 @@
+
+%w{
+
+	map_option_string
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'command_line_utilities', name)
+end
+
+

data/lib/xqsr3/containers.rb

@@ -0,0 +1,11 @@
+
+%w{
+
+	frequency_map
+	multi_map
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'containers', name)
+end
+
+

data/lib/xqsr3/conversion.rb

@@ -0,0 +1,11 @@
+
+%w{
+
+	bool_parser
+	integer_parser
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'conversion', name)
+end
+
+

data/lib/xqsr3/diagnostics.rb

@@ -0,0 +1,11 @@
+
+%w{
+
+	exception_utilities
+	inspect_builder
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'diagnostics', name)
+end
+
+

data/lib/xqsr3/extensions.rb

@@ -0,0 +1,13 @@
+
+%w{
+
+	array
+	enumerable
+	hash
+	io
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'extensions', name)
+end
+
+

data/lib/xqsr3/extensions/array.rb

@@ -0,0 +1,3 @@
+
+require 'xqsr3/extensions/array/join_with_or'
+

data/lib/xqsr3/extensions/io/writelines.rb

@@ -5,13 +5,13 @@
 # Purpose:      Adds a writelines() method to the IO class
 #
 # Created:      13th April 2007
-# Updated:      10th June 2016
+# Updated:      31st October 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
 # Author:       Matthew Wilson
 #
-# Copyright (c) 2007-2016, Matthew Wilson and Synesis Software
+# Copyright (c) 2007-2019, Matthew Wilson and Synesis Software
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -54,13 +54,45 @@ require 'xqsr3/io/writelines'
 
 class IO
 
-	# Extends +IO+ class with the ::Xqsr3::IO::write_lines
-	# method
-	def self.writelines(path, contents, lineSep = nil, columnSep = nil)
+	# Extends +IO+ class with the +::Xqsr3::IO::write_lines+ method
+	#
+	#
+	#def self.writelines(path, contents, lineSep = nil, columnSep = nil)
+	def self.writelines(path, contents, *args)
 
-		::Xqsr3::IO.writelines path, contents, line_separator: lineSep, column_separator: columnSep, eol_lookahead_limit: 20
+		options = {}
+
+		case args.size
+		when 0
+
+			;
+		when 1
+
+			arg3 = args[0]
+
+			if arg3.respond_to?(:to_hash)
+
+				options.merge! arg3.to_hash
+			else
+
+				options[:line_separator] = arg3
+			end
+		when 2
+
+			arg3 = args[0]
+			arg4 = args[1]
+
+			options[:line_separator] = arg2
+			options[:column_separator] = arg2
+		else
+
+			raise ArgumentError, "wrong number of arguments (given #{2 + args.size}, expected 2..4)"
+		end
+
+		::Xqsr3::IO.writelines path, contents, **options
 	end
 end # class IO
 
 # ############################## end of file ############################# #
 
+

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

@@ -11,11 +11,9 @@ 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/hash_utilities.rb

@@ -0,0 +1,11 @@
+
+%w{
+
+	deep_transform
+	key_matching
+}.each do |name|
+
+	require File.join(File.dirname(__FILE__), 'hash_utilities', name)
+end
+
+

data/lib/xqsr3/io/writelines.rb

@@ -5,7 +5,7 @@
 # Purpose:      Adds a writelines() method to the IO module
 #
 # Created:      13th April 2007
-# Updated:      16th April 2019
+# Updated:      31st October 2019
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
@@ -60,26 +60,54 @@ module IO
 	module WriteLine_Constants_ #:nodoc: all
 
 		NUMBER_OF_LINES_TO_EXAMINE	=	20
-
 	end # module WriteLine_Constants_
 
 	private
 
 	# @!visibility private
-	def self.write_to_target_ target, contents, line_separator, column_separator # :nodoc:
+	def self.write_to_target_ target, contents, line_separator, column_separator, no_last_eol # :nodoc:
 
-$stderr.puts "#{self.class}.write_to_target_(target(#{target.class})='#{target}', contents(#{contents.class})='#{contents}', line_separator(#{line_separator.class})='#{line_separator}', column_separator=(#{column_separator.class})='#{column_separator}')" if $DEBUG
-		if contents.instance_of? ::Hash
+$stderr.puts "#{self.class}.write_to_target_(target(#{target.class})='#{target}', contents(#{contents.class})='#{contents}', line_separator(#{line_separator.class})='#{line_separator}', column_separator(#{column_separator.class})='#{column_separator}', no_last_eol(#{no_last_eol.class})=#{no_last_eol})" if $DEBUG
+
+		if no_last_eol
+
+			first = true
+
+			if contents.instance_of? ::Hash
+
+				contents.each do |k, v|
+
+					target << line_separator unless first
+
+					target << "#{k}#{column_separator}#{v}"
+
+					first = false
+				end
+			else
+
+				contents.each do |element|
+
+					target << line_separator unless first
 
-			contents.each do |k, v|
+					target << "#{element}"
 
-				target << "#{k}#{column_separator}#{v}#{line_separator}"
+					first = false
+				end
 			end
 		else
 
-			contents.each do |element|
+			if contents.instance_of? ::Hash
+
+				contents.each do |k, v|
 
-				target << "#{element}#{line_separator}"
+					target << "#{k}#{column_separator}#{v}#{line_separator}"
+				end
+			else
+
+				contents.each do |element|
+
+					target << "#{element}#{line_separator}"
+				end
 			end
 		end
 
@@ -139,6 +167,7 @@ $stderr.puts "#{self.class}.write_to_target_(target(#{target.class})='#{target}'
 	#   - +:column_separator+ {optional} The column separator, to be applied between each field in the case where +contents+ is a +Hash+.
 	#   - +:eol_lookahead_limit+ {optional} The number of content elements (line/pair) to inspect to determine whether element has a terminating end-of-line sequence. Defaults to 20. If 0, and +:line_separator+ is not specified, then will default to <tt>"\n"</tt>. If +nil+, then every line will be inspected.
 	#   - +:line_separator+ {optional} The line separator, to be applied to the end of line created from each entry. When not specified, it will be deduced by inspecting +contents+ (according to +eol_lookahead_limit+).
+	#   - +:no_last_eol+ {optional} If present and _truey_, causes suppression of the addition of the +:line_separator+ on the last line.
 	#
 	# === Return
 	#
@@ -170,6 +199,7 @@ $stderr.puts "#{self.class}.write_to_target_(target(#{target.class})='#{target}'
 		options				||=	{}
 		eol_lookahead_limit	=	options[:eol_lookahead_limit] || WriteLine_Constants_::NUMBER_OF_LINES_TO_EXAMINE
 		column_separator	=	options[:column_separator] || ''
+		no_last_eol			=	options[:no_last_eol] || false
 		line_separator		=	nil
 		line_separator		||=	options[:line_separator]
 		line_separator		||=	self.deduce_line_separator_(contents, eol_lookahead_limit) unless !eol_lookahead_limit.kind_of?(::Integer) || 0 == eol_lookahead_limit
@@ -186,11 +216,11 @@ $stderr.puts "#{self.class}.write_to_target_(target(#{target.class})='#{target}'
 
 			File.open(target, "w") do |io|
 
-				self.write_to_target_ io, contents, line_separator, column_separator
+				self.write_to_target_ io, contents, line_separator, column_separator, no_last_eol
 			end
 		else
 
-			self.write_to_target_ target, contents, line_separator, column_separator
+			self.write_to_target_ target, contents, line_separator, column_separator, no_last_eol
 		end
 	end # writelines
 end # module IO

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/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/version.rb

@@ -5,12 +5,13 @@
 # Purpose:      Version for Xqsr3 library
 #
 # Created:      3rd April 2016
-# Updated:      4th July 2019
+# Updated:      26th May 2020
 #
 # Home:         http://github.com/synesissoftware/xqsr3
 #
 # Author:       Matthew Wilson
 #
+# Copyright (c) 2019-2020, 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.34.0'
+	VERSION				=	'0.36.0'
 
 	private
 	VERSION_PARTS_		=	VERSION.split(/[.]/).collect { |n| n.to_i } # :nodoc:

data/test/unit/extensions/io/tc_writelines.rb

@@ -22,6 +22,18 @@ class Test_IO_writelines < Test::Unit::TestCase
 		assert_equal "abc\n", s.string
 	end
 
+	def test_single_string_nolasteol
+
+		input = 'abc'
+
+		s = StringIO.new '', 'a'
+
+		r = ::IO.writelines s, input, no_last_eol: true
+
+		assert_equal 1, r
+		assert_equal "abc", s.string
+	end
+
 	def test_single_string_in_array
 
 		input = [ 'abc' ]
@@ -46,6 +58,18 @@ class Test_IO_writelines < Test::Unit::TestCase
 		assert_equal "abc\n", s.string
 	end
 
+	def test_single_string_in_hash_nolasteol
+
+		input = { 'abc' => '' }
+
+		s = StringIO.new '', 'a'
+
+		r = ::IO.writelines s, input, no_last_eol: true
+
+		assert_equal 1, r
+		assert_equal "abc", s.string
+	end
+
 	def test_two_strings_in_array
 
 		input = [ 'abc', 'def' ]
@@ -82,6 +106,18 @@ class Test_IO_writelines < Test::Unit::TestCase
 		assert_equal "abc\ndef\n", s.string
 	end
 
+	def test_two_strings_in_hash_nolasteol
+
+		input = { 'ab' => 'c', 'de' => 'f' }
+
+		s = StringIO.new '', 'a'
+
+		r = ::IO.writelines s, input, no_last_eol: true
+
+		assert_equal 2, r
+		assert_equal "abc\ndef", s.string
+	end
+
 	def test_ten_strings_in_array
 
 		input = (0...10).map { |i| i.to_s }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: xqsr3
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.36.0
 platform: ruby
 authors:
 - Matt Wilson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-04 00:00:00.000000000 Z
+date: 2020-05-26 00:00:00.000000000 Z
 dependencies: []
 description: |
   eXtensions by fine Quantum for Standard Ruby and 3rd-party libraries is a
@@ -23,16 +23,24 @@ files:
 - README.md
 - examples/count_word_frequencies.md
 - examples/count_word_frequencies.rb
+- lib/xqsr3/all_extensions.rb
+- lib/xqsr3/array_utilities.rb
 - lib/xqsr3/array_utilities/join_with_or.rb
+- lib/xqsr3/command_line_utilities.rb
 - lib/xqsr3/command_line_utilities/map_option_string.rb
+- lib/xqsr3/containers.rb
 - lib/xqsr3/containers/frequency_map.rb
 - lib/xqsr3/containers/multi_map.rb
+- lib/xqsr3/conversion.rb
 - lib/xqsr3/conversion/bool_parser.rb
 - lib/xqsr3/conversion/integer_parser.rb
+- lib/xqsr3/diagnostics.rb
 - lib/xqsr3/diagnostics/exception_utilities.rb
 - lib/xqsr3/diagnostics/exceptions/with_cause.rb
 - lib/xqsr3/diagnostics/inspect_builder.rb
 - lib/xqsr3/doc_.rb
+- lib/xqsr3/extensions.rb
+- lib/xqsr3/extensions/array.rb
 - lib/xqsr3/extensions/array/join_with_or.rb
 - lib/xqsr3/extensions/enumerable.rb
 - lib/xqsr3/extensions/enumerable/collect_with_index.rb
@@ -68,12 +76,14 @@ files:
 - lib/xqsr3/extensions/test/unit/assert_superclass_of.rb
 - lib/xqsr3/extensions/test/unit/assert_true.rb
 - lib/xqsr3/extensions/test/unit/assert_type_has_instance_methods.rb
+- lib/xqsr3/hash_utilities.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
+- lib/xqsr3/string_utilities.rb
 - lib/xqsr3/string_utilities/ends_with.rb
 - lib/xqsr3/string_utilities/nil_if_empty.rb
 - lib/xqsr3/string_utilities/nil_if_whitespace.rb
@@ -160,7 +170,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: xqsr3