types 0.4.1 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ba6a881d71e9cc56f38d4e6fa2d7508b2f884f33768de92842c97e2160a6955
-  data.tar.gz: fcf5e669cb9e7d92a8a64a47bf74a1fb7a2504686da5bb2f5ab234239275ec21
+  metadata.gz: 6e335bb59eee3f88c55549626aa4011a45dd37eab7942dee8ccbdf70e0fe5e7f
+  data.tar.gz: 357d9dee79c38053f3f9809cd342ff6bae2529d7b7e1cbe5a6fe17f5e8fd7cbb
 SHA512:
-  metadata.gz: '02978795e5d7bd65e5c7ecd54beff026802c3d9d142986a63eb3aa833db3db85f83849a9b97524ce78daa3c65952a27af9739bc48a26af65286b3f559f41a53f'
-  data.tar.gz: 633f75598b51ec5c36bc7b5c1498bbd78dd2b5ff0c722e633df8591a66647d1edb151980461e0b4906633bdb7910154a2adf8443a1b582ab93571d99c29cd3ac
+  metadata.gz: 34065d6677004658191ede53a58ebd334c483841868c3f9b8abd1f176d8909fef1ed3c9cf67a4e29b44afa52a333fed63fc6ad8272dfc3078032fa6d810f1002
+  data.tar.gz: dee2f82b5dac9a2a31ad311f532f22c360d7dcf46c98c542048fd65451ade32007f6203c19371d7047cd3f3878778f032c07a5d6857a65b887d06b56c11dc934

data/lib/types/block.rb

@@ -42,12 +42,12 @@ module Types
 			end
 		end
 		
-		# @returns [String] the RBS type string, e.g. `Proc[(String, Integer) -> String]`.
+		# @returns [String] the RBS type string, e.g. `^(String, Integer) -> String`.
 		def to_rbs
 			argument_types = @argument_types.map(&:to_rbs).join(", ")
 			return_type = @return_type ? @return_type.to_rbs : "void"
 			
-			return "Proc[(#{argument_types}) -> #{return_type}]"
+			return "^(#{argument_types}) -> #{return_type}"
 		end
 	end
 	

data/lib/types/enumerator.rb

@@ -0,0 +1,73 @@
+# frozen_string_literal: true
+
+# Released under the MIT License.
+# Copyright, 2022-2025, by Samuel Williams.
+
+require_relative "generic"
+
+module Types
+	# Represents an enumerator type with a specific item type.
+	#
+	# ```ruby
+	# type = Types::Enumerator(Types::Integer)
+	# type.parse([1, 2, 3].each) # => Enumerator for [1, 2, 3]
+	# ```
+	class Enumerator
+		include Generic
+		
+		# @parameter item_type [Type] The type of the enumerator elements.
+		def initialize(item_type)
+			@item_type = item_type
+		end
+		
+		# @returns [Boolean] true if this is a composite type.
+		def composite?
+			true
+		end
+		
+		# Maps the given enumerator using the item type's parse method.
+		# @parameter enumerator [Enumerator] The enumerator to map.
+		# @returns [Enumerator] The mapped enumerator.
+		def map(enumerator)
+			enumerator.map{|value| @item_type.parse(value)}
+		end
+		
+		# Parses the input as an enumerator with the specified item type.
+		# @parameter input [Object] The value to parse.
+		# @returns [Enumerator] The parsed enumerator.
+		# @raises [ArgumentError] if the input cannot be converted to an enumerator.
+		def parse(input)
+			case input
+			when ::Enumerator
+				return input
+			when ::Array
+				return input.each
+			else
+				raise ArgumentError, "Cannot coerce #{input.inspect} into Enumerator!"
+			end
+		end
+		
+		# @returns [String] the string representation of the enumerator type.
+		def to_s
+			"Enumerator(#{@item_type})"
+		end
+		
+		# @returns [String] the RBS type string, e.g. `Enumerator[String]`.
+		def to_rbs
+			"Enumerator[#{@item_type.to_rbs}]"
+		end
+		
+		# Resolves to the actual Ruby Enumerator class.
+		# @returns [Class] The Enumerator class.
+		def resolve
+			::Enumerator
+		end
+	end
+	
+	# Constructs an {Enumerator} type from the given item type.
+	# @parameter item_type [Type] The type of the enumerator elements.
+	# @returns [Enumerator] a new {Enumerator} type.
+	def self.Enumerator(item_type = Any)
+		Enumerator.new(item_type)
+	end
+end 

data/lib/types/hash.rb

@@ -47,9 +47,9 @@ module Types
 			"Hash(#{@key_type}, #{@value_type})"
 		end
 		
-		# @returns [String] the RBS type string, e.g. `{ String => Integer }`.
+		# @returns [String] the RBS type string, e.g. `Hash[String, Integer]`.
 		def to_rbs
-			"{ #{@key_type.to_rbs} => #{@value_type.to_rbs} }"
+			"Hash[#{@key_type.to_rbs}, #{@value_type.to_rbs}]"
 		end
 		
 		# Resolves to the actual Ruby Hash class.

data/lib/types/method.rb

@@ -55,12 +55,9 @@ module Types
 			return buffer
 		end
 		
-		# @returns [String] the RBS type string, e.g. `Method[Receiver, (Args) -> Return]`.
+		# @returns [String] the RBS type string, e.g. `::Method`.
 		def to_rbs
-			argument_types = @argument_types.map(&:to_rbs).join(", ")
-			return_type = @return_type ? @return_type.to_rbs : "void"
-			
-			return "Method[#{@receiver_type}, (#{argument_types}) -> #{return_type}]"
+			"Method"
 		end
 		
 		# Parses the input as a method or proc.

data/lib/types/version.rb

@@ -4,5 +4,5 @@
 # Copyright, 2022-2025, by Samuel Williams.
 
 module Types
-	VERSION = "0.4.1"
+	VERSION = "0.4.3"
 end

data/lib/types.rb

@@ -11,6 +11,7 @@ require_relative "types/block"
 require_relative "types/boolean"
 require_relative "types/class"
 require_relative "types/decimal"
+require_relative "types/enumerator"
 require_relative "types/float"
 require_relative "types/hash"
 require_relative "types/integer"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: types
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: ruby
 authors:
 - Samuel Williams
@@ -51,6 +51,7 @@ files:
 - lib/types/boolean.rb
 - lib/types/class.rb
 - lib/types/decimal.rb
+- lib/types/enumerator.rb
 - lib/types/float.rb
 - lib/types/generic.rb
 - lib/types/hash.rb