caruby-core 1.4.2 → 1.4.3

data/lib/caruby/version.rb

@@ -1,3 +1,3 @@
 module CaRuby
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/lib/caruby/yard/resource_metadata_handler.rb

@@ -0,0 +1,8 @@
+class ResourceMetadataHandler < YARD::Handlers::Ruby::Legacy::AttributeHandler
+  handles method_call(/\Aqualify_attribute\b/)
+  namespace_only
+
+  def process
+    push_state(:scope => :class) { super }
+  end
+end

data/lib/caruby.rb

@@ -1,3 +1,5 @@
+require 'caruby/resource'
+
 # CaRuby is a JRuby facade for the caBIG application APIs.
 # See the [http://http://caruby.rubyforge.org/](caRuby) home page for more information.
 module CaRuby;end

metadata

@@ -6,11 +6,11 @@ executables: []
 
 version: !ruby/object:Gem::Version 
   prerelease: false
-  version: 1.4.2
+  version: 1.4.3
   segments: 
   - 1
   - 4
-  - 2
+  - 3
 post_install_message: 
 date: 2010-11-30 08:00:00 +00:00
 files: 
@@ -28,17 +28,20 @@ files:
 - lib/caruby/csv/csv_mapper.rb
 - lib/caruby/csv/csvio.rb
 - lib/caruby/database/fetched_matcher.rb
+- lib/caruby/database/lazy_loader.rb
 - lib/caruby/database/persistable.rb
 - lib/caruby/database/persistence_service.rb
+- lib/caruby/database/persistifier.rb
 - lib/caruby/database/reader.rb
-- lib/caruby/database/saved_merger.rb
+- lib/caruby/database/saved_matcher.rb
 - lib/caruby/database/search_template_builder.rb
 - lib/caruby/database/sql_executor.rb
 - lib/caruby/database/store_template_builder.rb
 - lib/caruby/database/writer.rb
-- lib/caruby/domain/annotatable.rb
-- lib/caruby/domain/annotation.rb
+- lib/caruby/domain/attribute_initializer.rb
 - lib/caruby/domain/attribute_metadata.rb
+- lib/caruby/domain/id_alias.rb
+- lib/caruby/domain/inversible.rb
 - lib/caruby/domain/java_attribute_metadata.rb
 - lib/caruby/domain/merge.rb
 - lib/caruby/domain/properties.rb
@@ -46,16 +49,13 @@ files:
 - lib/caruby/domain/resource_attributes.rb
 - lib/caruby/domain/resource_dependency.rb
 - lib/caruby/domain/resource_introspection.rb
+- lib/caruby/domain/resource_inverse.rb
 - lib/caruby/domain/resource_metadata.rb
 - lib/caruby/domain/resource_module.rb
 - lib/caruby/domain/uniquify.rb
-- lib/caruby/import/annotatable_class.rb
-- lib/caruby/import/annotation_class.rb
-- lib/caruby/import/annotation_module.rb
 - lib/caruby/import/java.rb
 - lib/caruby/migration/migratable.rb
 - lib/caruby/migration/migrator.rb
-- lib/caruby/migration/resource.rb
 - lib/caruby/migration/resource_module.rb
 - lib/caruby/migration/uniquify.rb
 - lib/caruby/util/attribute_path.rb
@@ -86,6 +86,7 @@ files:
 - lib/caruby/util/version.rb
 - lib/caruby/util/visitor.rb
 - lib/caruby/util/weak_hash.rb
+- lib/caruby/yard/resource_metadata_handler.rb
 - History.txt
 - LEGAL
 - LICENSE

data/lib/caruby/database/saved_merger.rb

