sus 0.5.0 → 0.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd31357ac07052a2e6c93a7dc674d2245a567644434eaf8e1983dedd7f594be7
-  data.tar.gz: c33ba038edd7f9c22896a6e3c4b8fe7f8880d4c0e8361c3d44cbd74bba35939f
+  metadata.gz: 5223e3220b3a2fbc2263efd27ca457b971241eff48bb667f0a2235cc6de5c98c
+  data.tar.gz: 2a6558d6a0cd06527115a569553ded158709b16be0125de5101fcf130ff753b4
 SHA512:
-  metadata.gz: bfcd742a489b8ec128cd79ab6d631b1ba6bc45421563eeec51acb476648bc5bb821dc5fccbf0530032e5075879c8271a1be0981825e444d0893a407ca6ebb6fa
-  data.tar.gz: 6014eff61f90083dbf9210faf64d2c7fec25c67cc8e0afa1721f20d3d730f7d8feea22c36e0db308b5712fea9b5a75433bd01785c0bea5eeb20bdb9a3ac5d7e4
+  metadata.gz: 55acd565c40a26bdbb65abd4f8ae491fadcbb2cdab96f341a76f86ae19187beeac32ab562d497f77fb0e40d8ac2c711aeceb5d984b2f9d1b529f3c74d2579cfb
+  data.tar.gz: d5872899a88f5e02125655773d57ba11930e31f106ef52c2e9b03d584e808cb761ac614bfc83270e94f7cb5c5aceff559dae9456732a39c38d87bf1e851d40ae

data/lib/sus/describe.rb

@@ -7,13 +7,10 @@ module Sus
 		
 		attr_accessor :subject
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
 		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.to_s
 			base.identity = Identity.nested(parent.identity, base.description, unique: unique)

data/lib/sus/filter.rb

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

data/lib/sus/identity.rb

@@ -56,7 +56,8 @@ module Sus
 			unless @key
 				key = Array.new
 				
-				append_unique_key(key)
+				# 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
@@ -66,18 +67,18 @@ module Sus
 		
 		protected
 		
-		def append_unique_key(key)
+		def append_unique_key(key, unique = @unique)
 			if @parent
 				@parent.append_unique_key(key)
 			else
 				key << @path
 			end
 			
-			if @unique == true
+			if unique == true
 				# No key is needed because this identity is unique.
 			else
-				if @unique
-					key << @unique
+				if unique
+					key << unique
 				elsif @line
 					key << @line
 				end

data/lib/sus/it.rb

@@ -7,7 +7,7 @@ module Sus
 			base = Class.new(parent)
 			base.extend(It)
 			base.description = description
-			base.identity = Identity.nested(parent.identity, base.description, unique: false)
+			base.identity = Identity.nested(parent.identity, base.description)
 			
 			if block_given?
 				base.define_method(:call, &block)

data/lib/sus/it_behaves_like.rb

@@ -7,13 +7,10 @@ module Sus
 		
 		attr_accessor :shared
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
 		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: unique)
 			base.class_exec(&shared.block)

data/lib/sus/version.rb

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

data/lib/sus/with.rb

@@ -8,13 +8,10 @@ module Sus
 		attr_accessor :subject
 		attr_accessor :variables
 		
-		def self.extended(base)
-			base.children = Hash.new
-		end
-		
 		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, unique: unique)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
 platform: ruby
 authors:
 - Samuel Williams
@@ -70,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.