uuidtools 0.1.3 → 0.1.4

data/CHANGELOG

@@ -1,3 +1,7 @@
+== UUIDTools 0.1.4
+ * improved speed when generating timestamp-based uuids
+ * fixed bug with rapid generation of timestamp uuids leading to dupicates
+ * improved code for detection of mac address
 == UUIDTools 0.1.3
  * fixed issue with UUID#raw attempting to call protected class methods
 == UUIDTools 0.1.2

data/lib/uuidtools.rb

@@ -21,7 +21,7 @@
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
 
-UUID_TOOLS_VERSION = "0.1.3"
+UUID_TOOLS_VERSION = "0.1.4"
 
 $:.unshift(File.dirname(__FILE__))
 
@@ -103,6 +103,7 @@ require 'digest/md5'
 #  UUID.random_create
 #  => #<UUID:0x19013a UUID:984265dc-4200-4f02-ae70-fe4f48964159>
 class UUID
+  @@mac_address = nil
   @@last_timestamp = nil
   @@last_node_id = nil
   @@last_clock_sequence = nil
@@ -247,7 +248,7 @@ class UUID
         # The node id has changed.  Change the clock id.
         clock_sequence = UUID.convert_byte_string_to_int(UUID.true_random)
       elsif @@last_timestamp != nil &&
-          gmt_timestamp_100_nanoseconds < @@last_timestamp
+          gmt_timestamp_100_nanoseconds <= @@last_timestamp
         clock_sequence = clock_sequence + 1
       end
       @@last_timestamp = gmt_timestamp_100_nanoseconds
@@ -460,42 +461,45 @@ class UUID
   # Returns the MAC address of the current computer's network card.
   # Returns nil if a MAC address could not be found.
   def UUID.get_mac_address #:nodoc:
-    if RUBY_PLATFORM =~ /win/ && !(RUBY_PLATFORM =~ /darwin/)
-      begin
-        ifconfig_output = `ipconfig /all`
-        mac_addresses = ifconfig_output.scan(
-          Regexp.new("(#{(["[0-9A-F]{2}"] * 6).join("-")})"))
-        if mac_addresses.size > 0
-          return mac_addresses.first.first.downcase.gsub(/-/, ":")
-        end
-      rescue
-      end
-    else
-      begin
-        ifconfig_output = `ifconfig`
-        mac_addresses = ifconfig_output.scan(
-          Regexp.new("ether (#{(["[0-9a-f]{2}"] * 6).join(":")})"))
-        if mac_addresses.size == 0
-          ifconfig_output = `ifconfig | grep HWaddr | cut -c39-`
+    if @@mac_address.nil?
+      if RUBY_PLATFORM =~ /win/ && !(RUBY_PLATFORM =~ /darwin/)
+        begin
+          ifconfig_output = `ipconfig /all`
           mac_addresses = ifconfig_output.scan(
-            Regexp.new("(#{(["[0-9a-f]{2}"] * 6).join(":")})"))
+            Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join("-")})"))
+          if mac_addresses.size > 0
+            @@mac_address = mac_addresses.first.first.downcase.gsub(/-/, ":")
+          end
+        rescue
         end
-        if mac_addresses.size == 0
-          ifconfig_output = `/sbin/ifconfig`
-          mac_addresses = ifconfig_output.scan(
-            Regexp.new("ether (#{(["[0-9a-f]{2}"] * 6).join(":")})"))
-        end
-        if mac_addresses.size == 0
-          ifconfig_output = `/sbin/ifconfig | grep HWaddr | cut -c39-`
+      else
+        begin
+          ifconfig_output = `ifconfig`
           mac_addresses = ifconfig_output.scan(
-            Regexp.new("(#{(["[0-9a-f]{2}"] * 6).join(":")})"))
+            Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+          if mac_addresses.size == 0
+            ifconfig_output = `ifconfig | grep HWaddr | cut -c39-`
+            mac_addresses = ifconfig_output.scan(
+              Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+          end
+          if mac_addresses.size == 0
+            ifconfig_output = `/sbin/ifconfig`
+            mac_addresses = ifconfig_output.scan(
+              Regexp.new("ether (#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+          end
+          if mac_addresses.size == 0
+            ifconfig_output = `/sbin/ifconfig | grep HWaddr | cut -c39-`
+            mac_addresses = ifconfig_output.scan(
+              Regexp.new("(#{(["[0-9a-fA-F]{2}"] * 6).join(":")})"))
+          end
+          if mac_addresses.size > 0
+            @@mac_address = mac_addresses.first.first
+          end
+        rescue
         end
-        if mac_addresses.size > 0
-          return mac_addresses.first.first
-        end
-      rescue
       end
     end
+    return @@mac_address
   end
   
   # Returns 128 bits of highly unpredictable data.

data/rakefile

@@ -7,7 +7,7 @@ require 'rake/gempackagetask'
 require 'rake/contrib/rubyforgepublisher'
 
 PKG_NAME      = 'uuidtools'
-PKG_VERSION   = '0.1.3'
+PKG_VERSION   = '0.1.4'
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 
 RELEASE_NAME  = "REL #{PKG_VERSION}"

data/test/create_test.rb

@@ -22,9 +22,15 @@ class CreateTest < Test::Unit::TestCase
       UUID.timestamp_create.to_s,
       UUID.timestamp_create.to_s)
     current_time = Time.now
-    assert_equal(
+    assert_not_equal(
       UUID.timestamp_create(current_time).to_s,
       UUID.timestamp_create(current_time).to_s)
+    uuids = []
+    1000.times do
+      uuids << UUID.timestamp_create
+    end
+    assert_equal(uuids.size, (uuids.map {|x| x.to_s}).uniq.size,
+      "Duplicate timestamp-based UUID generated.")
   end
 
   def test_random_create

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: uuidtools
 version: !ruby/object:Gem::Version 
-  version: 0.1.3
-date: 2005-09-28 00:00:00 -04:00
+  version: 0.1.4
+date: 2005-11-11 00:00:00 -05:00
 summary: Generation of UUIDs.
 require_paths: 
   - lib