@@ -1,131 +0,0 @@
-require 'caruby/util/collection'
-require 'caruby/util/pretty_print'
-require 'caruby/domain/reference_visitor'
-require 'caruby/database/fetched_matcher'
-require 'caruby/database/store_template_builder'
-
-module CaRuby
-  class Database
-    # Merges database content sources into saved targets.
-    class SavedMerger
-      # @param [Database] database the database performing the save
-      def initialize(database)
-        @database = database
-        # the save result matchers
-        cr_mtchr = FetchedMatcher.new(:relaxed)
-        upd_mtchr = FetchedMatcher.new
-        # the save result merge visitors
-        @cr_mrg_vstr = MergeVisitor.new(:matcher => cr_mtchr) { |src, tgt| mergeable_saved_attributes(tgt) }
-        @upd_mrg_vstr = MergeVisitor.new(:matcher => upd_mtchr) { |src, tgt| mergeable_saved_attributes(tgt) }
-      end
-      
-            
-      # Merges the database content into the given saved domain object.
-      # Dependents are merged recursively.
-      #
-      # @param [Resource] obj the saved domain object
-      # @param [Resource] result the caCORE result
-      # @return [Resource] the object representing the persistent state
-      def merge(saved, result)
-        # the sync source reflecting the database content
-        src = saved_source(saved, result)
-        # merge the source into obj, including all cascaded dependents
-        merge_saved(saved, src)
-        src
-      end
-
-      # @param [Resource] obj the saved domain object
-      # @param [Resource] result the caCORE result domain object
-      # @return [Resource] the source domain object which accurately reflects the database state
-      # @see #fetch_saved?
-      def saved_source(obj, result)
-        # The true stored content might need to be fetched from the database.
-        if obj.fetch_saved? then
-          tmpl = result.copy(:identifier)
-          logger.debug { "Fetching saved #{obj.qp} using template #{tmpl}..." }
-          tmpl.find
-        else
-          result
-        end
-      end
-      
-      # Merges the content of the source domain object into the saved domain object obj.
-      # If obj differs from source, then obj is resaved. Dependents are merged recursively.
-      #
-      # @param [Resource] obj the saved domain object
-      # @param [Resource] source object holding the stored content
-      def merge_saved(obj, source)
-        logger.debug { "Merging database content #{source} into saved #{obj.qp}..." }
-        visitor = @database.mergeable_autogenerated_operation? ? @cr_mrg_vstr : @upd_mrg_vstr
-        visitor.visit(obj, source) do |tgt, src|
-          logger.debug { "Saved #{obj.qp} merge visitor merged database content #{src.qp} into #{tgt.qp}..." }
-          merge_saved_reference(tgt, src)
-        end
-      end
-      
-      # Sets the target snapshot attribute values from the given source, if different.
-      #
-      # @param [Resource] target the saved domain object
-      # @param [Resource] source the domain object reflecting the database state
-      # @return [Resource] the synced target
-      def merge_saved_reference(target, source)
-        # set each unsaved non-domain attribute from the source to reflect the database value
-        target.copy_volatile_attributes(source)
-        
-        # take a snapshot of the saved target
-        target.take_snapshot
-        logger.debug { "A snapshot was taken of the saved #{target.qp}." }
-        
-        # the non-domain attribute => [target value, source value] difference hash
-        diff = target.diff(source)
-        # the difference attribute => source value hash, excluding nil source values
-        dvh = diff.transform { |vdiff| vdiff.last }.compact
-        return if dvh.empty?
-        logger.debug { "Saved #{target} differs from database content #{source.qp} as follows: #{diff.filter_on_key { |attr| dvh.has_key?(attr) }.qp}" }
-        logger.debug { "Setting saved #{target.qp} snapshot values from source values to reflect the database state: #{dvh.qp}..." }
-        # update the snapshot from the source value to reflect the database state
-        target.snapshot.merge!(dvh)
-        
-        target
-      end
-    
-      # Returns the dependent attributes that can be copied from a save result to
-      # the given save argument object. This method qualifies the obj class
-      # {AttributeMetadata#copyable_saved_attributes} by whether the attribute is
-      # actually auto-generated for the saved object, i.e. the object was itself
-      # created or auto-generated. If obj was created or auto-generated, then
-      # this method returns the {AttributeMetadata#copyable_saved_attributes}.
-      # Otherwise, this method returns the {AttributeMetadata#cascaded_attributes}.
-      #
-      # @param [Resource] obj the domain object which was saved 
-      # @return  [<Symbol>] the attributes to copy
-      def mergeable_saved_attributes(obj)
-        fa = obj.class.fetched_domain_attributes
-        obj.suspend_lazy_loader do
-          attrs = obj.class.cascaded_attributes.filter do |attr|
-            fa.include?(attr) or not obj.send(attr).nil_or_empty?
-          end
-          if @database.mergeable_autogenerated_operation? then
-            ag_attrs = mergeable_saved_autogenerated_attributes(obj)
-            unless ag_attrs.empty? then
-              logger.debug { "Adding #{obj.qp} mergeable saved auto-generated #{ag_attrs.to_series} to the merge set..." }
-              attrs = attrs.to_set.merge(ag_attrs)
-            end
-          end
-          logger.debug { "Mergeable saved #{obj.qp} attributes: #{attrs.qp}." } unless attrs.empty?
-          attrs
-        end
-      end
-      
-      # Returns the autogenerated dependent attributes that can be copied from a save result to
-      # the given save argument object.
-      #
-      # @param [Resource] obj the domain object which was saved 
-      # @return [<Symbol>] the attributes to copy, or nil if no such attributes
-      def mergeable_saved_autogenerated_attributes(obj)
-        attrs = obj.class.mergeable_saved_autogenerated_attributes
-        attrs.reject { |attr| obj.send(attr).nil_or_empty? }
-      end
-    end
-  end
-end

