rgen 0.4.0 → 0.4.1

data/lib/rgen/serializer/xmi20_serializer.rb

@@ -0,0 +1,60 @@
+require 'rgen/serializer/xml_serializer'
+
+module RGen
+
+module Serializer
+
+class XMI20Serializer < XMLSerializer
+
+	def serialize(rootElement)
+		buildReferenceStrings(rootElement, "#/")
+		attrs = attributeHash(rootElement)
+		attrs['xmi:version'] = "2.0"
+		attrs['xmlns:xmi'] = "http://www.omg.org/XMI"
+		attrs['xmlns:xsi'] = "http://www.w3.org/2001/XMLSchema-instance"
+		attrs['xmlns:ecore'] = "http://www.eclipse.org/emf/2002/Ecore" 
+		tag = "ecore:"+rootElement.class.ecore.name
+		startTag(tag, attrs, 0)
+		writeComposites(rootElement, 1)
+		endTag(tag, 0)
+	end
+	
+	def writeComposites(element, indent)
+		eachReferencedElement(element, containmentReferences(element)) do |r,te|
+			attrs = attributeHash(te)
+			attrs['xsi:type'] = "ecore:"+te.class.ecore.name
+			tag = r.name
+			startTag(tag, attrs, indent)
+			writeComposites(te, indent+1)
+			endTag(tag, indent)
+		end
+	end
+
+	def attributeHash(element)
+		result = {}
+		eAllAttributes(element).select{|a| !a.derived}.each do |a|
+			val = element.getGeneric(a.name)
+			result[a.name] = val unless val.nil? || val == ""
+		end
+		eAllReferences(element).select{|r| !r.containment && !r.derived}.each do |r|
+			targetElements = element.getGeneric(r.name)
+			targetElements = [targetElements] unless targetElements.is_a?(Array)
+			val = targetElements.collect{|te| @referenceStrings[te]}.compact.join(' ')
+			result[r.name] = val unless val.nil? || val == ""
+		end
+		result	
+	end
+	
+	def buildReferenceStrings(element, string)
+		@referenceStrings ||= {}
+		@referenceStrings[element] = string
+		eachReferencedElement(element, containmentReferences(element)) do |r,te|
+			buildReferenceStrings(te, string+"/"+te.name) if te.respond_to?(:name)
+		end
+	end
+
+end
+
+end
+
+end

data/lib/rgen/serializer/xml_serializer.rb

@@ -0,0 +1,61 @@
+module RGen
+
+module Serializer
+
+class XMLSerializer
+
+	def initialize
+		@output = ""
+	end
+	
+	def result
+		@output
+	end
+	
+	def serialize(rootElement)
+		raise "Abstract class, overwrite method in subclass!"
+	end
+	
+	def startTag(tag, attributes, indent)
+		@output += "  "*indent + "<#{tag} " + attributes.keys.collect{|k| "#{k}=\"#{attributes[k]}\""}.join(" ") + ">\n"
+	end
+
+	def endTag(tag, indent)
+		@output += "  "*indent + "</#{tag}>\n"
+	end
+	
+	protected
+
+  def eAllReferences(element)
+    @eAllReferences ||= {}
+    @eAllReferences[element.class] ||= element.class.ecore.eAllReferences
+  end
+
+  def eAllAttributes(element)
+    @eAllAttributes ||= {}
+    @eAllAttributes[element.class] ||= element.class.ecore.eAllAttributes
+  end
+    
+  def eAllStructuralFeatures(element)
+    @eAllStructuralFeatures ||= {}
+    @eAllStructuralFeatures[element.class] ||= element.class.ecore.eAllStructuralFeatures
+  end
+
+	def eachReferencedElement(element, refs, &block)
+		refs.each do |r|
+			targetElements = element.getGeneric(r.name)
+			targetElements = [targetElements] unless targetElements.is_a?(Array)
+			targetElements.each do |te|
+				yield(r,te)
+			end
+		end			
+	end  
+
+  def containmentReferences(element)
+  	eAllReferences(element).select{|r| r.containment}
+  end
+end
+
+end
+
+end

data/lib/rgen/template_language/output_handler.rb

@@ -28,40 +28,28 @@ module TemplateLanguage
         @output.concat(s)
       elsif @mode == :explicit
         while s.size > 0
