rgen 0.5.4 → 0.6.0

data/lib/rgen/metamodel_builder/builder_runtime.rb

@@ -1,7 +1,7 @@
 # RGen Framework
 # (c) Martin Thiede, 2006
 
-require 'rgen/name_helper'
+require 'rgen/util/name_helper'
 
 module RGen
 
@@ -11,27 +11,27 @@ module MetamodelBuilder
 # The methods provided by this module are used by the methods generated
 # by the class methods of MetamodelBuilder::BuilderExtensions
 module BuilderRuntime
-	include NameHelper
+	include Util::NameHelper
 	
 	def is_a?(c)
     return super unless c.const_defined?(:ClassModule)
     kind_of?(c::ClassModule)
 	end
 	
-	def addGeneric(role, value)
-		send("add#{firstToUpper(role)}",value)
+	def addGeneric(role, value, index=-1)
+		send("add#{firstToUpper(role.to_s)}",value, index)
 	end
 	
 	def removeGeneric(role, value)
-		send("remove#{firstToUpper(role)}",value)
+		send("remove#{firstToUpper(role.to_s)}",value)
 	end
 	
 	def setGeneric(role, value)
-		send("#{role}=",value)
+		send("set#{firstToUpper(role.to_s)}",value)
 	end
 
   def hasManyMethods(role)
-    respond_to?("add#{firstToUpper(role)}")
+    respond_to?("add#{firstToUpper(role.to_s)}")
   end
 
   def setOrAddGeneric(role, value)
@@ -43,7 +43,7 @@ module BuilderRuntime
   end
 
 	def getGeneric(role)
-		send("#{role}")
+		send("get#{firstToUpper(role.to_s)}")
 	end
 
   def getGenericAsArray(role)

data/lib/rgen/metamodel_builder/constant_order_helper.rb

@@ -38,7 +38,7 @@ ConstantOrderHelper = Class.new do
   def classCreated(c)
     handlePendingEnum
     cont = containerModule(c)
-    name = c.name.split("::").last
+    name = (c.name || "").split("::").last
     return unless cont.respond_to?(:_constantOrder) && !cont._constantOrder.include?(name)
     cont._constantOrder << name
   end
@@ -46,7 +46,7 @@ ConstantOrderHelper = Class.new do
   def moduleCreated(m)
     handlePendingEnum
     cont = containerModule(m)
-    name = m.name.split("::").last
+    name = (m.name || "").split("::").last
     return unless cont.respond_to?(:_constantOrder) && !cont._constantOrder.include?(name)
     cont._constantOrder << name
     @currentModule = m
@@ -60,7 +60,7 @@ ConstantOrderHelper = Class.new do
   private
 
   def containerModule(m)
-    containerName = m.name.split("::")[0..-2].join("::")
+    containerName = (m.name || "").split("::")[0..-2].join("::")
     containerName.empty? ? nil : eval(containerName, TOPLEVEL_BINDING)
   end 
 
@@ -72,7 +72,7 @@ ConstantOrderHelper = Class.new do
         newConstants = m.constants - m._constantOrder
         const = newConstants.find{|c| m.const_get(c).object_id == @pendingEnum.object_id}
         if const
-          m._constantOrder << const
+          m._constantOrder << const.to_s
           break
         end
       end

data/lib/rgen/metamodel_builder/data_types.rb

@@ -43,7 +43,11 @@ module DataTypes
 	  def literals_as_strings
 	  	literals.collect do |l|
 	  		if l.is_a?(Symbol)
-	  			":"+l.to_s
+          if l.to_s =~ /^\d|\W/
+            ":'"+l.to_s+"'"
+          else
+            ":"+l.to_s
+          end
 	  		elsif l.is_a?(TrueClass) || l.is_a?(FalseClass)
 	  			l.to_s
 	  		else

data/lib/rgen/metamodel_builder/intermediate/feature.rb