data/lib/caruby/domain/annotatable.rb

@@ -1,25 +0,0 @@
-require 'caruby/resource'
-
-module CaRuby
-  # The Annotatable module marks a domain class as an anchor which holds at least one annotation attribute.
-  module Annotatable
-    include Resource
-
-    # Dynamically creates a new annotation reference method with the given symbol if symbol is the camelized form of a
-    # class in one of the Annotatable class's annotation modules.
-    def method_missing(symbol, *args)
-      name = symbol.to_s
-      # remove trailing assignment = if present
-      name.chop! if name =~ /=$/
-      # the class with the camelized form of the name
-      klass = self.class.annotation_class(name.camelize)
-      # delegate to super to print an error if no class
-      super if klass.nil?
-      # add the annotation attribute
-      klass.add_annotation(self.class)
-      raise NotImplementedError.new("#{self.class.qp} annotation method not created: #{symbol}") unless respond_to?(symbol)
-      #call the annotation attribute method
-      send(symbol, *args)
-    end
-  end
-end

data/lib/caruby/domain/annotation.rb

@@ -1,23 +0,0 @@
-require 'caruby/resource'
-
-module CaRuby
-  # The Annotation module marks a domain object as an Annotation.
-  module Annotation
-    include Resource
-
-    # Dynamically creates a new annotable owner attribute with the given symbol if symbol is an annotatable owner attribute
-    # accessor method.
-    #
-    # @see #attribute_missing
-    def method_missing(symbol, *args)
-      name = symbol.to_s
-      # remove trailing assignment = if present
-      name.chop! if name =~ /=$/
-      # try to make the owner attribute
-      self.class.attribute_metadata(name.to_sym)
-      # if we reached here, then the owner was created so verify and call the new method
-      raise NoMethodError.new("#{name.demodulize} owner attribute #{name} created but accessor method not found: #{symbol}") unless method_defined?(symbol)
-      send(symbol, *args)
-    end
-  end
-end

data/lib/caruby/import/annotatable_class.rb

