console 1.25.1 → 1.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4e757a90ed9500d5af00cd1719bfe6d56aea8e304ec5b04495e687f5555befe9
-  data.tar.gz: 9c3c3e74775bc4946c771f824414112227825376849d5f14515374d41c9b1ff1
+  metadata.gz: ea53f121a472d6011335a91ac4a96f4f3630c4524b1158166be906a51e4dd186
+  data.tar.gz: 20cdb45a16606315c9a0e054fb9e3460698e6fcccd190bd7668902f179c7b5fa
 SHA512:
-  metadata.gz: 8cc0e4c8ec5458bb65c77fee9a0e1299665e33d771298919aa3a722f97f5e3c7f1ce541fb7d73d0970cc7a885d10dbde2a6967fe7ff5e06c390e64a4c9467de8
-  data.tar.gz: b5a1cf780444bb8cd7bd566a3188f05befdf903b9612d53eae5434413fccd691491d4726aae77a2a053220d5b2b31add23c219d6ef4b482b29a910ad76456051
+  metadata.gz: 42748b35f41a887222716d8bd0b9e55f92a5506f31fa7cb0a3e5ac5155341c55d6ca2849745b77d568b7b11e3d79faf0193377b9547fce98c5c16ca1043f9222
+  data.tar.gz: de9535e3fb41fcce945512f9d482329cfc695888c43da753d1f7c392e074e4b4b1e6584fbfd1c39b4851c25f00563b1e0ee3efbd5240294649ff4dc68519483d

data/lib/console/capture.rb

@@ -9,27 +9,45 @@ module Console
 	# A general sink which captures all events into a buffer.
 	class Capture
 		def initialize
-			@buffer = []
+			@records = []
 			@verbose = false
 		end
 		
-		attr :buffer
+		attr :records
+		
+		# @deprecated Use {#records} instead of {#buffer}.
+		alias buffer records
+		
+		alias to_a records
+		
 		attr :verbose
 		
-		def last
-			@buffer.last
+		def include?(pattern)
+			@records.any? do |record|
+				record[:subject].to_s&.match?(pattern) or record[:message].to_s&.match?(pattern)
+			end
 		end
 		
-		def include?(pattern)
-			JSON.dump(@buffer).include?(pattern)
+		def each(&block)
+			@records.each(&block)
+		end
+		
+		include Enumerable
+		
+		def first
+			@records.first
+		end
+		
+		def last
+			@records.last
 		end
 		
 		def clear
-			@buffer.clear
+			@records.clear
 		end
 		
 		def empty?
-			@buffer.empty?
+			@records.empty?
 		end
 		
 		def verbose!(value = true)
@@ -41,39 +59,41 @@ module Console
 		end
 		
 		def call(subject = nil, *arguments, severity: UNKNOWN, event: nil,  **options, &block)
-			message = {
+			record = {
 				time: ::Time.now.iso8601,
 				severity: severity,
 				**options,
 			}
 			
 			if subject
-				message[:subject] = subject
+				record[:subject] = subject
 			end
 			
 			if event
-				message[:event] = event.to_hash
+				record[:event] = event.to_hash
 			end
 			
 			if arguments.any?
-				message[:arguments] = arguments
+				record[:arguments] = arguments
 			end
 			
 			if annotation = Fiber.current.annotation
-				message[:annotation] = annotation
+				record[:annotation] = annotation
 			end
 			
 			if block_given?
 				if block.arity.zero?
-					message[:message] = yield
+					record[:message] = yield
 				else
 					buffer = StringIO.new
 					yield buffer
-					message[:message] = buffer.string
+					record[:message] = buffer.string
 				end
+			else
+				record[:message] = arguments.join(" ")
 			end
 			
-			@buffer << message
+			@records << record
 		end
 	end
 end

data/lib/console/filter.rb

@@ -7,7 +7,7 @@
 # Copyright, 2021, by Robert Schulze.
 
 module Console
-	UNKNOWN = 'unknown'
+	UNKNOWN = :unknown
 	
 	class Filter
 		if Object.const_defined?(:Ractor) and RUBY_VERSION >= '3.1'
@@ -35,7 +35,7 @@ module Console
 					
 					define_immutable_method(name) do |subject = nil, *arguments, **options, &block|
 						if self.enabled?(subject, level)
-							self.call(subject, *arguments, severity: name, **@options, **options, &block)
+							@output.call(subject, *arguments, severity: name, **@options, **options, &block)
 						end
 					end
 					
@@ -143,8 +143,13 @@ module Console
 			@subjects.delete(subject)
 		end
 		
-		def call(*arguments, **options, &block)
-			@output.call(*arguments, **options, &block)
+		def call(subject, *arguments, **options, &block)
+			severity = options[:severity] || UNKNOWN
+			level = self.class::LEVELS[severity]
+			
+			if self.enabled?(subject, level)
+				@output.call(subject, *arguments, **options, &block)
+			end
 		end
 	end
 end

data/lib/console/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2019-2024, by Samuel Williams.
 
 module Console
-	VERSION = "1.25.1"
+	VERSION = "1.26.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: console
 version: !ruby/object:Gem::Version
-  version: 1.25.1
+  version: 1.26.0
 platform: ruby
 authors:
 - Samuel Williams
@@ -46,7 +46,7 @@ cert_chain:
   Q2K9NVun/S785AP05vKkXZEFYxqG6EW012U4oLcFl5MySFajYXRYbuUpH6AY+HP8
   voD0MPg1DssDLKwXyt1eKD/+Fq0bFWhwVM/1XiAXL7lyYUyOq24KHgQ2Csg=
   -----END CERTIFICATE-----
-date: 2024-05-03 00:00:00.000000000 Z
+date: 2024-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fiber-annotation
@@ -149,7 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.3
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: Beautiful logging for Ruby.