gn0m30-uuid 2.2.1 → 2.2.2

data/gn0m30-uuid.gemspec

@@ -1,6 +1,6 @@
 spec = Gem::Specification.new do |spec|
   spec.name = 'gn0m30-uuid'
-  spec.version = '2.2.1'
+  spec.version = '2.2.2'
   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

@@ -13,7 +13,7 @@ require 'tmpdir'
 require 'rubygems'
 require 'macaddr'
 require 'base62'
-
+require 'scanf'
 
 ##
 # = Generating UUIDs
@@ -186,6 +186,36 @@ class UUID
   def self.validate_teenie(uuid)
     return true if uuid =~ /\A[\da-fA-f]{24}\z/i
   end
+
+  ##
+  # translate one format uuid to another
+  def self.translate(uuid, source_format, target_format)
+    if source_format == :teenie
+      raise "invalid uuid passed in for translation" unless UUID.validate_teenie(uuid)
+    else
+      raise "invalid uuid passed in for translation" unless UUID.validate(uuid)
+    end
+
+    raise "invalid source format passed in for tranlation" unless FORMATS[source_format]
+    raise "invalid target format passed in for tranlation" unless FORMATS[target_format]
+    raise "it's a waste of time to translate one format to another" unless source_format != target_format
+
+    parts = Array.new
+    
+    if source_format != :teenie
+      parts = uuid.scanf(FORMATS[source_format])
+    else
+      # this has to stay in synch with the :teenie format
+      parts[0] = uuid[0..5].base62_decode
+      parts[1] = uuid[6..8].base62_decode
+      parts[2] = uuid[9..11].base62_decode
+      parts[3] = uuid[12..14].base62_decode
+      parts[4] = uuid[15..23].base62_decode
+    end
+
+    @uuid ||= new
+    @uuid.generate_from_parts(target_format, parts[0], parts[1], parts[2], parts[3], parts[4])
+  end
   
   ##
   # Create a new UUID generator.  You really only need to do this once.
@@ -214,9 +244,6 @@ class UUID
   # Generates a new UUID string using +format+.  See FORMATS for a list of
   # supported formats.
   def generate(format = :default)
-    template = FORMATS[format]
-
-    raise ArgumentError, "invalid UUID format #{format.inspect}" unless template
 
     # The clock must be monotonically increasing. The clock resolution is at
     # best 100 ns (UUID spec), but practically may be lower (on my setup,
@@ -255,18 +282,7 @@ class UUID
     part4 = @sequence & 0xFFFF
     part5 = @mac & 0xFFFFFFFFFFFF
 
-    # for this special case, the parts are going to be strings which we will 0 pad
-    if format == :teenie
-      part1 = part1.base62_encode
-      part2 = part2.base62_encode
-      part3 = part3.base62_encode
-      part4 = part4.base62_encode
-      part5 = part5.base62_encode
-
-      (template % [part1, part2, part3, part4, part5]).gsub(' ', '0')
-    else
-      template % [part1, part2, part3, part4, part5]
-    end
+    generate_from_parts(format, part1, part2, part3, part4, part5)
   end
 
   ##
@@ -300,6 +316,28 @@ class UUID
     "MAC: #{mac}  Sequence: #{@sequence}"
   end
 
+  ##
+  # this is used both for generation and translation
+  def generate_from_parts(format, part1, part2, part3, part4, part5)
+
+    template = FORMATS[format]
+
+    raise ArgumentError, "invalid UUID format #{format.inspect}" unless template
+
+    # for this special case, the parts are going to be strings which we will 0 pad
+    if format == :teenie
+      part1 = part1.base62_encode
+      part2 = part2.base62_encode
+      part3 = part3.base62_encode
+      part4 = part4.base62_encode
+      part5 = part5.base62_encode
+
+      (template % [part1, part2, part3, part4, part5]).gsub(' ', '0')
+    else
+      template % [part1, part2, part3, part4, part5]
+    end
+  end
+  
 protected
 
   ##

data/test/test-translate.rb

@@ -0,0 +1,40 @@
+###
+# test the translate method
+#
+require "test/unit"
+require "uuid"
+
+class TestTranslate < Test::Unit::TestCase
+
+  def test_default_to_teenie_and_back
+
+    11.times do
+      uuid = UUID.new
+      original_uuid = uuid.generate()
+
+      teenie_uuid = UUID.translate(original_uuid, :default, :teenie)
+      assert UUID.validate_teenie(teenie_uuid), 'teenie'
+
+      default_uuid = UUID.translate(teenie_uuid, :teenie, :default)
+      assert UUID.validate(default_uuid), 'default'
+
+      assert default_uuid == original_uuid, 'got back what we started with'
+    end
+  end
+
+  def test_teenie_to_compact_and_back
+
+    7.times do
+      uuid = UUID.new
+      original_uuid = uuid.generate(:teenie)
+
+      compact_uuid = UUID.translate(original_uuid, :teenie, :compact)
+      assert UUID.validate(compact_uuid), 'compact'
+
+      teenie_uuid = UUID.translate(compact_uuid, :compact, :teenie)
+      assert UUID.validate_teenie(teenie_uuid), 'teenie'
+
+      assert teenie_uuid == original_uuid, 'got back what we started with'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gn0m30-uuid
 version: !ruby/object:Gem::Version 
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors: 
 - Assaf Arkin
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-18 00:00:00 -05:00
+date: 2010-04-05 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,6 +47,7 @@ extra_rdoc_files:
 - README.rdoc
 - MIT-LICENSE
 files: 
+- test/test-translate.rb
 - test/test-uuid.rb
 - lib/uuid.rb
 - README.rdoc