lexical_uuid 0.1.6 → 0.1.7

data/Rakefile

@@ -11,7 +11,7 @@ begin
     gem.homepage = "http://github.com/jamesgolick/lexical_uuid"
     gem.authors = ["James Golick"]
     gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "fnv"
+    gem.add_dependency "RubyInline", ">3.8.4"
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.7

data/lexical_uuid.gemspec

@@ -1,51 +1,58 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "lexical_uuid"
-  s.version = "0.1.6"
+  s.name = %q{lexical_uuid}
+  s.version = "0.1.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["James Golick"]
-  s.date = "2011-09-23"
-  s.description = "UUIDs that are byte-ordered lamport clocks (timestamp, worker_id). Much simpler than type-1 UUID's crappy, weirdo layout."
-  s.email = "jamesgolick@gmail.com"
+  s.date = %q{2010-11-22}
+  s.description = %q{UUIDs that are byte-ordered lamport clocks (timestamp, worker_id). Much simpler than type-1 UUID's crappy, weirdo layout.}
+  s.email = %q{jamesgolick@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+     "README.rdoc"
   ]
   s.files = [
     ".document",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION",
-    "lexical_uuid.gemspec",
-    "lib/lexical_uuid.rb",
-    "spec/lexical_uuid_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
+     ".gitignore",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "VERSION",
+     "lexical_uuid.gemspec",
+     "lib/lexical_uuid.rb",
+     "spec/lexical_uuid_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
-  s.homepage = "http://github.com/jamesgolick/lexical_uuid"
+  s.homepage = %q{http://github.com/jamesgolick/lexical_uuid}
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.10"
-  s.summary = "UUIDs that are byte-ordered lamport clocks (timestamp, worker_id). Much simpler than type-1 UUID's crappy, weirdo layout."
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{UUIDs that are byte-ordered lamport clocks (timestamp, worker_id). Much simpler than type-1 UUID's crappy, weirdo layout.}
+  s.test_files = [
+    "spec/lexical_uuid_spec.rb",
+     "spec/spec_helper.rb"
+  ]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<RubyInline>, ["> 3.8.4"])
+      s.add_runtime_dependency(%q<RubyInline>, ["= 3.8.4"])
     else
       s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<RubyInline>, ["> 3.8.4"])
+      s.add_dependency(%q<RubyInline>, ["= 3.8.4"])
     end
   else
     s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<RubyInline>, ["> 3.8.4"])
+    s.add_dependency(%q<RubyInline>, ["= 3.8.4"])
   end
 end
 

data/lib/lexical_uuid.rb

@@ -1,8 +1,35 @@
 require "rubygems"
 require "socket"
-require "fnv"
-require File.join(File.dirname(__FILE__), "time_ext")
-require File.join(File.dirname(__FILE__), "increasing_microsecond_clock")
+require "inline"
+
+class String
+  inline :C do |builder|
+    builder.c <<-__END__
+      static long fnv1a() {
+        int hash = 2166136261;
+        int i    = 0;
+      
+        for(i = 0; i < RSTRING_LEN(self); i++) {
+          hash ^= RSTRING_PTR(self)[i];
+          hash *= 16777619;
+        }
+
+        return hash;
+      }
+    __END__
+  end
+end
+
+# Borrowed from the SimpleUUID gem
+class Time
+  def self.stamp
+    Time.now.stamp
+  end
+  
+  def stamp
+    to_i * 1_000_000 + usec
+  end
+end
 
 class LexicalUUID
   class << self
@@ -14,16 +41,17 @@ class LexicalUUID
       def create_worker_id
         fqdn = Socket.gethostbyname(Socket.gethostname).first
         pid  = Process.pid
-        FNV.new.fnv1a_64("#{fqdn}-#{pid}")
+        "#{fqdn}-#{pid}".fnv1a
       end
   end
 
-  attr_reader :worker_id, :timestamp
+  attr_reader :worker_id, :jitter, :timestamp
 
-  def initialize(timestamp = nil, worker_id = nil, timestamp_factory = IncreasingMicrosecondClock)
+  def initialize(timestamp = nil, jitter = nil, worker_id = nil)
     case timestamp
     when Fixnum, Bignum
       @timestamp = timestamp
+      @jitter    = jitter || create_jitter
       @worker_id = worker_id || self.class.worker_id
     when String
       case timestamp.size
@@ -31,25 +59,27 @@ class LexicalUUID
         from_bytes(timestamp)
       when 36
         elements = timestamp.split("-")
-        from_bytes(elements.join.to_a.pack('H32'))
+        from_bytes([elements.join].pack('H32'))
       else
         raise ArgumentError, 
           "#{timestamp} was incorrectly sized. Must be 16 timestamp."
       end
     when Time
       @timestamp = timestamp.stamp
+      @jitter    = create_jitter
       @worker_id = self.class.worker_id
     when nil
       @worker_id = self.class.worker_id
-      @timestamp = timestamp_factory.call
+      @jitter    = create_jitter
+      @timestamp = Time.stamp
     end
   end
 
   def to_bytes
     [timestamp >> 32,
-      timestamp & 0xffffffff,
-      worker_id >> 32,
-      worker_id & 0xffffffff].pack("NNNN")
+     timestamp & 0xffffffff,
+     jitter,
+     worker_id].pack("iIii")
   end
 
   # Also borrowed from simple_uuid
