simple_uuid 0.3.0 → 0.4.0

data/CHANGELOG

@@ -1,13 +1,24 @@
-v0.3.0 Add option `:randomize` to turn off the random part of the UUID
+v0.4.0
+- Fix comparison of time UUIDs (@muirmanders, #13)
+- Moved to the cassandra-rb github project
 
-v0.2.0 perf optimizations for cassandra cql
+v0.3.0
+- Add option `:randomize` to turn off the random part of the UUID
 
-v0.1.2 add license file
+v0.2.0
+- perf optimizations for cassandra cql
 
-v0.1.1 fix problem with ruby 1.9 [Aanand Prasad]
+v0.1.2
+- add license file
 
-v0.1.0 move UUID class into a SimpleUUID module
+v0.1.1
+- fix problem with ruby 1.9 [Aanand Prasad]
 
-v0.0.2 Update equality test for compatibility with Cassandra gem.
+v0.1.0
+- move UUID class into a SimpleUUID module
 
-v0.0.1 Initial extraction from the cassandra gem.
+v0.0.2
+- Update equality test for compatibility with Cassandra gem.
+
+v0.0.1
+- Initial extraction from the cassandra gem.

data/README.rdoc

@@ -32,6 +32,6 @@ Install the gem:
 
 == Reporting problems
 
-The support forum is here[http://github.com/ryanking/simple_uuid/issues].
+The support forum is here[http://github.com/cassandra-rb/simple_uuid/issues].
 
 Patches and contributions are very welcome.

data/Rakefile

@@ -3,8 +3,6 @@ require 'echoe'
 Echoe.new('simple_uuid') do |e|
   e.author = 'Ryan King, Evan Weaver'
   e.description = 'Simple, scalable UUID generation.'
-  e.email = 'ryan@twitter.com'
   e.rubygems_version = ">= 0.8"
-  e.project = "fauna"
   e.retain_gemspec = true
 end

data/lib/simple_uuid.rb

@@ -27,7 +27,7 @@ module SimpleUUID
       when String
         case bytes.size
         when 16 # Raw byte array
-          @bytes = bytes
+          @bytes = bytes.respond_to?(:force_encoding) ? bytes.force_encoding("ASCII-8BIT") : bytes
         when 36 # Human-readable UUID representation; inverse of #to_guid
           elements = bytes.split("-")
           raise TypeError, "Expected #{bytes.inspect} to cast to a #{self.class} (malformed UUID representation)" if elements.size != 5
@@ -56,11 +56,19 @@ module SimpleUUID
 
         # Top 3 bytes reserved
         if opts[:randomize] == false
-          byte_array += [
-            0 | VARIANT,
-            0,
-            0
-          ]
+          byte_array += if !opts[:salt].nil?
+            clock_h, clock_l, node_h, node_l =
+              opts[:salt].to_s.unpack("CCnN")
+
+            clock = [
+              clock_h | VARIANT,
+              clock_l
+            ].pack("n").unpack("n").first
+
+            [ clock, node_h, node_l ]
+          else
+            [ 0 | VARIANT, 0, 0 ]
+          end
         else
           byte_array += [
             rand(2**13) | VARIANT,
@@ -109,11 +117,15 @@ module SimpleUUID
     end
 
     def <=>(other)
-      total_usecs <=> other.send(:total_usecs)
-    end
-
-    def ==(other)
-      to_s == other.to_s
+      me = to_s.unpack('Nn2C*')
+      him = other.to_s.unpack('Nn2C*')
+      # swap most significant time bits to front
+      me[0], me[2], him[0], him[2] = me[2], me[0], him[2], him[0]
+      me.zip(him) do |m, h|
+        comp = m <=> h
+        return comp if comp != 0
+      end
+      return 0
     end
 
     def inspect(long = false)

data/simple_uuid.gemspec

@@ -2,22 +2,20 @@
 
 Gem::Specification.new do |s|
   s.name = "simple_uuid"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0.8") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ryan King, Evan Weaver"]
-  s.date = "2012-11-27"
   s.description = "Simple, scalable UUID generation."
-  s.email = "ryan@twitter.com"
   s.extra_rdoc_files = ["CHANGELOG", "LICENSE", "README.rdoc", "lib/simple_uuid.rb"]
   s.files = ["CHANGELOG", "LICENSE", "Manifest", "README.rdoc", "Rakefile", "lib/simple_uuid.rb", "simple_uuid.gemspec", "test/test_uuid.rb"]
-  s.homepage = "http://fauna.github.com/fauna/simple_uuid/"
+  s.homepage = "https://github.com/cassandra-rb/simple_uuid"
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Simple_uuid", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = "fauna"
   s.rubygems_version = "1.8.24"
   s.summary = "Simple, scalable UUID generation."
   s.test_files = ["test/test_uuid.rb"]
+  s.licenses = ['Apache']
 
   if s.respond_to? :specification_version then
     s.specification_version = 3

data/test/test_uuid.rb

@@ -1,5 +1,7 @@
 require 'test/unit'
+require 'digest/md5'
 require 'simple_uuid'
+
 include SimpleUUID
 
 class UUIDTest < Test::Unit::TestCase
@@ -18,6 +20,29 @@ class UUIDTest < Test::Unit::TestCase
     assert_equal uuid, UUID.new(uuid.to_guid)
   end
 
+  def test_equality_with_encoding
+    return unless "".respond_to? :force_encoding
+
+    utf8_uuid_bytes = "\xFD\x17\x1F\xA6=O\x11\xE2\x92\x13pV\x81\xBB\x05\x87".force_encoding("UTF-8")
+    binary_uuid_bytes = "\xFD\x17\x1F\xA6=O\x11\xE2\x92\x13pV\x81\xBB\x05\x87".force_encoding("ASCII-8BIT")
+
+    assert_equal UUID.new(utf8_uuid_bytes), UUID.new(binary_uuid_bytes)
+  end
+
+  def test_salt
+    tnow = Time.now
+    salt =  Digest::MD5.new.update("some salt")
+    tthen = Time.now
+
+    uuid1 = UUID.new(tnow, :randomize => false, :salt => salt.digest)
+    uuid2 = UUID.new(tthen, :randomize => false, :salt => salt.digest)
+
+    assert_equal uuid1.to_time, tnow
+    assert_equal uuid2.to_time, tthen
+    assert_equal uuid1.bytes[8..-1], uuid2.bytes[8..-1]
+    assert uuid2 > uuid1
+  end
+
   def test_uuid_error
     assert_raises(TypeError) do
       UUID.new("bogus")
@@ -48,13 +73,13 @@ class UUIDTest < Test::Unit::TestCase
     assert current_uuid >= current_uuid
     assert future_uuid >= current_uuid
   end
-  
+
   def test_to_time
     ts = Time.new
     uuid = UUID.new(ts)
     assert_equal ts, uuid.to_time
   end
-  
+
   def test_total_usecs
     uuid = UUID.new
     assert_equal uuid.send(:total_usecs), UUID.total_usecs(uuid.bytes)
@@ -66,4 +91,21 @@ class UUIDTest < Test::Unit::TestCase
     assert_not_equal UUID.new(t), UUID.new(t)
     assert_equal UUID.new(t, randomize: false), UUID.new(t, randomize: false)
   end
+
+  def test_identical_times
+    t = Time.now
+    u1 = UUID.new(t)
+    u2 = UUID.new(t)
+
+    assert_not_equal u1, u2
+    assert_equal u1, UUID.new(u1) # sanity
+    assert_not_equal 0, u1 <=> u2
+    assert_equal u1.to_time, u2.to_time
+
+    if u1.to_s[-8, 8] > u2.to_s[-8, 8]
+      assert u1 > u2
+    else
+      assert u2 > u1
+    end
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: simple_uuid
 version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: 
+  prerelease: false
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Ryan King, Evan Weaver
@@ -15,11 +14,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-11-27 00:00:00 Z
+date: 2013-10-10 00:00:00 -07:00
+default_executable: 
 dependencies: []
 
 description: Simple, scalable UUID generation.
-email: ryan@twitter.com
+email: 
 executables: []
 
 extensions: []
@@ -38,9 +38,10 @@ files:
 - lib/simple_uuid.rb
 - simple_uuid.gemspec
 - test/test_uuid.rb
-homepage: http://fauna.github.com/fauna/simple_uuid/
-licenses: []
-
+has_rdoc: true
+homepage: https://github.com/cassandra-rb/simple_uuid
+licenses: 
+- Apache
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -52,28 +53,24 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 27
       segments: 
       - 0
       - 8
       version: "0.8"
 requirements: []
 
-rubyforge_project: fauna
-rubygems_version: 1.8.24
+rubyforge_project: 
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Simple, scalable UUID generation.