-          #puts "DEGUB: #{@state} #{s.dump}"
-          # s starts with whitespace
-          if s =~ /\A(\s+)(.*)/m	
-            ws = $1; rest = $2
-            #puts "DEGUB: ws #{ws.dump} rest #{rest.dump}"
-            if @state == :wait_for_nl
-              # ws contains a newline
-              if ws =~ /\A[\t ]*(\r?\n)(\s*)/m
-                @output.concat($1)
-                @state = :wait_for_nonws
-                s = $2 + rest
-              else
-                @output.concat(ws)
-                s = rest
-              end
+          if @state == :wait_for_nl
+            if s =~ /\A([^\r\n]*\r?\n)(.*)/m
+              rest = $2
+              @output.concat($1.gsub(/[\t ]+(?=\r|\n)/,''))
+              s = rest || ""
+              @state = :wait_for_nonws
             else
-              s = rest
+              @output.concat(s)
+              s = ""
             end
-            # s starts with non-whitespace
-          elsif s =~ /\A(\S+)(.*)/m
-            nonws = $1; rest = $2
-            #puts "DEGUB: nonws #{nonws.dump} rest #{rest.dump}"
-            if @state == :wait_for_nonws
-              # within the same output handle we can recognize a newline by ourselves
-              # but if the output handler is changed, someone has to tell us
-              if !@noIndentNextLine && !(@output =~ /[^\n]\z/)
+          elsif @state == :wait_for_nonws
+            if s =~ /\A\s*(\S+.*)/m
+              s = $1 || ""
+              if !@noIndentNextLine && !(@output.to_s.size > 0 && @output.to_s[-1] != "\n"[0])
                 @output.concat("   "*@indent)
               else
                 @noIndentNextLine = false
               end
+              @state = :wait_for_nl
+            else
+              s = ""
             end
-            @output.concat(nonws)
-            @state = :wait_for_nl
-            s = rest
           end
         end
       end

data/lib/rgen/template_language/template_container.rb

@@ -130,7 +130,7 @@ module RGen
         @indent = params[:indent] || @indent
         # if this is the first call to expand within this container, @output is nil
         noIndentNextLine = params[:noIndentNextLine]
-        noIndentNextLine = (@output.to_s =~ /[^\n]\z/ ? true : false) if noIndentNextLine.nil?
+        noIndentNextLine = (@output.to_s.size > 0 && @output.to_s[-1] != "\n"[0]) if noIndentNextLine.nil?
         old_context, @context = @context, context if context
         local_output = nil
         if template =~ LOCAL_TEMPLATE_REGEX

data/lib/rgen/transformer.rb

@@ -13,6 +13,10 @@ module RGen
 # Within the subclass, the Transformer.transform class method can be used to specify transformation
 # blocks for specific metamodel classes of the source metamodel.
 # 
+# If there is no transformation rule for the current object's class, a rule for the superclass
+# is used instead. If there's no rule for the superclass, the class hierarchy is searched
+# this way until Object.
+# 
 # Here is an example:
 # 
 # 	class MyTransformer < RGen::Transformer
@@ -30,7 +34,7 @@ module RGen
 # as well as for elements of class OtherInputClass. The former is to be transformed into
 # an instance of OutputClass, the latter into an instance of OtherOutputClass.
 # Note that the Ruby class objects are used to specifiy the classes.
-# 
+#
 # =Transforming Attributes
 # 
 # Besides the target class of a transformation, the attributes of the result object are
@@ -98,7 +102,7 @@ module RGen
 # 
 # Here is an example:
 # 
-#		transform ModelIn, :to => ModelOut do
+# 	transform ModelIn, :to => ModelOut do
 # 		{ :number => doubleNumber }
 # 	end
 #
@@ -128,6 +132,9 @@ module RGen
 # value is true, the corresponding block is used for transformation. If more than one
 # conditions are true, only the first transformer block will be evaluated.
 # 
+# If there is no rule with a condition evaluating to true, rules for superclasses will
+# be checked as described above.
+# 
 # Here is an example:
 # 
 # 	transform ModelIn, :to => ModelOut, :if => :largeNumber do
@@ -225,6 +232,7 @@ class Transformer
 		@env_in = env_in
 		@env_out = env_out
 		@transformer_results = {}
+		@transformer_jobs = []
 	end
 
 
