rgen 0.4.6 → 0.5.0

data/test/transformer_test.rb

@@ -6,7 +6,6 @@ require 'rgen/transformer'
 require 'rgen/environment'
 require 'rgen/model_comparator'
 require 'metamodels/uml13_metamodel'
-require 'instantiators/ea_instantiator'
 require 'testmodel/class_model_checker'
 
 class TransformerTest < Test::Unit::TestCase
@@ -242,10 +241,9 @@ class TransformerTest < Test::Unit::TestCase
 	def test_copyTransformer
 		envIn = RGen::Environment.new
 		envOut = RGen::Environment.new
-		File.open(MODEL_DIR+"/ea_testmodel.xml") { |f|
-			inst = EAInstantiator.new(envIn, EAInstantiator::ERROR)
-			inst.instantiate(f.read)
-		}
+
+    EASupport.instantiateUML13FromXMI11(envIn, MODEL_DIR+"/ea_testmodel.xml") 
+		
 		CopyTransformer.new(envIn, envOut).transform
 		checkClassModel(envOut)
 		assert modelEqual?(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rgen
 version: !ruby/object:Gem::Version 
-  version: 0.4.6
+  version: 0.5.0
 platform: ruby
 authors: 
 - Martin Thiede
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-01 00:00:00 +01:00
+date: 2009-06-08 00:00:00 +02:00
 default_executable: 
 dependencies: []
 
@@ -24,8 +24,15 @@ extra_rdoc_files:
 - CHANGELOG
 - MIT-LICENSE
 files: 
+- lib/ea_support
+- lib/ea_support/ea_support.rb
+- lib/ea_support/id_store.rb
+- lib/ea_support/uml13_ea_metamodel.rb
+- lib/ea_support/uml13_ea_metamodel_ext.rb
+- lib/ea_support/uml13_ea_metamodel_generator.rb
+- lib/ea_support/uml13_ea_to_uml13.rb
+- lib/ea_support/uml13_to_uml13_ea.rb
 - lib/instantiators
-- lib/instantiators/ea_instantiator.rb
 - lib/metamodels
 - lib/metamodels/uml13_metamodel.rb
 - lib/metamodels/uml13_metamodel_ext.rb
@@ -42,6 +49,7 @@ files:
 - lib/rgen/auto_class_creator.rb
 - lib/rgen/ecore
 - lib/rgen/ecore/ecore.rb
+- lib/rgen/ecore/ecore_builder_methods.rb
 - lib/rgen/ecore/ecore_ext.rb
 - lib/rgen/ecore/ecore_instantiator.rb
 - lib/rgen/ecore/ecore_transformer.rb
@@ -62,7 +70,14 @@ files:
 - lib/rgen/metamodel_builder/metamodel_description.rb
 - lib/rgen/metamodel_builder/mm_multiple.rb
 - lib/rgen/metamodel_builder/module_extension.rb
+- lib/rgen/metamodel_builder/module_extension2.rb
 - lib/rgen/metamodel_builder.rb
+- lib/rgen/method_delegation.rb
+- lib/rgen/model_builder
+- lib/rgen/model_builder/builder_context.rb
+- lib/rgen/model_builder/model_serializer.rb
+- lib/rgen/model_builder/reference_resolver.rb
+- lib/rgen/model_builder.rb
 - lib/rgen/model_comparator.rb
 - lib/rgen/model_dumper.rb
 - lib/rgen/name_helper.rb
@@ -77,12 +92,15 @@ files:
 - lib/rgen/template_language/template_helper.rb
 - lib/rgen/template_language.rb
 - lib/rgen/transformer.rb
+- lib/serializers
 - lib/transformers
+- lib/transformers/ecore_to_uml13.rb
 - lib/transformers/uml13_to_ecore.rb
 - test/array_extensions_test.rb
 - test/ea_instantiator_test.rb
 - test/ea_serializer_test
 - test/ea_serializer_test/ea_testmodel_regenerated.xml
+- test/ea_serializer_test/ea_testmodel_regenerated_import.log
 - test/ea_serializer_test.rb
 - test/ecore_self_test.rb
 - test/environment_test.rb
@@ -94,6 +112,16 @@ files:
 - test/metamodel_roundtrip_test/TestModel.rb
 - test/metamodel_roundtrip_test/TestModel_Regenerated.rb
 - test/metamodel_roundtrip_test.rb
+- test/method_delegation_test.rb
+- test/model_builder
+- test/model_builder/builder_context_test.rb
+- test/model_builder/builder_test.rb
+- test/model_builder/ecore_internal.rb
+- test/model_builder/ecore_original.rb
+- test/model_builder/ecore_original_regenerated.rb
+- test/model_builder/reference_resolver_test.rb
+- test/model_builder/serializer_test.rb
+- test/model_builder_test.rb
 - test/output_handler_test.rb
 - test/rgen_test.rb
 - test/template_language_test
@@ -108,21 +136,40 @@ files:
 - test/template_language_test/templates/content
 - test/template_language_test/templates/content/author.tpl
 - test/template_language_test/templates/content/chapter.tpl
+- test/template_language_test/templates/define_local_test
+- test/template_language_test/templates/define_local_test/local.tpl
+- test/template_language_test/templates/define_local_test/test.tpl
+- test/template_language_test/templates/evaluate_test
+- test/template_language_test/templates/evaluate_test/test.tpl
 - test/template_language_test/templates/indent_string_test.tpl
 - test/template_language_test/templates/index
 - test/template_language_test/templates/index/c
 - test/template_language_test/templates/index/c/cmod.tpl
 - test/template_language_test/templates/index/chapter.tpl
 - test/template_language_test/templates/no_backslash_r_test.tpl
+- test/template_language_test/templates/no_indent_test
+- test/template_language_test/templates/no_indent_test/no_indent.tpl
+- test/template_language_test/templates/no_indent_test/sub1
+- test/template_language_test/templates/no_indent_test/sub1/no_indent.tpl
+- test/template_language_test/templates/no_indent_test/test.tpl
+- test/template_language_test/templates/no_indent_test/test2.tpl
+- test/template_language_test/templates/no_indent_test/test3.tpl
 - test/template_language_test/templates/null_context_test.tpl
 - test/template_language_test/templates/root.tpl
+- test/template_language_test/templates/template_resolution_test
+- test/template_language_test/templates/template_resolution_test/sub1
+- test/template_language_test/templates/template_resolution_test/sub1/sub1.tpl
+- test/template_language_test/templates/template_resolution_test/sub1.tpl
+- test/template_language_test/templates/template_resolution_test/test.tpl
 - test/template_language_test/testout.txt
 - test/template_language_test.rb
 - test/testmodel
 - test/testmodel/class_model_checker.rb
 - test/testmodel/ea_testmodel.eap
 - test/testmodel/ea_testmodel.xml
+- test/testmodel/ea_testmodel_import.log
 - test/testmodel/ea_testmodel_partial.xml
+- test/testmodel/ea_testmodel_regenerated.xml
 - test/testmodel/ecore_model_checker.rb
 - test/testmodel/manual_testmodel.xml
 - test/testmodel/object_model_checker.rb
@@ -215,6 +262,8 @@ rdoc_options:
 - test
 - -x
 - metamodels
+- -x
+- ea_support/uml13*
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/lib/instantiators/ea_instantiator.rb

@@ -1,39 +0,0 @@
-require 'rgen/instantiator/xmi11_instantiator'
-require 'metamodels/uml13_metamodel'
-
-class EAInstantiator < XMI11Instantiator
-
-  #TODO add element names to make feature names unique
-  FIXMAP = {
-    :tags => {
-      "EAStub" => proc { |tag, attr| UML13::Class.new(
-        :name => attr["name"]
-      )},
-      "ActivityModel" => "ActivityGraph",
-      "PseudoState" => "Pseudostate"
-    },
-    :feature_names => {
-      "isOrdered" => "ordering",
-      "subtype" => "child",
-      "supertype" => "parent",
-      "changeable" => "changeability",
-      "substate" => "subvertex"
-    },
-    :feature_values => {
-      "ordering" => {"true" => "ordered", "false" => "unordered"},
-      "aggregation" => {"shared" => "aggregate"},
-      "changeability" => {"none" => "frozen"},
-      "multiplicity" => proc { |v| UML13::Multiplicity.new(
-        :range => [UML13::MultiplicityRange.new(
-          :lower => v.split("..").first,
-          :upper => v.split("..").last
-        )])}
-    }
-  }
-  
-  def initialize(env, loglevel)
-    super(env, FIXMAP, loglevel)
-    add_metamodel("omg.org/UML1.3", UML13)
-  end
-  
-end