Changeset 30649 for lang/ruby/uuid/trunk/lib

Timestamp:

03/01/09 22:04:49 (4 years ago)

Author:

shyouhei

Message:

some tuneup; typical usage for an uuid object is for a hash key, so it should be wiser for us to tune #hash and #eql?.

Files:

• lang/ruby/uuid/trunk/lib/uuid.rb (modified) (8 diffs)

lang/ruby/uuid/trunk/lib/uuid.rb

@@ -28 +28 @@
 
 # Pure ruby UUID generator, which is compatible with RFC4122
-UUID = Struct.new "UUID", :raw_bytes
 class UUID
         # UUID epoch is 15th Oct. 1582
@@ -34 +33 @@
 
         private_class_method :new
+
+        private
+        def initialize str
+                tmp = str.unpack "C*"
+                @num = tmp.inject do |r, i|
+                        r * 256 | i
+                end
+                @num.freeze
+                self.freeze
+        end
+
+        public
+
+        def raw_bytes
+                ret = String.new
+                tmp = @num
+                16.times do |i|
+                        x, y = tmp.divmod 256
+                        ret << y
+                        tmp = x
+                end
+                ret.reverse!
+                ret
+        end
 
         class << self
@@ -63 +86 @@
                         sum = sha1.digest
                         raw = mask 5, sum[0..15]
-                        ret = new raw
-                        ret.raw_bytes.freeze
-                        ret.freeze
-                        ret
+                        new raw
                 end
 
@@ -76 +96 @@
                         sum = md5.digest
                         raw = mask 3, sum[0..16]
-                        ret = new raw
-                        ret.raw_bytes.freeze
-                        ret.freeze
-                        ret
+                        new raw
                 end
 
@@ -88 +105 @@
                         rnd = [prand, prand, prand, prand].pack "N4"
                         raw = mask 4, rnd
-                        ret = new raw
-                        ret.raw_bytes.freeze
-                        ret.freeze
-                        ret
+                        new raw
                 end
 
@@ -177 +191 @@
                         str.gsub! %r/[^0-9A-Fa-f]/, ''
                         raw = str[0..31].to_a.pack 'H*'
-                        ret = new raw
-                        ret.raw_bytes.freeze
-                        ret.freeze
-                        ret
+                        new raw
                 end
 
@@ -187 +198 @@
                 def pack tl, tm, th, ch, cl, n
                         raw = [tl, tm, th, ch, cl, n].pack "NnnCCa6"
-                        ret = new raw
-                        ret.raw_bytes.freeze
-                        ret.freeze
-                        ret
+                        new raw
                 end
         end
@@ -254 +262 @@
         end
         alias urn to_uri
+        alias inspect to_uri
 
         # Convert into 128-bit unsigned integer
         # Typically a Bignum instance, but can be a Fixnum.
         def to_int
-                tmp = self.raw_bytes.unpack "C*"
-                tmp.inject do |r, i|
-                        r * 256 | i
-                end
+                @num
         end
         alias to_i to_int