rgen 0.2.0 → 0.3.0

data/lib/rgen/xml_instantiator.rb

@@ -0,0 +1,132 @@
+require 'rgen/metamodel_builder'
+require 'rgen/instantiator'
+require 'rgen/name_helper'
+require 'rexml/parsers/sax2parser'
+require 'rexml/sax2listener'
+
+module RGen
+
+class XMLInstantiator < Instantiator
+	include REXML::SAX2Listener
+	include NameHelper
+	
+	class << self
+		def tag_ns_map
+			@tag_ns_map ||={}
+			@tag_ns_map
+		end
+	end
+
+	class XMLElementDescriptor
+		attr_reader :tag, :mod, :parent, :attributes
+		attr_accessor :object, :children
+		def initialize(tag, mod, parent, children, attributes)
+			@tag, @mod, @parent, @children, @attributes = tag, mod, parent, children, attributes
+			@parent.children << self if @parent
+		end
+	end
+	
+	NamespaceDescriptor = Struct.new(:prefix, :target)
+	
+	def self.map_tag_ns(from, to, prefix="")
+		tag_ns_map[from] = NamespaceDescriptor.new(prefix, to)
+	end
+	
+	def initialize(env, mod, createMM=false)
+		super(env,mod)
+		@env = env
+		@default_module = mod
+		@createMM = createMM
+		@stack = []
+	end
+	
+	def instantiate_file(file)
+		File.open(file) { |f| parse(f.read)}
+		resolve
+	end
+	
+	def instantiate(text)
+		parse(text)
+		resolve
+	end
+		
+	def parse(src)
+		parser = REXML::Parsers::SAX2Parser.new(src)
+		parser.listen(self)
+		parser.parse
+	end	
+	
+	def start_element(ns, tag, qtag, attributes)
+		ns_desc = self.class.tag_ns_map[ns]
+		tag = ns_desc.nil? ? qtag : ns_desc.prefix+tag
+		mod = (ns_desc && ns_desc.target) || @default_module		
+		@stack.push XMLElementDescriptor.new(tag, mod, @stack[-1], [], attributes)
+	end
+
+	def end_element(uri, localname, qname)	
+		elementDesc = @stack.pop
+		obj = callBuildMethod(:new_object, NameError, :create_class, elementDesc.mod, elementDesc)
+		@env << obj
+		elementDesc.object = obj
+		elementDesc.children.each { |c|
+			callBuildMethod(:assoc_p2c, NoMethodError, :create_p2c_assoc, elementDesc, c)
+		}
+		elementDesc.attributes.each_pair {|k,v|
+			callBuildMethod(:set_attribute, NoMethodError, :create_attribute, elementDesc, k, v)
+		}
+		# optionally prune children to save memory
+		#elementDesc.children = nil
+	end
+	
+	def callBuildMethod(method, exception, mmMethod, *args)
+		begin
+			send(method, *args)
+		rescue exception
+			if @createMM
+				send(mmMethod, *args)
+				send(method, *args)
+			else
+				raise
+			end
+		end
+	end
+
+	# Model and Metamodel builder methods
+	# These methods are to be overwritten by specific instantiators
+	def new_object(mod, node)
+		mod.const_get(saneClassName(node)).new
+	end
+	
+	def create_class(mod, node)
+		mod.const_set(saneClassName(node), Class.new(RGen::MetamodelBuilder::MMBase))
+	end
+
+	def assoc_p2c(parent, child)
+		parent.object.addGeneric(saneMethodName(child), child.object)
+		child.object.setGeneric("parent", parent.object)
+	end
+	
+	def create_p2c_assoc(parent, child)
+		parent.object.class.has_many(saneMethodName(child), child.object.class)
+		child.object.class.has_one("parent", RGen::MetamodelBuilder::MMBase)
+	end
+	
+	def set_attribute(node, attr, value)
+		node.object.setGeneric(normalize(attr), value)
+	end
+	
+	def create_attribute(node, attr, value)
+		node.object.class.has_one(normalize(attr))
+	end
+					
+	def saneClassName(node)
+		firstToUpper(normalize(node.tag)).sub(/^Class$/, 'Clazz')
+	end
+	
+	def saneMethodName(node)
+		firstToLower(normalize(node.tag)).sub(/^class$/, 'clazz')
+	end	
+					
+end
+
+end

