sus 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8383ea04a6993d4e2c871ea7657c52489ef552ef3b8b07982eed6c9afe30b6eb
-  data.tar.gz: 2e256747d0c6f2372afc6663242888da0ab8895600e956ce962531aa29e514cd
+  metadata.gz: fd31357ac07052a2e6c93a7dc674d2245a567644434eaf8e1983dedd7f594be7
+  data.tar.gz: c33ba038edd7f9c22896a6e3c4b8fe7f8880d4c0e8361c3d44cbd74bba35939f
 SHA512:
-  metadata.gz: 93e210ec09d3512186fe2e82ed5fae116e72dda4ba64ec3b050387c3b0b233b3841050bded33bdf31b532cee71144205410a50fe54c270bbe101e3c6ddcfda91
-  data.tar.gz: 28d48801189055201108645be27db4eace9b41a3e9dca8749eff807d9d192ae9f5889c98d683115265b1d42859774e05c4b87a80f082e4c95904ba0677752f9c
+  metadata.gz: bfcd742a489b8ec128cd79ab6d631b1ba6bc45421563eeec51acb476648bc5bb821dc5fccbf0530032e5075879c8271a1be0981825e444d0893a407ca6ebb6fa
+  data.tar.gz: 6014eff61f90083dbf9210faf64d2c7fec25c67cc8e0afa1721f20d3d730f7d8feea22c36e0db308b5712fea9b5a75433bd01785c0bea5eeb20bdb9a3ac5d7e4

data/lib/sus/describe.rb

@@ -11,12 +11,12 @@ module Sus
 			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.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 +35,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 @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,7 @@ module Sus
 			unless @key
 				key = Array.new
 				
-				append_unique_key(key, false)
+				append_unique_key(key)
 				
 				@key = key.join(':')
 			end
@@ -65,15 +66,21 @@ module Sus
 		
 		protected
 		
-		def append_unique_key(key, unique = @unique)
+		def append_unique_key(key)
 			if @parent
 				@parent.append_unique_key(key)
 			else
 				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.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)
+			base.identity = Identity.nested(parent.identity, base.description, unique: false)
 			
 			if block_given?
 				base.define_method(:call, &block)

data/lib/sus/it_behaves_like.rb

@@ -11,11 +11,11 @@ module Sus
 			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.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 +27,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.4.0"
+	VERSION = "0.5.0"
 end

data/lib/sus/with.rb

@@ -12,12 +12,12 @@ module Sus
 			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.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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Samuel Williams
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-08 00:00:00.000000000 Z
+date: 2021-12-09 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -28,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