rgen 0.5.2 → 0.5.3

data/CHANGELOG

@@ -99,7 +99,7 @@
 * Fixed metamodel builder bug: _register at one-side did not unregister from the element referenced by the old value
 * Added helper class for building simple model comparators
 
-=0.5.2 ( )
+=0.5.2 (Jun 13th, 2010)
 
 * Added has_many_attr to metamodel builder, support for "many" attributes
 * Added JSON support (json instantiator and serializer)
@@ -110,3 +110,8 @@
 * Fixed ecore xml instantiator and serializer to handle references to builtin datatypes correctly
 * Fixed bug in ecore xml serializer to not output references which are opposites of containment references
 
+=0.5.3 (Aug 13th, 2010)
+
+* Fixed string escaping in JSON instantiator and serializer
+* Fixed order of eClassifiers and eSubpackages within an EPackage created by reflection on a RGen module
+

data/Rakefile

@@ -3,8 +3,8 @@ require 'rake/rdoctask'
 
 RGenGemSpec = Gem::Specification.new do |s|
   s.name = %q{rgen}
-  s.version = "0.5.2"
-  s.date = %q{2010-06-13}
+  s.version = "0.5.3"
+  s.date = %q{2010-08-13}
   s.summary = %q{Ruby Modelling and Generator Framework}
   s.email = %q{martin dot thiede at gmx de}
   s.homepage = %q{http://ruby-gen.org}

data/lib/rgen/ecore/ecore_transformer.rb

@@ -32,13 +32,14 @@ class ECoreTransformer < Transformer
   
   transform Module, :to => EPackage, :if => :convert?  do
   	@enumParentModule ||= {}
-  	constants.select {|c| const_get(c).is_a?(MetamodelBuilder::DataTypes::Enum)}.
+    _constants = _constantOrder + (constants - _constantOrder)
+  	_constants.select {|c| const_get(c).is_a?(MetamodelBuilder::DataTypes::Enum)}.
   		each {|c| @enumParentModule[const_get(c)] = @current_object}
     { :name => name.gsub(/.*::(\w+)$/,'\1'),
-      :eClassifiers => trans(constants.collect{|c| const_get(c)}.select{|c| c.is_a?(Class) || 
+      :eClassifiers => trans(_constants.collect{|c| const_get(c)}.select{|c| c.is_a?(Class) || 
 	      (c.is_a?(MetamodelBuilder::DataTypes::Enum) && c != MetamodelBuilder::DataTypes::Boolean) }),
       :eSuperPackage => trans(name =~ /(.*)::\w+$/ ? eval($1) : nil),
-      :eSubpackages => trans(constants.collect{|c| const_get(c)}.select{|c| c.is_a?(Module) && !c.is_a?(Class)}),
+      :eSubpackages => trans(_constants.collect{|c| const_get(c)}.select{|c| c.is_a?(Module) && !c.is_a?(Class)}),
       :eAnnotations => trans(_annotations)
     }
   end
@@ -87,4 +88,4 @@ end
   
 end
   
-end
+end

data/lib/rgen/instantiator/json_parser.rb

@@ -15,7 +15,7 @@ module Instantiator
 
 class JsonParser < Racc::Parser
 
-module_eval <<'..end json_parser.y modeval..ide42306a0dd', 'json_parser.y', 38
+module_eval <<'..end json_parser.y modeval..id3d5fb611e2', 'json_parser.y', 38
 
 	ParserToken = Struct.new(:line, :file, :value)
 
@@ -45,6 +45,11 @@ module_eval <<'..end json_parser.y modeval..ide42306a0dd', 'json_parser.y', 38
           sval = $1
           sval.gsub!('\\\\','\\')
           sval.gsub!('\\"','"')
+          sval.gsub!('\\n',"\n")
+          sval.gsub!('\\r',"\r")
+          sval.gsub!('\\t',"\t")
+          sval.gsub!('\\f',"\f")
+          sval.gsub!('\\b',"\b")
 					@q << [:STRING, ParserToken.new(line, file, sval)]
 				when /\A(\{|\}|\[|\]|,|:|true|false)/
 					str = $'
@@ -62,7 +67,7 @@ module_eval <<'..end json_parser.y modeval..ide42306a0dd', 'json_parser.y', 38
     r
 	end
 	
-..end json_parser.y modeval..ide42306a0dd
+..end json_parser.y modeval..id3d5fb611e2
 
 ##### racc 1.4.5 generates ###
 

data/lib/rgen/instantiator/json_parser.y

@@ -64,6 +64,11 @@ module Instantiator
           sval = $1
           sval.gsub!('\\\\','\\')
           sval.gsub!('\\"','"')
+          sval.gsub!('\\n',"\n")
+          sval.gsub!('\\r',"\r")
+          sval.gsub!('\\t',"\t")
+          sval.gsub!('\\f',"\f")
+          sval.gsub!('\\b',"\b")
 					@q << [:STRING, ParserToken.new(line, file, sval)]
 				when /\A(\{|\}|\[|\]|,|:|true|false)/
 					str = $'

data/lib/rgen/metamodel_builder.rb

@@ -1,6 +1,7 @@
 # RGen Framework
 # (c) Martin Thiede, 2006
 
+require 'rgen/metamodel_builder/constant_order_helper'
 require 'rgen/metamodel_builder/builder_runtime'
 require 'rgen/metamodel_builder/builder_extensions'
 require 'rgen/metamodel_builder/module_extension'

data/lib/rgen/metamodel_builder/builder_extensions.rb

@@ -266,6 +266,7 @@ module BuilderExtensions
 	
 	def inherited(c)
 	  c.send(:include, c.const_set(:ClassModule, Module.new))
+    MetamodelBuilder::ConstantOrderHelper.classCreated(c)
 	end
 		
 	protected

data/lib/rgen/metamodel_builder/constant_order_helper.rb

@@ -0,0 +1,89 @@
+module RGen
+
+module MetamodelBuilder
+
+# The purpose of the ConstantOrderHelper is to capture the definition order of RGen metamodel builder 
+# classes, modules and enums. The problem is that Ruby doesn't seem to track the order of
+# constants being created in a module. However the order is important because it defines the order
+# of eClassifiers and eSubpackages in a EPackage.
+#
+# It would be helpful here if Ruby provided a +const_added+ callback, but this is not the case up to now.
+#
+# The idea for capturing is that all events of creating a RGen class, module or enum are reported to the
+# ConstantOrderHelper singleton.
+# For classes and modules it tries to add their names to the parent's +_constantOrder+ array.
+# The parent module is derived from the class's or module's name. However, the new name is only added
+# if the respective parent module has a new constant (which is not yet in +_constantOrder+) which
+# points to the new class or module.
+# For enums it is a bit more complicated, because at the time the enum is created, the parent
+# module does not yet contain the constant to which the enum is assigned. Therefor, the enum is remembered
+# and it is tried to be stored on the next event (class, module or enum) within the module which was
+# created last (which was last extended with ModuleExtension). If it can not be found in that module,
+# all parent modules of the last module are searched. This way it should also be correctly entered in
+# case it was defined outside of the last created module. 
+# Note that an enum is not stored to the constant order array unless another event occurs. That's why
+# it is possible that one enum is missing at the enum. This needs to be taken care of by the ECore transformer.
+#
+# This way of capturing should be sufficient for the regular use cases of the RGen metamodel builder language.
+# However, it is possible to write code which messes this up, see unit tests for details.
+# In the worst case, the new classes, modules or enums will just not be found in a parent module and thus be ignored.
+#
+ConstantOrderHelper = Class.new do
+
+  def initialize
+    @currentModule = nil
+    @pendingEnum = nil
+  end
+
+  def classCreated(c)
+    handlePendingEnum
+    cont = containerModule(c)
+    name = c.name.split("::").last
+    return unless cont.respond_to?(:_constantOrder) && !cont._constantOrder.include?(name)
+    cont._constantOrder << name
+  end
+
+  def moduleCreated(m)
+    handlePendingEnum
+    cont = containerModule(m)
+    name = m.name.split("::").last
+    return unless cont.respond_to?(:_constantOrder) && !cont._constantOrder.include?(name)
+    cont._constantOrder << name
+    @currentModule = m
+  end
+
+  def enumCreated(e)
+    handlePendingEnum
+    @pendingEnum = e
+  end
+
+  private
+
+  def containerModule(m)
+    containerName = m.name.split("::")[0..-2].join("::")
+    containerName.empty? ? nil : eval(containerName, TOPLEVEL_BINDING)
+  end 
+
+  def handlePendingEnum
+    return unless @pendingEnum
+    m = @currentModule
+    while m
+      if m.respond_to?(:_constantOrder)
+        newConstants = m.constants - m._constantOrder
+        const = newConstants.find{|c| m.const_get(c).object_id == @pendingEnum.object_id}
+        if const
+          m._constantOrder << const
+          break
+        end
+      end
+      m = containerModule(m)
+    end
+    @pendingEnum = nil
+  end
+      
+end.new
+
+end
+
+end
+

data/lib/rgen/metamodel_builder/data_types.rb

@@ -21,6 +21,7 @@ module DataTypes
 	  
 	  # Creates a new named enum type object consisting of the elements passed as arguments.
 	  def initialize(params)
+      MetamodelBuilder::ConstantOrderHelper.enumCreated(self)
 	  	if params.is_a?(Array)
 		    @literals = params
 	  		@name = "anonymous"
@@ -64,4 +65,4 @@ end
 
 end
 
-end
+end

data/lib/rgen/metamodel_builder/module_extension.rb

@@ -17,6 +17,10 @@ module ModuleExtension
   def _annotations
     @_annotations ||= []
   end
+
+  def _constantOrder
+    @_constantOrder ||= []
+  end
   
   def final_method(m)
     @final_methods ||= []
@@ -26,8 +30,13 @@ module ModuleExtension
   def method_added(m)
     raise "Method #{m} can not be redefined" if @final_methods && @final_methods.include?(m)
   end
+
+  def self.extended(m)
+    MetamodelBuilder::ConstantOrderHelper.moduleCreated(m)
+  end
+
 end
 
 end
 
-end
+end

data/lib/rgen/serializer/json_serializer.rb

@@ -101,7 +101,8 @@ class JsonSerializer
 
   def attributeValue(value, a)
     if a.eType == RGen::ECore::EString || a.eType.is_a?(RGen::ECore::EEnum)
-      "\""+value.to_s.gsub('"','\\"').gsub('\\','\\\\')+"\""
+      "\""+value.to_s.gsub('\\','\\\\\\\\').gsub('"','\\"').gsub("\n","\\n").gsub("\r","\\r").
+        gsub("\t","\\t").gsub("\f","\\f").gsub("\b","\\b")+"\""
     else
       value.to_s
     end

data/test/json_test.rb

@@ -46,18 +46,26 @@ class JsonTest < Test::Unit::TestCase
   end
 
   def test_json_serializer_escapes
-    testModel = TestMM::TestNode.new(:text => %q(some " \ \" text))
+    testModel = TestMM::TestNode.new(:text => %Q(some " \\ \\" text \r xx \n xx \r\n xx \t xx \b xx \f))
     output = StringWriter.new
     ser = RGen::Serializer::JsonSerializer.new(output)
 
-    assert_equal %q({ "_class": "TestNode", "text": "some \" \\ \\\" text" }), ser.serialize(testModel) 
+    assert_equal %q({ "_class": "TestNode", "text": "some \" \\\\ \\\\\" text \r xx \n xx \r\n xx \t xx \b xx \f" }),
+      ser.serialize(testModel) 
   end
    
   def test_json_instantiator_escapes
     env = RGen::Environment.new
     inst = RGen::Instantiator::JsonInstantiator.new(env, TestMM)
-    inst.instantiate(%q({ "_class": "TestNode", "text": "some \" \\ \\\\\" text" }))
-    assert_equal %q(some " \ \" text), env.elements.first.text
+    inst.instantiate(%q({ "_class": "TestNode", "text": "some \" \\\\ \\\\\" text \r xx \n xx \r\n xx \t xx \b xx \f" }))
+    assert_equal %Q(some " \\ \\" text \r xx \n xx \r\n xx \t xx \b xx \f), env.elements.first.text
+  end
+
+  def test_json_instantiator_escape_single_backslash
+    env = RGen::Environment.new
+    inst = RGen::Instantiator::JsonInstantiator.new(env, TestMM)
+    inst.instantiate(%q({ "_class": "TestNode", "text": "a single \\ will be just itself" }))
+    assert_equal %q(a single \\ will be just itself), env.elements.first.text
   end
 
   def test_json_serializer_integer

data/test/metamodel_order_test.rb

@@ -0,0 +1,125 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'test/unit'
+require 'rgen/ecore/ecore'
+require 'rgen/array_extensions'
+
+class MetamodelReflectionTest < Test::Unit::TestCase
+	include RGen::ECore
+	
+  module TestMM1
+    extend RGen::MetamodelBuilder::ModuleExtension
+
+    class Class11 < RGen::MetamodelBuilder::MMBase
+    end
+
+    module Module11
+      extend RGen::MetamodelBuilder::ModuleExtension
+
+      DataType111 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType111" ,:literals => {:b => 1})
+      DataType112 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType112", :literals => {:b => 1})
+
+      class Class111 < RGen::MetamodelBuilder::MMBase
+      end
+      
+      # anonymous classes won't be handled by the order helper, but will be in eClassifiers
+      Class112 = Class.new(RGen::MetamodelBuilder::MMBase)
+
+      # classes that are not MMBase won't be handled
+      class Class113 
+      end
+
+      # modules that are not extended by the ModuleExtension are not handled
+      module Module111
+      end
+
+      # however it can be extendend later on
+      module Module112
+        # this one is not handled by the order helper since Module112 doesn't have the ModuleExtension yet
+        # however, it will be in eClassifiers
+        class Class1121 < RGen::MetamodelBuilder::MMBase
+        end
+      end
+      # this datatype must be in Module11 not Module112
+      DataType113 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType113", :literals => {:b => 1})
+
+      Module112.extend(RGen::MetamodelBuilder::ModuleExtension)
+      # this datatype must be in Module11 not Module112
+      DataType114 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType114", :literals => {:b => 1})
+      module Module112
+        # this one is handled because now Module112 is extended
+        class Class1122 < RGen::MetamodelBuilder::MMBase
+        end
+      end
+
+      DataType115 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType115", :literals => {:b => 1})
+      DataType116 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType116", :literals => {:b => 1})
+    end
+
+    DataType11 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType11", :literals => {:a => 1})
+
+    class Class12 < RGen::MetamodelBuilder::MMBase
+    end
+
+    class Class13 < RGen::MetamodelBuilder::MMBase
+    end
+  end
+
+  # datatypes outside of a module won't be handled
+  DataType1 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType1", :literals => {:b => 1})
+
+  # classes outside of a module won't be handled
+  class Class1 < RGen::MetamodelBuilder::MMBase
+  end
+
+  module TestMM2
+    extend RGen::MetamodelBuilder::ModuleExtension
+  
+    TestMM1::Module11.extend(RGen::MetamodelBuilder::ModuleExtension)
+    # this is a critical case: because of the previous extension of Module11 which is in a different
+    # hierarchy, DataType7 is looked for in Module11 and its parents; finally it is not
+    # found and the definition is ignored for order calculation
+    DataType21 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType21", :literals => {:b => 1})
+
+    module Module21
+      extend RGen::MetamodelBuilder::ModuleExtension
+    end
+
+    module Module22
+      extend RGen::MetamodelBuilder::ModuleExtension
+    end
+
+    module Module23
+      extend RGen::MetamodelBuilder::ModuleExtension
+    end
+
+    # if there is no other class or module after the last datatype, it won't show up in _constantOrder
+    # however, the order of eClassifiers can still be reconstructed
+    DataType22 = RGen::MetamodelBuilder::DataTypes::Enum.new(:name => "DataType22", :literals => {:b => 1})
+  end
+
+  def test_constant_order
+    assert_equal ["Class11", "Module11", "DataType11", "Class12", "Class13"], TestMM1._constantOrder
+    assert_equal ["DataType111", "DataType112", "Class111", "DataType113", "Module112", "DataType114", "DataType115", "DataType116"], TestMM1::Module11._constantOrder
+    assert_equal ["Class1122"], TestMM1::Module11::Module112._constantOrder
+    assert_equal ["Module21", "Module22", "Module23"], TestMM2._constantOrder
+  end
+
+  def test_classifier_order
+    # eClassifiers also contains the ones which where ignored in order calculation, these are expected at the end
+    # (in an arbitrary order)
+    assert_equal ["Class11", "DataType11", "Class12", "Class13"], TestMM1.ecore.eClassifiers.name
+    assert_equal ["DataType111", "DataType112", "Class111", "DataType113", "DataType114", "DataType115", "DataType116", "Class112"], TestMM1::Module11.ecore.eClassifiers.name
+    assert_equal ["Class1122", "Class1121"], TestMM1::Module11::Module112.ecore.eClassifiers.name
+    assert_equal ["DataType22", "DataType21"], TestMM2.ecore.eClassifiers.name
+  end
+
+  def test_subpackage_order
+    assert_equal ["Module11"], TestMM1.ecore.eSubpackages.name
+    assert_equal ["Module112"], TestMM1::Module11.ecore.eSubpackages.name
+    assert_equal [], TestMM1::Module11::Module112.ecore.eSubpackages.name
+    assert_equal ["Module21", "Module22", "Module23"], TestMM2.ecore.eSubpackages.name
+  end
+end
+
+

data/test/metamodel_roundtrip_test/TestModel_Regenerated.rb

@@ -6,55 +6,60 @@ module HouseMetamodel
 
    SexEnum = Enum.new(:name => 'SexEnum', :literals =>[ :male, :female ])
 
-   module Rooms
-      extend RGen::MetamodelBuilder::ModuleExtension
-      include RGen::MetamodelBuilder::DataTypes
+   class MeetingPlace < RGen::MetamodelBuilder::MMBase
+      annotation :source => "testmodel", :details => {'complexity' => '1', 'date_created' => '2006-07-12 08:40:46', 'date_modified' => '2006-07-12 08:44:02', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'}
+   end
 
+   class Person < RGen::MetamodelBuilder::MMBase
+      annotation 'complexity' => '1', 'date_created' => '2006-06-27 08:34:23', 'date_modified' => '2006-06-27 08:34:26', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+      has_attr 'sex', HouseMetamodel::SexEnum 
+      has_many_attr 'nicknames', String 
    end
 
-   module DependingOnRooms
+   class House < RGen::MetamodelBuilder::MMBase
+      annotation 'complexity' => '1', 'date_created' => '2005-09-16 19:52:18', 'date_modified' => '2006-02-28 08:29:19', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'stereotype' => 'dummy', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+      has_attr 'size', Integer 
+      has_attr 'module', String 
+      has_attr 'address', String, :changeable => false do
+         annotation 'collection' => 'false', 'containment' => 'Not Specified', 'derived' => '0', 'duplicates' => '0', 'ea_guid' => '{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}', 'lowerBound' => '1', 'ordered' => '0', 'position' => '0', 'styleex' => 'volatile=0;', 'type' => 'String', 'upperBound' => '1'
+      end
+   end
+
+
+   module Rooms
       extend RGen::MetamodelBuilder::ModuleExtension
       include RGen::MetamodelBuilder::DataTypes
 
-   end
-end
 
-class HouseMetamodel::House < RGen::MetamodelBuilder::MMBase
-   annotation 'complexity' => '1', 'date_created' => '2005-09-16 19:52:18', 'date_modified' => '2006-02-28 08:29:19', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'stereotype' => 'dummy', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
-   has_attr 'size', Integer 
-   has_attr 'module', String 
-   has_attr 'address', String, :changeable => false do
-      annotation 'collection' => 'false', 'containment' => 'Not Specified', 'derived' => '0', 'duplicates' => '0', 'ea_guid' => '{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}', 'lowerBound' => '1', 'ordered' => '0', 'position' => '0', 'styleex' => 'volatile=0;', 'type' => 'String', 'upperBound' => '1'
-   end
-end
+      class Room < RGen::MetamodelBuilder::MMBase
+         abstract
+         annotation 'complexity' => '1', 'date_created' => '2005-09-16 19:52:28', 'date_modified' => '2006-06-22 21:15:25', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+      end
 
-class HouseMetamodel::Person < RGen::MetamodelBuilder::MMBase
-   annotation 'complexity' => '1', 'date_created' => '2006-06-27 08:34:23', 'date_modified' => '2006-06-27 08:34:26', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
-   has_attr 'sex', HouseMetamodel::SexEnum 
-   has_many_attr 'nicknames', String 
-end
+      class Bathroom < Room
+         annotation 'complexity' => '1', 'date_created' => '2006-06-27 08:32:25', 'date_modified' => '2006-06-27 08:34:23', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+      end
 
-class HouseMetamodel::MeetingPlace < RGen::MetamodelBuilder::MMBase
-   annotation :source => "testmodel", :details => {'complexity' => '1', 'date_created' => '2006-07-12 08:40:46', 'date_modified' => '2006-07-12 08:44:02', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD', 'package_name' => 'HouseMetamodel', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'}
-end
+      class Kitchen < RGen::MetamodelBuilder::MMMultiple(HouseMetamodel::MeetingPlace, Room)
+         annotation 'complexity' => '1', 'date_created' => '2005-11-30 19:26:13', 'date_modified' => '2006-06-22 21:15:34', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
+      end
 
-class HouseMetamodel::Rooms::Room < RGen::MetamodelBuilder::MMBase
-   abstract
-   annotation 'complexity' => '1', 'date_created' => '2005-09-16 19:52:28', 'date_modified' => '2006-06-22 21:15:25', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
-end
+   end
 
-class HouseMetamodel::Rooms::Bathroom < HouseMetamodel::Rooms::Room
-   annotation 'complexity' => '1', 'date_created' => '2006-06-27 08:32:25', 'date_modified' => '2006-06-27 08:34:23', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
-end
+   module DependingOnRooms
+      extend RGen::MetamodelBuilder::ModuleExtension
+      include RGen::MetamodelBuilder::DataTypes
 
-class HouseMetamodel::Rooms::Kitchen < RGen::MetamodelBuilder::MMMultiple(HouseMetamodel::MeetingPlace, HouseMetamodel::Rooms::Room)
-   annotation 'complexity' => '1', 'date_created' => '2005-11-30 19:26:13', 'date_modified' => '2006-06-22 21:15:34', 'ea_ntype' => '0', 'ea_stype' => 'Class', 'gentype' => 'Java', 'isSpecification' => 'false', 'package' => 'EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08', 'package_name' => 'Rooms', 'phase' => '1.0', 'status' => 'Proposed', 'style' => 'BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;', 'tagged' => '0', 'version' => '1.0'
-end
 
-class HouseMetamodel::DependingOnRooms::RoomSub < HouseMetamodel::Rooms::Room
-end
+      class RoomSub < HouseMetamodel::Rooms::Room
+      end
 
+   end
+end
 
+HouseMetamodel::Person.has_many 'home', HouseMetamodel::House do
+   annotation 'containment' => 'Unspecified'
+end
 HouseMetamodel::House.has_one 'bathroom', HouseMetamodel::Rooms::Bathroom, :transient => true, :lowerBound => 1 
 HouseMetamodel::House.one_to_one 'kitchen', HouseMetamodel::Rooms::Kitchen, 'house', :lowerBound => 1, :opposite_lowerBound => 1 do
    annotation 'containment' => 'Unspecified'
@@ -63,6 +68,3 @@ end
 HouseMetamodel::House.contains_many 'room', HouseMetamodel::Rooms::Room, 'house', :lowerBound => 1 do
    opposite_annotation 'containment' => 'Unspecified'
 end
-HouseMetamodel::Person.has_many 'home', HouseMetamodel::House do
-   annotation 'containment' => 'Unspecified'
-end