data/test/metamodel_builder_test.rb

@@ -28,6 +28,9 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 		assert_raise StandardError do
 			sc.an_array = "a string"
 		end
+		
+		assert_equal HasOneTestClass.one_attributes, ["name", "an_array"]
+		assert_equal HasOneTestClass.many_attributes, []
 	end
 	
 	class HasManyTestClass < RGen::MetamodelBuilder::MMBase
@@ -49,6 +52,8 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 		assert_raise StandardError do
 			o.addString(:notastring)
 		end
+		assert_equal HasManyTestClass.one_attributes, []
+		assert_equal HasManyTestClass.many_attributes, ["string"]
 	end
 
 	class OneClass < RGen::MetamodelBuilder::MMBase
@@ -86,6 +91,53 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 		oc.removeManyClasses mc
 		assert !oc.manyClasses.include?(mc)
 		assert_equal nil, mc.oneClass
+
+		assert_equal OneClass.one_attributes, []
+		assert_equal OneClass.many_attributes, ["manyClasses"]
+		assert_equal ManyClass.one_attributes, ["oneClass"]
+		assert_equal ManyClass.many_attributes, []
+	end
+
+	class OneClass2 < RGen::MetamodelBuilder::MMBase
+	end
+	class ManyClass2 < RGen::MetamodelBuilder::MMBase
+	end
+	ManyClass2.many_to_one 'oneClass', OneClass2, 'manyClasses'
+	
+	def test_one_to_many2
+		oc = OneClass2.new
+		assert_respond_to oc, :manyClasses
+		assert oc.manyClasses.empty?
+		
+		mc = ManyClass2.new
+		assert_respond_to mc, :oneClass
+		assert_respond_to mc, :oneClass=
+		assert_nil mc.oneClass
+		
+		# put the OneClass into the ManyClass
+		mc.oneClass = oc
+		assert_equal oc, mc.oneClass
+		assert oc.manyClasses.include?(mc)
+		
+		# remove the OneClass from the ManyClass
+		mc.oneClass = nil
+		assert_equal nil, mc.oneClass
+		assert !oc.manyClasses.include?(mc)
+
+		# put the ManyClass into the OneClass
+		oc.addManyClasses mc
+		assert oc.manyClasses.include?(mc)
+		assert_equal oc, mc.oneClass
+		
+		# remove the ManyClass from the OneClass
+		oc.removeManyClasses mc
+		assert !oc.manyClasses.include?(mc)
+		assert_equal nil, mc.oneClass
+
+		assert_equal OneClass2.one_attributes, []
+		assert_equal OneClass2.many_attributes, ["manyClasses"]
+		assert_equal ManyClass2.one_attributes, ["oneClass"]
+		assert_equal ManyClass2.many_attributes, []
 	end
 
 	class AClassOO < RGen::MetamodelBuilder::MMBase
@@ -124,6 +176,11 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 		ac.bClass = nil
 		assert_equal nil, ac.bClass
 		assert_equal nil, bc.aClass
+
+		assert_equal AClassOO.one_attributes, ["bClass"]
+		assert_equal AClassOO.many_attributes, []
+		assert_equal BClassOO.one_attributes, ["aClass"]
+		assert_equal BClassOO.many_attributes, []
 	end
 
 	class AClassMM < RGen::MetamodelBuilder::MMBase
@@ -171,5 +228,34 @@ class MetamodelBuilderTest < Test::Unit::TestCase
 		ac.removeBClasses bc
 		assert !ac.bClasses.include?(bc)
 		assert !bc.aClasses.include?(ac)
+
+		assert_equal AClassMM.one_attributes, []
+		assert_equal AClassMM.many_attributes, ["bClasses"]
+		assert_equal BClassMM.one_attributes, []
+		assert_equal BClassMM.many_attributes, ["aClasses"]
+	end
+	
+	class SomeSuperClass < RGen::MetamodelBuilder::MMBase
+		has_one "name"
+		has_many "others"
+	end
+	
+	class SomeSubClass < SomeSuperClass
+		has_one "subname"
+		has_many "subothers"
+	end
+	
+	class OtherSubClass < SomeSuperClass
+		has_one "othersubname"
+		has_many "othersubothers"
+	end
+	
+	def test_inheritance
+		assert_equal SomeSuperClass.one_attributes, ["name"]
+		assert_equal SomeSuperClass.many_attributes, ["others"]
+		assert_equal SomeSubClass.one_attributes.sort, ["name", "subname"]
+		assert_equal SomeSubClass.many_attributes.sort, ["others", "subothers"]
+		assert_equal OtherSubClass.one_attributes.sort, ["name", "othersubname"]
+		assert_equal OtherSubClass.many_attributes.sort, ["others", "othersubothers"]
 	end
 end

