typeid 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af045f36c25f729104c597aec25af3c3755bee1d163bc22badce8fa85952d7ec
-  data.tar.gz: 8869cf01f856b513c501229d69fe262233934f7a8c886c8703e1c65a3c53692c
+  metadata.gz: 1c2971eed0f4cb54b1f89e253e78e092e4a8fd9a5895a5f04e9ff9701bf289bc
+  data.tar.gz: 469d897f849ac01ecfa60adbaa6aada3f4ce7b29182b1e33fc967f35294b2a96
 SHA512:
-  metadata.gz: 6f0019bff65125af55cf414d9bd0d5145cdafa1fedc1cbc6cf69b207966c4674a461daba129bc4cf4d9cb021c9f976a5b77b875bb3041ceae561c0cfd48f4941
-  data.tar.gz: 41def5ca6d85fe6a5a5b4133d64b1c47a3c56632564fe2c83d45c8ddeec752e96523738bf1cc9bf615f547afa60149928552cf01593dcc583c3da729dab1e2f6
+  metadata.gz: bf90dbde8bbcb004ca85c507bcc3d81922971eb9d31bc87d4ce2c2980fdf6be5548c69438b69bce4361eef1ef9ee65caef8b2e87370d0a13c45e201b758303ea
+  data.tar.gz: 516981aac6f786f452d28ada1b0e87fa17d31cf8eea1c07db10f15f9ebbd15f499cef4897321a6bd6a8920812b2f835c85f6a6df456239b6f19299f14b62f2b7

data/lib/typeid/version.rb

@@ -1,3 +1,3 @@
 class TypeID < String
-  VERSION = "0.2.1".freeze
+  VERSION = "0.2.2".freeze
 end

data/lib/typeid.rb

@@ -32,11 +32,11 @@ class TypeID < String
   # @param string [String] string representation of a +TypeID+
   # @return [TypeID]
   def self.from_string(string)
-    case string.split("_")
-    in [suffix]
+    case string.rpartition("_")
+    in ["", "", suffix]
       from("", suffix)
 
-    in [prefix, suffix]
+    in [prefix, "_", suffix]
       raise Error, "prefix cannot be empty when there's a separator" if prefix.empty?
 
       from(prefix, suffix)
@@ -83,7 +83,8 @@ class TypeID < String
     suffix: TypeID::UUID.generate(timestamp: timestamp).base32
   )
     raise Error, "prefix length cannot be greater than #{MAX_PREFIX_LENGTH}" if prefix.length > MAX_PREFIX_LENGTH
-    raise Error, "prefix must be lowercase ASCII characters" unless prefix.match?(/^[a-z]*$/)
+    raise Error, "prefix must be lowercase ASCII characters" unless prefix.match?(/^[a-z_]*$/)
+    raise Error, "prefix cannot start or end with an underscore" if prefix.start_with?("_") || prefix.end_with?("_")
     raise Error, "suffix must be #{TypeID::UUID::Base32::ENCODED_STRING_LENGTH} characters" unless suffix.length == TypeID::UUID::Base32::ENCODED_STRING_LENGTH
     raise Error, "suffix must only contain the letters in '#{TypeID::UUID::Base32::ALPHABET}'" unless suffix.chars.all? { |char| TypeID::UUID::Base32::ALPHABET.include?(char) }
     raise Error, "suffix must start with a 0-7 digit to avoid overflows" unless ("0".."7").cover?(suffix.chars.first)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: typeid
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Andrew Booth
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-08 00:00:00.000000000 Z
+date: 2024-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: uuid7