gn0m30-uuid 2.1.2 → 2.2.1

data/CHANGELOG

@@ -1,6 +1,16 @@
-2.1.1 (2010-01-25)
+
+2.2.1 (2010-02-18)
+* merged changes from assaf/uuid
+
+2.2.0 (2010-02-18)
+* Added: set UUID.state_file = false if you cannot use a state file (e.g. shared hosting environment)
+
+2.1.2 (2010-01-25)
 * added the :teenie format
 
+2.1.1 (2010-01-27)
+* Fixed bug which caused UUID.new to fail if the state file was somehow extant but empty
+
 2.1.0 (2009-12-16)
 * Added uuid.validate -- easier to implement than explain why it's wrong.
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2008 Assaf Arkin, Eric Hodel
+Copyright (c) 2005-2010 Assaf Arkin, Eric Hodel
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.rdoc

@@ -73,6 +73,12 @@ writable, the file is created as <tt>.ruby-uuid</tt> in the home directory.
 If you need to create the file with a different mode, use UUID#state_file
 before running the UUID generator.
 
+Note: If you are running on a shared host where the state file is not shared
+between processes, or persisted across restarts (e.g. Heroku, Google App
+Engine) you can simple turn it off:
+
+  UUID.state_file = false
+
 State files are not portable across machines.
 
 

data/gn0m30-uuid.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |spec|
   spec.name = 'gn0m30-uuid'
-  spec.version = '2.1.2'
+  spec.version = '2.2.1'
   spec.summary = "UUID generator with teenie format"
   spec.description = <<-EOF
 UUID generator for producing universally unique identifiers based on RFC 4122

data/lib/uuid.rb

@@ -3,7 +3,7 @@
 #
 # Author:: Assaf Arkin  assaf@labnotes.org
 #          Eric Hodel drbrain@segment7.net
-# Copyright:: Copyright (c) 2005-2008 Assaf Arkin, Eric Hodel
+# Copyright:: Copyright (c) 2005-2010 Assaf Arkin, Eric Hodel
 # License:: MIT and/or Creative Commons Attribution-ShareAlike
 
 require 'fileutils'
@@ -135,7 +135,7 @@ class UUID
   #
   # State files are not portable across machines.
   def self.state_file(mode = 0644)
-    return @state_file if @state_file
+    return @state_file unless @state_file.nil?
 
     @mode = mode
 
@@ -162,7 +162,11 @@ class UUID
   end
 
   ##
-  # Specify the path of the state file.
+  # Specify the path of the state file.  Use this if you need a different
+  # location for your state file.
+  #
+  # Set to false if your system cannot use a state file (e.g. many shared
+  # hosts).
   def self.state_file=(path)
     @state_file = path
   end
@@ -190,15 +194,18 @@ class UUID
     @last_clock = (Time.now.to_f * CLOCK_MULTIPLIER).to_i
     @mutex = Mutex.new
 
-    if File.exist?(self.class.state_file) then
+    state_file = self.class.state_file
+    if state_file && File.size?(state_file) then
       next_sequence
     else
       @mac = Mac.addr.gsub(/:|-/, '').hex & 0x7FFFFFFFFFFF
       fail "Cannot determine MAC address from any available interface, tried with #{Mac.addr}" if @mac == 0
       @sequence = rand 0x10000
 
-      open_lock 'w' do |io|
-        write_state io
+      if state_file
+        open_lock 'w' do |io|
+          write_state io
+        end
       end
     end
   end
@@ -265,15 +272,19 @@ class UUID
   ##
   # Updates the state file with a new sequence number.
   def next_sequence
-    open_lock 'r+' do |io|
-      @mac, @sequence, @last_clock = read_state(io)
+    if self.class.state_file
+      open_lock 'r+' do |io|
+        @mac, @sequence, @last_clock = read_state(io)
 
-      io.rewind
-      io.truncate 0
+        io.rewind
+        io.truncate 0
 
-      @sequence += 1
+        @sequence += 1
 
-      write_state io
+        write_state io
+      end
+    else
+      @sequence += 1
     end
   rescue Errno::ENOENT
     open_lock 'w' do |io|

data/test/test-uuid.rb

@@ -21,6 +21,16 @@ class TestUUID < Test::Unit::TestCase
     assert_equal path, UUID.state_file
   end
 
+  def test_with_no_state_file
+    UUID.state_file = false
+    assert !UUID.state_file
+    uuid = UUID.new
+    assert_match(/\A[\da-f]{32}\z/i, uuid.generate(:compact))
+    seq = uuid.next_sequence
+    assert_equal seq + 1, uuid.next_sequence
+    assert !UUID.state_file
+  end
+
   def test_instance_generate
     uuid = UUID.new
     assert_match(/\A[\da-f]{32}\z/i, uuid.generate(:compact))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gn0m30-uuid
 version: !ruby/object:Gem::Version 
-  version: 2.1.2
+  version: 2.2.1
 platform: ruby
 authors: 
 - Assaf Arkin