data/test/metamodel_generator_test.rb

@@ -10,13 +10,12 @@ class MetamodelGeneratorTest < Test::Unit::TestCase
 	OUTPUT_DIR = File.dirname(__FILE__)+"/metamodel_generator_test"
 	MM_FILE = OUTPUT_DIR+"/TestModel.rb"
 	
-	include XMIClassInstantiator
 	include MMGen::MetamodelGenerator
 		
 	def test_generator
 		envUML = RGen::Environment.new
 		File.open(MODEL_DIR+"/testmodel.xml") { |f|
-			instantiateUMLClassModel(envUML, f.read)
+			XMIClassInstantiator.new.instantiateUMLClassModel(envUML, f.read)
 		}
 
 		rootPackage = envUML.find(:class => UMLClassModel::UMLPackage).select{|p| p.name == "HouseMetamodel"}.first

data/test/rgen_test.rb

@@ -11,3 +11,4 @@ require 'xmi_class_instantiator_test'
 require 'xmi_object_instantiator_test'
 require 'metamodel_generator_test'
 require 'transformer_test'
+require 'xml_instantiator_test'

data/test/transformer_test.rb

@@ -1,8 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
+$:.unshift File.join(File.dirname(__FILE__),"..","test")
 
 require 'test/unit'
 require 'rgen/transformer'
 require 'rgen/environment'
+require 'uml/uml_classmodel'
+require 'ea/xmi_class_instantiator'
+require 'xmi_instantiator_test/class_model_checker'
 
 class TransformerTest < Test::Unit::TestCase
 
@@ -173,4 +177,27 @@ class TransformerTest < Test::Unit::TestCase
 		assert_equal 2, env_out.elements.size
 		assert (t.trans(froms)-env_out.elements).empty?
 	end
+	
+	class CopyTransformer < RGen::Transformer
+		include UMLClassModel
+		def transform
+			trans(:class => UMLPackage)
+		end
+		constants.each{|c| copy const_get(c) if c =~ /^UML/}
+	end
+
+	MODEL_DIR = File.join(File.dirname(__FILE__),"xmi_instantiator_test")
+
+	include ClassModelChecker
+	
+	def test_copyTransformer
+		envIn = RGen::Environment.new
+		envOut = RGen::Environment.new
+		File.open(MODEL_DIR+"/testmodel.xml") { |f|
+			XMIClassInstantiator.new.instantiateUMLClassModel(envIn, f.read)
+		}
+		CopyTransformer.new(envIn, envOut).transform
+		checkClassModel(envOut)
+	end
+	
 end

data/test/xmi_class_instantiator_test.rb

@@ -1,107 +1,24 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
+$:.unshift File.join(File.dirname(__FILE__),"..","test")
 
 require 'test/unit'
 require 'ea/xmi_class_instantiator'
+require 'rgen/transformer'
+require 'xmi_instantiator_test/class_model_checker'
 
 class XmiClassInstantiatorTest < Test::Unit::TestCase
 
 	MODEL_DIR = File.join(File.dirname(__FILE__),"xmi_instantiator_test")
 
-	include XMIClassInstantiator
-		
+	include ClassModelChecker
+	
 	def test_model
 		envUML = RGen::Environment.new
 		File.open(MODEL_DIR+"/testmodel.xml") { |f|
-			instantiateUMLClassModel(envUML, f.read)
+			XMIClassInstantiator.new.instantiateUMLClassModel(envUML, f.read)
 		}
