mem_model 0.5.0 → 0.6.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2RlY2YxMjZlNWIyNzA1MTliM2FlZDI5N2ZjNTZlNjYyOTI2MjM0Ng==
+    MzRmZDhkYTI1YTQ4MjUwZDEzMDcxZmQ2YjM3YjRmYjUxM2UzNzQxZg==
   data.tar.gz: !binary |-
-    ZGYyNWYyMjY2MTI1ODkzZDg1ZGMxMGYwYmNkMjA1ZmI1MTY5OGYyNA==
+    ZWNjODQxZGM3MjRlMjg3OTY2ODBlMGFhYWQ3MzUzYmFjNDQ0MDhmYw==
 SHA512:
   metadata.gz: !binary |-
-    Y2I1ZjJlNmZmMTI0ZDhkYjU5ZjQ3NzE2NWUwNDlmMzU2MmFlNGEwNjYwMzFj
-    ODE4OGY3NzVlYzE3MTgwM2U3MGQxMjQ0ZmIyZWY3OTJmNmI1MjY1NzE4NDcw
-    ZjkxYTE5MzcwY2VkYzRjMmZmYWJhYzU2MjI2YzFlNzA3M2Y5ZDM=
+    YTBjNDdhM2ZkYTc5NjkzMTQ1MTJjZGYwMDE5YWU3ZGYxMDMwY2RhMWI5ZjRh
+    MGY3MzY4ZGVlYmVhNmQwNTBiZDVlYjZmMzAzZmQ2MzVmZjRmNjZmNDhjZGQ5
+    OTA5YjZkMGM3MmJiNDdlNjA5ZjViMDhjMDkyZTg5ZTY3ZGNhYmE=
   data.tar.gz: !binary |-
-    ZjY0YWZkMDY3ZDNmZjQwYTEyNWE1M2U2YjEzNmY4MDM3ZDMyOGY1ZjJmZWU0
-    NGQ1NzY4NmJmNTg4ZjcyY2VlZmJmZmZmZTNhYzA0NDczM2IzODczMTA0OWY5
-    NmZjZDgxNjU2ZThkZjgxMTIyYWE0ZTI4M2M1MzY3MTVjNjg3Zjg=
+    Njk1ZWUzNGVkYjdiODFhODY4NDZiMDFlMmY1MzU5M2RmZDJlMGRhZjRmNjNk
+    NWExM2Y1M2ZkY2EwNzk4NGQ1NWU1ODU5YzAwNjM5ZjY4NTNmZjgzMWU0ZDU4
+    MzY2YTJjMDI5NjFjMDFjZDVjZjU5M2IxMDQwZDY0NDIzZTBkMmQ=

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+### 0.6.0 / 2014-01-02
+
+* 1 unknown:
+
+  * Use internal random_bytes - SecureRandom is blowing up once committed
+
+
 ### 0.5.0 / 2014-01-02
 
 * 1 enhancement:

data/lib/mem_model.rb

@@ -1,7 +1,6 @@
 lib_dir = File.dirname(__FILE__)
 $LOAD_PATH << lib_dir unless $LOAD_PATH.include? lib_dir
 
-require 'securerandom'
 require 'set'
 
 module MemModel

data/lib/mem_model/base.rb

@@ -38,10 +38,6 @@ module MemModel
         all[-1]
       end
 
-      def generate_id
-        object_id
-      end
-
       # Find or nil
       def find(id)
         store.detect{ |r| r.id == id }
@@ -92,10 +88,13 @@ module MemModel
 
     def initialize(attributes = {})
       @persisted = false unless maglev?
-      self.id = self.class.generate_id
       load_attributes(attributes)
+      self.id ||= self.generate_id
     end
 
+    def generate_id
+      object_id
+    end
 
     def model_name; self.class.model_name; end
 

data/lib/mem_model/guid.rb

@@ -4,7 +4,35 @@ module MemModel
 
     module ClassMethods
       def generate_id
-        [guid_prefix, '-', SecureRandom.uuid].join.upcase
+        [guid_prefix, '-', new_uuid].join.upcase
+      end
+
+      def random_bytes(n=16)
+        flags = File::RDONLY
+        flags |= File::NONBLOCK if defined? File::NONBLOCK
+        flags |= File::NOCTTY if defined? File::NOCTTY
+        flags |= File::NOFOLLOW if defined? File::NOFOLLOW
+        begin
+          File.open("/dev/urandom", flags) {|f|
+            unless f.stat.chardev?
+              raise Errno::ENOENT
+            end
+            ret = f.readpartial(n)
+            if ret.length != n
+              raise NotImplementedError, "Unexpected partial read from random device"
+            end
+            return ret
+          }
+        rescue Errno::ENOENT
+          raise NotImplementedError, "No random device"
+        end
+      end
+
+      def new_uuid
+        ary = self.random_bytes(16).unpack("NnnnnN")
+        ary[2] = (ary[2] & 0x0fff) | 0x4000
+        ary[3] = (ary[3] & 0x3fff) | 0x8000
+        "%08x-%04x-%04x-%04x-%04x%08x" % ary
       end
 
       def guid_prefix

data/lib/mem_model/version.rb

@@ -1,3 +1,3 @@
 module MemModel
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/mem_model.gemspec

@@ -1,9 +1,9 @@
 # -*- encoding: utf-8 -*-
-# stub: mem_model 0.5.0.20140102213025 ruby lib
+# stub: mem_model 0.6.0.20140102221058 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "mem_model"
-  s.version = "0.5.0.20140102213025"
+  s.version = "0.6.0.20140102221058"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["JohnnyT"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mem_model
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - JohnnyT