Dicom_UID 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 77add1d490996873947cbb9b63cb9ac6731b9107362da19707bb6c6918d0f65d
-  data.tar.gz: aa93e16d1ea8374321ccdb4b0f3b772d768af63cd80c0ac8a39ac04c7a583d0a
+  metadata.gz: 48794268290e7c2a88d4c2be888492ae8b32b62ed73500ed51a0653ae9b0cc60
+  data.tar.gz: 7eb0fc128363463b48bd4f799c2a3a9487ad9857b748667a10982d792e48e8fe
 SHA512:
-  metadata.gz: 2d2f8ff395c4867c134176b99a4970a740769a1e802e291366d98a819d28ef59300e3be05947631fc355b016e835c2de08d857402444fa4f8095517eb90a345e
-  data.tar.gz: 23eab413d47fd50ad28a8bc7768f3c1bc8b3163fb69b4a6e93e3c99dffeccab55e3a3ebc3517a7166ab483fb37fe35031ba00a5e7a76e1772f8402f85418bb38
+  metadata.gz: 8e63b07e2e8274fca43ee4b4587952c194f3690cdc0435008d7f2ea23f44036dd742acb3b4f41e73a0b95b9dbfc139d93289181beea8112db3f35e5bcc6fb0a8
+  data.tar.gz: 769293cc95e8789e09d725465c3e531940a3c1ef6cc969b621816bc92ac236528487e9eeff2b6ef4758986b1d337a296b834ba88a963bc3fb8804b7887388c38

data/lib/dicom_uid.rb

@@ -5,20 +5,33 @@
 # <org>.<suffix>
 class DicomUID
 
+  attr_accessor :uid, :name
+
+  def initialize name
+    @uid = random_dicom_uid '', nil
+    @name = name
+  end
+
+  def to_s
+    'UID : ' << @uid << ' NAME : ' << @name
+  end
+
 
   # Generates random component with random, defined, length
-  def self.random_component length = 64
+  def random_component length = 64, odd_byte_boundary
+
     # randing length of number
     length_component = length - 1
     loop do
-        srand
-        length_component = rand(0..length)
-        break if length_component != length - 1 and length_component != 0
+      srand
+      length_component = rand(0..length)
+      break if length_component != length - 1 and length_component != 0
     end
 
     # randing the component
     component = (rand ('9' * length_component).to_i).to_s
-    if component[-1].to_i % 2 == 1# if odd number
+
+    if odd_byte_boundary and component[-1].to_i % 2 == 1# if odd number
       component << 'O'
       component = component[1..-1]# removing first int
     end
@@ -28,7 +41,7 @@ class DicomUID
 
 
   # Generate recursively a random dicom uid
-  def self.rand_duid uid = '', remain
+  def rand_duid uid = '', remain
     comp = self.random_component remain
     remain -= comp.length
     uid << comp
@@ -42,16 +55,22 @@ class DicomUID
 
   # set default values, with org_root if needed
   # the size of the UID is randomized
-  def self.random_dicom_uid org_root, fixed_size
+  def random_dicom_uid org_root, fixed_size, odd_byte_boundary = true
+
     # 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
+    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] != '.'
+
     srand
     fixed_size ||= rand 64
+
+    raise OversizedUIDError if fixed_size > 64
+    raise RangeError("Size of UID can't be negative") if fixed_size < 0
+
     # building the suffix
-    return self.rand_duid org_root, (fixed_size - org_root.length)
+    self.rand_duid org_root, (fixed_size - org_root.length), odd_byte_boundary
   end
 
 end
@@ -74,4 +93,4 @@ class OversizedUIDError < StandardError
   def initialize msg = "UID musn't be more than 64 characters"
     super
   end
-end
+end

metadata

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