-		
-		# check main package
-		mainPackage = envUML.elements.select {|e| e.is_a? UMLPackage and e.name == "HouseMetamodel"}.first
-		assert_not_nil mainPackage
-		
-		# check Rooms package
-		assert mainPackage.subpackages.is_a?(Array)
-		assert_equal 1, mainPackage.subpackages.size
-		assert mainPackage.subpackages[0].is_a?(UMLPackage)
-		roomsPackage = mainPackage.subpackages[0]
-		assert_equal "Rooms", roomsPackage.name
-		
-		# check main package classes
-		assert mainPackage.classes.is_a?(Array)
-		assert_equal 3, mainPackage.classes.size
-		assert mainPackage.classes.all?{|c| c.is_a?(UMLClass)}
-		houseClass = mainPackage.classes.select{|c| c.name == "House"}.first
-		personClass = mainPackage.classes.select{|c| c.name == "Person"}.first
-		meetingPlaceClass = mainPackage.classes.select{|c| c.name == "MeetingPlace"}.first
-		assert_not_nil houseClass
-		assert_not_nil personClass
-		assert_not_nil meetingPlaceClass
+		checkClassModel(envUML)
+	end
 
-		# check Rooms package classes
-		assert roomsPackage.classes.is_a?(Array)
-		assert_equal 3, roomsPackage.classes.size
-		assert roomsPackage.classes.all?{|c| c.is_a?(UMLClass)}
-		roomClass = roomsPackage.classes.select{|c| c.name == "Room"}.first
-		kitchenClass = roomsPackage.classes.select{|c| c.name == "Kitchen"}.first
-		bathroomClass = roomsPackage.classes.select{|c| c.name == "Bathroom"}.first
-		assert_not_nil roomClass
-		assert_not_nil kitchenClass
-		assert_not_nil bathroomClass
-		
-		# check Room inheritance
-		assert roomClass.subclasses.is_a?(Array)
-		assert_equal 2, roomClass.subclasses.size
-		assert_not_nil roomClass.subclasses.select{|c| c.name == "Kitchen"}.first
-		assert_not_nil roomClass.subclasses.select{|c| c.name == "Bathroom"}.first
-		assert kitchenClass.superclasses.is_a?(Array)
-		assert_equal 2, kitchenClass.superclasses.size
-		assert_equal roomClass.object_id, kitchenClass.superclasses.select{|c| c.name == "Room"}.first.object_id
-		assert_equal meetingPlaceClass.object_id, kitchenClass.superclasses.select{|c| c.name == "MeetingPlace"}.first.object_id
-		assert bathroomClass.superclasses.is_a?(Array)
-		assert_equal 1, bathroomClass.superclasses.size
-		assert_equal roomClass.object_id, bathroomClass.superclasses[0].object_id
 
-		# check House-Room "part of" association
-		assert houseClass.localCompositeEnds.otherEnd.clazz.is_a?(Array)
-		assert_equal 1, houseClass.localCompositeEnds.size
-		roomEnd = houseClass.localCompositeEnds[0].otherEnd
-		assert_equal UMLAggregation, roomEnd.assoc.class
-		assert_equal roomClass.object_id, roomEnd.clazz.object_id
-		assert_equal "room", roomEnd.role
-		assert_equal "1..*", roomEnd.multiplicity
-		assert_equal 1, roomEnd.lowerMult
-		assert_equal :many, roomEnd.upperMult
-		
-		assert roomClass.remoteCompositeEnds.clazz.is_a?(Array)
-		assert_equal 1, roomClass.remoteCompositeEnds.size
-		assert_equal houseClass.object_id, roomClass.remoteCompositeEnds[0].clazz.object_id
-		assert_equal "house", roomClass.remoteCompositeEnds[0].role
-				
-		# check House OUT associations
-		assert houseClass.remoteNavigableEnds.is_a?(Array)
-		assert_equal 2, houseClass.remoteNavigableEnds.size
-		bathEnd = houseClass.remoteNavigableEnds.select{|e| e.role == "bathroom"}.first
-		kitchenEnd = houseClass.remoteNavigableEnds.select{|e| e.role == "kitchen"}.first
-		assert_not_nil bathEnd
-		assert_not_nil kitchenEnd
-		assert_equal UMLAssociation, bathEnd.assoc.class
-		assert_equal UMLAssociation, kitchenEnd.assoc.class
-		assert_equal "1", kitchenEnd.multiplicity
-		assert_equal 1, kitchenEnd.lowerMult
-		assert_equal 1, kitchenEnd.upperMult
-		
-		# check House IN associations
-		assert houseClass.localNavigableEnds.is_a?(Array)
-		assert_equal 3, houseClass.localNavigableEnds.size
-		homeEnd = houseClass.localNavigableEnds.select{|e| e.role == "home"}.first
-		assert_not_nil homeEnd
-		assert_equal UMLAssociation, homeEnd.assoc.class
-		assert_equal "0..*", homeEnd.multiplicity
-		assert_equal 0, homeEnd.lowerMult
-		assert_equal :many, homeEnd.upperMult
-		
-		# check House all associations
-		assert houseClass.assocEnds.is_a?(Array)
-		assert_equal 4, houseClass.assocEnds.size
-	end
 end

