sus 0.10.4 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cbfd2216a9188a212a020c1e4780bc01e2d7b1246bf2f9475d28ad7e4e939f31
-  data.tar.gz: 4929af7ca54b12e5e5cf460a097a507c782c64a5eb9265e425df12ed71e5c1b2
+  metadata.gz: f878b94ac4b8236fdb411866336061b34cca3c59a9573e4cb0ef238d545ffe3d
+  data.tar.gz: c61aaee1228f6ab7796811ee739de195a5b59cf1a014f304d08f3d64488c94ba
 SHA512:
-  metadata.gz: 7f246c6a57ec8c2ac0bf995e7e7194e1aa2b526f858fc9efb6942b7769b7fe801b7c8095e06c4f5127d71669510813c00185d831cf983624cf2b6ad1776fc2d0
-  data.tar.gz: 279b9ec5642a6a3a4af069524c0944ff08d0d101066189054ac00ebacd215886a0f84b23dd2a6ae07ad0c65bc6c646bcd6374298910b913d9a9b152259aa64de
+  metadata.gz: 181ee960cee58bf710d7de09a6f83f72a71f01d25716d18dd386562bf2984e14f690cfa1561b298d36bc068d06676481979866f48ee2a2716866e725a9d3c07f
+  data.tar.gz: 206fa66d07315578142b07b3802a66af629668502a2745dbf4a3f60cbebf4c8d8cc8c2edd4011397a22b7d039c753874409fe576d42890745629d4d5ac57a906

data/lib/sus/be.rb

@@ -52,6 +52,8 @@ module Sus
 				Be.new(:===, value)
 			end
 		end
+		
+		NIL = Be.new(:nil?)
 	end
 	
 	class Base
@@ -68,7 +70,7 @@ module Sus
 		end
 		
 		def be_nil
-			Be.new(:nil?)
+			Be::NIL
 		end
 	end
 end

data/lib/sus/clock.rb

@@ -7,27 +7,41 @@ module Sus
 	class Clock
 		include Comparable
 		
+		def self.start!
+			self.new.tap(&:start!)
+		end
+		
 		def initialize(duration = 0.0)
 			@duration = duration
 		end
 		
-		attr :duration
+		def duration
+			if @start_time
+				now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+				@duration += now - @start_time
+				@start_time = now
+			end
+			
+			return @duration
+		end
 		
 		def <=>(other)
-			@duration <=> other.to_f
+			duration <=> other.to_f
 		end
 		
 		def to_f
-			@duration
+			duration
 		end
 		
 		def to_s
-			if @duration < 0.001
-				"#{(@duration * 1_000_000).round(1)}µs"
-			elsif @duration < 1.0
-				"#{(@duration * 1_000).round(1)}ms"
+			duration = self.duration
+			
+			if duration < 0.001
+				"#{(duration * 1_000_000).round(1)}µs"
+			elsif duration < 1.0
+				"#{(duration * 1_000).round(1)}ms"
 			else
-				"#{@duration.round(1)}s"
+				"#{duration.round(1)}s"
 			end
 		end
 		
@@ -37,9 +51,12 @@ module Sus
 		
 		def stop!
 			if @start_time
-				@duration += Process.clock_gettime(Process::CLOCK_MONOTONIC) - @start_time
+				now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
+				@duration += now - @start_time
 				@start_time = nil
 			end
+			
+			return duration
 		end
 	end
 end

data/lib/sus/have.rb

@@ -0,0 +1,103 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022, by Samuel Williams.
+
+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
+				@predicate = predicate
+			end
+			
+			def print(output)
+				output.write("key ", :variable, @name.inspect, :reset, " ", @predicate, :reset)
+			end
+			
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					assertions.assert(subject.key?(@name), "has key")
+					@predicate&.call(assertions, subject[@name])
+				end
+			end
+		end
+		
+		class Attribute
+			def initialize(name, predicate)
+				@name = name
+				@predicate = predicate
+			end
+			
+			def print(output)
+				output.write("attribute ", :variable, @name.to_s, :reset, " ", @predicate, :reset)
+			end
+			
+			def call(assertions, subject)
+				assertions.nested(self) do |assertions|
+					assertions.assert(subject.respond_to?(@name), "has attribute")
+					@predicate&.call(assertions, subject.send(@name))
+				end
+			end
+		end
+	end
+	
+	class Base
+		def have(*predicates)
+			Have::Composite.new(predicates)
+		end
+		
+		def have_keys(*keys)
+			predicates = []
+			
+			keys.each do |key|
+				if key.is_a?(Hash)
+					key.each do |key, predicate|
+						predicates << Have::Key.new(key, predicate)
+					end
+				else
+					predicates << Have::Key.new(key)
+				end
+			end
+			
+			Have::Composite.new(predicates)
+		end
+		
+		def have_attributes(**attributes)
+			predicates = attributes.map do |key, value|
+				Have::Attribute.new(key, value)
+			end
+			
+			Have::Composite.new(predicates)
+		end
+	end
+end

data/lib/sus/version.rb

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

data/lib/sus.rb

@@ -17,6 +17,6 @@ require_relative 'sus/receive'
 
 require_relative 'sus/raise_exception'
 require_relative 'sus/have_duration'
-require_relative 'sus/have_attributes'
+require_relative 'sus/have'
 
 require_relative 'sus/filter'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sus
 version: !ruby/object:Gem::Version
-  version: 0.10.4
+  version: 0.11.2
 platform: ruby
 authors:
 - Samuel Williams
@@ -37,7 +37,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2022-08-26 00:00:00.000000000 Z
+date: 2022-08-27 00:00:00.000000000 Z
 dependencies: []
 description:
 email:
@@ -62,7 +62,7 @@ files:
 - lib/sus/file.rb
 - lib/sus/filter.rb
 - lib/sus/fixtures.rb
-- lib/sus/have_attributes.rb
+- lib/sus/have.rb
 - lib/sus/have_duration.rb
 - lib/sus/identity.rb
 - lib/sus/include_context.rb

data/lib/sus/have_attributes.rb

@@ -1,41 +0,0 @@
-# frozen_string_literal: true
-
-# Released under the MIT License.
-# Copyright, 2021-2022, by Samuel Williams.
-
-module Sus
-	class HaveAttributes
-		def initialize(attributes)
-			@attributes = attributes
-		end
-		
-		def print(output)
-			first = true
-			output.write("have attributes {")
-			@attributes.each do |key, predicate|
-				if first
-					first = false
-				else
-					output.write(", ")
-				end
-				
-				output.write(:variable, key.to_s, :reset, " ", predicate, :reset)
-			end
-			output.write("}")
-		end
-		
-		def call(assertions, subject)
-			assertions.nested(self) do |assertions|
-				@attributes.each do |key, predicate|
-					predicate.call(assertions, subject.public_send(key))
-				end
-			end
-		end
-	end
-	
-	class Base
-		def have_attributes(...)
-			HaveAttributes.new(...)
-		end
-	end
-end