rtp-connect 1.0 → 1.1

data/lib/rtp-connect/record.rb

@@ -5,6 +5,12 @@ module RTP
     attr_reader :keyword
     attr_reader :crc
 
+    # Setting the keyword attribute.
+    #
+    def crc=(value)
+      @crc = value.to_s
+    end
+
     # Encodes a string from the contents of this instance.
     # This produces the full line, including a computed CRC checksum.
     #
@@ -25,11 +31,10 @@ module RTP
       end
     end
 
-    # Setting the keyword attribute.
+    # Returns self.
     #
-    def crc=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @crc = value
+    def to_record
+      self
     end
 
   end

data/lib/rtp-connect/ruby_extensions.rb

@@ -37,7 +37,7 @@ class String
   # and the resulting quote-less value strings are returned in an array.
   #
   def values
-    original = self.split(',')
+    original = CSV.parse(self).first
     processed = Array.new
     original.collect {|element| processed << element.gsub('"', '')}
     return processed

data/lib/rtp-connect/site_setup.rb

@@ -34,10 +34,8 @@ module RTP
     # * <tt>parent</tt> -- A Record which is used to determine the proper parent of this instance.
     #
     def self.load(string, parent)
-      raise ArgumentError, "Invalid argument 'string'. Expected String, got #{string.class}." unless string.is_a?(String)
-      raise ArgumentError, "Invalid argument 'parent'. Expected RTP::Prescription, got #{parent.class}." unless parent.is_a?(RTP::Prescription)
       # Get the quote-less values:
-      values = string.values
+      values = string.to_s.values
       raise ArgumentError, "Invalid argument 'string': Expected exactly 16 elements, got #{values.length}." unless values.length == 16
       s = self.new(parent)
       # Assign the values to attributes:
@@ -67,19 +65,34 @@ module RTP
     # * <tt>parent</tt> -- A Record which is used to determine the proper parent of this instance.
     #
     def initialize(parent)
-      raise ArgumentError, "Invalid argument 'parent'. Expected RTP::Prescription, got #{parent.class}." unless parent.is_a?(RTP::Prescription)
-      # Parent relation:
-      @parent = get_parent(parent, Prescription)
+      # Parent relation (always expecting a Prescription here):
+      @parent = get_parent(parent.to_prescription, Prescription)
       @parent.add_site_setup(self)
       @keyword = 'SITE_SETUP_DEF'
     end
 
+    # Returns true if the argument is an instance with attributes equal to self.
+    #
+    def ==(other)
+      if other.respond_to?(:to_site_setup)
+        other.send(:state) == state
+      end
+    end
+
+    alias_method :eql?, :==
+
     # Returns an empty array, as these instances are child-less by definition.
     #
     def children
       return Array.new
     end
 
+    # Generates a Fixnum hash value for this instance.
+    #
+    def hash
+      state.hash
+    end
+
     # Returns the values of this instance in an array.
     # The values does not include the CRC.
     #
@@ -106,122 +119,124 @@ module RTP
     # Writes the SiteSetup object + any hiearchy of child objects,
     # to a properly formatted RTPConnect ascii string.
     #
-    def to_str
+    def to_s
       str = encode
       if children
         children.each do |child|
-          str += child.to_str
+          str += child.to_s
         end
       end
       return str
     end
 
+    alias :to_str :to_s
+
+    # Returns self.
+    #
+    def to_site_setup
+      self
+    end
+
     # Sets the keyword attribute.
     #
     def keyword=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      raise ArgumentError, "Invalid keyword. Expected 'SITE_SETUP_DEF', got #{value}." unless value.upcase == "SITE_SETUP_DEF"
+      value = value.to_s.upcase
+      raise ArgumentError, "Invalid keyword. Expected 'SITE_SETUP_DEF', got #{value}." unless value == "SITE_SETUP_DEF"
       @keyword = value
     end
 
     # Sets the rx_site_name attribute.
     #
     def rx_site_name=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @rx_site_name = value
+      @rx_site_name = value && value.to_s
     end
 
     # Sets the patient_orientation attribute.
     #
     def patient_orientation=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @patient_orientation = value
+      @patient_orientation = value && value.to_s
     end
 
     # Sets the treatment_machine attribute.
     #
     def treatment_machine=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @treatment_machine = value
+      @treatment_machine = value && value.to_s
     end
 
     # Sets the tolerance_table attribute.
     #
     def tolerance_table=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @tolerance_table = value
+      @tolerance_table = value && value.to_s
     end
 
     # Sets the iso_pos_x attribute.
     #
     def iso_pos_x=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @iso_pos_x = value
+      @iso_pos_x = value && value.to_s
     end
 
     # Sets the iso_pos_y attribute.
     #
     def iso_pos_y=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @iso_pos_y = value
+      @iso_pos_y = value && value.to_s
     end
 
     # Sets the iso_pos_z attribute.
     #
     def iso_pos_z=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @iso_pos_z = value
+      @iso_pos_z = value && value.to_s
     end
 
     # Sets the structure_set_uid attribute.
     #
     def structure_set_uid=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @structure_set_uid = value
+      @structure_set_uid = value && value.to_s
     end
 
     # Sets the frame_of_ref_uid attribute.
     #
     def frame_of_ref_uid=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @frame_of_ref_uid = value
+      @frame_of_ref_uid = value && value.to_s
     end
 
     # Sets the couch_vertical attribute.
     #
     def couch_vertical=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @couch_vertical = value
+      @couch_vertical = value && value.to_s
     end
 
     # Sets the couch_lateral attribute.
     #
     def couch_lateral=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @couch_lateral = value
+      @couch_lateral = value && value.to_s
     end
 
     # Sets the couch_longitudinal attribute.
     #
     def couch_longitudinal=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @couch_longitudinal = value
+      @couch_longitudinal = value && value.to_s
     end
 
     # Sets the couch_angle attribute.
     #
     def couch_angle=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @couch_angle = value
+      @couch_angle = value && value.to_s
     end
 
     # Sets the couch_pedestal attribute.
     #
     def couch_pedestal=(value)
-      raise ArgumentError, "Invalid argument 'value'. Expected String, got #{value.class}." unless value.is_a?(String)
-      @couch_pedestal = value
+      @couch_pedestal = value && value.to_s
     end
 
+
+    private
+
+
+    # Returns the attributes of this instance in an array (for comparison purposes).
+    #
+    alias_method :state, :values
+
   end
 
 end

data/lib/rtp-connect/version.rb

@@ -1,6 +1,6 @@
 module RTP
 
   # The RTPConnect library version string.
-  VERSION = "1.0"
+  VERSION = "1.1"
 
 end

metadata

@@ -2,7 +2,7 @@
 name: rtp-connect
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: "1.0"
+  version: "1.1"
 platform: ruby
 authors: 
 - Christoffer Lervag
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-30 00:00:00 Z
+date: 2012-04-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bundler
@@ -42,7 +42,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.7.0
+        version: 2.9.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -53,7 +53,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.10.0
+        version: 0.10.5
   type: :development
   version_requirements: *id004
 description: RTPConnect is a file format used in radiotherapy for export & import of treatment planning data.