sus 0.3.0 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1c425b82649b8f50e5976153a010975266ed1484f41507cf81b3c1353223e489
-  data.tar.gz: a67daffd36d952add4e867f2f8abb8f35a8b77b5c15daf7110bf022078142db0
+  metadata.gz: e7af09d0464d3ca51e1934e41acd230f7654faa864a37a6d21937023d282a180
+  data.tar.gz: 79205ad8526cd12292909e8509a859beda4854035c46b5ce696c0434b1287da4
 SHA512:
-  metadata.gz: 8bcda2c3ad36727e6a4654216e7d82b1311c2194978f463b16798030dfec2bcdadf8daf3df48a00705d4831c1e1d8b24fae62e48c5d452027a13b0f66a9f6a58
-  data.tar.gz: 31dacb8749146bcfb29a8ccd4a041e515dc03ecebc87b1cd9c02a1a09d5cd75b00f4b80396d1665ccdc10bfff047bc75e69bc0464be84d95ac1cfb9e33d5bcc6
+  metadata.gz: 28c12a85e343b51be0203b90aeff2e4c38d7031b2a835fa0cab1dfb9f4401de59dc2b747d5e4f45c7f5247c94a42267d0dfeb123bfdbb0a3b3a5e9eb546c781d
+  data.tar.gz: 58a4fe6cd8d9f0ba1c59334783260b60d70abf6ee710944ad1576d8e66e4f81b5c598afbfa6c9e495e544bf906fe02e461de99ecf0d60377552c8c2701a4c08a

data/lib/sus/be.rb

@@ -11,7 +11,7 @@ module Sus
 		
 		def call(assertions, subject)
 			assertions.nested(self) do |assertions|
-				assertions.assert(subject.public_send(*@arguments), self)
+				assertions.assert(subject.public_send(*@arguments), subject)
 			end
 		end
 		

data/lib/sus/be_within.rb

@@ -12,7 +12,7 @@ module Sus
 			
 			def call(assertions, subject)
 				assertions.nested(self) do |assertions|
-					assertions.assert(@range.include?(subject), self)
+					assertions.assert(@range.include?(subject), subject)
 				end
 			end
 		end

data/lib/sus/describe.rb

@@ -7,16 +7,13 @@ module Sus
 		
 		attr_accessor :subject
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
-		def self.build(parent, subject, identity: nil, &block)
+		def self.build(parent, subject, unique: true, &block)
 			base = Class.new(parent)
-			base.extend(Describe)
+			base.singleton_class.prepend(Describe)
+			base.children = Hash.new
 			base.subject = subject
-			base.description = subject.inspect
-			base.identity = identity || Identity.nested(parent.identity, base.description)
+			base.description = subject.to_s
+			base.identity = Identity.nested(parent.identity, base.description, unique: unique)
 			base.define_method(:subject, ->{subject})
 			
 			if block_given?
@@ -35,8 +32,8 @@ module Sus
 	end
 	
 	module Context
-		def describe(...)
-			add Describe.build(self, ...)
+		def describe(subject, **options, &block)
+			add Describe.build(self, subject, **options, &block)
 		end
 	end
 end

data/lib/sus/file.rb

@@ -0,0 +1,34 @@
+
+require_relative 'context'
+
+# This has to be done at the top level. It allows us to define constants within the given class while still retaining top-level constant resolution.
+Sus::TOPLEVEL_CLASS_EVAL = ->(klass, path){klass.class_eval(::File.read(path), path)}
+
+module Sus
+	module File
+		extend Context
+		
+		attr_accessor :path
+		
+		def self.extended(base)
+			base.children = Hash.new
+		end
+		
+		def self.build(parent, path)
+			base = Class.new(parent)
+			base.extend(File)
+			base.description = path
+			base.identity = Identity.new(path)
+			
+			TOPLEVEL_CLASS_EVAL.call(base, path)
+			
+			return base
+		end
+	end
+	
+	module Context
+		def file(path)
+			add File.build(self, path)
+		end
+	end
+end

data/lib/sus/filter.rb

@@ -16,7 +16,13 @@ module Sus
 			end
 			
 			def insert(identity, context)
-				@contexts[identity.key] = context
+				key = identity.key
+				
+				if existing_context = @contexts[key]
+					raise KeyError, "Assigning context to existing key: #{key.inspect}!"
+				else
+					@contexts[key] = context
+				end
 			end
 			
 			def [] key

