torid 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afed761e9019552f02faa3669e3f495a4cf28545
-  data.tar.gz: 4d35d92decf2c3ea6cc1f905f26e2ec298acbe4e
+  metadata.gz: 904f97e3e10a368d48b9ed1b56f3432b6ee7cf0a
+  data.tar.gz: 99f03c856b0d00bcbcaf0d795b9f41f851f4649b
 SHA512:
-  metadata.gz: d33560130ca1e6f3d6c6a82cd19ee2bd5d90ef8ced357ccc44777b6c285b88fa1cf756972ebe1d88e5b5a8ae395e1001c862bf0ae7e9be4e66dd8f0bb21eddaf
-  data.tar.gz: 94af487b8ba0c1533c998d08c34f65e5bfc803fc5527cf382bca181e52d576547cb4a8cfdd2927bfebee062c1e6f212b5ce17ccad475922a8299ba2ec30abefc
+  metadata.gz: 39f9398d44e8e80199117a3c119ada2186c151f5ee2f3373146178c600206c6d4a787527e581551d33181384595ce8e0bc31e2d6998250031be87dd72fc036b9
+  data.tar.gz: 208f6443b30679a1b54c6b26818c8b2c903f699195a7e8db3dec89d38c36cb54f805bdf2a9fe5aa94d4cb662edc1f773cbcc09239de13b6048043a62257a7a59

data/HISTORY.md

@@ -1,4 +1,9 @@
 # Torid Changelog
+## Version 1.2.1 - 2014-09-13
+
+* Fix bug where after a fork you could generate the same uuids in different
+  processes (copiousfreetime/torid#1)
+
 ## Version 1.2.0 - 2014-09-04
 
 * Added equivalence checking

data/lib/torid.rb

@@ -2,7 +2,7 @@
 # that sort lexically in time order.
 module Torid
   # Public: The Version of the Torid library as a String
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 
   # Public: return the next Torid::UUID from the default Generator
   #

data/lib/torid/generator.rb

@@ -21,27 +21,40 @@ module Torid
     # Internal: The Clock instance used to get 64bit timestamps
     attr_reader :clock
 
-    # Internal: The Node id of this instance
-    attr_reader :node_id
-
     # Internal: Create a new Torid UUID Generator
     #
     # clock   - an object that responds to `#tick` and returns a 64bit integer.
     #           (default: Torid::Clock)
-    # node_id - the 64bit node id of this node. (default: Generator.node_id)
+    # node_id - the 64bit node id of this node. (default: Generator.create_node_id)
     #
-    def initialize( clock = Torid::Clock, node_id = Generator.node_id )
+    def initialize( clock = Torid::Clock, node_id = Generator.create_node_id )
       @clock   = clock
       @node_id = node_id
+      @pid     = Process.pid
     end
 
     # Public: Return the next UUID from this generator
     #
     # Returns Torid::UUID
     def next
-      Torid::UUID.new( @clock.tick, @node_id )
+     Torid::UUID.new( clock.tick, node_id )
     end
 
+    # Public: Return the node id
+    #
+    # This also checks if the node id is still a valid node id, by checking
+    # the pid of the process and the pid of the last time the node id was
+    # generated.
+    #
+    # Returns the node_id
+    def node_id
+      current_pid = Process.pid
+      if current_pid != @pid then
+        @pid     = current_pid
+        @node_id = Generator.create_node_id( @pid )
+      end
+      return @node_id
+    end
 
     # Internal: Generate a unique node identifier.
     #
@@ -55,9 +68,8 @@ module Torid
     # with the random bytes added by me.
     #
     # Returns a 64 bit Integer
-    def self.create_node_id
+    def self.create_node_id( pid = Process.pid )
       hostname = Socket.gethostbyname( Socket.gethostname ).first
-      pid      = Process.pid
       random   = SecureRandom.hex( 16 )
       FNV.new.fnv1a_64("#{hostname}-#{pid}-#{random}")
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: torid
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jeremy Hinegardner
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-04 00:00:00.000000000 Z
+date: 2014-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fnv