dicom 0.9.1 → 0.9.2

data/lib/dicom/parent.rb

@@ -20,7 +20,7 @@ module DICOM
     #
     # === Parameters
     #
-    # * <tt>tag</tt> -- A tag string which identifies the data element to be returned (Exception: In the case where an Item is wanted, an index (Fixnum) is used instead).
+    # * <tt>tag_or_index</tt> -- A tag string which identifies the data element to be returned (Exception: In the case where an Item is wanted, an index (Fixnum) is used instead).
     #
     # === Examples
     #
@@ -29,8 +29,9 @@ module DICOM
     #   # Extract the first Item from a Sequence:
     #   first_item = obj["3006,0020"][1]
     #
-    def [](tag)
-      return @tags[tag]
+    def [](tag_or_index)
+      formatted = tag_or_index.is_a?(String) ? tag_or_index.upcase : tag_or_index
+      return @tags[formatted]
     end
 
     # Adds a Element or Sequence instance to self (where self can be either a DObject or an Item).
@@ -282,7 +283,7 @@ module DICOM
     #   process_name(obj["0010,0010"]) if obj.exists?("0010,0010")
     #
     def exists?(tag)
-      if @tags[tag]
+      if self[tag]
         return true
       else
         return false
@@ -300,7 +301,7 @@ module DICOM
       raise ArgumentError, "Expected String, got #{group_string.class}." unless group_string.is_a?(String)
       found = Array.new
       children.each do |child|
-        found << child if child.tag.group == group_string
+        found << child if child.tag.group == group_string.upcase
       end
       return found
     end
@@ -597,7 +598,7 @@ module DICOM
         raise ArgumentError, "Expected String or Integer, got #{tag.class}."
       end
       # We need to delete the specified child element's parent reference in addition to removing it from the tag Hash.
-      element = @tags[tag]
+      element = self[tag]
       if element
         element.parent = nil unless options[:no_follow]
         @tags.delete(tag)
@@ -762,10 +763,10 @@ module DICOM
         raise ArgumentError, "Expected String or Integer, got #{tag.class}."
       end
       if exists?(tag)
-        if @tags[tag].is_parent?
+        if self[tag].is_parent?
           raise ArgumentError, "Illegal parameter '#{tag}'. Parent elements, like the referenced '#{@tags[tag].class}', have no value. Only Element tags are valid."
         else
-          return @tags[tag].value
+          return self[tag].value
         end
       else
         return nil

data/lib/dicom/sequence.rb

@@ -38,7 +38,7 @@ module DICOM
       # Set common parent variables:
       initialize_parent
       # Set instance variables:
-      @tag = tag
+      @tag = tag.upcase
       @value = nil
       @bin = nil
       # We may beed to retrieve name and vr from the library:

data/lib/dicom/version.rb

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

metadata

@@ -2,7 +2,7 @@
 name: dicom
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors: 
 - Christoffer Lervag
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-27 00:00:00 Z
+date: 2011-10-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 0.6.0.0
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.12.0
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
@@ -105,6 +105,7 @@ files:
 - lib/dicom/image_processor_r_magick.rb
 - lib/dicom/item.rb
 - lib/dicom/link.rb
+- lib/dicom/logging.rb
 - lib/dicom/parent.rb
 - lib/dicom/ruby_extensions.rb
 - lib/dicom/sequence.rb