caruby-core 1.5.4 → 1.5.5

data/History.md

@@ -1,7 +1,11 @@
 This history lists major release themes. See the GitHub Commits (https://github.com/caruby/core)
 for change details.
 
-1.5.4 / 2011-07-19
+1.5.4 / 2011-09-22
+------------------
+* Support mixed-case custom DE package name.
+
+1.5.4 / 2011-09-22
 ------------------
 * Add migration value filter option.
 

data/lib/caruby/database/reader.rb

@@ -463,7 +463,7 @@ module CaRuby
         obj.class.attribute_metadata(attribute).collection? ? result : result.first
       end
 
-      # Returns a copy of obj containing only those key attributes used in a find operation.
+      # @return [{Symbol => Object}, nil] the find operation key attributes, or nil if there is no complete key
       #
       # @quirk caCORE caCORE search fetches on all non-nil attributes, except occasionally the identifier
       #   (cf. https://cabig-kc.nci.nih.gov/Bugzilla/show_bug.cgi?id=79).
@@ -475,28 +475,32 @@ module CaRuby
         key_value_hash(obj, obj.class.alternate_key_attributes)
       end
 
-      # Returns the attribute => value hash suitable for a finder template if obj has searchable values
-      # for all of the given key attributes, nil otherwise.
+      # @return [{Symbol => Object}, nil] the attribute => value hash suitable for a finder template
+      #   if obj has searchable values for all of the given key attributes, nil otherwise
       def key_value_hash(obj, attributes)
         # the key must be non-trivial
         return if attributes.nil_or_empty?
         # the attribute => value hash
-        attributes.to_compact_hash do |attr|
-          value = obj.send(attr)
-          # validate that no key attribute is missing and each reference exists
-          if value.nil_or_empty? then
-            logger.debug { "Can't fetch #{obj.qp} based on #{attributes.qp} since #{attr} does not have a value." }
-            return
-          elsif obj.class.domain_attribute?(attr) then
-            unless exists?(value) then
-              logger.debug { "Can't fetch #{obj.qp} based on #{attributes.qp} since #{attr} does not exist in the database: #{value}." }
-              return
-            end
+        attributes.to_compact_hash { |attr| finder_parameter(obj, attr) or return }
+      end
+      
+      # @return a non-empty, existing find parameter for the given attribute
+      def finder_parameter(obj, attribute)
+        value = obj.send(attribute)
+        # validate that the key attribute is non-nil and each reference exists
+        if value.nil_or_empty? then
+          logger.debug { "Can't fetch #{obj.qp} based on key with missing attribute #{attribute}." }
+          nil
+        elsif obj.class.domain_attribute?(attribute) then
+          if exists?(value) then
             # the finder value is a copy of the reference with just the identifier
             value.copy(:identifier)
           else
-            value
+            logger.debug { "Can't fetch #{obj.qp} based on key with domain attribute #{attribute}, since the referenced value does not exist in the database: #{value}." }
+            nil
           end
+        else
+          value
         end
       end
 

data/lib/caruby/database/saved_matcher.rb

@@ -20,7 +20,7 @@ module CaRuby
         end
         matches
       end
-
+      
       # Adds to the given target => source matches hash for the unmatched targets and sources
       # using {#match_minimal}.
       #

data/lib/caruby/domain.rb

@@ -97,92 +97,9 @@ module CaRuby
       # Loading the access properties on demand sets the classpath.
       access_properties
     end
-    
-#    # @param [Class, String] class_or_name the class to import into this module
-#    # @return [Class] the imported {Resource} class
-#    def resource_import(class_or_name)
-#      java_import(class_or_name)
-#      klass = Class.to_ruby(class_or_name)
-#      add_class(klass)
-#      klass
-#    end
-#
-#    # @param [String] the class name to check
-#    # @eturn [Class, nil] the domain class for the class name, or nil if none in this module
-#    def domain_type_with_name(name)
-#      pkg, base = Java.split_class_name(name)
-#      return unless pkg.nil? or pkg == @java_package
-#      begin
-#        type = const_get(base)
-#      rescue JavaImportError => e
-#        # no such domain type; not an error.
-#        # other exceptions indicate that there was a domain type but could not be loaded; these exceptions propagate up the call stack
-#        logger.debug { "#{$!}" }
-#        return
-#      end
-#      type if type < Resource
-#    end
 
     private
-    
-#    # Adds the given class to this domain module. The class is extended with {Metadata} methods.
-#    #
-#    # @param [Class] the {Resource} class to add
-#    def add_class(klass)
-#      # This domain module's known Resource classes.
-#      @rsc_classes ||= Set.new
-#      # Bail if already added.
-#      return if @rsc_classes.include?(klass)
-#
-#      logger.debug { "Adding #{klass.java_class.name} to #{qp}..." }
-#      # Add metadata to the class. This is done before adding the superclass and
-#      # referenced metadata, since they in turn might reference the current class
-#      # metadata.
-#      Metadata.extend_class(klass, self)
-#      # Add the class to the known Resource class set.
-#      @rsc_classes << klass
-#      
-#      # Make the superclass a Resource, if necessary.
-#      sc = klass.superclass
-#      unless @rsc_classes.include?(sc) then
-#        # the domain module includes the superclass on demand
-#        pkg, sym = Java.split_class_name(sc)
-#        if pkg == @java_package then
-#          # Load the superclass on demand; don't need to make this class a Resource,
-#          # but do need to import the class.
-#          const_get(sym)
-#        else
-#          # Superclass is not a member of the domain package; make this class a Resource.
-#          mod = @mixin
-#          klass.class_eval { include mod }
-#        end
-#      end
-#
-#      # Add referenced domain classes as necessary.
-#      klass.each_attribute_metadata do |attr_md|
-#        ref = attr_md.type
-#        next if @rsc_classes.include?(ref)
-#        pkg, sym = Java.split_class_name(ref)
-#        # This domain module adds a referenced Domain class on demand.
-#        if pkg == @java_package then
-#          puts "rm ac1 #{klass} #{attr_md} -> #{ref}..."
-#          logger.debug { "Loading #{klass.qp} #{attr_md} reference #{ref.qp}" }
-#          const_get(sym)
-#        end
-#      end
-#      
-#      # Invoke the callback.
-#      class_added(klass)
-#      logger.debug { "#{klass.java_class.name} added to #{qp}." }
-#      # print the class structure to the log
-#      logger.info(klass.pp_s)
-#    end
-#    
-#    # Callback invoked after the given domain class is added to this domain module.
-#    #
-#    # @param [Class] klass the class that was added
-#    def class_added(klass); end
-   
+       
     # Loads the application start-up properties in the given file path.
     #
     # @return (see #access_properties)
@@ -248,70 +165,6 @@ module CaRuby
         value
       end
     end
-#    
-#    # Imports the domain Java class with specified class name_or_sym.
-#    # This method enables the domain class extensions for storing and retrieving domain objects.
-#    # The class is added to this module.
-#    #
-#    # The optional block overrides the native Java property access wrappers.
-#    # For example:
-#    #   ClinicalTrials.java_import Java::edu.wustl.catissuecore.domain.Study do
-#    #     def study_code=(value)
-#    #       value = value.to_s if Integer === value
-#    #       setStudyCode(value)
-#    #     end
-#    #   end
-#    # imports the ClinicalTrials Study class as ClinicalTrials::Study and overrides the
-#    # +study_code+ setter method.
-#    #
-#    # Convenience aliases are added to the imported class, e.g. attribute +studyParticipantCollection+
-#    # is aliased as +study_participants+. Specifically, each attribute reader and writer is aliased with
-#    # the lower-case, underscore equivalent and a name ending in 'Collection' is changed to plural.
-#    # Pluralization is smart, e.g. +studyCollection+ is aliased to +studies+ rather than +studys+.
-#    #
-#    # The optional aliases argument consists of additional alias => standard attribute associations.
-#    # The optional owner_attr argument is a non-Java annotation owner attribute.
-#    #
-#    # @param [Symbol] symbol the class symbol
-#    # @param [String, nil] pkg the Java class package name, or nil for the default module package
-#    # @return [Class] the imported domain class
-#    def import_domain_class(symbol, pkg=nil)
-#      # import the Java class
-#      pkg ||= @java_package
-#      name = [pkg, symbol.to_s].join('.')
-#      logger.debug { "Detecting whether #{symbol} is a #{pkg} Java class..." }
-#      # Push each imported class onto a stack. When all referenced classes are imported,
-#      # each class on the stack is post-initialized and the class structure is printed to
-#      # the log.
-#      @import_stack ||= []
-#      @import_stack.push(symbol)
-#      begin
-#        resource_import(name)
-#      ensure
-#        @import_stack.pop
-#      end
-#      
-#      # the imported Java class is registered as a constant in this module
-#      klass = const_get(symbol)
-#      add_class(klass)
-#      
-#      # if we are back to top of the stack, then print the imported Resources
-#      if symbol == @import_stack.first then
-#        # a referenced class could be imported on demand in the course of printing a referencing class;
-#        # the referenced class is then pushed onto the stack. thus, the stack can grow during the
-#        # course of printing, but each imported class is consumed and printed in the end.
-#        until @import_stack.empty? do
-#          # the class constant
-#          sym = @import_stack.pop
-#          # the imported class
-#          kls = const_get(sym)
-#          # print the class structure to the log
-#          logger.info(kls.pp_s)
-#        end
-#      end
-#      
-#      klass
-#    end
 
     # The property/value matcher, e.g.:
     #   host: jacardi

data/lib/caruby/domain/attributes.rb

@@ -7,7 +7,6 @@ module CaRuby
   module Domain
     # Meta-data mix-in for attribute accessors.
     module Attributes
-  
       # @return [<Symbol>] this class's attributes
       attr_reader :attributes
       
@@ -37,7 +36,7 @@ module CaRuby
         attr_md
       end
   
-      # Returns the +[:identifier]+ primary key attribute array.
+      # @return [(Symbol)] the +[:identifier]+ primary key attribute singleton array
       def primary_key_attributes
         IDENTIFIER_ATTR_ARRAY
       end
@@ -45,13 +44,17 @@ module CaRuby
       # Returns this class's secondary key attribute array.
       # If this class's secondary key is not set, then the secondary key is the Metadata superclass
       # secondary key, if any.
+      #
+      # @return [<Symbol>] the secondary key attributes
       def secondary_key_attributes
         @scndy_key_attrs or superclass < Resource ? superclass.secondary_key_attributes : Array::EMPTY_ARRAY
       end
   
-       # Returns this class's alternate key attribute array.
-       # If this class's secondary key is not set, then the alternate key is the Metadata superclass
-       # alternate key, if any.
+      # Returns this class's alternate key attribute array.
+      # If this class's secondary key is not set, then the alternate key is the {Metadata} superclass
+      # alternate key, if any.
+      #
+      # @return [<Symbol>] the alternate key attributes
       def alternate_key_attributes
         @alt_key_attrs or superclass < Resource ? superclass.alternate_key_attributes : Array::EMPTY_ARRAY
       end
@@ -71,9 +74,10 @@ module CaRuby
         attr_md || (attribute_missing(attribute) && @local_attr_md_hash[attribute])
       end
   
-      # Returns the standard attribute symbol for the given name_or_alias.
-      #
-      # Raises NameError if the attribute is not found
+      # @param [Symbol, String] name_or_alias the attribute name or alias
+      # @return [Symbol] the standard attribute symbol for the given name or alias
+      # @raise [ArgumentError] if the attribute name or alias argument is missing
+      # @raise [NameError] if the attribute is not found
       def standard_attribute(name_or_alias)
         if name_or_alias.nil? then
           raise ArgumentError.new("#{qp} standard attribute call is missing the attribute name/alias parameter")
@@ -81,7 +85,7 @@ module CaRuby
         @alias_std_attr_map[name_or_alias.to_sym] or raise NameError.new("#{self} attribute not found: #{name_or_alias}")
       end
   
-      ## the built-in Metadata attribute filters ##
+      ## Metadata ATTRIBUTE FILTERS ##
   
       # @return [<Symbol>] the domain attributes which wrap a java property
       # @see Attribute#java_property?
@@ -228,7 +232,11 @@ module CaRuby
       def fetched_dependent_attributes
         @ftchd_dep_attrs ||= (fetched_domain_attributes & dependent_attributes).to_a
       end
-
+      
+      def nonowner_attributes
+        @nownr_atts ||= attribute_filter { |attr_md| not attr_md.owner? }
+      end
+      
       # @return [<Symbol>] the saved dependent attributes
       # @see Attribute#dependent?
       # @see Attribute#saved?
@@ -269,7 +277,7 @@ module CaRuby
       end
   
       # @return [<Symbol>] the domain attributes whose referents must exist before an instance of this
-      #   metadata's subject classcan be created
+      #   metadata's subject class can be created
       # @see Attribute#storable_prerequisite?
       def storable_prerequisite_attributes
         @stbl_prereq_dom_attrs ||= attribute_filter { |attr_md| attr_md.storable_prerequisite? }

data/lib/caruby/domain/dependency.rb

@@ -51,26 +51,6 @@ module CaRuby
         inv_type.add_owner(self, attribute, inverse)
       end
       
-      # Makes a new owner attribute. The attribute name is the lower-case demodulized
-      # owner class name. The owner class must reference this class via the given
-      # inverse dependent attribute.
-      #
-      # @param klass (see #detect_owner_attribute)
-      # @param [Symbol] the owner -> dependent inverse attribute 
-      # @return [Symbol] this class's new owner attribute
-      # @raise [ArgumentError] if the inverse is nil
-      def create_owner_attribute(klass, inverse)
-        if inverse.nil? then
-          raise ArgumentError.new("Cannot create a #{qp} owner attribute to #{klass} without a dependent attribute to this class.")
-        end
-        attr = klass.name.demodulize.underscore.to_sym
-        attr_accessor(attr)
-        attr_md = add_attribute(attr, klass)
-        attr_md.inverse = inverse
-        logger.debug { "Created #{qp} owner attribute #{attr} with inverse #{klass.qp}.#{inverse}." }
-        attr
-      end
-      
       # @return [Boolean] whether this class depends on an owner
       def dependent?
         not owners.empty?
@@ -98,6 +78,11 @@ module CaRuby
       def owner_attributes
         @oattrs ||= owner_attribute_metadata_enumerator.transform { |attr_md| attr_md.to_sym }
       end
+      
+      # @return [Boolean] whether this {Resource} class is dependent and reference its owners
+      def bidirectional_dependent?
+        dependent? and not owner_attributes.empty?
+      end
   
       # @return [<Class>] this class's dependent types
       def dependents

data/lib/caruby/domain/inverse.rb

@@ -5,7 +5,6 @@ module CaRuby
   module Domain
     # Meta-data mix-in to infer and set inverse attributes.
     module Inverse
-      
       # Returns the inverse of the given attribute. If the attribute has an #{Attribute#inverse_metadata},
       # then that attribute's inverse is returned. Otherwise, if the attribute is an #{Attribute#owner?},
       # then the target class dependent attribute which matches this type is returned, if it exists.

data/lib/caruby/domain/metadata.rb

@@ -5,6 +5,7 @@ require 'caruby/domain/introspection'
 require 'caruby/domain/inverse'
 require 'caruby/domain/dependency'
 require 'caruby/domain/attributes'
+require 'caruby/json/deserializer'
 
 module CaRuby
   module Domain
@@ -13,7 +14,7 @@ module CaRuby
     
     # Adds introspected metadata to a Class.
     module Metadata
-      include Introspection, Inverse, Dependency, Attributes
+      include Introspection, Inverse, Dependency, Attributes, JSON::Deserializer
       
       # @return [Module] the {Domain} module context
       attr_accessor :domain_module

data/lib/caruby/migration/migrator.rb

@@ -139,6 +139,9 @@ module CaRuby
       # make a CSV loader which only converts input fields corresponding to non-String attributes
       @loader = CsvIO.new(@input, &method(:convert))
       logger.debug { "Migration data input file #{@input} headers: #{@loader.headers.qp}" } 
+      
+      # add shim modifiers
+      load_shims(@shims)
 
       # create the class => path => default value hash
       @def_hash = @def_files ? load_defaults_files(@def_files) : {}
@@ -151,6 +154,7 @@ module CaRuby
       # create the path => class => header hash
       @header_map = create_header_map(fld_map)
       # add missing owner classes (copy the keys rather than using each_key since the hash is updated)
+      @owners = Set.new
       @cls_paths_hash.keys.each { |klass| add_owners(klass) }
       # order the creatable classes by dependency, owners first, to smooth the migration process
       @creatable_classes = @cls_paths_hash.keys.sort! { |klass, other| other.depends_on?(klass) ? -1 : (klass.depends_on?(other) ? 1 : 0) }
@@ -169,9 +173,6 @@ module CaRuby
       logger.info { "Migration creatable classes: #{@creatable_classes.qp}." }
       unless @def_hash.empty? then logger.info { "Migration defaults: #{@def_hash.qp}." } end
       
-      # add shim modifiers
-      load_shims(@shims)
-      
       # the class => attribute migration methods hash
       create_migration_method_hashes
       
@@ -208,10 +209,14 @@ module CaRuby
       end
     end
     
-    # Adds missing klass owner classes to the migration class path hash (with empty paths).
+    # Adds missing owner classes to the migration class path hash (with empty paths)
+    # for the  the given migration class.
+    #
+    # @param [Class] klass the migration class
     def add_owners(klass)
       owner = missing_owner_for(klass) || return
       logger.debug { "Migrator adding #{klass.qp} owner #{owner}" }
+      @owners << owner
       @cls_paths_hash[owner] = Array::EMPTY_ARRAY
       add_owners(owner)
     end
@@ -312,7 +317,7 @@ module CaRuby
             # call the migration method
             Proc.new { |obj, value, row| obj.send(mth, value, row) }
           end
-        else
+        elsif proc then
           # call the filter
           Proc.new { |obj, value, row| proc.call(value) }
         end
@@ -350,32 +355,64 @@ module CaRuby
       proc_hash
     end
     
+    # Builds a proc that filters the input value. The config filter mapping entry is one of the following:
+    #   * literal: literal
+    #   * regexp: literal
+    #   * regexp: template
+    #
+    # The regexp template can include match references (+$1+, +$2+, etc.) corresponding to the regexp captures.
+    # If the input value equals a literal, then the mapped literal is returned. Otherwise, if the input value
+    # matches a regexp, then the mapped transformation is returned after reference substitution. Otherwise,
+    # the input value is returned unchanged.
+    #
+    # For example, the config:
+    #   /(\d{1,2})\/x\/(\d{1,2})/: $1/1/$2
+    #   n/a: ~
+    # converts the input value as follows:
+    #   3/12/02 => 3/12/02 (no match)
+    #   5/x/04 => 5/1/04
+    #   n/a => nil 
+    #
     # @param [{Object => Object}] filter the config value mapping
     # @return [Proc] the filter migration block
+    # @raise [MigrationError] if the filter includes a regexp option other than +i+ (case-insensitive)
     def to_filter_proc(filter)
-      # Split the filter into a straight value => value hash and a regexp => value hash.
+      # Split the filter into a straight value => value hash and a pattern => value hash.
       ph, vh = filter.split { |k, v| k =~ REGEXP_PAT }
+      # The Regexp => value hash is built from the pattern => value hash.
       reh = {}
       ph.each do |k, v|
+        # The /pattern/opts string is parsed to the pattern and options.
         pat, opt = REGEXP_PAT.match(k).captures
+        # Convert the regexp i option character to a Regexp initializer parameter.
         reopt = if opt then
           case opt
             when 'i' then Regexp::IGNORECASE
             else raise MigrationError.new("Migration value filter regular expression #{k} qualifier not supported: expected 'i', found '#{opt}'")
           end
         end
+        # the Regexp object
         re = Regexp.new(pat, reopt)
-        reh[re] = v.gsub(/\$\d/, '%s') if String === v
+        # The regexp value can include match references ($1, $2, etc.). In that case, replace the $
+        # match reference with a %s print reference, since the filter formats the matching input value.
+        reh[re] = String === v ? v.gsub(/\$\d/, '%s') : v
       end
+      # The new proc matches preferentially on the literal value, then the first matching regexp.
+      # If no match on either a literal or a regexp, then the value is preserved.
       Proc.new do |value|
         if vh.has_key?(value) then
           vh[value]
         else
-          # the first regex which matches the value
+          # The first regex which matches the value.
           regexp = reh.detect_key { |re| value =~ re }
           # If there is a match, then apply the filter to the match data.
           # Otherwise, pass the value through unmodified.
-          regexp ? (reh[regexp] % $~.captures) : value
+          if regexp then
+            v = reh[regexp]
+            String === v ? v % $~.captures : v
+          else
+            value
+          end
         end
       end
     end
@@ -510,7 +547,18 @@ module CaRuby
           logger.debug { "Invalidated migrated #{obj} since it does not have a valid owner." }
         end
       end
-      valid
+      
+      # Go back through the valid objects in reverse dependency order to invalidate owners
+      # created only to hold a dependent which was subsequently invalidated.
+      valid.reject do |obj|
+        if @owners.include?(obj.class) and obj.dependents.all? { |dep| invalid.include?(dep) } then
+          # clear all references from the invalidated owner
+          obj.class.domain_attributes.each_metadata { |attr_md| obj.clear_attribute(attr_md.to_sym) }
+          invalid << obj
+          logger.debug { "Invalidated #{obj.qp} since it was created solely to hold subsequently invalidated dependents." }
+          true
+        end
+      end
     end
     
     # Returns whether the given domain object satisfies at least one of the following conditions:

data/lib/caruby/resource.rb

@@ -7,6 +7,7 @@ require 'caruby/util/collection'
 require 'caruby/domain'
 require 'caruby/domain/mixin'
 require 'caruby/domain/merge'
+require 'caruby/json/serializer'
 require 'caruby/domain/reference_visitor'
 require 'caruby/database/persistable'
 require 'caruby/domain/inversible'
@@ -19,7 +20,7 @@ module CaRuby
   # This module defines essential common domain methods that enable the jRuby-Java API bridge.
   # Classes which include Domain must implement the +metadata+ Domain::Metadata accessor method.
   module Resource
-    include Mergeable, Migratable, Persistable, Inversible
+    include Mergeable, Migratable, Persistable, Inversible, JSON::Serializer
     
     # @quirk JRuby Bug #5090 - JRuby 1.5 object_id is no longer a reserved method, and results
     #   in a String value rather than an Integer (cf. http://jira.codehaus.org/browse/JRUBY-5090).
@@ -581,6 +582,9 @@ module CaRuby
         logger.error("Validation of #{qp} unsuccessful - missing #{invalid.join(', ')}:\n#{dump}")
         raise ValidationError.new("Required attribute value missing for #{self}: #{invalid.join(', ')}")
       end
+      if self.class.bidirectional_dependent? and not owner then
+        raise ValidationError.new("Dependent #{self} does not reference an owner")
+      end
     end
     
     # Enumerates the dependents for setting defaults. Subclasses can override if the

data/lib/caruby/util/collection.rb

@@ -241,8 +241,8 @@ module Enumerable
   
   alias :wrap :transform
   
-  def join(other)
-    Joiner.new(self, other)
+  def join(sep = $,)
+    to_a.join(sep)
   end
   
   # Sorts this collection's members with a partial sort operator, i.e. the comparison returns -1, 0, 1 or nil.

data/lib/caruby/version.rb

@@ -1,3 +1,3 @@
 module CaRuby
-  VERSION = "1.5.4"
+  VERSION = "1.5.5"
 end

data/test/lib/caruby/import/mixed_case_test.rb

@@ -0,0 +1,14 @@
+# Add the Java jar file to the Java path.
+require 'test/fixtures/caruby/import/ext/bin/mixed_case.jar'
+
+require 'java'
+require "test/unit"
+
+# Verifies whether JRuby supports a mixed-case package. This can occur in caBIG applications, e.g.
+# the +caTissue+ PSBIN custom dynamic extensions. Work-around is to 
+class MixedCaseTest < Test::Unit::TestCase
+  def test_import
+    assert_raises(NameError, "Mixed-case package not resolved") { Java::mixed.Case.Example }
+    assert_nothing_raised("Mixed-case JRuby module not resolved") { Java::MixedCase::Example }
+  end
+end

data/test/lib/caruby/util/collection_test.rb

@@ -77,6 +77,11 @@ class CollectionTest < Test::Unit::TestCase
     assert_equal([1, 2, 3, 4, 5], base.to_a, 'Filter does not modify the base')
   end
 
+  def test_enum_join
+    assert_equal("1", [1].filter { true }.join, "Enumerable singleton join incorrect")
+    assert_equal("1,2", [1, 2].filter { true }.join(','), "Enumerable join incorrect")
+  end
+
   def test_array_filter_without_block
     assert_equal([1, 3], [1, nil, 3, false].filter.to_a, 'Filter incorrect')
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: caruby-core
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 1
   - 5
-  - 4
-  version: 1.5.4
+  - 5
+  version: 1.5.5
 platform: ruby
 authors: 
 - OHSU
@@ -61,7 +61,7 @@ dependencies:
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: uom
+  name: json
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,6 +74,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: uom
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id005
 description: "    caRuby is a JRuby facade for interaction with caBIG applications.\n"
 email: caruby.org@gmail.com
 executables: []
@@ -166,6 +180,7 @@ files:
 - test/lib/caruby/domain/inversible_test.rb
 - test/lib/caruby/domain/reference_visitor_test.rb
 - test/lib/caruby/import/java_test.rb
+- test/lib/caruby/import/mixed_case_test.rb
 - test/lib/caruby/migration/test_case.rb
 - test/lib/caruby/test_case.rb
 - test/lib/caruby/util/cache_test.rb