sus 0.13.0 → 0.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: beb15dd70f3fd10ea7d5485648b632944450255950ecbbd0c02fbd10aa533933
-  data.tar.gz: 4cc4f588633c0dee5211f39dec34224f78f44a47c1720c74c4a3fc90df9c7671
+  metadata.gz: 1aa2de6186ab05050d85b1125c7244bb6cf25b1250f9973bc067f72a405e9396
+  data.tar.gz: 0bed63c55b1d2571d981efcb44fd5c008eab6f78e47bb7bf2d53e061b356b59a
 SHA512:
-  metadata.gz: '0292a0378064908cfff1ca760f09f2bb64f1131835ca7fafae02e1120726af7cd0575a240516392b817133dde4c444e18b0962ac5e381c761c5b98c325696ce9'
-  data.tar.gz: 54c3cd3c3116562271bc4c1f68172bc9fa43a3a8881bca00033d94ebd26b9a633b39897631a00a9dc90e0fef1b2c82affde754a74f644a95680080379b16d258
+  metadata.gz: fe13105ac13ba02104c02e512273964b0b784cae3663faec805cd6bb4d3ed2efeb4fe0720521817766ea3a438f81ebf5ffc5a8877c864d131c31fbedaed6ec17
+  data.tar.gz: 23abcec32de31cdb6243a43439bc2a41e38842a456feb191808734aa2387c701c75de25af39f15c35474c1c6e222ea78e797b305247a8cd6ed5b646824cf7ea4

data/lib/sus/assertions.rb

@@ -14,12 +14,15 @@ module Sus
 			self.new(**options)
 		end
 		
-		def initialize(identity: nil, target: nil, output: Output.buffered, inverted: false, isolated: false, measure: false, verbose: false)
+		# @parameter orientation [Boolean] Whether the assertions are positive or negative in general.
+		# @parameter inverted [Boolean] Whether the assertions are inverted with respect to the parent.
+		def initialize(identity: nil, target: nil, output: Output.buffered, inverted: false, orientation: true, isolated: false, measure: false, verbose: false)
 			# In theory, the target could carry the identity of the assertion group, but it's not really necessary, so we just handle it explicitly and pass it into any nested assertions.
 			@identity = identity
 			@target = target
 			@output = output
 			@inverted = inverted
+			@orientation = orientation
 			@isolated = isolated
 			@verbose = verbose
 			
@@ -39,7 +42,13 @@ module Sus
 		attr :target
 		attr :output
 		attr :level
+		
+		# Whether this aset of assertions is inverted
 		attr :inverted
+		
+		# The absolute orientation of this set of assertions:
+		attr :orientation
+		
 		attr :isolated
 		attr :verbose
 		
@@ -118,14 +127,14 @@ module Sus
 			if condition
 				@passed << self
 				
-				if @inverted || @verbose
-					@output.puts(:indent, :passed, pass_prefix, message || "assertion", Output::Backtrace.first(@identity))
+				if !@orientation || @verbose
+					@output.puts(:indent, *pass_prefix, message || "assertion", Output::Backtrace.first(@identity))
 				end
 			else
 				@failed << self
 				
-				if !@inverted || @verbose
-					@output.puts(:indent, :failed, fail_prefix, message || "assertion", Output::Backtrace.first(@identity))
+				if @orientation || @verbose
+					@output.puts(:indent, *fail_prefix, message || "assertion", Output::Backtrace.first(@identity))
 				end
 			end
 		end
@@ -158,7 +167,7 @@ module Sus
 			
 			lines = error.message.split(/\r?\n/)
 			
-			@output.puts(:indent, :error, fail_prefix, "Unhandled exception ", :value, error.class, ":", :reset, " ", lines.shift)
+			@output.puts(:indent, *fail_prefix, "Unhandled exception ", :value, error.class, ":", :reset, " ", lines.shift)
 			
 			lines.each do |line|
 				@output.puts(:indent, "| ", line)
@@ -177,9 +186,16 @@ module Sus
 				output = @output
 			end
 			
+			# Inverting a nested assertions causes the orientation to flip:
+			if inverted
+				orientation = !@orientation
+			else
+				orientation = @orientation
+			end
+			
 			output.puts(:indent, target)
 			