@@ -235,7 +243,7 @@ class Transformer
 	# In addition, the result is cached, i.e. a second invocation with the same parameter
 	# object will return the same result object without any further evaluation of the 
 	# transformation rules. Nil will be transformed into nil. Ruby "singleton" objects
-	# +true+, +false+, numerics and symbols will be return without any change. Ruby strings
+	# +true+, +false+, numerics and symbols will be returned without any change. Ruby strings
 	# will be duplicated with the result being cached.
 	# 
 	# The transformation input can be given as:
@@ -253,16 +261,41 @@ class Transformer
 		return @transformer_results[obj] if @transformer_results[obj]
 		return @transformer_results[obj] = obj.dup if obj.is_a?(String)
 		return obj.collect{|o| trans(o)}.compact if obj.is_a? Array
-		raise StandardError.new("No transformer for class #{obj.class.name}") unless self.class._transformer_blocks[obj.class]
+		raise StandardError.new("No transformer for class #{obj.class.name}") unless _transformerBlock(obj.class)
 		block_desc = _evaluateCondition(obj)
 		return nil unless block_desc
 		@transformer_results[obj] = _instantiateTargetClass(obj, block_desc.target)
+		# we will transform the properties later
+		@transformer_jobs << TransformerJob.new(self, obj, block_desc)
+		# if there have been jobs in the queue before, don't process them in this call
+		# this way calls to trans are not nested; a recursive implementation 
+		# may cause a "Stack level too deep" exception for large models
+		return @transformer_results[obj] if @transformer_jobs.size > 1
+		# otherwise this is the first call of trans, process all jobs here
+		# more jobs will be added during job execution
+		while @transformer_jobs.size > 0
+			@transformer_jobs.first.execute
+			@transformer_jobs.shift
+		end
+		@transformer_results[obj]
+	end
+	
+	def _transformProperties(obj, block_desc) #:nodoc:
 		old_object, @current_object = @current_object, obj
 		block_result = instance_eval(&block_desc.block)
 		raise StandardError.new("Transformer must return a hash") unless block_result.is_a? Hash
 		@current_object = old_object
 		_attributesFromHash(@transformer_results[obj], block_result)
 	end
+	
+	class TransformerJob #:nodoc:
+		def initialize(transformer, obj, block_desc)
+			@transformer, @obj, @block_desc = transformer, obj, block_desc
+		end
+		def execute
+			@transformer._transformProperties(@obj, @block_desc)
+		end
+	end
 
 	# Each call which is not handled by the transformer object is passed to the object
 	# currently being transformed.
@@ -278,15 +311,23 @@ class Transformer
 	end
 
 	private
+	
+	# returns _transformer_blocks content for clazz or one of its superclasses 
+	def _transformerBlock(clazz) # :nodoc:
+		block = self.class._transformer_blocks[clazz]
+		block = _transformerBlock(clazz.superclass) if block.nil? && clazz != Object
+		block
+	end
 		
-	# returns the first TransformationDescription for which condition is true :nodoc:
-	def _evaluateCondition(obj)
-		tb = self.class._transformer_blocks[obj.class]
+	# returns the first TransformationDescription for clazz or one of its superclasses
+	# for which condition is true 
+	def _evaluateCondition(obj, clazz=obj.class) # :nodoc:
+		tb = self.class._transformer_blocks[clazz]
 		block_description = nil
 		if tb.is_a?(TransformationDescription)
 			# non-conditional
 			block_description = tb
-		else
+		elsif tb
 			old_object, @current_object = @current_object, obj
 			tb.each_pair {|condition, block|
 				if condition.is_a?(Proc)
@@ -303,6 +344,7 @@ class Transformer
 			}
 			@current_object = old_object
 		end
+		block_description = _evaluateCondition(obj, clazz.superclass) if block_description.nil? && clazz != Object
 		block_description
 	end
 	

data/test/metamodel_builder_test.rb

@@ -417,4 +417,26 @@ class MetamodelBuilderTest < Test::Unit::TestCase
     end
   end
   
