uuidtools 1.0.5 → 1.0.6

data/CHANGELOG

@@ -1,3 +1,6 @@
+== UUIDTools 1.0.6
+ * fixed Bignum hash issue
+ * added implicit to_str cast
 == UUIDTools 1.0.5
  * improved specs
  * fixed minor bugs

data/lib/compat/securerandom.rb

@@ -33,165 +33,167 @@
 # p SecureRandom.random_bytes(10) #=> "\323U\030TO\234\357\020\a\337"
 # ...
 
-begin
-  require 'openssl'
-rescue LoadError
-end
+if !defined?(SecureRandom)
+  begin
+    require 'openssl'
+  rescue LoadError
+  end
 
-module SecureRandom
-  # SecureRandom.random_bytes generates a random binary string.
-  #
-  # The argument n specifies the length of the result string.
-  #
-  # If n is not specified, 16 is assumed.
-  # It may be larger in future.
-  #
-  # If secure random number generator is not available,
-  # NotImplementedError is raised.
-  def self.random_bytes(n=nil)
-    n ||= 16
+  module SecureRandom
+    # SecureRandom.random_bytes generates a random binary string.
+    #
+    # The argument n specifies the length of the result string.
+    #
+    # If n is not specified, 16 is assumed.
+    # It may be larger in future.
+    #
+    # If secure random number generator is not available,
+    # NotImplementedError is raised.
+    def self.random_bytes(n=nil)
+      n ||= 16
 
-    if defined? OpenSSL::Random
-      return OpenSSL::Random.random_bytes(n)
-    end
+      if defined? OpenSSL::Random
+        return OpenSSL::Random.random_bytes(n)
+      end
 
-    if !defined?(@has_urandom) || @has_urandom
-      flags = File::RDONLY
-      flags |= File::NONBLOCK if defined? File::NONBLOCK
-      flags |= File::NOCTTY if defined? File::NOCTTY
-      flags |= File::NOFOLLOW if defined? File::NOFOLLOW
-      begin
-        File.open("/dev/urandom", flags) {|f|
-          unless f.stat.chardev?
-            raise Errno::ENOENT
-          end
-          @has_urandom = true
-          ret = f.readpartial(n)
-          if ret.length != n
-            raise NotImplementedError,
-              "Unexpected partial read from random device"
-          end
-          return ret
-        }
-      rescue Errno::ENOENT
-        @has_urandom = false
+      if !defined?(@has_urandom) || @has_urandom
+        flags = File::RDONLY
+        flags |= File::NONBLOCK if defined? File::NONBLOCK
+        flags |= File::NOCTTY if defined? File::NOCTTY
+        flags |= File::NOFOLLOW if defined? File::NOFOLLOW
+        begin
+          File.open("/dev/urandom", flags) {|f|
+            unless f.stat.chardev?
+              raise Errno::ENOENT
+            end
+            @has_urandom = true
+            ret = f.readpartial(n)
+            if ret.length != n
+              raise NotImplementedError,
+                "Unexpected partial read from random device"
+            end
+            return ret
+          }
+        rescue Errno::ENOENT
+          @has_urandom = false
+        end
       end
-    end
 
-    if !defined?(@has_win32)
-      begin
-        require 'Win32API'
+      if !defined?(@has_win32)
+        begin
+          require 'Win32API'
 
-        crypt_acquire_context = Win32API.new(
-          "advapi32", "CryptAcquireContext", 'PPPII', 'L'
-        )
-        @crypt_gen_random = Win32API.new(
-          "advapi32", "CryptGenRandom", 'LIP', 'L'
-        )
+          crypt_acquire_context = Win32API.new(
+            "advapi32", "CryptAcquireContext", 'PPPII', 'L'
+          )
+          @crypt_gen_random = Win32API.new(
+            "advapi32", "CryptGenRandom", 'LIP', 'L'
+          )
 
-        hProvStr = " " * 4
-        prov_rsa_full = 1
-        crypt_verifycontext = 0xF0000000
+          hProvStr = " " * 4
+          prov_rsa_full = 1
+          crypt_verifycontext = 0xF0000000
 
-        if crypt_acquire_context.call(
-            hProvStr, nil, nil, prov_rsa_full, crypt_verifycontext) == 0
-          raise SystemCallError,
-            "CryptAcquireContext failed: #{lastWin32ErrorMessage}"
-        end
-        @hProv, = hProvStr.unpack('L')
+          if crypt_acquire_context.call(
+              hProvStr, nil, nil, prov_rsa_full, crypt_verifycontext) == 0
+            raise SystemCallError,
+              "CryptAcquireContext failed: #{lastWin32ErrorMessage}"
+          end
+          @hProv, = hProvStr.unpack('L')
 
