Merge pull request rails#52473 from r7kamura/securerandom-base36

Declare Active Support dependency on securerandom >= 0.3

Author: byroot

Gemfile.lock

@@ -95,6 +95,7 @@ PATH
       i18n (>= 1.6, < 2)
       logger (>= 1.4.2)
       minitest (>= 5.1)
+      securerandom (>= 0.3)
       tzinfo (~> 2.0, >= 2.0.5)
     rails (8.0.0.alpha)
       actioncable (= 8.0.0.alpha)
@@ -515,6 +516,7 @@ GEM
       google-protobuf (~> 3.25)
     sass-embedded (1.69.6-x86_64-linux-gnu)
       google-protobuf (~> 3.25)
+    securerandom (0.3.1)
     selenium-webdriver (4.22.0)
       base64 (~> 0.2)
       logger (~> 1.4)

activesupport/activesupport.gemspec

@@ -43,4 +43,5 @@ Gem::Specification.new do |s|
   s.add_dependency "drb"
   s.add_dependency "bigdecimal"
   s.add_dependency "logger", ">= 1.4.2"
+  s.add_dependency "securerandom", ">= 0.3"
 end

activesupport/lib/active_support/core_ext/securerandom.rb

@@ -16,18 +16,8 @@ module SecureRandom
   #
   #   p SecureRandom.base58 # => "4kUgL2pdQMSCQtjE"
   #   p SecureRandom.base58(24) # => "77TMHrHJFvFDwodq8w7Ev2m7"
-  if RUBY_VERSION >= "3.3"
-    def self.base58(n = 16)
-      SecureRandom.alphanumeric(n, chars: BASE58_ALPHABET)
-    end
-  else
-    def self.base58(n = 16)
-      SecureRandom.random_bytes(n).unpack("C*").map do |byte|
-        idx = byte % 64
-        idx = SecureRandom.random_number(58) if idx >= 58
-        BASE58_ALPHABET[idx]
-      end.join
-    end
+  def self.base58(n = 16)
+    SecureRandom.alphanumeric(n, chars: BASE58_ALPHABET)
   end
 
   # SecureRandom.base36 generates a random base36 string in lowercase.
@@ -41,17 +31,11 @@ def self.base58(n = 16)
   #
   #   p SecureRandom.base36 # => "4kugl2pdqmscqtje"
   #   p SecureRandom.base36(24) # => "77tmhrhjfvfdwodq8w7ev2m7"
-  if RUBY_VERSION >= "3.3"
-    def self.base36(n = 16)
-      SecureRandom.alphanumeric(n, chars: BASE36_ALPHABET)
-    end
-  else
-    def self.base36(n = 16)
-      SecureRandom.random_bytes(n).unpack("C*").map do |byte|
-        idx = byte % 64
-        idx = SecureRandom.random_number(36) if idx >= 36
-        BASE36_ALPHABET[idx]
-      end.join
-    end
+  def self.base36(n = 16)
+    SecureRandom.random_bytes(n).unpack("C*").map do |byte|
+      idx = byte % 64
+      idx = SecureRandom.random_number(36) if idx >= 36
+      BASE36_ALPHABET[idx]
+    end.join
   end
 end