data/test/xmi_instantiator_test/class_model_checker.rb

@@ -0,0 +1,97 @@
+require 'uml/uml_classmodel'
+
+module ClassModelChecker			
+	include UMLClassModel
+
+	def checkClassModel(envUML)
+						
+		# check main package
+		mainPackage = envUML.elements.select {|e| e.is_a? UMLPackage and e.name == "HouseMetamodel"}.first
+		assert_not_nil mainPackage
+		
+		# check Rooms package
+		assert mainPackage.subpackages.is_a?(Array)
+		assert_equal 1, mainPackage.subpackages.size
+		assert mainPackage.subpackages[0].is_a?(UMLPackage)
+		roomsPackage = mainPackage.subpackages[0]
+		assert_equal "Rooms", roomsPackage.name
+		
+		# check main package classes
+		assert mainPackage.classes.is_a?(Array)
+		assert_equal 3, mainPackage.classes.size
+		assert mainPackage.classes.all?{|c| c.is_a?(UMLClass)}
+		houseClass = mainPackage.classes.select{|c| c.name == "House"}.first
+		personClass = mainPackage.classes.select{|c| c.name == "Person"}.first
+		meetingPlaceClass = mainPackage.classes.select{|c| c.name == "MeetingPlace"}.first
+		assert_not_nil houseClass
+		assert_not_nil personClass
+		assert_not_nil meetingPlaceClass
+
+		# check Rooms package classes
+		assert roomsPackage.classes.is_a?(Array)
+		assert_equal 3, roomsPackage.classes.size
+		assert roomsPackage.classes.all?{|c| c.is_a?(UMLClass)}
+		roomClass = roomsPackage.classes.select{|c| c.name == "Room"}.first
+		kitchenClass = roomsPackage.classes.select{|c| c.name == "Kitchen"}.first
+		bathroomClass = roomsPackage.classes.select{|c| c.name == "Bathroom"}.first
+		assert_not_nil roomClass
+		assert_not_nil kitchenClass
+		assert_not_nil bathroomClass
+		
+		# check Room inheritance
+		assert roomClass.subclasses.is_a?(Array)
+		assert_equal 2, roomClass.subclasses.size
+		assert_not_nil roomClass.subclasses.select{|c| c.name == "Kitchen"}.first
+		assert_not_nil roomClass.subclasses.select{|c| c.name == "Bathroom"}.first
+		assert kitchenClass.superclasses.is_a?(Array)
+		assert_equal 2, kitchenClass.superclasses.size
+		assert_equal roomClass.object_id, kitchenClass.superclasses.select{|c| c.name == "Room"}.first.object_id
+		assert_equal meetingPlaceClass.object_id, kitchenClass.superclasses.select{|c| c.name == "MeetingPlace"}.first.object_id
+		assert bathroomClass.superclasses.is_a?(Array)
+		assert_equal 1, bathroomClass.superclasses.size
+		assert_equal roomClass.object_id, bathroomClass.superclasses[0].object_id
+
+		# check House-Room "part of" association
+		assert houseClass.localCompositeEnds.otherEnd.clazz.is_a?(Array)
+		assert_equal 1, houseClass.localCompositeEnds.size
+		roomEnd = houseClass.localCompositeEnds[0].otherEnd
+		assert_equal UMLAggregation, roomEnd.assoc.class
+		assert_equal roomClass.object_id, roomEnd.clazz.object_id
+		assert_equal "room", roomEnd.role
+		assert_equal "1..*", roomEnd.multiplicity
+		assert_equal 1, roomEnd.lowerMult
+		assert_equal :many, roomEnd.upperMult
+		
+		assert roomClass.remoteCompositeEnds.clazz.is_a?(Array)
+		assert_equal 1, roomClass.remoteCompositeEnds.size
+		assert_equal houseClass.object_id, roomClass.remoteCompositeEnds[0].clazz.object_id
+		assert_equal "house", roomClass.remoteCompositeEnds[0].role
+				
+		# check House OUT associations
+		assert houseClass.remoteNavigableEnds.is_a?(Array)
+		assert_equal 2, houseClass.remoteNavigableEnds.size
+		bathEnd = houseClass.remoteNavigableEnds.select{|e| e.role == "bathroom"}.first
+		kitchenEnd = houseClass.remoteNavigableEnds.select{|e| e.role == "kitchen"}.first
+		assert_not_nil bathEnd
+		assert_not_nil kitchenEnd
+		assert_equal UMLAssociation, bathEnd.assoc.class
+		assert_equal UMLAssociation, kitchenEnd.assoc.class
+		assert_equal "1", kitchenEnd.multiplicity
+		assert_equal 1, kitchenEnd.lowerMult
+		assert_equal 1, kitchenEnd.upperMult
+		
+		# check House IN associations
+		assert houseClass.localNavigableEnds.is_a?(Array)
+		assert_equal 3, houseClass.localNavigableEnds.size
+		homeEnd = houseClass.localNavigableEnds.select{|e| e.role == "home"}.first
+		assert_not_nil homeEnd
+		assert_equal UMLAssociation, homeEnd.assoc.class
+		assert_equal "0..*", homeEnd.multiplicity
+		assert_equal 0, homeEnd.lowerMult
+		assert_equal :many, homeEnd.upperMult
+		
+		# check House all associations
+		assert houseClass.assocEnds.is_a?(Array)
+		assert_equal 4, houseClass.assocEnds.size
+	end
+end

