Dicom_UID 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2598742649426f416a4829dddc2e383492f65a37eabfbe8f38936420eae981ee
-  data.tar.gz: 91af01a8d1ae77d0c6c2ecf206dc94ba10e68d78e80780fb3a621b49e2ea9e96
+  metadata.gz: 77add1d490996873947cbb9b63cb9ac6731b9107362da19707bb6c6918d0f65d
+  data.tar.gz: aa93e16d1ea8374321ccdb4b0f3b772d768af63cd80c0ac8a39ac04c7a583d0a
 SHA512:
-  metadata.gz: a9a3bcba499f0ff002926d06766584cab15dd100be2a5f6c8e7e1075ae53cf5afdc5581e89429045b5e43113e114dc2d90f904fe7746c0063bcb6795ee2053e6
-  data.tar.gz: 4334079996de6849f8821f7e4f74f313004963f8a62080451a0901a81aab062698619ed18c893359305503d88fc43aba2a81aef67f358d85f1b312f469491e72
+  metadata.gz: 2d2f8ff395c4867c134176b99a4970a740769a1e802e291366d98a819d28ef59300e3be05947631fc355b016e835c2de08d857402444fa4f8095517eb90a345e
+  data.tar.gz: 23eab413d47fd50ad28a8bc7768f3c1bc8b3163fb69b4a6e93e3c99dffeccab55e3a3ebc3517a7166ab483fb37fe35031ba00a5e7a76e1772f8402f85418bb38

data/lib/dicom_uid.rb

@@ -2,6 +2,7 @@
 
 # DICOM UID Generator according to the DICOM documentation
 # http://dicom.nema.org/dicom/2013/output/chtml/part05/chapter_9.html
+# <org>.<suffix>
 class DicomUID
 
 
@@ -40,9 +41,37 @@ class DicomUID
 
 
   # set default values, with org_root if needed
-  def self.random_dicom_uid org_root = '', size = 64
-    org_root << '.' if !org_root.empty? and org_root[-1] != '.'
-    return self.rand_duid org_root, size
+  # the size of the UID is randomized
+  def self.random_dicom_uid org_root, fixed_size
+    # building the org root
+    org_root ||= random_component# UID needs at least an org root
+    raise LeadingZeroError if org_root[0] == '0' and org_root.length != 1
+    raise OddByteError if org_root[-2].to_i % 2 == 1 and org_root[-1] != 0
+    org_root << '.' if org_root[-1] != '.'
+    srand
+    fixed_size ||= rand 64
+    # building the suffix
+    return self.rand_duid org_root, (fixed_size - org_root.length)
   end
 
 end
+
+# EXCEPTIONS
+
+class LeadingZeroError < StandardError
+  def initialize msg = "Can't have a leading 0 in a component with multiple digits"
+    super
+  end
+end
+
+class OddByteError < StandardError
+  def initialize msg = "Can't have an odd last byte in a component"
+    super
+  end
+end
+
+class OversizedUIDError < StandardError
+  def initialize msg = "UID musn't be more than 64 characters"
+    super
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Dicom_UID
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Repain Paul