@@ -0,0 +1,167 @@
+require 'rgen/metamodel_builder/data_types'
+
+module RGen
+
+module MetamodelBuilder
+
+module Intermediate
+
+class Feature
+  attr_reader :etype, :impl_type
+
+  def value(prop)
+    @props[prop]
+  end
+  
+  def annotations
+    @annotations ||= []
+  end
+
+  def many?
+    value(:upperBound) > 1 || value(:upperBound) == -1
+  end
+
+  def reference?
+    is_a?(Reference)
+  end
+
+  protected
+
+  def check(props)
+    @props.keys.each do |p|
+      kind = props[p]
+      raise StandardError.new("invalid property #{p}") unless kind
+      raise StandardError.new("property '#{p}' not set") if value(p).nil? && kind == :required
+    end
+  end
+
+end
+
+class Attribute < Feature
+
+  Properties = { 
+    :name => :required, 
+    :ordered => :required, 
+    :unique => :required,
+    :changeable => :required,
+    :volatile => :required,
+    :transient => :required,
+    :unsettable => :required,
+    :derived => :required,
+    :lowerBound => :required,
+    :upperBound => :required,
+    :defaultValueLiteral => :optional
+  }
+
+  Defaults = {
+    :ordered => true,
+    :unique => true,
+    :changeable => true,
+    :volatile => false,
+    :transient => false,
+    :unsettable => false,
+    :derived => false,
+    :lowerBound => 0
+  }
+
+  Types = { 
+    String => :EString,
+    Integer => :EInt,
+    Float => :EFloat,
+    RGen::MetamodelBuilder::DataTypes::Boolean => :EBoolean,
+    Object => :ERubyObject,
+    Class => :ERubyClass 
+  }
+
+  def self.default_value(prop)
+    Defaults[prop]
+  end
+  
+  def self.properties
+    Properties.keys.sort{|a,b| a.to_s <=> b.to_s}
+  end
+
+  def initialize(type, props)
+    @props = Defaults.merge(props)
+    type ||= String
+    @etype = Types[type]
+    if @etype
+      @impl_type = type
+    elsif type.is_a?(RGen::MetamodelBuilder::DataTypes::Enum)
+      @etype = :EEnumerable
+      @impl_type = type
+    else
+      raise ArgumentError.new("invalid type '#{type}'")
+    end
+    if @props[:derived]
+      @props[:changeable] = false
+      @props[:volatile] = true
+      @props[:transient] = true
+    end    
+    check(Properties)
+  end
+
+end
+
+class Reference < Feature
+  attr_accessor :opposite
+
+  Properties = { 
+    :name => :required, 
+    :ordered => :required, 
+    :unique => :required,
+    :changeable => :required,
+    :volatile => :required,
+    :transient => :required,
+    :unsettable => :required,
+    :derived => :required,
+    :lowerBound => :required,
+    :upperBound => :required,
+    :resolveProxies => :required,
+    :containment => :required
+  }
+
+  Defaults = {
+    :ordered => true,
+    :unique => true,
+    :changeable => true,
+    :volatile => false,
+    :transient => false,
+    :unsettable => false,
+    :derived => false,
+    :lowerBound => 0,
+    :resolveProxies => true
+  }
+
+  def self.default_value(prop)
+    Defaults[prop]
+  end
+  
+  def self.properties
+    Properties.keys.sort{|a,b| a.to_s <=> b.to_s}
+  end
+
+  def initialize(type, props)
+    @props = Defaults.merge(props)
+    if type.respond_to?(:_metamodel_description) 
+      @etype = nil
+      @impl_type = type
+    else
+      raise ArgumentError.new("'#{type}' (#{type.class}) is not a MMBase in reference #{props[:name]}")
+    end
+    if @props[:derived]
+      @props[:changeable] = false
+      @props[:volatile] = true
+      @props[:transient] = true
+    end    
+    check(Properties)
+  end
+
+end
+
+end
+
+end
+
+end
+

data/lib/rgen/metamodel_builder/module_extension.rb

@@ -1,4 +1,4 @@
-require 'rgen/ecore/ecore_instantiator'
+require 'rgen/ecore/ecore_interface'
 require 'rgen/metamodel_builder/intermediate/annotation'
 
 module RGen
@@ -8,7 +8,7 @@ module MetamodelBuilder
 # This module is used to extend modules which should be
 # part of RGen metamodels
 module ModuleExtension
-  include RGen::ECore::ECoreInstantiator
+  include RGen::ECore::ECoreInterface
   
   def annotation(hash)
     _annotations << Intermediate::Annotation.new(hash)

data/lib/rgen/model_builder.rb

@@ -1,5 +1,5 @@
 require 'rgen/model_builder/builder_context'
-require 'rgen/method_delegation'
+require 'rgen/util/method_delegation'
 #require 'ruby-prof'
 
 module RGen
@@ -10,18 +10,23 @@ module ModelBuilder
     resolver = ReferenceResolver.new
     bc = BuilderContext.new(package, builderMethodsModule, resolver, env)
     contextModule = eval("Module.nesting", block.binding).first
-    MethodDelegation.registerDelegate(bc, contextModule, "const_missing")
+    Util::MethodDelegation.registerDelegate(bc, contextModule, "const_missing")
+    BuilderContext.currentBuilderContext = bc
+    begin
     #RubyProf.start
-    bc.instance_eval(&block)
+      bc.instance_eval(&block)
     #prof = RubyProf.stop
     #File.open("profile_flat.txt","w+") do |f|
     #  RubyProf::FlatPrinter.new(prof).print(f, 0)
     # end