data/test/xmi_object_instantiator_test.rb

@@ -7,12 +7,12 @@ class XmiObjectInstantiatorTest < Test::Unit::TestCase
 
 	MODEL_DIR = File.join(File.dirname(__FILE__),"xmi_instantiator_test")
 
-	include XMIObjectInstantiator
-		
+	include UMLObjectModel
+
 	def test_model
 		envUML = RGen::Environment.new
 		File.open(MODEL_DIR+"/testmodel.xml") { |f|
-			instantiateUMLObjectModel(envUML, f.read)
+			XMIObjectInstantiator.new.instantiateUMLObjectModel(envUML, f.read)
 		}
 		
 		# check main package

data/test/xml_instantiator_test/testmodel.xml

@@ -0,0 +1,7 @@
+<TestModel xmlns:MNS="testmodel.org/myNamespace" >
+	<MNS:House>
+		<MNS:Room id="1" name="Kitchen" />
+		<MNS:Room id="2" name="TomsRoom" />
+	</MNS:House>
+	<Person name="Tom" room="2" />
+</TestModel>

data/test/xml_instantiator_test.rb

@@ -0,0 +1,83 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'test/unit'
+require 'rgen/xml_instantiator'
+require 'rgen/environment'
+require 'rgen/model_dumper'
+
+module EmptyMM
+end
+
+module DefaultMM
+	module MNS
+		class Room < RGen::MetamodelBuilder::MMBase; end
+	end
+	class Person < RGen::MetamodelBuilder::MMBase; end
+	Person.one_to_one 'personalRoom', MNS::Room, 'inhabitant'
+end
+
+class XMLInstantiatorTest < Test::Unit::TestCase
+
+	XML_DIR = File.join(File.dirname(__FILE__),"xml_instantiator_test")
+	
+	include RGen::ModelDumper
+	
+	class MyInstantiator < RGen::XMLInstantiator
+	
+		map_tag_ns "testmodel.org/myNamespace", DefaultMM::MNS
+		
+#		resolve :type do
+#			@env.find(:xmi_id => getType).first
+#		end
+	
+		resolve_by_id :personalRoom, :id => :getId, :src => :room
+		
+	end
+	
+	def test_custom
+		env = RGen::Environment.new
+		inst = MyInstantiator.new(env, DefaultMM, true)
+		inst.instantiate_file(File.join(XML_DIR,"testmodel.xml"))
+		
+		house = env.find(:class => DefaultMM::MNS::House).first
+		assert_not_nil house
+		assert_equal 2, house.room.size
+		
+		rooms = env.find(:class => DefaultMM::MNS::Room)
+		assert_equal 2, rooms.size
+		assert_equal 0, (house.room - rooms).size
+		rooms.each {|r| assert r.parent == house}
+		tomsRoom = rooms.select{|r| r.name == "TomsRoom"}.first
+		assert_not_nil tomsRoom
+		
+		persons = env.find(:class => DefaultMM::Person)
+		assert_equal 1, persons.size
+		tom = persons.select{|p| p.name == "Tom"}.first
+		assert_not_nil tom
+		
+		assert tom.personalRoom == tomsRoom
+	end
+	
+	def test_default
+		env = RGen::Environment.new
+		inst = RGen::XMLInstantiator.new(env, EmptyMM, true)
+		inst.instantiate_file(File.join(XML_DIR,"testmodel.xml"))
+		
+		house = env.find(:class => EmptyMM::MNS_House).first
+		assert_not_nil house
+		assert_equal 2, house.mNS_Room.size
+		
+		rooms = env.find(:class => EmptyMM::MNS_Room)
+		assert_equal 2, rooms.size
+		assert_equal 0, (house.mNS_Room - rooms).size
+		rooms.each {|r| assert r.parent == house}
+		tomsRoom = rooms.select{|r| r.name == "TomsRoom"}.first
+		assert_not_nil tomsRoom
+		
+		persons = env.find(:class => EmptyMM::Person)
+		assert_equal 1, persons.size
+		tom = persons.select{|p| p.name == "Tom"}.first
+		assert_not_nil tom
+	end
+	
+end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.0
 specification_version: 1
 name: rgen
 version: !ruby/object:Gem::Version 
