gabe-uuid 0.3.1 → 0.3.2

data/Rakefile

@@ -11,7 +11,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name         = 'uuid'
-  s.version      = '0.3.1'
+  s.version      = '0.3.2'
   s.platform     = Gem::Platform::RUBY
   s.author       = 'Gabriel Boyer'
   s.email        = 'gboyer@gmail.com'
@@ -22,7 +22,7 @@ spec = Gem::Specification.new do |s|
   s.files        = %w[ LICENSE README.markdown Rakefile
 	                     spec/spec_helper.rb spec/uuid_spec.rb
 	                     lib/uuid.rb lib/compat/securerandom.rb ]
-  s.required_ruby_version = ">= 1.8.6"
+  s.required_ruby_version = "~> 1.8.6"
 end
  
 Rake::GemPackageTask.new(spec) do |package|

data/lib/uuid.rb

@@ -5,6 +5,8 @@ rescue LoadError
 end
 
 class UUID
+  VERSION = '0.3.2'
+  
   def initialize(value)
     @value = Integer(value)
     unless (@value >= 0) && (@value < (1 << 128))
@@ -16,11 +18,17 @@ class UUID
     eql?(other)
   end
   
+  def bytes
+    bs = ''
+    (0..120).step(8) { |shift| bs << ((@value >> (120 - shift)) & 0xff) }
+    bs
+  end
+  
   def clock_seq
-    ((clock_seq_hi_variant & 0x3f) << 8) | clock_seq_low
+    ((clock_seq_and_reserved & 0x3f) << 8) | clock_seq_low
   end
   
-  def clock_seq_hi_variant
+  def clock_seq_and_reserved
     (to_i >> 56) & 0xff
   end
   
@@ -44,15 +52,19 @@ class UUID
     to_s
   end
   
+  def nil_uuid?
+    to_i == 0
+  end
+  
   def node
     to_i & 0xffffffffffff
   end
   
   def time
-    ((time_hi_version & 0x0fff) << 48) | (time_mid << 32) | time_low
+    ((time_hi_and_version & 0x0fff) << 48) | (time_mid << 32) | time_low
   end
   
-  def time_hi_version
+  def time_hi_and_version
     (to_i >> 64) & 0xffff
   end
   
@@ -77,51 +89,46 @@ class UUID
     "urn:uuid:#{self}"
   end
   
-  RESERVED_NCS, RFC_4122, RESERVED_MICROSOFT, RESERVED_FUTURE = [
-    'reserved for NCS compatibility',
-    'specified in RFC 4122',
-    'reserved for Microsoft compatibility',
-    'reserved for future definition'
-  ]
+  RESERVED_NCS       = 0b000 # Reserved for NCS compatibility
+  RFC_4122           = 0b100 # Specified in RFC 4122
+  RESERVED_MICROSOFT = 0b110 # Reserved for Microsoft compatibility
+  RESERVED_FUTURE    = 0b111 # Reserved for future definition
   
   def variant
-    case 0
-    when to_i & (0x8000 << 48)
-      RESERVED_NCS
-    when to_i & (0x4000 << 48)
-      RFC_4122
-    when to_i & (0x2000 << 48)
-      RESERVED_MICROSOFT
+    raw_variant = (clock_seq_and_reserved >> 5)
+    if (raw_variant >> 2) == 0
+      0x000
+    elsif (raw_variant >> 1) == 2
+      0x100
     else
-      RESERVED_FUTURE
-    end
+      raw_variant
+    end >> 6
   end
   
   def version
     (variant == RFC_4122) ? ((to_i >> 76) & 0xf) : nil
   end
   
-  class << self
-    def parse(uuid)
-      str = uuid.to_s
-      unless str =~ /^(urn:uuid:)?[0-9a-fA-F]{8}((-)?[0-9a-fA-F]{4}){3}(-)?[0-9a-fA-F]{12}$/
-        raise ArgumentError, "#{str} is not a recognized UUID representation"
-      end
-      new bytes_to_i(str.gsub(/(^urn:uuid:|-)/, '').downcase.unpack('a2' * 16).collect { |x| x.to_i(16) }.pack('C*'))
+  def self.new_from_bytes(bytes)
+    unless bytes.length == 16
+      raise ArgumentError, "#{bytes} must have length of 16"
     end