@@ -61,14 +91,20 @@ class LexicalUUID
   end
 
   def <=>(other)
-    timestamp == other.timestamp ? 
-      worker_id <=> other.worker_id : timestamp <=> other.timestamp
+    if timestamp == other.timestamp && jitter == other.jitter
+      worker_id <=> other.worker_id
+    elsif timestamp == other.timestamp
+      jitter <=> other.jitter
+    else
+      timestamp <=> other.timestamp
+    end
   end
 
   def ==(other)
     other.is_a?(LexicalUUID) &&
       timestamp == other.timestamp &&
-        worker_id == other.worker_id
+        jitter == other.jitter &&
+          worker_id == other.worker_id
   end
 
   def eql?(other)
@@ -81,8 +117,11 @@ class LexicalUUID
 
   private
     def from_bytes(bytes)
-      time_high, time_low, worker_high, worker_low = bytes.unpack("NNNN")
+      time_high, time_low, @jitter, @worker_id = bytes.unpack("iIii")
       @timestamp = (time_high << 32) | time_low
-      @worker_id = (worker_high << 32) | worker_low
+    end
+
+    def create_jitter
+      rand(2**32)
     end
 end

data/spec/lexical_uuid_spec.rb

@@ -14,11 +14,15 @@ describe "LexicalUUID" do
       @uuid.timestamp.should < Time.stamp
     end
 
+    it "has jitter" do
+      @uuid.jitter.should_not be_nil
+    end
+
     it "serializes to bytes" do
       expected_bytes = [@uuid.timestamp >> 32,
                         @uuid.timestamp & 0xffffffff,
-                        @uuid.worker_id >> 32,
-                        @uuid.worker_id & 0xffffffff].pack("NNNN")
+                        @uuid.jitter,
+                        @uuid.worker_id].pack("iIii")
       @uuid.to_bytes.should == expected_bytes
     end
   end
@@ -28,8 +32,8 @@ describe "LexicalUUID" do
       before do
         @bytes = [1234567890 >> 32,
                   1234567890 & 0xffffffff,
-                  9876543210 >> 32,
-                  9876543210 & 0xffffffff].pack("NNNN")
+                  54321,
+                  12345].pack("iIii")
         @uuid  = LexicalUUID.new(@bytes)
       end
 
@@ -37,8 +41,12 @@ describe "LexicalUUID" do
         @uuid.timestamp.should == 1234567890
       end
 
+      it "correctly extracts the jitter" do
+        @uuid.jitter.should == 54321
+      end
+
       it "correctly extracts the worker id" do
-        @uuid.worker_id.should == 9876543210
+        @uuid.worker_id.should == 12345
       end
     end
     