-    MethodDelegation.unregisterDelegate(bc, contextModule, "const_missing")
+    ensure
+      BuilderContext.currentBuilderContext = nil
+    end
+    Util::MethodDelegation.unregisterDelegate(bc, contextModule, "const_missing")
     #puts "Resolving..."
     resolver.resolve(bc.toplevelElements)
     bc.toplevelElements
   end    
 end
 
-end
+end

data/lib/rgen/model_builder/builder_context.rb

@@ -25,6 +25,22 @@ class BuilderContext
     ConstPathElement.new(const, self)
   end
   
+  # in Ruby 1.9.0 and 1.9.1 #instance_eval looks up constants in the calling scope
+  # that's why const_missing needs to be prepared in BuilderContext, too 
+  class << self
+    def currentBuilderContext=(bc)
+     @@currentBuilderContext = bc
+    end
+
+    def const_missing(name)
+      if @@currentBuilderContext
+        ConstPathElement.new(name, @@currentBuilderContext)
+      else
+        super
+      end
+    end
+  end
+
   class CommandResolver
     def initialize(rootPackage, extensionsModule, builderContext)
       @extensionFactory = ExtensionContainerFactory.new(rootPackage, extensionsModule, builderContext)
@@ -315,4 +331,4 @@ end
 
 end
   
-end
+end

data/lib/rgen/serializer/opposite_reference_filter.rb

@@ -0,0 +1,18 @@
+module RGen
+
+module Serializer
+
+# Filters refereences with an eOpposite:
+#  1. containment references are always preferred
+#  2. at a 1-to-n reference the 1-reference is always preferred
+#  3. otherwise the reference with the name in string sort order before the opposite's name is prefereed
+# 
+OppositeReferenceFilter = proc do |features|
+  features.reject{|f| f.is_a?(RGen::ECore::EReference) && !f.containment && f.eOpposite &&
+    (f.eOpposite.containment || (f.many && !f.eOpposite.many) || (!(!f.many && f.eOpposite.many) && (f.name < f.eOpposite.name)))}
+end
+
+end
+
+end
+

data/lib/rgen/serializer/qualified_name_provider.rb

@@ -0,0 +1,45 @@
+module RGen
+
+module Serializer
+
+# simple identifier calculation based on qualified names
+# prerequisits:
+# * containment relations must be bidirectionsl
+# * local name stored in single attribute +@attribute_name+ for all classes
+#
+class QualifiedNameProvider
+
+  def initialize(options={})
+    @qualified_name_cache = {}
+    @attribute_name = options[:attribute_name] || "name"
+    @separator = options[:separator] || "/"
+    @leading_separator = options.has_key?(:leading_separator) ? options[:leading_separator] : true 
+  end
+
+  def identifier(element)
+    (element.is_a?(RGen::MetamodelBuilder::MMProxy) && element.targetIdentifier) || qualified_name(element)
+  end
+
+  def qualified_name(element)
+    return @qualified_name_cache[element] if @qualified_name_cache[element]
+    localIdent = ((element.respond_to?(@attribute_name) && element.getGeneric(@attribute_name)) || "").strip
+    parentRef = element.class.ecore.eAllReferences.select{|r| r.eOpposite && r.eOpposite.containment}.first
+    parent = parentRef && element.getGeneric(parentRef.name)
+    if parent
+      if localIdent.size > 0
+        parentIdent = qualified_name(parent)
+        result = parentIdent + @separator + localIdent
+      else
+        result = qualified_name(parent)
+      end
+    else
+      result = (@leading_separator ? @separator : "") + localIdent
+    end
+    @qualified_name_cache[element] = result
+  end
+end
+
+end
+
+end
+

data/lib/rgen/template_language/template_container.rb

@@ -143,6 +143,7 @@ module RGen
       def _expand(template, args, params)
         raise StandardError.new("expand :for argument evaluates to nil") if params.has_key?(:for) && params[:for].nil?
         context = params[:for]
+        old_indent = @indent
         @indent = params[:indent] || @indent
         noIndentNextLine = params[:_noIndentNextLine] || 
           (@output.is_a?(OutputHandler) && @output.noIndentNextLine) || 
@@ -163,6 +164,7 @@ module RGen
         end
         _direct_concat(local_output) unless params[:_evalOnly]
         @context = old_context if old_context
+        @indent = old_indent
         local_output.to_s
       end
       
@@ -229,4 +231,4 @@ module RGen
     
   end
   
-end
+end

data/lib/rgen/{auto_class_creator.rb → util/auto_class_creator.rb}

@@ -5,6 +5,8 @@ require 'rgen/metamodel_builder'
 
 module RGen
 
+module Util
+
 class Base
 	extend MetamodelBuilder
 	def initialize(env=nil)
@@ -53,4 +55,7 @@ module AutoClassCreator
 	end
 end
 
-end
+end
+
+end
+