data/lib/sus/identity.rb

@@ -7,6 +7,7 @@ module Sus
 			self.new(location.path, name, location.lineno, parent, **options)
 		end
 		
+		# @parameter unique [Boolean | Symbol] Whether this identity is unique or needs a unique key/line number suffix.
 		def initialize(path, name = nil, line = nil, parent = nil, unique: true)
 			@path = path
 			@name = name
@@ -55,7 +56,8 @@ module Sus
 			unless @key
 				key = Array.new
 				
-				append_unique_key(key, false)
+				# For a specific leaf node, the last part is not unique, i.e. it must be identified explicitly.
+				append_unique_key(key, @unique == true ? false : @unique)
 				
 				@key = key.join(':')
 			end
@@ -72,8 +74,14 @@ module Sus
 				key << @path
 			end
 			
-			if @line
-				key << @line unless unique
+			if unique == true
+				# No key is needed because this identity is unique.
+			else
+				if unique
+					key << unique
+				elsif @line
+					key << @line
+				end
 			end
 		end
 	end

data/lib/sus/it_behaves_like.rb

@@ -7,15 +7,12 @@ module Sus
 		
 		attr_accessor :shared
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
-		def self.build(parent, shared)
+		def self.build(parent, shared, unique: false)
 			base = Class.new(parent)
-			base.extend(ItBehavesLike)
+			base.singleton_class.prepend(ItBehavesLike)
+			base.children = Hash.new
 			base.description = shared.name
-			base.identity = Identity.nested(parent.identity, base.description, unique: false)
+			base.identity = Identity.nested(parent.identity, base.description, unique: unique)
 			base.class_exec(&shared.block)
 			return base
 		end
@@ -27,8 +24,8 @@ module Sus
 	end
 	
 	module Context
-		def it_behaves_like(shared)
-			add ItBehavesLike.build(self, shared)
+		def it_behaves_like(shared, **options)
+			add ItBehavesLike.build(self, shared, **options)
 		end
 	end
 end

data/lib/sus/registry.rb

@@ -1,6 +1,7 @@
 
 require_relative 'base'
 
+require_relative 'file'
 require_relative 'describe'
 require_relative 'with'
 
@@ -12,9 +13,6 @@ require_relative 'include_context'
 
 require_relative 'let'
 
-# This has to be done at the top level. It allows us to define constants within the given class while still retaining top-level constant resolution.
-TOPLEVEL_CLASS_EVAL = ->(klass, path){klass.class_eval(File.read(path), path)}
-
 module Sus
 	class Registry
 		# Create a top level scope with self as the instance:
@@ -25,9 +23,7 @@ module Sus
 		attr :base
 		
 		def load(path)
-			@base.describe(path, identity: Identity.new(path)) do
-				TOPLEVEL_CLASS_EVAL.call(self, path)
-			end
+			@base.file(path)
 		end
 		
 		def call(assertions = Assertions.default)

data/lib/sus/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Sus
-	VERSION = "0.3.0"
+	VERSION = "0.5.2"
 end

data/lib/sus/with.rb

@@ -8,16 +8,13 @@ module Sus
 		attr_accessor :subject
 		attr_accessor :variables
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
-		def self.build(parent, subject, variables, &block)
+		def self.build(parent, subject, variables, unique: true, &block)
 			base = Class.new(parent)
-			base.extend(With)
+			base.singleton_class.prepend(With)
+			base.children = Hash.new
 			base.subject = subject
 			base.description = subject
-			base.identity = Identity.nested(parent.identity, base.description)
+			base.identity = Identity.nested(parent.identity, base.description, unique: unique)
 			base.variables = variables
 			
 			variables.each do |key, value|

metadata

@@ -1,19 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.5.2
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-10 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
 executables:
 - sus
+- sus-parallel
 extensions: []
 extra_rdoc_files: []
 files:
@@ -27,6 +28,7 @@ files:
 - lib/sus/context.rb
 - lib/sus/describe.rb
 - lib/sus/expect.rb
+- lib/sus/file.rb
 - lib/sus/filter.rb
 - lib/sus/have_duration.rb
 - lib/sus/identity.rb
@@ -68,7 +70,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.0.dev
+rubygems_version: 3.2.32
 signing_key:
 specification_version: 4
 summary: A fast and scalable test runner.