@@ -54,8 +62,9 @@ describe "LexicalUUID" do
   describe "initializing a uuid from a timestamp and worker_id" do
     before do
       @timestamp = 15463021018891620831
-      @worker_id = 9964740229835689317
-      @uuid      = LexicalUUID.new(@timestamp, @worker_id)
+      @jitter    = 1234125
+      @worker_id = 51341
+      @uuid      = LexicalUUID.new(@timestamp, @jitter, @worker_id)
     end
 
     it "sets the timestamp" do
@@ -65,29 +74,37 @@ describe "LexicalUUID" do
     it "sets the worker_id" do
       @uuid.worker_id.should == @worker_id
     end
+
+    it "sets the jitter" do
+      @uuid.jitter.should == @jitter
+    end
   end
 
   describe "converting a uuid in to a guid" do
     before do
-      @uuid = LexicalUUID.new(15463021018891620831, 9964740229835689317)
+      @uuid = LexicalUUID.new(15463021018891620831, 2320096881, 2389085541)
     end
     
     it "matches other uuid->guid implementations" do
-      @uuid.to_guid.should == "d697afb0-a96f-11df-8a49-de718e668d65"
+      @uuid.to_guid.should == "b0af97d6-df11-6fa9-71de-498a658d668e"
     end
   end
 
   describe "initializing from a guid" do
     before do
-      @uuid = LexicalUUID.new("d697afb0-a96f-11df-8a49-de718e668d65")
+      @uuid = LexicalUUID.new("d3910400-a04d-1c02-69bd-2d82f733af24")
     end
     
     it "correctly initializes the timestamp" do
-      @uuid.timestamp.should == 15463021018891620831
+      @uuid.timestamp.should == 1286235366378912
+    end
+
+    it "correctly initializes the jitter" do
+      @uuid.jitter.should == -2110931607
     end
 
     it "correctly initializes the worker_id" do
-      @uuid.worker_id.should == 9964740229835689317
+      @uuid.worker_id.should == 615461879
     end
   end
 
@@ -103,6 +120,10 @@ describe "LexicalUUID" do
     it "uses the default worker_id" do
       @uuid.worker_id.should == LexicalUUID.worker_id
     end
+
+    it "initializes the jitter" do
+      @uuid.jitter.should_not be_nil
+    end
   end
 
   describe "comparing uuids" do
@@ -111,11 +132,17 @@ describe "LexicalUUID" do
       (LexicalUUID.new(223) <=> LexicalUUID.new(134)).should == 1
     end
 
-    it "compares by worker_id if the timestamps are equal" do
+    it "compares by jitter if the timestamps are equal" do
       (LexicalUUID.new(123, 1) <=> LexicalUUID.new(123, 2)).should == -1
       (LexicalUUID.new(123, 2) <=> LexicalUUID.new(123, 1)).should == 1
       (LexicalUUID.new(123, 1) <=> LexicalUUID.new(123, 1)).should == 0
     end
+
+    it "compares by worker_id if the timestamps and jitter are equal" do
+      (LexicalUUID.new(123, 1, 0) <=> LexicalUUID.new(123, 1, 1)).should == -1
+      (LexicalUUID.new(123, 1, 1) <=> LexicalUUID.new(123, 1, 0)).should == 1
+      (LexicalUUID.new(123, 1, 1) <=> LexicalUUID.new(123, 1, 1)).should == 0
+    end
   end
 
   describe "==" do
@@ -128,7 +155,7 @@ describe "LexicalUUID" do
     end
 
     it "is not equal when the worker_ids are not equal" do
-      LexicalUUID.new(123, 223).should_not == LexicalUUID.new(123, 123)
+      LexicalUUID.new(123, 223, 432).should_not == LexicalUUID.new(123, 123, 234)
     end
   end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lexical_uuid
 version: !ruby/object:Gem::Version 
-  hash: 23
+  hash: 21
   prerelease: 
   segments: 
   - 0
   - 1
-  - 6
-  version: 0.1.6
+  - 7
+  version: 0.1.7
 platform: ruby
 authors: 
 - James Golick