-        @has_win32 = true
-      rescue LoadError
-        @has_win32 = false
+          @has_win32 = true
+        rescue LoadError
+          @has_win32 = false
+        end
       end
-    end
-    if @has_win32
-      bytes = " " * n
-      if @crypt_gen_random.call(@hProv, bytes.size, bytes) == 0
-        raise SystemCallError,
-          "CryptGenRandom failed: #{lastWin32ErrorMessage}"
+      if @has_win32
+        bytes = " " * n
+        if @crypt_gen_random.call(@hProv, bytes.size, bytes) == 0
+          raise SystemCallError,
+            "CryptGenRandom failed: #{lastWin32ErrorMessage}"
+        end
+        return bytes
       end
-      return bytes
-    end
 
-    raise NotImplementedError, "No random device"
-  end
+      raise NotImplementedError, "No random device"
+    end
 
-  # SecureRandom.hex generates a random hex string.
-  #
-  # The argument n specifies the length of the random length.
-  # The length of the result string is twice of n.
-  #
-  # If n is not specified, 16 is assumed.
-  # It may be larger in future.
-  #
-  # If secure random number generator is not available,
-  # NotImplementedError is raised.
-  def self.hex(n=nil)
-    random_bytes(n).unpack("H*")[0]
-  end
+    # SecureRandom.hex generates a random hex string.
+    #
+    # The argument n specifies the length of the random length.
+    # The length of the result string is twice of n.
+    #
+    # If n is not specified, 16 is assumed.
+    # It may be larger in future.
+    #
+    # If secure random number generator is not available,
+    # NotImplementedError is raised.
+    def self.hex(n=nil)
+      random_bytes(n).unpack("H*")[0]
+    end
 
-  # SecureRandom.base64 generates a random base64 string.
-  #
-  # The argument n specifies the length of the random length.
-  # The length of the result string is about 4/3 of n.
-  #
-  # If n is not specified, 16 is assumed.
-  # It may be larger in future.
-  #
-  # If secure random number generator is not available,
-  # NotImplementedError is raised.
-  def self.base64(n=nil)
-    [random_bytes(n)].pack("m*").delete("\n")
-  end
+    # SecureRandom.base64 generates a random base64 string.
+    #
+    # The argument n specifies the length of the random length.
+    # The length of the result string is about 4/3 of n.
+    #
+    # If n is not specified, 16 is assumed.
+    # It may be larger in future.
+    #
+    # If secure random number generator is not available,
+    # NotImplementedError is raised.
+    def self.base64(n=nil)
+      [random_bytes(n)].pack("m*").delete("\n")
+    end
 
-  # SecureRandom.random_number generates a random number.
-  #
-  # If an positive integer is given as n,
-  # SecureRandom.random_number returns an integer:
-  # 0 <= SecureRandom.random_number(n) < n.
-  #
-  # If 0 is given or an argument is not given,
-  # SecureRandom.random_number returns an float:
-  # 0.0 <= SecureRandom.random_number() < 1.0.
-  def self.random_number(n=0)
-    if 0 < n
-      hex = n.to_s(16)
-      hex = '0' + hex if (hex.length & 1) == 1
-      bin = [hex].pack("H*")
-      mask = bin[0].ord
-      mask |= mask >> 1
-      mask |= mask >> 2
-      mask |= mask >> 4
-      begin
-        rnd = SecureRandom.random_bytes(bin.length)
-        rnd[0] = (rnd[0].ord & mask).chr
-      end until rnd < bin
-      rnd.unpack("H*")[0].hex
-    else
-      # assumption: Float::MANT_DIG <= 64
-      i64 = SecureRandom.random_bytes(8).unpack("Q")[0]
-      Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG)
+    # SecureRandom.random_number generates a random number.
+    #
+    # If an positive integer is given as n,
+    # SecureRandom.random_number returns an integer:
+    # 0 <= SecureRandom.random_number(n) < n.
+    #
+    # If 0 is given or an argument is not given,
+    # SecureRandom.random_number returns an float:
+    # 0.0 <= SecureRandom.random_number() < 1.0.
+    def self.random_number(n=0)
+      if 0 < n
+        hex = n.to_s(16)
+        hex = '0' + hex if (hex.length & 1) == 1
+        bin = [hex].pack("H*")
+        mask = bin[0].ord
+        mask |= mask >> 1
+        mask |= mask >> 2
+        mask |= mask >> 4
+        begin
+          rnd = SecureRandom.random_bytes(bin.length)
+          rnd[0] = (rnd[0].ord & mask).chr
+        end until rnd < bin
+        rnd.unpack("H*")[0].hex
+      else
+        # assumption: Float::MANT_DIG <= 64
+        i64 = SecureRandom.random_bytes(8).unpack("Q")[0]
+        Math.ldexp(i64 >> (64-Float::MANT_DIG), -Float::MANT_DIG)
+      end
     end