-  version: 0.2.0
-date: 2006-09-03 00:00:00 +02:00
+  version: 0.3.0
+date: 2006-10-08 00:00:00 +02:00
 summary: Ruby Modelling and Generator Framework
 require_paths: 
 - lib
@@ -48,13 +48,15 @@ files:
 - lib/rgen/array_extensions.rb
 - lib/rgen/auto_class_creator.rb
 - lib/rgen/environment.rb
+- lib/rgen/instantiator.rb
 - lib/rgen/metamodel_builder
 - lib/rgen/metamodel_builder.rb
+- lib/rgen/model_dumper.rb
 - lib/rgen/name_helper.rb
 - lib/rgen/template_language
 - lib/rgen/template_language.rb
 - lib/rgen/transformer.rb
-- lib/rgen/xml_instantiator
+- lib/rgen/xml_instantiator.rb
 - lib/rgen/metamodel_builder/builder_extensions.rb
 - lib/rgen/metamodel_builder/builder_runtime.rb
 - lib/rgen/metamodel_builder/build_helper.rb
@@ -62,9 +64,6 @@ files:
 - lib/rgen/template_language/output_handler.rb
 - lib/rgen/template_language/template_container.rb
 - lib/rgen/template_language/template_helper.rb
-- lib/rgen/xml_instantiator/dependency_resolver.rb
-- lib/rgen/xml_instantiator/xml_instantiator.rb
-- lib/rgen/xml_instantiator/xml_parser.rb
 - lib/uml/objectmodel_instantiator.rb
 - lib/uml/uml_classmodel.rb
 - lib/uml/uml_objectmodel.rb
@@ -81,6 +80,8 @@ files:
 - test/xmi_class_instantiator_test.rb
 - test/xmi_instantiator_test
 - test/xmi_object_instantiator_test.rb
+- test/xml_instantiator_test
+- test/xml_instantiator_test.rb
 - test/metamodel_generator_test/expected_result.txt
 - test/metamodel_generator_test/TestModel.rb
 - test/template_language_test/expected_result.txt
@@ -93,8 +94,10 @@ files:
 - test/template_language_test/templates/index/c
 - test/template_language_test/templates/index/chapter.tpl
 - test/template_language_test/templates/index/c/cmod.tpl
+- test/xmi_instantiator_test/class_model_checker.rb
 - test/xmi_instantiator_test/testmodel.eap
 - test/xmi_instantiator_test/testmodel.xml
+- test/xml_instantiator_test/testmodel.xml
 - README
 - CHANGELOG
 - MIT-LICENSE