@@ -1,28 +0,0 @@
-require 'caruby/util/class'
-require 'caruby/util/collection'
-require 'caruby/import/annotation_module'
-
-module JavaImport
-  # AnnotatableClass adds Annotation modules to an annotation anchor's domain module.
-  module AnnotatableClass
-
-    def self.extended(klass)
-      klass.class_eval { include CaRuby::Annotatable }
-    end
-
-    def annotation_modules
-      @annotation_modules ||= []
-    end
-
-    # Creates a new AnnotationModule anchored by this class for the given package and database service.
-    def create_annotation_module(package, service)
-      annotation_modules << AnnotationModule.create_annotation_module(self, package, service)
-    end
-
-    # Returns the class with the given unqualified name in one of this AnnotationClass's JavaImport::AnnotationModule
-    # modules, or nil if no such class.
-    def annotation_class(name)
-      annotation_modules.detect_value { |mod| annotation_modules.const_get(name) rescue nil }
-    end
-  end
-end

data/lib/caruby/import/annotation_class.rb

@@ -1,27 +0,0 @@
-module JavaImport
-  # AnnotationClass extends a domain class for an annotation class scoped by an annotation module.
-  # The extended class must contain the +@anchor_class+ and +@annotation_module+ instance variables.
-  module AnnotationClass
-
-    # Dynamically creates a new reference attribute if the given attribute symbol is the underscore
-    # form of this Annotation's anchor class.
-    #
-    #@param [Symbol] attribute the missing attribute 
-    def attribute_missing(attribute)
-      # delegate to super to print an error if no class
-      super unless attribute.to_s == anchor_class.qp.underscore
-      # add the annotation attribute to the anchor class and the anchor attribute to this class
-      anchor_class.add_annotation(self)
-    end
-
-    # @return [Class] the annotated class
-    def anchor_class
-      @anchor_class
-    end
-
-    # @return [Module] the module which scopes this AnnotationClass
-    def annotation_module
-      @annotation_module
-    end
-  end
-end

data/lib/caruby/import/annotation_module.rb

@@ -1,67 +0,0 @@
-require 'caruby/util/class'
-require 'caruby/util/collection'
-require 'caruby/import/importable'
-require 'caruby/import/annotation_class'
-
-module JavaImport
-  # AnnotationModule creates annotation package modules within a domain module as a context for importing annotation classes.
-  module AnnotationModule
-    include Importable
-
-    # Creates a new AnnotationModule in the given domain_module from the given annotation package and service.
-    def self.create_annotation_module(anchor_class, package, service)
-      domain_module = anchor_class.domain_module
-      # make parent modules for each package component
-      mod = package.split('.').inject(anchor_class.domain_module) do |parent, name|
-        mod_id = name.camelize.to_sym
-        if parent.const_defined?(mod_id) then
-          parent.const_get(mod_id)
-        else
-          parent.const_set(mod_id, Module.new)
-        end
-      end
-      # the terminal module is the AnnotationModule
-      mod.extend(self)
-      # initialize the java_package, service and empty access_properties
-      mod.module_eval do
-        @anchor_class = anchor_class
-        @java_package = package
-        @service = service
-        @resource_module__props = CaRuby::Domain::Properties.new
-      end
-      mod_name = mod.name[anchor_class.domain_module.name.length..-1]
-      logger.debug { "Created annotation module #{mod}." }
-      mod
-    end
-
-    def java_package
-      @java_package
-    end
-
-    def service
-      @service
-    end
-
-    def anchor_class
-      @anchor_class
-    end
-
-    def access_properties
-      @resource_module__props
-    end
-
-    # Imports the domain Java class with specified class_name by delegating to Importable and
-    # augmenting the importer to include CaRuby::Annotation in each imported class.
-    def import_domain_class(class_name)
-      anchor_class = @anchor_class
-      ann_mod = self
-      klass = super(class_name) do
-        include CaRuby::Annotation
-        @anchor_class = anchor_class
-        @annotation_module = ann_mod
-        yield if block_given?
-      end
-      klass.extend(AnnotationClass)
-    end
-  end
-end

data/lib/caruby/migration/resource.rb

@@ -1,8 +0,0 @@
-require 'caruby/resource'
-require 'caruby/migration/migratable'
-
-module CaRuby
-  module Resource
-    include Migratable
-  end
-end