-    
-    def uuid4
-      bytes = SecureRandom.random_bytes(16)
-      bytes[6] = (bytes[6] & 0x0f) | 0x40
-      bytes[8] = (bytes[8] & 0x3f) | 0x80
-      new bytes_to_i(bytes)
-    end
-    
-    private
-    
-    def bytes_to_i(bytes)
-      bytes.unpack('C*').inject { |value, i| value * 256 | i }
+    new bytes.unpack('C*').inject { |value, i| value * 256 | i }
+  end
+  
+  def self.parse(uuid)
+    str = uuid.to_s
+    unless str =~ /^(urn:uuid:)?[0-9a-fA-F]{8}((-)?[0-9a-fA-F]{4}){3}(-)?[0-9a-fA-F]{12}$/
+      raise ArgumentError, "#{str} is not a recognized UUID representation"
     end
+    new_from_bytes (str.gsub(/(^urn:uuid:|-)/, '').downcase.unpack('a2' * 16).collect { |x| x.to_i(16) }.pack('C*'))
+  end
+  
+  def self.uuid4
+    bytes = SecureRandom.random_bytes(16)
+    bytes[6] = (bytes[6] & 0x0f) | 0x40
+    bytes[8] = (bytes[8] & 0x3f) | 0x80
+    new_from_bytes bytes
   end
 end
 

data/spec/uuid_spec.rb

@@ -1,18 +1,13 @@
 require File.join(File.dirname(__FILE__), 'spec_helper')
 
-describe UUID, '.uuid4' do
-  it 'generates a new UUID' do
-    UUID.uuid4.should be_a_kind_of(UUID)
-    UUID.uuid4.should_not == UUID.uuid4
+describe UUID, '.new_from_bytes' do
+  it 'creates a UUID from a 16-byte string' do
+    lambda { UUID.new_from_bytes('x' * 16) }.should_not raise_error
   end
   
-  it 'generates version 4 UUIDs' do
-    UUID.uuid4.to_s.should =~ /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
-    UUID.uuid4.version.should == 4
-  end
-  
-  it 'generates UUIDs of the RFC 4122 variant' do
-    UUID.uuid4.variant.should == UUID::RFC_4122
+  it 'raises an ArgumentError when not passed 16 bytes' do
+    lambda { UUID.new_from_bytes('x' * 15) }.should raise_error(ArgumentError)
+    lambda { UUID.new_from_bytes('x' * 17) }.should raise_error(ArgumentError)
   end
 end
 
@@ -30,6 +25,22 @@ describe UUID, '.parse' do
   end
 end
 
+describe UUID, '.uuid4' do
+  it 'generates a new UUID' do
+    UUID.uuid4.should be_a_kind_of(UUID)
+    UUID.uuid4.should_not == UUID.uuid4
+  end
+  
+  it 'generates version 4 UUIDs' do
+    UUID.uuid4.to_s.should =~ /[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-4[0-9a-fA-F]{3}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}/
+    UUID.uuid4.version.should == 4
+  end
+  
+  it 'generates UUIDs of the RFC 4122 variant' do
+    UUID.uuid4.variant.should == UUID::RFC_4122
+  end
+end
+
 describe UUID, '#initialize' do
   it 'creates a UUID from an Integer when passed one that is within range for a UUID' do
     id = UUID.uuid4
@@ -47,6 +58,29 @@ describe UUID, '#initialize' do
   end
 end
 
+describe UUID, '#bytes' do
+  it 'returns a 16-byte representation of the UUID' do
+    UUID.uuid4.bytes.length.should == 16
+  end
+  
+  it 'can be used to reconstruct a UUID, in conjunction with UUID.new_from_bytes' do
+    id = UUID.uuid4
+    UUID.new_from_bytes(id.bytes).should == id
+  end
+end
+
+describe UUID, '#nil_uuid?' do
+  it 'returns true for the nil (0, UUID::Nil) UUID' do
+    UUID.new(0).should be_nil_uuid
+    UUID::Nil.should be_nil_uuid
+  end
+  
+  it 'returns false for non-nil UUIDs' do
+    UUID.parse('2f2b66f0-90ca-11dd-a935-000ea6f788fa').should_not be_nil_uuid
+    UUID.uuid4.should_not be_nil_uuid
+  end
+end
+
 describe UUID, '#to_i' do
   it 'returns an unsigned integer representation of the UUID' do
     i = UUID.uuid4.to_i

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: gabe-uuid
 version: !ruby/object:Gem::Version 
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors: 
 - Gabriel Boyer
@@ -38,7 +38,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
-  - - ">="
+  - - ~>
     - !ruby/object:Gem::Version 
       version: 1.8.6
   version: