dicom 0.9.2 → 0.9.3

data/lib/dicom/ruby_extensions.rb

@@ -96,8 +96,7 @@ class String
   # Returns true if it is, false if not.
   #
   def private?
-    #return ((self.upcase =~ /\A\h{3}[1,3,5,7,9,B,D,F],\h{4}\z/) == nil ? false : true) # (incompatible with ruby 1.8)
-    return ((self.upcase =~ /\A[a-fA-F\d]{3}[1,3,5,7,9,B,D,F],[a-fA-F\d]{4}\z/) == nil ? false : true)
+    return ((self.upcase =~ /\A\h{3}[1,3,5,7,9,B,D,F],\h{4}\z/) == nil ? false : true)
   end
 
   # Checks if the string is a valid tag (as defined by Ruby DICOM: "GGGG,EEEE").
@@ -105,8 +104,7 @@ class String
   #
   def tag?
     # Test that the string is composed of exactly 4 HEX characters, followed by a comma, then 4 more HEX characters:
-    #return ((self.upcase =~ /\A\h{4},\h{4}\z/) == nil ? false : true) # (It turns out the hex reference '\h' isnt compatible with ruby 1.8)
-    return ((self.upcase =~ /\A[a-fA-F\d]{4},[a-fA-F\d]{4}\z/) == nil ? false : true)
+    return ((self.upcase =~ /\A\h{4},\h{4}\z/) == nil ? false : true)
   end
 
   # Redefines the old unpack method, adding the ability to decode signed integers in big endian.
@@ -154,6 +152,10 @@ class Array
   # * <tt>string</tt> -- A template string which decides the encoding scheme to use.
   #
   def pack(string)
+    # FIXME: At some time in the future, when Ruby 1.9.3 can be set as required ruby version,
+    # this custom pack (as well as unpack) method can be discarded, and the desired endian
+    # encodings can probably be achieved with the new template strings introduced in 1.9.3.
+    #
     # Check for some custom pack strings that we've invented:
     case string
       when "k*" # SS

data/lib/dicom/sequence.rb

@@ -29,9 +29,9 @@ module DICOM
     # === Examples
     #
     #   # Create a new Sequence and connect it to a DObject instance:
-    #   structure_set_roi = Sequence.new("3006,0020", :parent => obj)
+    #   structure_set_roi = Sequence.new("3006,0020", :parent => dcm)
     #   # Create an "Encapsulated Pixel Data" Sequence:
-    #   encapsulated_pixel_data = Sequence.new("7FE0,0010", :name => "Encapsulated Pixel Data", :parent => obj, :vr => "OW")
+    #   encapsulated_pixel_data = Sequence.new("7FE0,0010", :name => "Encapsulated Pixel Data", :parent => dcm, :vr => "OW")
     #
     def initialize(tag, options={})
       raise ArgumentError, "The supplied tag (#{tag}) is not valid. The tag must be a string of the form 'GGGG,EEEE'." unless tag.is_a?(String) && tag.tag?
@@ -57,5 +57,37 @@ module DICOM
       end
     end
 
+    # Returns true if the argument is an instance with attributes equal to self.
+    #
+    def ==(other)
+      if other.respond_to?(:to_sequence)
+        other.send(:state) == state
+      end
+    end
+
+    alias_method :eql?, :==
+
+    # Generates a Fixnum hash value for this instance.
+    #
+    def hash
+      state.hash
+    end
+
+    # Returns self.
+    #
+    def to_sequence
+      self
+    end
+
+
+    private
+
+
+    # Returns the attributes of this instance in an array (for comparison purposes).
+    #
+    def state
+      [@tag, @vr, @tags]
+    end
+
   end
 end

data/lib/dicom/stream.rb

@@ -80,7 +80,14 @@ module DICOM
         value = nil
       else
         if type == "AT"
-          value = decode_tag
+          # We need to guard ourselves against the case where a string contains an invalid 'AT' value:
+          if length == 4
+            value = decode_tag
+          else
+            # Invalid. Just return nil.
+            skip(length)
+            value = nil
+          end
         else
           # Decode the binary string and return value:
           value = @string.slice(@index, length).unpack(vr_to_str(type))
@@ -233,7 +240,7 @@ module DICOM
         # Encode:
         bin = value.pack(type)
         # Add an empty byte if the resulting binary has an odd length:
-        bin = bin + @pad_byte[vr] if bin.length[0] == 1
+        bin = bin + @pad_byte[vr] if bin.length.odd?
       end
       return bin
     end

data/lib/dicom/variables.rb

@@ -17,6 +17,25 @@ module DICOM
     # Module methods:
     #++
 
+    # Generates a random (unique) UID string.
+    # The UID is composed of a DICOM root UID, a type prefix,
+    # a datetime part and a random number part.
+    # Returns the UID string.
+    #
+    # === Parameters
+    #
+    # * <tt>root</tt> -- String. The DICOM root UID to be used for generating the UID string, e.g. '1.2.840.999'.
+    # * <tt>prefix</tt> -- String. An integer string which is placed between the dicom root and the time/random part of the UID.
+    #
+    def generate_uid(root=UID, prefix=1)
+      # NB! For UIDs, leading zeroes immediately after a dot is not allowed.
+      date = Time.now.strftime("%Y%m%d").to_i.to_s
+      time = Time.now.strftime("%H%M%S").to_i.to_s
+      random = rand(99999) + 1 # (Minimum 1, max. 99999)
+      uid = [root, prefix, date, time, random].join('.')
+      return uid
+    end
+
     # Use tags as key. Example: "0010,0010"
     #
     def key_use_tags

data/lib/dicom/version.rb

@@ -1,6 +1,6 @@
 module DICOM
 
   # The ruby-dicom version string.
-  VERSION = "0.9.2"
+  VERSION = "0.9.3"
 
 end

metadata

@@ -2,7 +2,7 @@
 name: dicom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - Christoffer Lervag
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-09 00:00:00 Z
+date: 2012-05-06 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -24,60 +24,71 @@ dependencies:
   type: :development
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: rake
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.5.0
+        version: 0.9.2.2
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rspec
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.12
+        version: 2.9.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: narray
+  name: mocha
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.0.0
+        version: 0.10.5
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rmagick
+  name: narray
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.12.0
+        version: 0.6.0.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: mini_magick
+  name: rmagick
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 3.2.1
+        version: 2.12.0
   type: :development
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: mini_magick
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 3.2.1
+  type: :development
+  version_requirements: *id007
 description: DICOM is a standard widely used throughout the world to store and transfer medical image data. This library enables efficient and powerful handling of DICOM in Ruby, to the benefit of any student or professional who would like to use their favorite language to process DICOM files and communicate across the network.
 email: chris.lervag@gmail.com
 executables: []
@@ -88,6 +99,7 @@ extra_rdoc_files: []
 
 files: 
 - lib/dicom/anonymizer.rb
+- lib/dicom/audit_trail.rb
 - lib/dicom/constants.rb
 - lib/dicom/d_client.rb
 - lib/dicom/d_library.rb
@@ -95,6 +107,7 @@ files:
 - lib/dicom/d_read.rb
 - lib/dicom/d_server.rb
 - lib/dicom/d_write.rb
+- lib/dicom/deprecated.rb
 - lib/dicom/dictionary.rb
 - lib/dicom/element.rb
 - lib/dicom/elemental.rb
@@ -117,8 +130,8 @@ files:
 - COPYING
 - README.rdoc
 homepage: http://dicom.rubyforge.org/
-licenses: []
-
+licenses: 
+- GPLv3
 post_install_message: 
 rdoc_options: []
 
@@ -129,17 +142,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.8.6
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      version: 1.8.6
 requirements: []
 
 rubyforge_project: dicom
-rubygems_version: 1.8.3
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Library for handling DICOM files and DICOM network communication.