+	module SomePackage 
+  	extend RGen::MetamodelBuilder::ModuleExtension
+		
+		class ClassA < RGen::MetamodelBuilder::MMBase
+		end
+		
+		module SubPackage 
+	  	extend RGen::MetamodelBuilder::ModuleExtension
+		
+			class ClassB < RGen::MetamodelBuilder::MMBase
+			end
+		end
+	end
+	
+	def test_ecore_identity
+		subPackage = SomePackage::SubPackage.ecore
+		assert_equal subPackage.eClassifiers.first.object_id, SomePackage::SubPackage::ClassB.ecore.object_id
+		
+		somePackage = SomePackage.ecore
+		assert_equal somePackage.eSubpackages.first.object_id, subPackage.object_id
+	end
+  
 end

data/test/metamodel_roundtrip_test.rb

@@ -5,6 +5,7 @@ require 'rgen/array_extensions'
 require 'rgen/model_comparator'
 require 'mmgen/metamodel_generator'
 require 'rgen/instantiator/ecore_xml_instantiator'
+require 'rgen/serializer/xmi20_serializer'
 
 class MetamodelGeneratorTest < Test::Unit::TestCase
   
@@ -49,4 +50,13 @@ class MetamodelGeneratorTest < Test::Unit::TestCase
     end
   end
   
+  def test_ecore_serializer
+    require TEST_DIR+"/TestModel.rb"
+    File.open(TEST_DIR+"/houseMetamodel_Regenerated.ecore","w") do |f|
+	  	ser = RGen::Serializer::XMI20Serializer.new
+	  	ser.serialize(HouseMetamodel.ecore)
+	  	f.write(ser.result)
+	 	end
+  end
+  
 end

data/test/metamodel_roundtrip_test/TestModel.rb

@@ -4,6 +4,7 @@ module HouseMetamodel
   extend RGen::MetamodelBuilder::ModuleExtension
   include RGen::MetamodelBuilder::DataTypes
   
+  SexEnum = Enum.new(:name => "SexEnum", :literals => [ :male, :female ])
   # TODO: Datatypes
   #   AggregationKind = Enum.new([ :none, :aggregate, :composite ])
   
@@ -13,6 +14,7 @@ module HouseMetamodel
   
   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', SexEnum
   end
   
   class House < RGen::MetamodelBuilder::MMBase

data/test/metamodel_roundtrip_test/TestModel_Regenerated.rb

@@ -4,6 +4,7 @@ module HouseMetamodel
    extend RGen::MetamodelBuilder::ModuleExtension
    include RGen::MetamodelBuilder::DataTypes
 
+   SexEnum = Enum.new(:name => 'SexEnum', :literals =>[ :male, :female ])
 
    module Rooms
       extend RGen::MetamodelBuilder::ModuleExtension
@@ -27,26 +28,27 @@ class HouseMetamodel::House < RGen::MetamodelBuilder::MMBase
    end
 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 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 
 end
 
-class HouseMetamodel::Rooms::Room < RGen::MetamodelBuilder::MMBase
-   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'
+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 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'
+class HouseMetamodel::Rooms::Room < RGen::MetamodelBuilder::MMBase
+   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::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
 
+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
 

data/test/metamodel_roundtrip_test/houseMetamodel.ecore

@@ -3,6 +3,9 @@
     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" name="HouseMetamodel">
   <eClassifiers xsi:type="ecore:EClass" name="House">
+    <eAnnotations source="bla">
+      <details key="a" value="b"/>
+    </eAnnotations>
     <eStructuralFeatures xsi:type="ecore:EAttribute" name="address" eType="#//String"
         changeable="false"/>
     <eStructuralFeatures xsi:type="ecore:EReference" name="bathroom" lowerBound="1"
@@ -16,8 +19,13 @@
   <eClassifiers xsi:type="ecore:EClass" name="Person">
     <eStructuralFeatures xsi:type="ecore:EReference" name="house" upperBound="-1"
         eType="#//House"/>
+    <eStructuralFeatures xsi:type="ecore:EAttribute" name="sex" eType="#//SexEnum"/>
   </eClassifiers>
   <eClassifiers xsi:type="ecore:EDataType" name="String" instanceClassName="java.lang.String"/>
+  <eClassifiers xsi:type="ecore:EEnum" name="SexEnum">
+    <eLiterals name="male"/>
+    <eLiterals name="female"/>
+  </eClassifiers>
   <eSubpackages name="Rooms">
     <eClassifiers xsi:type="ecore:EClass" name="Room">
       <eStructuralFeatures xsi:type="ecore:EReference" name="house" eType="#//House"