caruby-tissue 1.3.2 → 1.3.3

data/History.txt

@@ -18,3 +18,7 @@
 
 * Minor migration bug fixes
 
+=== 1.3.3 / 2011-02-26
+
+* JRuby 1.5 upgrade
+

data/lib/catissue/domain/collection_protocol.rb

@@ -1,4 +1,5 @@
 require 'date'
+require 'catissue/domain/hash_code'
 
 module CaTissue
   # import the Java class
@@ -6,7 +7,7 @@ module CaTissue
 
   # The CollectionProtocol domain class.
   class CollectionProtocol
-    include Resource
+    include Resource, HashCode
     
     # caTissue alert - Bug #64: Some domain collection properties not initialized.
     # Initialize consent_tiers if necessary. 
@@ -52,23 +53,6 @@ module CaTissue
       registrations.nil? ? [] : registrations.map { |reg| reg.participant }
     end
 
-    # Overrides the Java CollectionProtocol hashCode to make the hash insensitive to identifier assignment.
-    #
-    # @see #==
-    def hash
-      # caTissue alert - bad caTissue API hashCode leads to ugly cascading errors when using a CP in a Set
-      (object_id * 31) + 17
-    end
-
-    # Returns whether other is {#equal?} to CollectionProtocol.
-    #
-    # This method is a work-around for caTissue Bug #70: CollectionProtocol and non-CollectionProtocol are equal in caTissue 1.1.
-    def ==(other)
-      object_id == other.object_id
-    end
-
-    alias :eql? :==
-
     # Returns a new CollectionProtocolRegistration for the specified participant in this CollectionProtocol with
     # optional +protocol_participant_identifier+ ppi.
     def register(participant, ppi=nil)

data/lib/catissue/domain/collection_protocol_event.rb

@@ -1,4 +1,5 @@
 require 'caruby/util/collection'
+require 'catissue/domain/hash_code'
 
 module CaTissue
   # import the Java class
@@ -6,7 +7,7 @@ module CaTissue
 
   # The CollectionProtocolRegistration domain class.
   class CollectionProtocolEvent
-    include Resource
+    include Resource, HashCode
     
     # caTissue alert - Bug #64: Some domain collection properties not initialized.
     # Initialize specimen_collection_groups if necessary.
@@ -46,25 +47,6 @@ module CaTissue
       self.specimen_collection_groups ||= Java::JavaUtil::LinkedHashSet.new
     end
 
-    # Overrides the Java CollectionProtocolEvent hashCode to make the hash insensitive to identifier assignment.
-    def hash
-      # caTissue alert - caTissue determines the hashCode from the identifier. Consequently, a CollectionProtocolEvent
-      # added to a HashSet without an identifier can no longer find the CPE when it is assigned an identifier.
-      # This bug results in obscure delayed cascade errors. Work-around is to override the hash method in the
-      # Ruby CPE wrapper class.
-      (object_id * 31) + 17
-    end
-
-    # Returns whether other is a CollectionProtocolEvent with the same identifier as this CollectionProtocolEvent,
-    # or the same object_id if this CollectionProtocolEvent's identifier is nil.
-    #
-    # This method is a work-around for caTissue bug: CollectionProtocolEvent and non-CollectionProtocolEvent are equal in caTissue 1.1.
-    def ==(other)
-      object_id == other.object_id
-    end
-
-    alias :eql? :==
-
     # Removes associations to this registration
     def delete
       protocol.events.delete(self) if protocol

data/lib/catissue/domain/hash_code.rb

@@ -0,0 +1,28 @@
+module CaTissue
+  # This HashCode mix-in overrides the caTissue hashCode and equality test to work around caTissue bugs.
+  module HashCode
+    # caTissue alert - caTissue hashCode changes with identifier assignment.
+    # This leads to ugly cascading errors when used in a Set or Hash.
+    #
+    # @return [Integer] a unique hash code
+    # @see #==
+    def hash
+      # JRuby alert - JRuby 1.5 object_id can be a String, e.g. CollectionProtocol_null.
+      # Work-around to the work-around is to make a unique object id in this aberrant case.
+      @_hc ||= (Object.new.object_id * 31) + 17
+    end
+
+    # Returns whether other is of type same type as this object with the same hash as this object.
+    #
+    # caTissue alert - Bug #70: caTissue equal returns true for class mismatch.
+    #
+    # @param other the object to compare
+    # @return [Boolean] whether the objects are identical
+    # @see #hash
+    def ==(other)
+      equal?(other)
+    end
+
+    alias :eql? :equal?
+  end
+end

data/lib/catissue/domain/storage_type.rb

@@ -1,6 +1,7 @@
 require 'caruby/util/collection'
 require 'caruby/util/partial_order'
 require 'catissue/util/storage_type_holder'
+require 'catissue/domain/hash_code'
 
 module CaTissue
   # import the Java class
@@ -8,7 +9,7 @@ module CaTissue
 
   # The StorageType domain class.
   class StorageType
-    include StorageTypeHolder, PartialOrder, Resource
+    include StorageTypeHolder, PartialOrder, Resource, HashCode
 
     add_attribute_aliases(:default_temperature => :default_temprature_in_centigrade)
 
@@ -70,13 +71,5 @@ module CaTissue
       return 1 if holds_storage_types.detect { |child| child >= other }
       -1 if other > self
     end
-
-    # Overrides the Java StorageType hashCode to make the hash insensitive to identifier assignment.
-    #
-    # @see #==
-    def hash
-      # caTissue alert - bad caTissue API hashCode leads to ugly cascading errors when using a CP in a Set
-      (object_id * 31) + 17
-    end
   end
 end

data/lib/catissue/version.rb

@@ -1,6 +1,6 @@
 module CaTissue
   # The version of this caRuby Tissue release.
-  VERSION = "1.3.2"
+  VERSION = "1.3.3"
   
   # The supported caTissue release versions.
   CATISSUE_VERSIONS = "1.1.2"

metadata

@@ -2,7 +2,7 @@
 name: caruby-tissue
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.3.2
+  version: 1.3.3
 platform: ruby
 authors: 
   - OHSU
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-30 00:00:00 -08:00
+date: 2011-02-26 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -116,6 +116,7 @@ files:
   - lib/catissue/domain/embedded_event_parameters.rb
   - lib/catissue/domain/external_identifier.rb
   - lib/catissue/domain/frozen_event_parameters.rb
+  - lib/catissue/domain/hash_code.rb
   - lib/catissue/domain/institution.rb
   - lib/catissue/domain/new_specimen_array_order_item.rb
   - lib/catissue/domain/order_details.rb