-			assertions = self.class.new(identity: identity, target: target, output: output, isolated: isolated, inverted: inverted, verbose: @verbose, **options)
+			assertions = self.class.new(identity: identity, target: target, output: output, isolated: isolated, inverted: inverted, orientation: orientation, verbose: @verbose, **options)
 			
 			output.indented do
 				begin
@@ -264,13 +280,24 @@ module Sus
 			# 	@output.puts
 			# end
 		end
-				
+		
+		PASSED_PREFIX = [:passed, "✓ "].freeze
+		FAILED_PREFIX = [:failed, "✗ "].freeze
+		
 		def pass_prefix
-			"✓ "
+			if @orientation
+				PASSED_PREFIX
+			else
+				FAILED_PREFIX
+			end
 		end
 		
 		def fail_prefix
-			"✗ "
+			if @orientation
+				FAILED_PREFIX
+			else
+				PASSED_PREFIX
+			end
 		end
 		
 		def inform_prefix

data/lib/sus/expect.rb

@@ -51,9 +51,5 @@ module Sus
 				Expect.new(@__assertions__, subject)
 			end
 		end
-		
-		def is_expected
-			expect(subject)
-		end
 	end
 end

data/lib/sus/have/all.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
+
+module Sus
+	module Have
+		class All
+			def initialize(predicates)
+				@predicates = predicates
+			end
+			
+			def print(output)
+				first = true
+				output.write("have {")
+				@predicates.each do |predicate|
+					if first
+						first = false
+					else
+						output.write(", ")
+					end
+					
+					output.write(predicate)
+				end
+				output.write("}")
+			end
+			
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					@predicates.each do |predicate|
+						predicate.call(assertions, subject)
+					end
+				end
+			end
+		end
+	end
+end

data/lib/sus/have/any.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
+
+module Sus
+	module Have
+		class Any
+			def initialize(predicates)
+				@predicates = predicates
+			end
+			
+			def print(output)
+				first = true
+				output.write("have any {")
+				@predicates.each do |predicate|
+					if first
+						first = false
+					else
+						output.write(", ")
+					end
+					
+					output.write(predicate)
+				end
+				output.write("}")
+			end
+			
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					@predicates.each do |predicate|
+						predicate.call(assertions, subject)
+					end
+					
+					if assertions.passed.any?
+						# We don't care about any failures in this case, as long as one of the values passed:
+						assertions.failed.clear
+					else
+						# Nothing passed, so we failed:
+						assertions.assert(false, "could not find any matching value")
+					end
+				end
+			end
+		end
+	end
+end

data/lib/sus/have.rb

@@ -3,37 +3,11 @@
 # Released under the MIT License.
 # Copyright, 2022, by Samuel Williams.
 
+require_relative 'have/all'
+require_relative 'have/any'
+
 module Sus
 	module Have
-		class Composite
-			def initialize(predicates)
-				@predicates = predicates
-			end
-			
-			def print(output)
-				first = true
-				output.write("have {")
-				@predicates.each do |predicate|
-					if first
-						first = false
-					else
-						output.write(", ")
-					end
-					
-					output.write(predicate)
-				end
-				output.write("}")
-			end
-			
-			def call(assertions, subject)
-				assertions.nested(self) do |assertions|
-					@predicates.each do |predicate|
-						predicate.call(assertions, subject)
-					end
-				end
-			end
-		end
-		
 		class Key
 			def initialize(name, predicate = nil)
 				@name = name
@@ -69,11 +43,29 @@ module Sus
 				end
 			end
 		end
+		
+		class Value
+			def initialize(predicate)
+				@predicate = predicate
+			end
+			
+			def print(output)
+				output.write("value ", @predicate, :reset)
+			end
+			
+			def call(assertions, subject)
+				subject.each_with_index do |value, index|
+					assertions.nested("[#{index}] = #{value.inspect}") do |assertions|
+						@predicate&.call(assertions, value)
+					end
+				end
+			end
+		end
 	end
 	
 	class Base
 		def have(*predicates)
-			Have::Composite.new(predicates)
+			Have::All.new(predicates)
 		end
 		
 		def have_keys(*keys)
