caruby-core 1.4.6 → 1.4.7

data/History.txt

@@ -1,29 +1,33 @@
 === 1.4.1 / 2010-11-23
 
-* Initial public release
+* Initial public release.
 
 === 1.4.2 / 2010-11-30
 
-* Minor Migrator fixes
+* Minor Migrator fixes.
 
 === 1.4.3 / 2011-02-18
 
 * Refactor Persistifier
 
-* Add attribute filters
+* Add attribute filters.
 
 === 1.4.4 / 2011-02-25
 
-* Support default migration option
+* Support default migration option.
 
 * Merge nondomain collection value properly.
 
 === 1.4.5 / 2011-02-26
 
-* Fix default option
+* Fix default option.
 
 === 1.4.6 / 2011-02-26
 
-* Upgrade to JRuby 1.5
+* Upgrade to JRuby 1.5.
+
+=== 1.4.7 / 2011-03-04
+
+* Support annotation migration.
 
 

data/README.md

@@ -35,11 +35,6 @@ Usage
 
 See the project [Home](http://caruby.rubyforge.org) Page for usage examples. 
 
-Changelog
----------
-
-- See +History.txt+
-
 Copyright
 ---------
 

data/lib/caruby/database/fetched_matcher.rb

@@ -4,12 +4,14 @@ require 'caruby/util/collection'
 module CaRuby
   class Database
     # Proc that matches fetched sources to targets.
-    class FetchedMatcher < Proc
+    class FetchedMatcher
       # Initializes a new FetchedMatcher.
-      def initialize
-        super { |srcs, tgts| match_fetched(srcs, tgts) }
+      def match(srcs, tgts)
+        match_fetched(srcs, tgts)
       end
       
+      alias :call :match
+      
       private
 
       # Returns a target => source match hash for the given targets and sources using
@@ -27,6 +29,7 @@ module CaRuby
           attr_md = klass.attribute_metadata(attr)
           attr_md.domain? and not attr_md.owner?
         end
+        
         # fetch the non-owner secondary key domain attributes as necessary 
         unless attrs.empty? then
           sources.each do |src|
@@ -39,6 +42,7 @@ module CaRuby
             end
           end
         end
+        
         # match source => target based on the secondary key
         unmatched = Set === sources ? sources.dup : sources.to_set
         matches = {}
@@ -48,6 +52,7 @@ module CaRuby
           matches[src] = tgt
           unmatched.delete(src)
         end
+        
         matches
       end
     end

data/lib/caruby/database/lazy_loader.rb

@@ -93,7 +93,7 @@ module CaRuby
         return oldval if fetched.nil_or_empty?
         # merge the fetched into the attribute
         logger.debug { "Merging #{subject.qp} fetched #{attribute} value #{fetched.qp}#{' into ' + oldval.qp if oldval}..." }
-        matches = @matcher.call(fetched.to_enum, oldval.to_enum)
+        matches = @matcher.match(fetched.to_enum, oldval.to_enum)
         subject.merge_attribute(attribute, fetched, matches)
       end    
     end

data/lib/caruby/database/persistence_service.rb

@@ -23,8 +23,10 @@ module CaRuby
       @name = name
       ver_opt = opts[:version]
       @version = ver_opt.to_s.to_version if ver_opt
-      @host = opts[:host] || "localhost"
+      @host = opts[:host] || default_host
+      @port = opts[:port] || 8080
       @timer = Stopwatch.new
+      logger.debug { "Created persistence service #{name} at #{@host}:#{@port}." }
     end
 
     ## Database access methods ##
@@ -81,7 +83,7 @@ module CaRuby
 
     # @return [ApplicationServiceProvider] the CaCORE service provider wrapped by this PersistenceService
     def app_service
-      url = "http://#{@host}:8080/#{name}/http/remoteService"
+      url = "http://#{@host}:#{@port}/#{@name}/http/remoteService"
       logger.debug { "Connecting to service provider at #{url}..." }
       ApplicationServiceProvider.remote_instance(url)
     end
@@ -109,7 +111,17 @@ module CaRuby
     def dispatch
       time { yield app_service }
     end
-
+    
+    # @return [String] the default host name
+    def default_host
+#      # TODO - extract from the service config file
+#      xml = JRuby.runtime.jruby_class_loader.getResourceAsStream('remoteService.xml')
+#      if xml then
+#        # parse xml file
+#      end
+      'localhost'
+    end
+    
     def query_hql(hql)
       logger.debug { "Building HQLCriteria..." }
       criteria = HQLCriteria.new(hql)

data/lib/caruby/database/saved_matcher.rb

@@ -4,10 +4,6 @@ module CaRuby
   class Database
     # Proc that matches saved result sources to targets.
     class SavedMatcher < FetchedMatcher
-      # Initializes a new SavedMatcher.
-      def initialize
-        super
-      end
       
       private
 

data/lib/caruby/database/writer.rb

@@ -549,6 +549,8 @@ module CaRuby
       #
       # @param (see #sync_saved)
       def sync_save_result(source, target)
+        # Bail if the result is the same as the source, as occurs, e.g., with caTissue annotations.
+        return if source == target
         logger.debug { "Synchronizing #{target} save result #{source} with the database..." }
         # If the target was created, then refetch and merge the source if necessary to reflect auto-generated
         # non-domain attribute values.

data/lib/caruby/database.rb

@@ -80,6 +80,7 @@ module CaRuby
     #
     # @param [String] service_name the name of the default {PersistenceService}
     # @param [{Symbol => String}] opts access options
+    # @option opts [String] :host application service host name
     # @option opts [String] :login application service login user
     # @option opts [String] :password application service login password
     # @example
@@ -91,9 +92,10 @@ module CaRuby
       @defaults = {}
       @user = Options.get(:user, opts)
       @password = Options.get(:password, opts)
-      @host = Options.get(:host, opts)
+      host = Options.get(:host, opts)
+      port = Options.get(:port, opts)
       # class => service hash; default is the catissuecore app service
-      @def_persist_svc = PersistenceService.new(service_name, :host => @host)
+      @def_persist_svc = PersistenceService.new(service_name, :host => host, :port => port)
       @persistence_services = [@def_persist_svc].to_set
       @cls_svc_hash = Hash.new(@def_persist_svc)
       # the create/update nested operations

data/lib/caruby/domain/resource_attributes.rb

@@ -73,6 +73,8 @@ module CaRuby
     def java_attributes
       @java_attrs ||= attribute_filter { |attr_md| attr_md.java_property? }
     end
+    
+    alias :printable_attributes :java_attributes
 
     # @return [<Symbol>] the domain attributes
     def domain_attributes
@@ -366,19 +368,19 @@ module CaRuby
     # @yield [attr_md] the attribute selector
     # @yieldparam [AttributeMetadata] attr_md the candidate attribute
     def attribute_filter(&filter)
-     Filter.new(@attr_md_hash, &filter)
+      Filter.new(@attr_md_hash, &filter)
     end
 
     # Initializes the attribute meta-data structures.
     def init_attributes
       @local_std_attr_hash = {}
-      @alias_std_attr_map = append_parent_enum(@local_std_attr_hash) { |par| par.alias_standard_attribute_hash }
+      @alias_std_attr_map = append_ancestor_enum(@local_std_attr_hash) { |par| par.alias_standard_attribute_hash }
       @local_attr_md_hash = {}
-      @attr_md_hash = append_parent_enum(@local_attr_md_hash) { |par| par.attribute_metadata_hash }
+      @attr_md_hash = append_ancestor_enum(@local_attr_md_hash) { |par| par.attribute_metadata_hash }
       @attributes = Enumerable::Enumerator.new(@attr_md_hash, :each_key)
       @local_mndty_attrs = Set.new
       @local_defaults = {}
-      @defaults = append_parent_enum(@local_defaults) { |par| par.defaults }
+      @defaults = append_ancestor_enum(@local_defaults) { |par| par.defaults }
     end
 
     # Creates the given aliases to attributes.
@@ -472,9 +474,13 @@ module CaRuby
       @local_std_attr_hash[aliaz.to_sym] = std_attr
     end
 
-    # Returns a new Enumerable which appends the evaluation of the given block in the parent
-    # metadata context. The default enum is the evaluation of the given block on this Metadata.
-    def append_parent_enum(enum)
+    # Appends to the given enumerable the result of evaluating the block given to this method
+    # on the superclass, if the superclass is a {Resource}.
+    #
+    # @param [Enumerable] enum the base collection
+    # @return [Enumerable] the {Enumerable#union} of the base collection with the superclass
+    #   collection, if applicable 
+    def append_ancestor_enum(enum)
       superclass < Resource ? enum.union(yield(superclass)) : enum
     end
 
@@ -506,7 +512,7 @@ module CaRuby
       # remove autogenerated or optional attributes
       mandatory.delete_if { |attr| attribute_metadata(attr).autogenerated? or attribute_metadata(attr).optional? }
       @local_mndty_attrs.merge!(mandatory)
-      append_parent_enum(@local_mndty_attrs) { |par| par.mandatory_attributes }
+      append_ancestor_enum(@local_mndty_attrs) { |par| par.mandatory_attributes }
     end
 
     # Raises a NameError. Domain classes can override this method to dynamically create a new reference attribute.

data/lib/caruby/domain/resource_module.rb

@@ -10,6 +10,7 @@ module CaRuby
       [:user, "--user USER", "the application login user"],
       [:password, "--password PSWD", "the application login password"],
       [:host, "--host HOST", "the application host name"],
+      [:port, "--port PORT", "the application port number"],
       [:database_host, "--database_host HOST", "the database host name"],
       [:database_type, "--database_type TYPE", "the database type (mysql or oracle)"],
       [:database_driver, "--database_driver DRIVER", "the database driver"],
@@ -27,7 +28,7 @@ module CaRuby
   #
   # The application properties hash specifies the startup information,
   # including the user, password and application Java jar library path.
-  # The properties are read from a property file. See CaRuby::Properties for
+  # The properties are read from a property file. See {Properties} for
   # more information.
   #
   # A Java class is imported into Ruby either by directly calling the
@@ -45,7 +46,9 @@ module CaRuby
   #   ClinicalTrials::Participant.new
   # without defining the +Participant+ Ruby class.
   module ResourceModule
-    # Adds the given klass to this ResourceModule. The class is extended with ResourceMetadata methods.
+    # Adds the given class to this ResourceModule. The class is extended with ResourceMetadata methods.
+    #
+    # @param [Class] the {Resource} class to add
     def add_class(klass)
       @rsc_classes ||= Set.new
       # add superclass if necessary
@@ -65,7 +68,7 @@ module CaRuby
     # @return [{Symbol => Object}] the caBIG application access properties
     # @see #load_access_properties
     def access_properties
-      @resource_module__props ||= load_access_properties
+      @rsc_props ||= load_access_properties
     end
 
     # Loads the application start-up properties in the given file path.
@@ -97,7 +100,7 @@ module CaRuby
         raise ArgumentError.new("Application access properties file does not exist: #{file}")
       end
       # the access properties
-      @resource_module__props ||= {}
+      props ||= {}
       # If no file was specified, then try the default.
       # If the default does not exist, then use the empty properties hash.
       # It is not an error to omit access properties, since the application domain classes
@@ -113,9 +116,8 @@ module CaRuby
         name = tokens.first.to_sym
         value = tokens.last
         # capture the property
-        @resource_module__props[name] = value
+        props[name] = value
       end
-      
       # Look for environment overrides preceded by the uppercase module name, e.g. CATISSUE
       # for the CaTissue module.
       env_prefix = name[/\w+$/].upcase
@@ -127,22 +129,22 @@ module CaRuby
         # the envvar value
         value = ENV[ev] || next
         # override the file property with the envar value
-        @resource_module__props[opt] = value
+        props[opt] = value
         logger.info("Set application property #{opt} from environment variable #{ev}.")
       end
       
       # load the Java application jar path
       path_ev = "#{env_prefix}_PATH"
-      path = ENV[path_ev] || @resource_module__props[:path]
+      path = ENV[path_ev] || props[:path]
       Java.add_path(path) if path
       
-      @resource_module__props
+      props
     end
 
     # Loads the Ruby source files in the given directory.
     def load_dir(dir)
       # load the properties on demand
-      load_access_properties if @resource_module__props.nil?
+      load_access_properties if @rsc_props.nil?
       # the domain class definitions
       sources = Dir.glob(File.join(dir, "*.rb"))
 
@@ -156,7 +158,7 @@ module CaRuby
       end
 
       # load the domain class definitions
-      sym_file_hash.each do |sym, file|
+      sym_file_hash.to_a.each do |sym, file|
         require file
       end
 
@@ -168,6 +170,11 @@ module CaRuby
         logger.info("#{klass.pp_s}")
       end
     end
+    
+    def java_import(klass)
+      # JRuby 1.4.x does not support a class argument
+      Class === klass  ? super(klass.java_class.name) : super
+    end
 
     # Extends the mod module with Java class support. See the class documentation for details.
     #
@@ -199,7 +206,7 @@ module CaRuby
     #
     # The optional block overrides the native Java property access wrappers.
     # For example:
-    #   ClinicalTrials.java_import('edu.wustl.catissuecore.domain.Study') do
+    #   ClinicalTrials.java_import Java::edu.wustl.catissuecore.domain.Study do
     #     def study_code=(value)
     #       value = value.to_s if Integer === value
     #       setStudyCode(value)
@@ -271,6 +278,9 @@ module CaRuby
     # The captures are the trimmed property and value
     PROP_DEF_REGEX = /^(\w+)(?:\s*[:=]\s*)([^#]+)/
     
+    # @return [String] the default application properties file, given by +~/.+_name_,
+    #   where _name_ is the underscore unqualified module name, e.g. +~/.catissue+
+    #   for module +CaTissue+
     def default_properties_file
       home = ENV['HOME'] || '~'
       file = File.expand_path("#{home}/.#{name[/\w+$/].downcase}")

data/lib/caruby/import/java.rb

@@ -15,22 +15,36 @@ module Java
   # Adds the directories in the given path and all Java jar files contained in the directories
   # to the execution classpath.
   #
-  # @param path the colon or semi-colon separated directories
+  # @param [String] path the colon or semi-colon separated directories
   def self.add_path(path)
     # the path directories
     dirs = path.split(/[:;]/).map { |dir| File.expand_path(dir) }
     # Add all jars found anywhere within the directories to the the classpath.
     add_jars(*dirs)
     # Add the directories to the the classpath.
-    dirs.each { |dir| $CLASSPATH << dir }
+    dirs.each { |dir| add_to_classpath(dir) }
   end  
   
   # Adds the jars in the directories to the execution class path.
   #
-  # @param directories the directories containing jars to add
+  # @param [<String>] directories the directories containing jars to add
   def self.add_jars(*directories)
     directories.each do |dir|
-      Dir[File.join(dir , "**", "*.jar")].each { |jar| $CLASSPATH << jar }
+      Dir[File.join(dir , "**", "*.jar")].each { |jar| add_to_classpath(jar) }
+    end
+  end
+  
+  # Adds the given jar file or directory to the classpath.
+  #
+  # @param [String] file the jar file or directory to add
+  def self.add_to_classpath(file)
+    if file =~ /.jar$/ then
+      # require is preferred to classpath append for a jar file
+      require file
+    else
+      # A directory must end in a slash since JRuby uses an URLClassLoader.
+      if File.directory?(file) and not file =~ /\/$/ then file = file + '/' end
+      $CLASSPATH << file
     end
   end
 

data/lib/caruby/migration/migratable.rb

@@ -118,55 +118,49 @@ module CaRuby
     # @param [{Symbol => String}] mth_hash a hash that associates this domain object's
     #   attributes to migration method names
     def migrate_references(row, migrated, mth_hash=nil)
-      self.class.saved_independent_attributes.each do |attr|
-        ref = migratable__reference_value(attr, migrated) 
-        migratable__set_reference(attr, ref, row, mth_hash) if ref
-      end
-      self.class.unidirectional_dependent_attributes.each do |attr|
-        ref = migratable__reference_value(attr, migrated) 
-        migratable__set_reference(attr, ref, row, mth_hash) if ref
-      end
+      migratable__set_references(self.class.saved_independent_attributes, row, migrated, mth_hash)
+      migratable__set_references(self.class.unidirectional_dependent_attributes, row, migrated, mth_hash)
     end
     
     private
     
-    # @param [Symbol] attribute the reference attribute to get
+    # @param [AttributeMetadata::Filter] the attributes to set
+    # @param row (see #migrate_references)
+    # @param migrated (see #migrate_references)
+    # @param mth_hash (see #migrate_references)
+     def migratable__set_references(attr_filter, row, migrated, mth_hash=nil)
+      attr_filter.each_pair do |attr, attr_md|
+        # the target value
+        ref = migratable__target_value(attr_md, row, migrated, mth_hash) || next
+        if attr_md.collection? then
+          # the current value
+          value = send(attr_md.reader) || next
+          value << ref
+          logger.debug { "Added migrated #{ref.qp} to #{qp} #{attribute}." }
+        else
+          set_attribute(attr, ref)
+          logger.debug { "Set #{qp} #{attr} to migrated #{ref.qp}." }
+        end
+      end
+    end
+    
+    # @param [AttributeMetadata] attr_md the reference attribute
+    # @param row (see #migrate_references)
     # @param migrated (see #migrate_references)
-    # @return [Resource, nil] the migrated value to which the attribute will be set
-    def migratable__reference_value(attribute, migrated)
-      # skip non-nil attributes
-      return if send(attribute)
-      # the attribute metadata, used for type information
-      attr_md = self.class.attribute_metadata(attribute)
-      # skip collection attributes
-      return if attr_md.collection?
+    # @param mth_hash (see #migrate_references)
+    # @return [Resource, nil] the migrated instance of the given class, or nil if there is not
+    #   exactly one such instance
+    def migratable__target_value(attr_md, row, migrated, mth_hash=nil)
       # the migrated references which are instances of the attribute type
       refs = migrated.select { |other| other != self and attr_md.type === other }
       # skip ambiguous references
       return unless refs.size == 1
       # the single reference
       ref = refs.first
-    end
-    
-    # Sets the given migrated domain object attribute to the given reference.
-    #
-    # If the attribute is associated to a method in mth_hash, then that method is called on
-    # the migrated instance and input row. The attribute is set to the method return value.
-    # mth_hash includes an entry for each +migrate_+_attribute_ method defined by this
-    # Resource's class.
-    #
-    # @param [Symbol] (see #migratable__reference_value)
-    # @param [Resource] ref the migrated reference
-    # @param row (see #migrate_references)
-    # @param mth_hash (see #migrate_references)
-    def migratable__set_reference(attribute, ref, row, mth_hash=nil)
-      # the shim method, if any
-      mth = mth_hash[attribute] if mth_hash
+       # the shim method, if any
+      mth = mth_hash[attr_md.to_sym] if mth_hash
       # if there is a shim method, then call it
-      ref = send(mth, ref, row) if mth and respond_to?(mth)
-      return if ref.nil?
-      logger.debug { "Setting #{qp} #{attribute} to migrated #{ref.qp}..." }
-      set_attribute(attribute, ref)
+      mth && respond_to?(mth) ? send(mth, ref, row) : ref
     end
   end
 end

data/lib/caruby/migration/migrator.rb

@@ -99,6 +99,7 @@ module CaRuby
     end
 
     def parse_options(opts)
+      logger.debug { "Migrator options: #{opts.qp}" }
       @fld_map_file = opts[:mapping]
       raise MigrationError.new("Migrator missing required field mapping file parameter") if @fld_map_file.nil?
       @def_file = opts[:defaults]
@@ -145,6 +146,7 @@ module CaRuby
       end
       logger.info { "Migration paths:\n#{print_hash.pp_s}" }
       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)
@@ -540,7 +542,7 @@ module CaRuby
       # collect the class => path => value entries
       map = LazyHash.new { Hash.new }
       config.each do |path_s, value|
-        next if value.blank?
+        next if value.nil_or_empty?
         klass, path = create_attribute_path(path_s)
         map[klass][path] = value
       end
@@ -555,7 +557,7 @@ module CaRuby
       names = path_s.split('.')
       # if the path starts with a capitalized class name, then resolve the class.
       # otherwise, the target class is the start of the path.
-      klass = names.first =~ /^[A-Z]/ ? @target_class.domain_module.const_get(names.shift) : @target_class
+      klass = names.first =~ /^[A-Z]/ ? class_for_name(names.shift) : @target_class
       # there must be at least one attribute
       if names.empty? then
         raise MigrationError.new("Attribute entry in migration configuration is not in <class>.<attribute> format: #{value}")
@@ -574,6 +576,13 @@ module CaRuby
       # important, since the class must be instantiated.
       [klass, path]
     end
+    
+    def class_for_name(name)
+      # navigate through the scope to the final class
+      name.split('::').inject(@target_class.domain_module) do |scope, cnm|
+        scope.const_get(cnm)
+      end
+    end
 
     # @return a new class => [paths] hash from the migration fields configuration map
     def create_class_paths_hash(fld_map, def_map)

data/lib/caruby/resource.rb

@@ -33,6 +33,8 @@ module CaRuby
       "#{self.class.qp}@#{proxy_object_id}"
     end
 
+    alias :qp :print_class_and_id
+
     # Sets the default attribute values for this domain object and its dependents. If this Resource
     # does not have an identifier, then missing attributes are set to the values defined by
     # {ResourceAttributes#add_attribute_defaults}.
@@ -54,25 +56,22 @@ module CaRuby
     end
 
     # Validates this domain object and its #{ResourceAttributes.unproxied_cascaded_attributes}
-    # for completeness prior to a database create or update operation.
-    # The object is valid if it contains a non-nil value for each mandatory property.
-    # Objects which have already been validated are skipped.
+    # for completeness prior to a database create operation.
+    # An object without an identifer is valid if it contains a non-nil value for each mandatory property.
+    # Objects which have an identifier or have already been validated are skipped.
+    #
+    # Subclasses should not override this method, but override the private {#local_validate} instead.
     #
     # @return [Resource] this domain object
-    # @raise [ValidationError] if a mandatory attribute value is missing
+    # @raise (see #local_validate)
     def validate
-      unless @validated then
-        logger.debug { "Validating #{qp} required attributes #{self.mandatory_attributes.to_a.to_series}..." }
-        invalid = missing_mandatory_attributes
-        unless invalid.empty? then
-          logger.error("Validation of #{qp} unsuccessful - missing #{invalid.join(', ')}:\n#{dump}")
-          raise ValidationError.new("Required attribute value missing for #{self}: #{invalid.join(', ')}")
-        end
+      if identifier.nil? and not @validated then
+        validate_local
+        @validated = true
       end
       self.class.unproxied_cascaded_attributes.each do |attr|
         send(attr).enumerate { |dep| dep.validate }
       end
-      @validated = true
       self
     end
     
@@ -550,6 +549,20 @@ module CaRuby
       merge_attributes(self.class.defaults)
     end
     
+    # Validates that this domain contains a non-nil value for each mandatory property.
+    #
+    # Subclasses can override this method for additional validation, but should call super first.
+    #
+    # @raise [ValidationError] if a mandatory attribute value is missing
+    def validate_local
+      logger.debug { "Validating #{qp} required attributes #{self.mandatory_attributes.to_a.to_series}..." }
+      invalid = missing_mandatory_attributes
+      unless invalid.empty? then
+        logger.error("Validation of #{qp} unsuccessful - missing #{invalid.join(', ')}:\n#{dump}")
+        raise ValidationError.new("Required attribute value missing for #{self}: #{invalid.join(', ')}")
+      end
+    end
+    
     # Enumerates the dependents for setting defaults. Subclasses can override if the
     # dependents must be visited in a certain order.
     alias :each_defaults_dependent :each_dependent
@@ -574,7 +587,7 @@ module CaRuby
       def initialize(base, visited=Set.new, &selector)
         @base = base
         @visited = visited << base
-        @selector = selector || Proc.new { |ref| ref.class.java_attributes }
+        @selector = selector || Proc.new { |ref| ref.class.printable_attributes }
       end
 
       def pretty_print(q)

data/lib/caruby/util/collection.rb

@@ -92,6 +92,13 @@ module Enumerable
     detect { true }
   end
 
+  # Returns the last enumerated item in this Enumerable, or nil if this Enumerable is empty.
+  #
+  # This method is functionally equivalent to +to_a.last+ but is more concise and efficient.
+  def last
+    detect { true }
+  end
+
   # Returns the count of items enumerated in this Enumerable.
   #
   # This method is functionally equivalent to +to_a.size+ but is more concise and efficient

data/lib/caruby/util/coordinate.rb

@@ -1,4 +1,5 @@
-require 'generator'
+# JRuby alert - SyncEnumerator moved from generator to REXML in JRuby 1.5
+require 'rexml/document'
 
 # A Coordinate is a convenience Array wrapper class with aliased #x, #y and {#z} dimensions.
 class Coordinate < Array
@@ -58,7 +59,7 @@ class Coordinate < Array
     return true if equal?(other)
     raise TypeError.new("Can't compare #{self} with #{other} since it is not a Coordinate") unless Coordinate === other
     raise ArgumentError.new("Can't compare #{self} with #{other} since it has a different dimension count") unless size == other.size
-    SyncEnumerator.new(self.reverse, other.reverse).each_with_index do |pair, index|
+    REXML::SyncEnumerator.new(self.reverse, other.reverse).each_with_index do |pair, index|
       dim = pair.first
       odim = pair.last
       raise ArgumentError.new("Can't compare #{self} with missing dimension #{index} to #{other}") unless dim

data/lib/caruby/util/roman.rb

@@ -0,0 +1,28 @@
+class String
+  # @return [Integer] the integer equivalent of this roman numeral
+  # @raise ArgumentError if this String is not a roman numeral in the range I-X
+  def to_arabic
+    case self
+      when /^(I{0,3})$/ then $1.size
+      when /^(I{0,3})(V|X)$/ then ROMAN_UNITS[$2] - $1.size
+      when /^(V)(I{0,3})$/ then ROMAN_UNITS[$1] + $2.size
+      else raise ArgumentError.new("#{self} is not a roman numeral in the range I-X")
+    end
+  end
+  
+  private
+  
+  ROMAN_UNITS = {'I' => 1, 'V' => 5, 'X' => 10}
+end
+
+class Integer
+  # @return [String] the roman numeral equivalent of this integer
+  def to_roman
+    if self < 1 or self > 10 then raise ArgumentError.new("#{self} cannot be converted to a roman numeral in the range I-X")
+    elsif self < 4 then 'I' * self
+    elsif self < 6 then ('I' * (5 - self)) + 'V'
+    elsif self < 9 then 'V' + ('I' * (self - 5))
+    else ('I' * (10 - self)) + 'X'
+    end
+  end
+end

data/lib/caruby/version.rb

@@ -1,3 +1,3 @@
 module CaRuby
-  VERSION = "1.4.6"
+  VERSION = "1.4.7"
 end

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

@@ -0,0 +1,18 @@
+$:.unshift 'lib'
+
+require "test/unit"
+require 'caruby/util/roman'
+
+class RomanTest < Test::Unit::TestCase
+  def test_to_arabic
+    ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X' ].each_with_index do |s, n|
+      assert_equal(n + 1, s.to_arabic, "Conversion of #{s} incorrect")
+    end
+  end
+  
+  def test_to_roman
+    ['I', 'II', 'III', 'IV', 'V', 'VI', 'VII', 'VIII', 'IX', 'X' ].each_with_index do |s, n|
+      assert_equal(s, (n + 1).to_roman, "Conversion of #{n + 1} incorrect")
+    end
+  end
+end

metadata

@@ -2,7 +2,7 @@
 name: caruby-core
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.4.6
+  version: 1.4.7
 platform: ruby
 authors: 
   - OHSU
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-26 00:00:00 -08:00
+date: 2011-03-04 00:00:00 -08:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -25,7 +25,7 @@ dependencies:
     type: :runtime
     version_requirements: *id001
   - !ruby/object:Gem::Dependency 
-    name: fastercsv
+    name: dbd-jdbc
     prerelease: false
     requirement: &id002 !ruby/object:Gem::Requirement 
       none: false
@@ -36,7 +36,7 @@ dependencies:
     type: :runtime
     version_requirements: *id002
   - !ruby/object:Gem::Dependency 
-    name: uom
+    name: fastercsv
     prerelease: false
     requirement: &id003 !ruby/object:Gem::Requirement 
       none: false
@@ -46,6 +46,17 @@ dependencies:
             version: "0"
     type: :runtime
     version_requirements: *id003
+  - !ruby/object:Gem::Dependency 
+    name: uom
+    prerelease: false
+    requirement: &id004 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ">="
+          - !ruby/object:Gem::Version 
+            version: "0"
+    type: :runtime
+    version_requirements: *id004
 description: "    caRuby is a JRuby facade for interaction with caBIG applications.\n"
 email: caruby.org@gmail.com
 executables: []
@@ -117,6 +128,7 @@ files:
   - lib/caruby/util/person.rb
   - lib/caruby/util/pretty_print.rb
   - lib/caruby/util/properties.rb
+  - lib/caruby/util/roman.rb
   - lib/caruby/util/stopwatch.rb
   - lib/caruby/util/topological_sync_enumerator.rb
   - lib/caruby/util/transitive_closure.rb
@@ -151,6 +163,7 @@ files:
   - test/lib/caruby/util/person_test.rb
   - test/lib/caruby/util/pretty_print_test.rb
   - test/lib/caruby/util/properties_test.rb
+  - test/lib/caruby/util/roman_test.rb
   - test/lib/caruby/util/stopwatch_test.rb
   - test/lib/caruby/util/topological_sync_enumerator_test.rb
   - test/lib/caruby/util/transitive_closure_test.rb
@@ -188,7 +201,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: caruby
-rubygems_version: 1.5.2
+rubygems_version: 1.5.3
 signing_key: 
 specification_version: 3
 summary: Ruby facade for caBIG applications.