rgen 0.8.4 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: e58b57346e1f7e95fcaa15f29112706c911d20ed
-  data.tar.gz: 6551cb4e9579f7e76582018876973edd9a58d0e6
+SHA256:
+  metadata.gz: 16727fb8ac509f1c0d992f9325059453b2a18c3060dcfaa580c73c5afbee80ef
+  data.tar.gz: 1558e56312461e98faafb733334af9cb995fc39facf6424a249158cd1542a024
 SHA512:
-  metadata.gz: 1e82e58dd4eaf95de47ef1714a778558a6bd3cb76f8229fb43e029a98f9e03c6234ee2fab831adde1d7de1b953665afab031f27f39b0ad7a060a91c4ed7c7328
-  data.tar.gz: 47b73a00783a82d630b0771fb55b01c4da6adffe73a459cd35828dd5040644b8b0f6cd00a565a4abf257d8c4d2e97ca17db2c072cbe05e8ae44fe9b2b3a2637e
+  metadata.gz: 54e6edfead77fb9e6065af8b09d3ee6998ea9bf5171ada9c4846dfcebfd0802d97c7c0708caffd9568b0e50ee7bf36c42813bcc3e21a7b50285bf37ba0693b3b
+  data.tar.gz: 48065bb8017587ee8c83f22b15337f2e7b2133560d466a0f91b9efc42ed6859337cacd2cc80f2e07883cd0571d3cf298daa6912cd9e07a2d6a01bf97b3f68768

data/CHANGELOG

@@ -222,3 +222,11 @@
 
 * Add early loading for types which have attributes conflicting with Ruby reserved words.
 * Change type checking code to use ObjectSpace to find class objects. This is to find classes with an unbound name.
+
+=0.9.0
+
+* Update to support Ruby 2.7, drop support for older Rubies
+
+=0.9.1
+
+* fixes in ecore model (make ENamedElement required; set default for EClass::{abstract, interface})

data/Project.yaml

@@ -1,7 +1,7 @@
 name: rgen
 gemspec: rgen.gemspec
 git: https://github.com/mthiede/rgen.git
-version: 0.8.4
+version: 0.9.1
 summary: Ruby Modelling and Generator Framework
 email: martin dot thiede at gmx de
 homepage: http://ruby-gen.org
@@ -15,7 +15,8 @@ exclude_files: ['**/*.bak']
 encrypt_sources: false
 dependencies:
   https://rubygems.org:
-    - {name: nokogiri,           version: ['~> 1.6.0', '>= 1.6.8.1'], development: true}
-    - {name: rake,               version: '~> 12.0',                development: true}
-    - {name: minitest,           version: ['~> 5.0', '>= 5.10.1'], development: true}
-    - {name: minitest-fail-fast, version: '~> 0.1.0',               development: true}
+    - {name: nokogiri,           version: ['>= 1.11.2', '< 1.12'],    development: true}
+    - {name: rake,               version: '~> 12.0',                  development: true}
+    - {name: minitest,           version: ['~> 5.0', '>= 5.10.1'],    development: true}
+    - {name: minitest-fail-fast, version: '~> 0.1.0',                 development: true}
+    - {name: andand,             version: '1.3.3',                    development: true}

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems/package_task'
 require 'rdoc/task'
-require 'bundler/setup'
 require 'rake/testtask'
 
 RGenGemSpec = eval(File.read('rgen.gemspec'))

data/lib/rgen/ecore/ecore.rb

@@ -12,9 +12,11 @@ module RGen
     extend RGen::MetamodelBuilder::ModuleExtension
     
     class EObject < RGen::MetamodelBuilder::MMBase
+      abstract
     end
     
     class EModelElement < RGen::MetamodelBuilder::MMBase
+      abstract
     end
     
     class EAnnotation < RGen::MetamodelBuilder::MMMultiple(EModelElement, EObject)
@@ -22,10 +24,12 @@ module RGen
     end
     
     class ENamedElement < EModelElement
-      has_attr 'name', String
+      abstract
+      has_attr 'name', String, :lowerBound => 1
     end
     
     class ETypedElement < ENamedElement
+      abstract
       has_attr 'lowerBound', Integer, :defaultValueLiteral => "0"
       has_attr 'ordered', Boolean, :defaultValueLiteral => "true"
       has_attr 'unique', Boolean, :defaultValueLiteral => "true"