@@ -89,7 +81,7 @@ module Sus
 				end
 			end
 			
-			Have::Composite.new(predicates)
+			Have::All.new(predicates)
 		end
 		
 		def have_attributes(**attributes)
@@ -97,7 +89,15 @@ module Sus
 				Have::Attribute.new(key, value)
 			end
 			
-			Have::Composite.new(predicates)
+			Have::All.new(predicates)
+		end
+		
+		def have_any(*predicates)
+			Have::Any.new(predicates)
+		end
+		
+		def have_value(predicate)
+			Have::Any.new([Have::Value.new(predicate)])
 		end
 	end
 end

data/lib/sus/output/progress.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 # Released under the MIT License.
-# Copyright, 2022, by Samuel Williams.
+# Copyright, 2021-2022, by Samuel Williams.
 
 require_relative 'bar'
 require_relative 'status'

data/lib/sus/raise_exception.rb

@@ -26,7 +26,7 @@ module Sus
 				rescue @exception_class => exception
 					# Did it have the right message?
 					if @message
-						assertions.assert(@message === exception.message, "raised with message")
+						@message.call(assertions, exception.message)
 					else
 						assertions.assert(true, "raised")
 					end

data/lib/sus/receive.rb

@@ -24,21 +24,27 @@ module Sus
 			output.write("receive ", :variable, @method.to_s, :reset, " ")
 		end
 		
-		def with_arguments(*arguments)
-			@arguments = WithArguments.new(arguments)
+		def with_arguments(predicate)
+			@arguments = WithArguments.new(predicate)
 			return self
 		end
-
-		def with_options(*options)
-			@options = WithOptions.new(options)
+		
+		def with_options(predicate)
+			@options = WithOptions.new(predicate)
 			return self
 		end
-
-		def with_block
-			@block = WithBlock.new
+		
+		def with_block(predicate = Be.new(:!=, nil))
+			@block = WithBlock.new(predicate)
 			return self
 		end
-
+		
+		def with(*arguments, **options)
+			with_arguments(Be.new(:==, arguments)) if arguments.any?
+			with_options(Be.new(:==, options)) if options.any?
+			return self
+		end
+		
 		def once
 			@times = Times.new(Be.new(:==, 1))
 		end
@@ -101,44 +107,49 @@ module Sus
 		end
 		
 		class WithArguments
-			def initialize(arguments)
-				@arguments = arguments
+			def initialize(predicate)
+				@predicate = predicate
 			end
 			
 			def print(output)
-				output.write("with arguments ", :variable, @arguments.inspect)
+				output.write("with arguments ", @predicate)
 			end
 			
 			def call(assertions, subject)
 				assertions.nested(self) do |assertions|
-					Expect.new(assertions, subject).to(Be == @arguments)
+					@predicate.call(assertions, subject)
 				end
 			end
 		end
 
 		class WithOptions
-			def initialize(options)
-				@options = options
+			def initialize(predicate)
+				@predicate = predicate
 			end
 			
 			def print(output)
-				output.write("with options ", :variable, @options.inspect)
+				output.write("with options ", @predicate)
 			end
 			
 			def call(assertions, subject)
 				assertions.nested(self) do |assertions|
-					Expect.new(assertions, subject).to(Be.new(:include?, @options))
+					@predicate.call(assertions, subject)
 				end
 			end
 		end
 		
 		class WithBlock
+			def initialize(predicate)
+				@predicate = predicate
+			end
+			
 			def print(output)
-				output.write("with block")
+				output.write("with block", @predicate)
 			end
 
 			def call(assertions, subject)
 				assertions.nested(self) do |assertions|
+					
 					Expect.new(assertions, subject).not.to(Be == nil)
 				end
 			end

data/lib/sus/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2021-2022, by Samuel Williams.
 
 module Sus
-	VERSION = "0.13.0"
+	VERSION = "0.14.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.14.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-09-02 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bake-test
@@ -105,6 +105,8 @@ files:
 - lib/sus/filter.rb
 - lib/sus/fixtures.rb
 - lib/sus/have.rb
+- lib/sus/have/all.rb
+- lib/sus/have/any.rb
 - lib/sus/have_duration.rb
 - lib/sus/identity.rb
 - lib/sus/include_context.rb