-  end
 
-  # Following code is based on David Garamond's GUID library for Ruby.
-  def self.lastWin32ErrorMessage # :nodoc:
-    get_last_error = Win32API.new(
-      "kernel32", "GetLastError", '', 'L'
-    )
-    format_message = Win32API.new(
-      "kernel32", "FormatMessageA", 'LPLLPLPPPPPPPP', 'L'
-    )
-    format_message_ignore_inserts = 0x00000200
-    format_message_from_system    = 0x00001000
+    # Following code is based on David Garamond's GUID library for Ruby.
+    def self.lastWin32ErrorMessage # :nodoc:
+      get_last_error = Win32API.new(
+        "kernel32", "GetLastError", '', 'L'
+      )
+      format_message = Win32API.new(
+        "kernel32", "FormatMessageA", 'LPLLPLPPPPPPPP', 'L'
+      )
+      format_message_ignore_inserts = 0x00000200
+      format_message_from_system    = 0x00001000
 
-    code = get_last_error.call
-    msg = "\0" * 1024
-    len = format_message.call(
-      format_message_ignore_inserts + format_message_from_system,
-      0, code, 0, msg, 1024, nil, nil, nil, nil, nil, nil, nil, nil
-    )
-    msg[0, len].tr("\r", '').chomp
+      code = get_last_error.call
+      msg = "\0" * 1024
+      len = format_message.call(
+        format_message_ignore_inserts + format_message_from_system,
+        0, code, 0, msg, 1024, nil, nil, nil, nil, nil, nil, nil, nil
+      )
+      msg[0, len].tr("\r", '').chomp
+    end
   end
 end

data/lib/uuidtools.rb

@@ -377,16 +377,19 @@ class UUID
     end
     return result.downcase
   end
+  alias_method :to_str, :to_s
 
   # Returns an integer representation for this UUID.
   def to_i
-    bytes = (time_low << 96) + (time_mid << 80) +
-      (time_hi_and_version << 64) + (clock_seq_hi_and_reserved << 56) +
-      (clock_seq_low << 48)
-    for i in 0..5
-      bytes += (nodes[i] << (40 - (i * 8)))
-    end
-    return bytes
+    @integer ||= (begin
+      bytes = (time_low << 96) + (time_mid << 80) +
+        (time_hi_and_version << 64) + (clock_seq_hi_and_reserved << 56) +
+        (clock_seq_low << 48)
+      for i in 0..5
+        bytes += (nodes[i] << (40 - (i * 8)))
+      end
+      bytes
+    end)
   end
 
   # Returns a URI string for this UUID.
@@ -396,7 +399,7 @@ class UUID
 
   # Returns an integer hash value.
   def hash
-    return self.to_i
+    @hash ||= self.to_i % 0x3fffffff
   end
 
   # Returns true if this UUID is exactly equal to the other UUID.
@@ -584,9 +587,3 @@ UUID_DNS_NAMESPACE = UUID.parse("6ba7b810-9dad-11d1-80b4-00c04fd430c8")
 UUID_URL_NAMESPACE = UUID.parse("6ba7b811-9dad-11d1-80b4-00c04fd430c8")
 UUID_OID_NAMESPACE = UUID.parse("6ba7b812-9dad-11d1-80b4-00c04fd430c8")
 UUID_X500_NAMESPACE = UUID.parse("6ba7b814-9dad-11d1-80b4-00c04fd430c8")
-
-at_exit do
-  if UUID.instance_variable_get("@random_device") != nil
-    UUID.instance_variable_get("@random_device").close rescue nil
-  end
-end

data/lib/uuidtools/version.rb

@@ -27,7 +27,7 @@ unless defined? UUID::VERSION
     module VERSION #:nodoc:
       MAJOR = 1
       MINOR = 0
-      TINY  = 5
+      TINY  = 6
 
       STRING = [MAJOR, MINOR, TINY].join('.')
     end

data/spec/uuidtools/uuid_parsing_spec.rb

@@ -90,7 +90,9 @@ describe UUID, "when parsing" do
   end
 
   it "should produce a sane hash value for a UUID" do
-    UUID.new(0, 0, 0, 0, 0, [0, 0, 0, 0, 0, 0]).hash.should == 0
+    uuid = UUID.new(0, 0, 0, 0, 0, [0, 0, 0, 0, 0, 0])
+    uuid.to_i.should == 0
+    uuid.hash.should be_kind_of(Fixnum)
   end
 
   it "should produce the correct URI for a UUID" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: uuidtools
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Bob Aman