@@ -43,6 +47,7 @@ module RGen
     end
     
     class EStructuralFeature < ETypedElement
+      abstract
       has_attr 'changeable', Boolean, :defaultValueLiteral => "true"
       has_attr 'defaultValue', Object, :derived=>true
       has_attr 'defaultValueLiteral', String
@@ -76,6 +81,7 @@ module RGen
     end
     
     class EClassifier < ENamedElement
+      abstract
       has_attr 'defaultValue', Object, :derived=>true
       has_attr 'instanceClass', Object, :derived=>true
       has_attr 'instanceClassName', String
@@ -142,8 +148,8 @@ module RGen
     end
     
     class EClass < EClassifier
-      has_attr 'abstract', Boolean
-      has_attr 'interface', Boolean
+      has_attr 'abstract', Boolean, :defaultValueLiteral => "false"
+      has_attr 'interface', Boolean, :defaultValueLiteral => "false"
       has_one  'eIDAttribute', ECore::EAttribute, :derived=>true, :resolveProxies=>false
       
       has_many 'eAllAttributes', ECore::EAttribute, :derived=>true

data/lib/rgen/ecore/ecore_to_json.rb

@@ -1,5 +1,6 @@
 require 'rgen/ecore/ecore'
 require 'json'
+require 'andand'
 
 module RGen
 
