Dicom_UID 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5e97f4395a5d889ad19cadea15ef9a2f67da63e5964fffaef298e07bd7ca2a83
-  data.tar.gz: 4f21101d69cbbb846aa9a7ae1ab8e10cee598f7aecc7e34d03879f2d699d28fc
+  metadata.gz: adc24bf89d5304fe5b569c6265b828b2942eaa8e60c5d5e1a560ff58534828c9
+  data.tar.gz: 640b2f0d0f42a2f4a4419790c609c640dafc6e40cab158686ed3fe944ee3eaae
 SHA512:
-  metadata.gz: 5976568e36b27869d5d2caf36bd41b0356695021c264d29fc84c2f0071f48868f396737015900bfaf27bbf89d4a7e5ab4bdea36d415af380170c72fe41d1f777
-  data.tar.gz: d375cac73d04c5d1820b5c035ad9742d31954d06ff25577eed934d6a7b09b76a62cfff79f4a25a010ed2ce61f5671f2c4a88d0de81694300ac0facafd990d9f7
+  metadata.gz: c010e4bcea0c9d193732fccbe3770605f72aa34611bd0b5586ffc5cc2b846b6c8998853d67bcece7e8ac1f0e9c693d0ca94a7fa3f0109e93c39f03e212be1b56
+  data.tar.gz: fce7c3a9ffc3d6dd3d525307f6466eae2ae3c07ac50b6137fb966060ecca2613a26a8ccc9cd0a70eeafdfc08265d8df3c970eee446679dca388fc1227c4214f0

data/lib/dicom_uid.rb

@@ -4,24 +4,38 @@
 # The UID looks like the following <org>.<suffix>
 # UID is composed of two main components, org and suffix. Components are separated by a dot and are only composed of decimals.
 # The UID must not be more than 64 characters, dots included.
-module DicomUID
+module DicomUID#:nodoc:
 
+  # Maximum size of an UID
+  MAXIMUM_SIZE = 64
 
-  # Generates random component with random, defined, maximum length
-  def self.random_component length, odd_byte_boundary
+
+  # Generates random component with defined, maximum length
+  # The maximum length is 62. Why ? Because an UID has at least an org_root
+  # and a suffix, and they are separated by a dot, which makes
+  # 1 character minimum and 62 characters maximum
+  def self.random_component length = 62, odd_byte_boundary = true
+
+    # exceptions
+    raise TypeError unless length.is_a? Integer and odd_byte_boundary == !!odd_byte_boundary
+    raise RangeError, "Length of a component cannot be negative or null" if length <= 0
+    raise OversizedUIDError if length > 62
 
     # randing length of number
-    length_component = length - 1
-    loop do
+    length_component = 0
+    while (length_component == length - 1) or length_component == 0
       srand
-      length_component = rand(0..length)
-      break if length_component != length - 1 and length_component != 0
+      length_component = rand 0..length
     end
 
     # randing the component
-    component = (rand ('9' * length_component).to_i).to_s
+    component = '9' * (length - 1)
+    while component.length == length - 1
+      component = (rand ('9' * length_component).to_i).to_s
+    end
 
-    if odd_byte_boundary and component[-1].to_i % 2 == 1# if odd number
+
+    if odd_byte_boundary and !odd_byte_rule component# if odd number
       component << 'O'
       component = component[1..-1]# removing first int
     end
@@ -30,31 +44,26 @@ module DicomUID
   end
 
 
-  # Generates recursively a random dicom uid
-  def self.rand_duid uid, remain, obb
-    comp = self.random_component remain, obb
-    remain -= comp.length
-    uid << comp
-
-    return uid if remain <= 0
-
-    uid << '.'
-    self.rand_duid uid, remain - 1, obb
-  end
 
 
   # set default values, with org_root if needed
   # the size of the UID is randomized
+  # fixed_size is the size ogf the whole UID, with the org taken into account
   def self.random_dicom_uid org_root, fixed_size, odd_byte_boundary = true
 
+    raise TypeError, 'Org root must be a string or an Integer' unless org_root.is_a? String or org_root.is_a? Integer
+    org_root = org_root.to_s if org_root.is_a? Integer
+    raise TypeError unless fixed_size.is_a? Integer and odd_byte_boundary == !!odd_byte_boundary
+
     # building the org root
-    org_root = self.random_component(64, odd_byte_boundary) if org_root.empty?# UID needs at least an org root
+    org_root = self.random_component(62, odd_byte_boundary) if org_root.empty?# 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 and odd_byte_boundary
-    org_root << '.' if org_root[-1] != '.'
+    raise OddByteError if !odd_byte_rule(org_root) and odd_byte_boundary
 
-    srand
-    fixed_size ||= rand 64
+    # if the fixed size doesn't exist, a random one is created, but
+    # it must be generated so that the UID musn't be above 64 chars
+    fixed_size ||= rand(0..(64 - org_root.length - 1))
+    fixed_size -= 1 if add_missing_dot org_root
 
     raise OversizedUIDError if fixed_size > 64
     raise RangeError("Size of UID can't be negative") if fixed_size < 0
@@ -65,14 +74,11 @@ module DicomUID
 
 
 
-
-
-
   def self.random_uids org_root, fixed_size, array_size, odd_byte_boundary = true
     uids = Array.new
 
     array_size.times do
-      uids << random_dicom_uid org_root, fixed_size, odd_byte_boundary
+      uids << (self.random_dicom_uid org_root, fixed_size, odd_byte_boundary)
     end
 
     uids
@@ -80,9 +86,50 @@ module DicomUID
 
 
 
+  private
 
+  # Generates recursively a random dicom uid
+  def self.rand_duid uid, remain, obb = true
+
+    # Exceptions
+    raise OversizedUIDError if uid.length > 64 or (uid.length + remain > 64)
+    raise RangeError, "Remaining characters can't be negative or null" if remain <= 0
+
+    comp = self.random_component remain, obb
+    remain -= comp.length
+    uid << comp
+
+    return uid if remain <= 0
+
+    uid << '.'
+    self.rand_duid uid, remain - 1, obb
+  end
+
+
+
+
+
+
+end
+
+
+def add_missing_dot comp
+  raise TypeError unless comp.is_a? String
+  if comp[-1] != '.'
+    comp << '.'
+    return true
+  end
+  false
 end
 
+
+def odd_byte_rule comp
+  return comp[-1].to_i % 2 == 0 || (comp[-2].to_i % 2 == 1 && comp[-1].to_i == 0) if comp.length != 1
+  comp[-1].to_i % 2 == 0
+end
+
+
+
 # EXCEPTIONS
 
 class LeadingZeroError < StandardError

metadata

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