@@ -105,10 +106,9 @@ def eenum(enum)
   merge(edatatype(enum), {
     :_class_ref => 'RGen.ECore.EEnum',
     :eLiterals => enum.eLiterals.map do |l|
-      merge({}, {
+      merge(enamedelement(l), {
         :_class_ref => 'RGen.ECore.EEnumLiteral',
         :value => l.value,
-        :literal => l.literal
       })
     end      
   })
@@ -116,6 +116,7 @@ end
 
 def eannotation(e)
   merge(emodelelement(e), {
+    :_class_ref => 'RGen.ECore.EAnnotation',
     :source => e.source,
     :details => e.details.map do |d|
       merge({}, {
@@ -133,8 +134,6 @@ def etypedelement(te)
     :unique => te.unique,
     :lowerBound => te.lowerBound,
     :upperBound => te.upperBound,
-    :many => te.many,
-    :required => te.required,
     :eType => {:_ref => te.eType ? ref_id(te.eType) : nil}
   })
 end
@@ -172,7 +171,7 @@ def ref_id(obj)
 end
   
 def ref_parts(obj)
-  return [obj.name] unless obj&.eContainer
+  return [obj.name] unless obj.andand.eContainer
   ref_parts(obj.eContainer) << obj.name 
 end
   

data/test/metamodel_builder_test.rb

@@ -196,7 +196,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       sc.name = 5
     end
-    assert_match /In (\w+::)+SimpleClass : Can not use a Fixnum where a String is expected/, err.message
+    assert_match /In (\w+::)+SimpleClass : Can not use a (Integer|Fixnum) where a String is expected/, err.message
     assert_equal "EString", mm::SimpleClass.ecore.eAttributes.find{|a| a.name=="name"}.eType.name
 
     assert_equal "xtest", sc.stringWithDefault
@@ -264,7 +264,7 @@ class MetamodelBuilderTest < MiniTest::Test
       assert_equal "123456789012345680.0", sprintf("%.1f", sc.floatWithDefault)
     end
     sc.floatWithDefault = nil
-    sc.floatWithDefault = BigDecimal.new("123456789012345678.0")
+    sc.floatWithDefault = BigDecimal("123456789012345678.0")
     assert sc.floatWithDefault.is_a?(BigDecimal)
     assert_equal "123456789012345678.0", sc.floatWithDefault.to_s("F")
 
@@ -298,7 +298,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises(StandardError) do
       o.addLiterals(1)
     end
-    assert_match /In (\w+::)+ManyAttrClass : Can not use a Fixnum where a String is expected/, err.message
+    assert_match /In (\w+::)+ManyAttrClass : Can not use a (Integer|Fixnum) where a String is expected/, err.message
 
     assert_equal [], o.literals
     o.addLiterals("a")
@@ -333,7 +333,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises(StandardError) do
       o.literals = 1
     end
-    assert_match /In (\w+::)+ManyAttrClass : Can not use a Fixnum where a Enumerable is expected/, err.message
+    assert_match /In (\w+::)+ManyAttrClass : Can not use a (Integer|Fixnum) where a Enumerable is expected/, err.message
  
     o.bools = [true, false, true, false]
     assert_equal [true, false, true, false], o.bools

data/test/metamodel_roundtrip_test/TestModel_Regenerated.rb

@@ -0,0 +1,71 @@
+require 'rgen/metamodel_builder'
+
+module HouseMetamodel
+   extend RGen::MetamodelBuilder::ModuleExtension
+   include RGen::MetamodelBuilder::DataTypes
+
+   SexEnum = Enum.new(:name => 'SexEnum', :literals =>[ :male, :female ])
+
+   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_attr 'id', Long 
+      has_many_attr 'nicknames', String 
+   end
+
+   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
+
+
+      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 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 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
+
+   end
+
+   module DependingOnRooms
+      extend RGen::MetamodelBuilder::ModuleExtension
+      include RGen::MetamodelBuilder::DataTypes
+
+
+      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, :lowerBound => 1, :transient => true 
+HouseMetamodel::House.one_to_one 'kitchen', HouseMetamodel::Rooms::Kitchen, 'house', :lowerBound => 1, :opposite_lowerBound => 1 do
+   annotation 'containment' => 'Unspecified'
+   opposite_annotation 'containment' => 'Unspecified'
+end
+HouseMetamodel::House.contains_many 'room', HouseMetamodel::Rooms::Room, 'house', :lowerBound => 1 do
+   opposite_annotation 'containment' => 'Unspecified'
+end

data/test/metamodel_roundtrip_test/houseMetamodel_Regenerated.ecore

@@ -0,0 +1,162 @@
+<ecore:EPackage name="HouseMetamodel" xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
+  <eClassifiers abstract="false" interface="false" instanceClassName="HouseMetamodel::MeetingPlace" name="MeetingPlace" eSubTypes="#//Rooms/Kitchen" xsi:type="ecore:EClass">
+    <eAnnotations source="testmodel" xsi:type="ecore:EAnnotation">
+      <details key="complexity" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="date_created" value="2006-07-12 08:40:46" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="date_modified" value="2006-07-12 08:44:02" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="ea_ntype" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="ea_stype" value="Class" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="gentype" value="Java" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="isSpecification" value="false" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="package" value="EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="package_name" value="HouseMetamodel" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="phase" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="status" value="Proposed" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="style" value="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="tagged" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="version" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers abstract="false" interface="false" instanceClassName="HouseMetamodel::Person" name="Person" xsi:type="ecore:EClass">
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="sex" eType="#//SexEnum" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="id" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="-1" name="nicknames" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures containment="false" resolveProxies="true" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="-1" name="home" eType="#//House" xsi:type="ecore:EReference">
+      <eAnnotations xsi:type="ecore:EAnnotation">
+        <details key="containment" value="Unspecified" xsi:type="ecore:EStringToStringMapEntry"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eAnnotations xsi:type="ecore:EAnnotation">
+      <details key="complexity" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="date_created" value="2006-06-27 08:34:23" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="date_modified" value="2006-06-27 08:34:26" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="ea_ntype" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="ea_stype" value="Class" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="gentype" value="Java" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="isSpecification" value="false" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="package" value="EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="package_name" value="HouseMetamodel" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="phase" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="status" value="Proposed" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="style" value="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="tagged" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="version" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers abstract="false" interface="false" instanceClassName="HouseMetamodel::House" name="House" xsi:type="ecore:EClass">
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="size" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="module" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="false" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="address" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" xsi:type="ecore:EAttribute">
+      <eAnnotations xsi:type="ecore:EAnnotation">
+        <details key="collection" value="false" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="containment" value="Not Specified" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="derived" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="duplicates" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ea_guid" value="{A8DF581B-9AC6-4f75-AB48-8FAEDFC6E068}" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="lowerBound" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ordered" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="position" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="styleex" value="volatile=0;" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="type" value="String" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="upperBound" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures containment="false" resolveProxies="true" changeable="true" derived="false" transient="true" unsettable="false" volatile="false" lowerBound="1" ordered="true" unique="true" upperBound="1" name="bathroom" eType="#//Rooms/Bathroom" xsi:type="ecore:EReference"/>
+    <eStructuralFeatures containment="false" resolveProxies="true" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="1" ordered="true" unique="true" upperBound="1" name="kitchen" eOpposite="#//Rooms/Kitchen/house" eType="#//Rooms/Kitchen" xsi:type="ecore:EReference">
+      <eAnnotations xsi:type="ecore:EAnnotation">
+        <details key="containment" value="Unspecified" xsi:type="ecore:EStringToStringMapEntry"/>
+      </eAnnotations>
+    </eStructuralFeatures>
+    <eStructuralFeatures containment="true" resolveProxies="true" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="1" ordered="true" unique="true" upperBound="-1" name="room" eOpposite="#//Rooms/Room/house" eType="#//Rooms/Room" xsi:type="ecore:EReference"/>
+    <eAnnotations xsi:type="ecore:EAnnotation">
+      <details key="complexity" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="date_created" value="2005-09-16 19:52:18" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="date_modified" value="2006-02-28 08:29:19" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="ea_ntype" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="ea_stype" value="Class" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="gentype" value="Java" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="isSpecification" value="false" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="package" value="EAPK_A1B83D59_CAE1_422c_BA5F_D3624D7156AD" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="package_name" value="HouseMetamodel" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="phase" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="status" value="Proposed" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="stereotype" value="dummy" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="style" value="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="tagged" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+      <details key="version" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+    </eAnnotations>
+  </eClassifiers>
+  <eClassifiers instanceClassName="HouseMetamodel::SexEnum" name="SexEnum" xsi:type="ecore:EEnum">
+    <eLiterals name="male" xsi:type="ecore:EEnumLiteral"/>
+    <eLiterals name="female" xsi:type="ecore:EEnumLiteral"/>
+  </eClassifiers>
+  <eSubpackages name="Rooms" xsi:type="ecore:EPackage">
+    <eClassifiers abstract="true" interface="false" instanceClassName="HouseMetamodel::Rooms::Room" name="Room" eSubTypes="#//Rooms/Bathroom #//Rooms/Kitchen #//DependingOnRooms/RoomSub" xsi:type="ecore:EClass">
+      <eStructuralFeatures containment="false" resolveProxies="true" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="house" eOpposite="#//House/room" eType="#//House" xsi:type="ecore:EReference">
+        <eAnnotations xsi:type="ecore:EAnnotation">
+          <details key="containment" value="Unspecified" xsi:type="ecore:EStringToStringMapEntry"/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eAnnotations xsi:type="ecore:EAnnotation">
+        <details key="complexity" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="date_created" value="2005-09-16 19:52:28" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="date_modified" value="2006-06-22 21:15:25" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ea_ntype" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ea_stype" value="Class" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="gentype" value="Java" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="isSpecification" value="false" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="package" value="EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="package_name" value="Rooms" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="phase" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="status" value="Proposed" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="style" value="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="tagged" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="version" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers abstract="false" interface="false" instanceClassName="HouseMetamodel::Rooms::Bathroom" name="Bathroom" eSuperTypes="#//Rooms/Room" xsi:type="ecore:EClass">
+      <eAnnotations xsi:type="ecore:EAnnotation">
+        <details key="complexity" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="date_created" value="2006-06-27 08:32:25" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="date_modified" value="2006-06-27 08:34:23" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ea_ntype" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ea_stype" value="Class" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="gentype" value="Java" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="isSpecification" value="false" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="package" value="EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="package_name" value="Rooms" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="phase" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="status" value="Proposed" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="style" value="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="tagged" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="version" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+      </eAnnotations>
+    </eClassifiers>
+    <eClassifiers abstract="false" interface="false" instanceClassName="HouseMetamodel::Rooms::Kitchen" name="Kitchen" eSuperTypes="#//MeetingPlace #//Rooms/Room" xsi:type="ecore:EClass">
+      <eStructuralFeatures containment="false" resolveProxies="true" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="1" ordered="true" unique="true" upperBound="1" name="house" eOpposite="#//House/kitchen" eType="#//House" xsi:type="ecore:EReference">
+        <eAnnotations xsi:type="ecore:EAnnotation">
+          <details key="containment" value="Unspecified" xsi:type="ecore:EStringToStringMapEntry"/>
+        </eAnnotations>
+      </eStructuralFeatures>
+      <eAnnotations xsi:type="ecore:EAnnotation">
+        <details key="complexity" value="1" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="date_created" value="2005-11-30 19:26:13" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="date_modified" value="2006-06-22 21:15:34" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ea_ntype" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="ea_stype" value="Class" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="gentype" value="Java" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="isSpecification" value="false" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="package" value="EAPK_F9D8C6E3_4DAD_4aa2_AD47_D0ABA4E93E08" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="package_name" value="Rooms" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="phase" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="status" value="Proposed" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="style" value="BackColor=-1;BorderColor=-1;BorderWidth=-1;FontColor=-1;VSwimLanes=0;HSwimLanes=0;BorderStyle=0;" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="tagged" value="0" xsi:type="ecore:EStringToStringMapEntry"/>
+        <details key="version" value="1.0" xsi:type="ecore:EStringToStringMapEntry"/>
+      </eAnnotations>
+    </eClassifiers>
+  </eSubpackages>
+  <eSubpackages name="DependingOnRooms" xsi:type="ecore:EPackage">
+    <eClassifiers abstract="false" interface="false" instanceClassName="HouseMetamodel::DependingOnRooms::RoomSub" name="RoomSub" eSuperTypes="#//Rooms/Room" xsi:type="ecore:EClass"/>
+  </eSubpackages>
+</ecore:EPackage>

data/test/metamodel_roundtrip_test/using_builtin_types.ecore

@@ -1,5 +1,5 @@
 <ecore:EPackage name="P1" xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
-  <eClassifiers name="C1" xsi:type="ecore:EClass">
+  <eClassifiers abstract="false" interface="false" name="C1" xsi:type="ecore:EClass">
     <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" xsi:type="ecore:EAttribute"/>
     <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" xsi:type="ecore:EAttribute"/>
     <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a3" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong" xsi:type="ecore:EAttribute"/>

data/test/metamodel_roundtrip_test/using_builtin_types_serialized.ecore

@@ -0,0 +1,9 @@
+<ecore:EPackage name="P1" xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore">
+  <eClassifiers abstract="false" interface="false" name="C1" xsi:type="ecore:EClass">
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a2" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a3" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//ELong" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a4" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EFloat" xsi:type="ecore:EAttribute"/>
+    <eStructuralFeatures iD="false" changeable="true" derived="false" transient="false" unsettable="false" volatile="false" lowerBound="0" ordered="true" unique="true" upperBound="1" name="a5" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean" xsi:type="ecore:EAttribute"/>
+  </eClassifiers>
+</ecore:EPackage>

data/test/model_builder/ecore_internal.rb

@@ -0,0 +1,113 @@
+ePackage "ECore", :eSuperPackage => "" do
+  eClass "EObject", :abstract => true, :instanceClassName => "RGen::ECore::EObject"
+  eClass "EModelElement", :abstract => true, :instanceClassName => "RGen::ECore::EModelElement" do
+    eReference "eAnnotations", :containment => true, :resolveProxies => false, :eOpposite => "EAnnotation.eModelElement", :upperBound => -1, :eType => "EAnnotation"
+  end
+  eClass "EAnnotation", :eSuperTypes => ["EModelElement", "EObject"], :instanceClassName => "RGen::ECore::EAnnotation" do
+    eAttribute "source", :eType => ""
+    eReference "eModelElement", :eOpposite => "EModelElement.eAnnotations", :eType => "EModelElement"
+    eReference "details", :containment => true, :resolveProxies => false, :upperBound => -1, :eType => "EStringToStringMapEntry"
+    eReference "contents", :containment => true, :resolveProxies => false, :upperBound => -1, :eType => "EObject"
+    eReference "references", :upperBound => -1, :eType => "EObject"
+  end
+  eClass "ENamedElement", :abstract => true, :eSuperTypes => ["EModelElement"], :instanceClassName => "RGen::ECore::ENamedElement" do
+    eAttribute "name", :lowerBound => 1, :eType => ""
+  end
+  eClass "ETypedElement", :abstract => true, :eSuperTypes => ["ENamedElement"], :instanceClassName => "RGen::ECore::ETypedElement" do
+    eAttribute "lowerBound", :defaultValueLiteral => "0", :eType => ""
+    eAttribute "ordered", :defaultValueLiteral => "true", :eType => ""
+    eAttribute "unique", :defaultValueLiteral => "true", :eType => ""
+    eAttribute "upperBound", :defaultValueLiteral => "1", :eType => ""
+    eAttribute "many", :changeable => false, :derived => true, :transient => true, :volatile => true, :eType => ""
+    eAttribute "required", :changeable => false, :derived => true, :transient => true, :volatile => true, :eType => ""
+    eReference "eType", :eType => "EClassifier"
+  end
+  eClass "EStructuralFeature", :abstract => true, :eSuperTypes => ["ETypedElement"], :instanceClassName => "RGen::ECore::EStructuralFeature" do
+    eAttribute "changeable", :defaultValueLiteral => "true", :eType => ""
+    eAttribute "defaultValue", :changeable => false, :derived => true, :transient => true, :volatile => true, :eType => ""
+    eAttribute "defaultValueLiteral", :eType => ""
+    eAttribute "derived", :defaultValueLiteral => "false", :eType => ""
+    eAttribute "transient", :defaultValueLiteral => "false", :eType => ""
+    eAttribute "unsettable", :defaultValueLiteral => "false", :eType => ""
+    eAttribute "volatile", :defaultValueLiteral => "false", :eType => ""
+    eReference "eContainingClass", :eOpposite => "EClass.eStructuralFeatures", :eType => "EClass"
+  end
+  eClass "EAttribute", :eSuperTypes => ["EStructuralFeature"], :instanceClassName => "RGen::ECore::EAttribute" do
+    eAttribute "iD", :defaultValueLiteral => "false", :eType => ""
+    eReference "eAttributeType", :changeable => false, :derived => true, :transient => true, :volatile => true, :lowerBound => 1, :eType => "EDataType"
+  end
+  eClass "EClassifier", :abstract => true, :eSuperTypes => ["ENamedElement"], :instanceClassName => "RGen::ECore::EClassifier" do
+    eAttribute "defaultValue", :changeable => false, :derived => true, :transient => true, :volatile => true, :eType => ""
+    eAttribute "instanceClass", :changeable => false, :derived => true, :transient => true, :volatile => true, :eType => ""
+    eAttribute "instanceClassName", :eType => ""
+    eReference "ePackage", :eOpposite => "EPackage.eClassifiers", :eType => "EPackage"
+  end
+  eClass "EDataType", :eSuperTypes => ["EClassifier"], :instanceClassName => "RGen::ECore::EDataType" do
+    eAttribute "serializable", :eType => ""
+  end
+  eClass "EGenericType", :eSuperTypes => ["EDataType"], :instanceClassName => "RGen::ECore::EGenericType" do
+    eReference "eClassifier", :eType => "EDataType"
+    eReference "eParameter", :eOpposite => "EParameter.eGenericType", :eType => "EParameter"
+    eReference "eTypeArguments", :containment => true, :eOpposite => "ETypeArgument.eGenericType", :upperBound => -1, :eType => "ETypeArgument"
+  end
+  eClass "ETypeArgument", :eSuperTypes => ["EModelElement"], :instanceClassName => "RGen::ECore::ETypeArgument" do
+    eReference "eClassifier", :eType => "EDataType"
+    eReference "eGenericType", :eOpposite => "EGenericType.eTypeArguments", :eType => "EGenericType"
+  end
+  eClass "EEnum", :eSuperTypes => ["EDataType"], :instanceClassName => "RGen::ECore::EEnum" do
+    eReference "eLiterals", :containment => true, :resolveProxies => false, :eOpposite => "EEnumLiteral.eEnum", :upperBound => -1, :eType => "EEnumLiteral"
+  end
+  eClass "EEnumLiteral", :eSuperTypes => ["ENamedElement"], :instanceClassName => "RGen::ECore::EEnumLiteral" do
+    eAttribute "literal", :eType => ""
+    eAttribute "value", :eType => ""
+    eReference "eEnum", :eOpposite => "EEnum.eLiterals", :eType => "EEnum"
+  end
+  eClass "EFactory", :eSuperTypes => ["EModelElement"], :instanceClassName => "RGen::ECore::EFactory" do
+    eReference "ePackage", :resolveProxies => false, :eOpposite => "EPackage.eFactoryInstance", :transient => true, :lowerBound => 1, :eType => "EPackage"
+  end
+  eClass "EOperation", :eSuperTypes => ["ETypedElement"], :instanceClassName => "RGen::ECore::EOperation" do
+    eReference "eContainingClass", :eOpposite => "EClass.eOperations", :eType => "EClass"
+    eReference "eParameters", :containment => true, :resolveProxies => false, :eOpposite => "EParameter.eOperation", :upperBound => -1, :eType => "EParameter"
+    eReference "eExceptions", :upperBound => -1, :eType => "EClassifier"
+  end
+  eClass "EPackage", :eSuperTypes => ["ENamedElement"], :instanceClassName => "RGen::ECore::EPackage" do
+    eAttribute "nsPrefix", :eType => ""
+    eAttribute "nsURI", :eType => ""
+    eReference "eClassifiers", :containment => true, :eOpposite => "EClassifier.ePackage", :upperBound => -1, :eType => "EClassifier"
+    eReference "eSubpackages", :containment => true, :eOpposite => "eSuperPackage", :upperBound => -1, :eType => "EPackage"
+    eReference "eSuperPackage", :eOpposite => "eSubpackages", :eType => "EPackage"
+    eReference "eFactoryInstance", :eOpposite => "EFactory.ePackage", :eType => "EFactory"
+  end
+  eClass "EParameter", :eSuperTypes => ["ETypedElement"], :instanceClassName => "RGen::ECore::EParameter" do
+    eReference "eOperation", :eOpposite => "EOperation.eParameters", :eType => "EOperation"
+    eReference "eGenericType", :containment => true, :eOpposite => "EGenericType.eParameter", :eType => "EGenericType"
+  end
+  eClass "EReference", :eSuperTypes => ["EStructuralFeature"], :instanceClassName => "RGen::ECore::EReference" do
+    eAttribute "container", :changeable => false, :derived => true, :transient => true, :volatile => true, :eType => ""
+    eAttribute "containment", :defaultValueLiteral => "false", :eType => ""
+    eAttribute "resolveProxies", :defaultValueLiteral => "true", :eType => ""
+    eReference "eOpposite", :eType => "EReference"
+    eReference "eReferenceType", :changeable => false, :derived => true, :transient => true, :volatile => true, :lowerBound => 1, :eType => "EClass"
+  end
+  eClass "EStringToStringMapEntry", :instanceClassName => "RGen::ECore::EStringToStringMapEntry" do
+    eAttribute "key", :eType => ""
+    eAttribute "value", :eType => ""
+  end
+  eClass "EClass", :eSuperTypes => ["EClassifier"], :instanceClassName => "RGen::ECore::EClass" do
+    eAttribute "abstract", :defaultValueLiteral => "false", :eType => ""
+    eAttribute "interface", :defaultValueLiteral => "false", :eType => ""
+    eReference "eIDAttribute", :resolveProxies => false, :changeable => false, :derived => true, :transient => true, :volatile => true, :eType => "EAttribute"
+    eReference "eAllAttributes", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EAttribute"
+    eReference "eAllContainments", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EReference"
+    eReference "eAllOperations", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EOperation"
+    eReference "eAllReferences", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EReference"
+    eReference "eAllStructuralFeatures", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EStructuralFeature"
+    eReference "eAllSuperTypes", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EClass"
+    eReference "eAttributes", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EAttribute"
+    eReference "eReferences", :changeable => false, :derived => true, :transient => true, :volatile => true, :upperBound => -1, :eType => "EReference"
+    eReference "eOperations", :containment => true, :resolveProxies => false, :eOpposite => "EOperation.eContainingClass", :upperBound => -1, :eType => "EOperation"
+    eReference "eStructuralFeatures", :containment => true, :resolveProxies => false, :eOpposite => "EStructuralFeature.eContainingClass", :upperBound => -1, :eType => "EStructuralFeature"
+    eReference "eSuperTypes", :eOpposite => "eSubTypes", :upperBound => -1, :eType => "EClass"
+    eReference "eSubTypes", :eOpposite => "eSuperTypes", :upperBound => -1, :eType => "EClass"
+  end
+end

data/test/template_language_test/line_endings_mixed.txt

@@ -0,0 +1,2 @@
+first line (unix) |
+second line (windows) |

data/test/template_language_test/line_endings_unix.txt

@@ -0,0 +1,2 @@
+first line |
+second line |

data/test/template_language_test/line_endings_windows.txt

@@ -0,0 +1,2 @@
+first line |
+second line |