rgen 0.7.0 → 0.8.4

data/lib/rgen/instantiator/default_xml_instantiator.rb

@@ -8,107 +8,112 @@ module Instantiator
 # Derive your own instantiator from this class or use it as is.
 # 
 class DefaultXMLInstantiator < NodebasedXMLInstantiator
-	include Util::NameHelper
+  include Util::NameHelper
 
-	NamespaceDescriptor = Struct.new(:prefix, :target)
-	
-	class << self
-	
-		def map_tag_ns(from, to, prefix="")
-			tag_ns_map[from] = NamespaceDescriptor.new(prefix, to)
-		end
-		
-		def tag_ns_map # :nodoc:
-			@tag_ns_map ||={}
-			@tag_ns_map
-		end
-		
-	end	
-	
-	def initialize(env, default_module, create_mm=false)
-		super(env)
-		@default_module = default_module
-		@create_mm = create_mm
-	end
-		
-	def on_descent(node)
-		obj = new_object(node)
-		@env << obj unless obj.nil?
-		node.object = obj
-		node.attributes.each_pair { |k,v| set_attribute(node, k, v) }
-	end
+  NamespaceDescriptor = Struct.new(:prefix, :target)
+  
+  class << self
+  
+    def map_tag_ns(from, to, prefix="")
+      tag_ns_map[from] = NamespaceDescriptor.new(prefix, to)
+    end
+    
+    def tag_ns_map # :nodoc:
+      @tag_ns_map ||={}
+      @tag_ns_map
+    end
+    
+  end  
+  
+  def initialize(env, default_module, create_mm=false)
+    super(env)
+    @default_module = default_module
+    @create_mm = create_mm
+  end
+    
+  def on_descent(node)
+    obj = new_object(node)
+    @env << obj unless obj.nil?
+    node.object = obj
+    node.attributes.each_pair { |k,v| set_attribute(node, k, v) }
+  end
 
-	def on_ascent(node)
-		node.children.each { |c| assoc_p2c(node, c) }
-		node.object.class.has_attr 'chardata', Object unless node.object.respond_to?(:chardata)
-		set_attribute(node, "chardata", node.chardata)
-	end
-	
+  def on_ascent(node)
+    node.children.each { |c| assoc_p2c(node, c) }
+    node.object.class.has_attr 'chardata', Object unless node.object.respond_to?(:chardata)
+    set_attribute(node, "chardata", node.chardata)
+  end
+  
   def class_name(str)
     saneClassName(str)
   end
   
-	def new_object(node)
-		ns_desc = self.class.tag_ns_map[node.namespace]
-		class_name = class_name(ns_desc.nil? ? node.qtag : ns_desc.prefix+node.tag)
-		mod = (ns_desc && ns_desc.target) || @default_module		
-		build_on_error(NameError, :build_class, class_name, mod) do
-			mod.const_get(class_name).new
-		end
-	end
+  def new_object(node)
+    ns_desc = self.class.tag_ns_map[node.namespace]
+    class_name = class_name(ns_desc.nil? ? node.qtag : ns_desc.prefix+node.tag)
+    mod = (ns_desc && ns_desc.target) || @default_module
+    build_on_error(NameError, :build_class, class_name, mod) do
+      begin
+        mod.const_get(class_name, false).new
+      rescue ArgumentError
+        # Ruby 1.8
+        mod.const_get(class_name).new
+      end
+    end
+  end
   
-	def build_class(name, mod)
-		mod.const_set(name, Class.new(RGen::MetamodelBuilder::MMBase))
-	end
+  def build_class(name, mod)
+    mod.const_set(name, Class.new(RGen::MetamodelBuilder::MMBase))
+  end
   
   def method_name(str)
     saneMethodName(str)
   end
 
-	def assoc_p2c(parent, child)
-        return unless parent.object && child.object
-        method_name = method_name(className(child.object))
-		build_on_error(NoMethodError, :build_p2c_assoc, parent, child, method_name) do
-			parent.object.addGeneric(method_name, child.object)
-			child.object.setGeneric("parent", parent.object)
-		end
-	end
-	
-	def build_p2c_assoc(parent, child, method_name)
-		parent.object.class.has_many(method_name, child.object.class)
-		child.object.class.has_one("parent", RGen::MetamodelBuilder::MMBase)
-	end
-	
-	def set_attribute(node, attr, value)
-	   return unless node.object
-	   	build_on_error(NoMethodError, :build_attribute, node, attr, value) do
-			node.object.setGeneric(method_name(attr), value)
-		end
-	end
-	
-	def build_attribute(node, attr, value)
-		node.object.class.has_attr(method_name(attr))
-	end
+  def assoc_p2c(parent, child)
+    return unless parent.object && child.object
+    method_name = method_name(className(child.object))
+    build_on_error(NoMethodError, :build_p2c_assoc, parent, child, method_name) do
+      parent.object.addGeneric(method_name, child.object)
+      child.object.setGeneric("parent", parent.object)
+    end
+  end
+  
+  def build_p2c_assoc(parent, child, method_name)
+    parent.object.class.has_many(method_name, child.object.class)
+    child.object.class.has_one("parent", RGen::MetamodelBuilder::MMBase)
+  end
+  
+  def set_attribute(node, attr, value)
+    return unless node.object
+      build_on_error(NoMethodError, :build_attribute, node, attr, value) do
+      node.object.setGeneric(method_name(attr), value)
+    end
+  end
+  
+  def build_attribute(node, attr, value)
+    node.object.class.has_attr(method_name(attr))
+  end
 
-	protected
-	
-	# Helper method for implementing classes.
-	# This method yields the given block.
-	# If the metamodel should be create automatically (see constructor)
-	# rescues +error+ and calls +builder_method+ with +args+, then 
-	# yields the block again.
-	def build_on_error(error, builder_method, *args)
-		begin
-			yield
-		rescue error
-			if @create_mm
-				send(builder_method, *args)
-				yield
-			else
-				raise
-			end
-		end
-	end
+  protected
+  
+  # Helper method for implementing classes.
+  # This method yields the given block.
+  # If the metamodel should be create automatically (see constructor)
+  # rescues +error+ and calls +builder_method+ with +args+, then 
+  # yields the block again.
+  def build_on_error(error, builder_method, *args)
+    begin
+      yield
+    rescue error
+      if @create_mm
+        send(builder_method, *args)
+        yield
+      else
+        raise
+      end
+    end
+  end
 
 end
 

data/lib/rgen/metamodel_builder/builder_extensions.rb

@@ -319,6 +319,10 @@ module BuilderExtensions
         end
         <% if name != "class" %>
           alias <%= name %> get<%= firstToUpper(name) %>
+        <% else %>
+          def getGeneric(role)
+            send("get\#{firstToUpper(role.to_s)}")
+          end
         <% end %>
 
       CODE
@@ -380,10 +384,14 @@ module BuilderExtensions
       @@many_read_builder ||= ERB.new <<-CODE
       
         def get<%= firstToUpper(name) %>
-          ( @<%= name %> ? @<%= name %>.dup : [] )
+          ( defined?(@<%= name %>) ? @<%= name %>.dup : [] )
         end
         <% if name != "class" %>
           alias <%= name %> get<%= firstToUpper(name) %>
+        <% else %>
+          def getGeneric(role)
+            send("get\#{firstToUpper(role.to_s)}")
+          end
         <% end %>
               
       CODE
@@ -394,8 +402,8 @@ module BuilderExtensions
       @@many_write_builder ||= ERB.new <<-CODE
     
         def add<%= firstToUpper(name) %>(val, index=-1)
-          @<%= name %> = [] unless @<%= name %>
-          return if val.nil? || (@<%= name %>.any?{|e| e.object_id == val.object_id} && (val.is_a?(MMBase) || val.is_a?(MMGeneric)))
+          @<%= name %> = [] unless defined?(@<%= name %>)
+          return if val.nil? || (val.is_a?(MMBase) || val.is_a?(MMGeneric)) && @<%= name %>.any? {|e| e.equal?(val)}
           <%= type_check_code("val", props) %>
           @<%= name %>.insert(index, val)
           <% if other_role %>
@@ -407,9 +415,9 @@ module BuilderExtensions
         end
         
         def remove<%= firstToUpper(name) %>(val)
-          @<%= name %> = [] unless @<%= name %>
+          @<%= name %> = [] unless defined?(@<%= name %>)
           @<%= name %>.each_with_index do |e,i|
-            if e.object_id == val.object_id
+            if e.equal?(val)
               @<%= name %>.delete_at(i)
               <% if props.reference? && props.value(:containment) %>
                 val._set_container(nil, nil)
@@ -428,14 +436,30 @@ module BuilderExtensions
           get<%= firstToUpper(name) %>.each {|e|
             remove<%= firstToUpper(name) %>(e)
           }
-          val.each {|v|
-            add<%= firstToUpper(name) %>(v)
+          @<%= name %> = [] unless defined?(@<%= name %>)
+          <% if props.reference? %>
+          val.uniq {|elem| elem.object_id }.each {|elem|
+            next if elem.nil?
+            <%= type_check_code("elem", props) %>
+            @<%= name %> << elem
+            <% if other_role %>
+              elem._register<%= firstToUpper(other_role) %>(self) unless elem.is_a?(MMGeneric)
+            <% end %>
+            <% if props.value(:containment) %>
+              elem._set_container(self, :<%= name %>)
+            <% end %>
           }
+          <% else %>
+          val.each {|elem|
+            <%= type_check_code("elem", props) %>
+            @<%= name %> << elem
+         }
+         <% end %>
         end
         alias <%= name %>= set<%= firstToUpper(name) %>
         
         def _register<%= firstToUpper(name) %>(val)
-          @<%= name %> = [] unless @<%= name %>
+          @<%= name %> = [] unless defined?(@<%= name %>)
           @<%= name %>.push val
           <% if props.reference? && props.value(:containment) %>
             val._set_container(self, :<%= name %>)
@@ -515,7 +539,7 @@ module BuilderExtensions
       code << "\n"
       expected = "Integer"
     elsif props.impl_type.is_a?(Class)
-      code << "unless #{varname}.nil? || #{varname}.is_a?(#{props.impl_type}) || #{varname}.is_a?(MMGeneric)"
+      code << "unless #{varname}.nil? || #{varname}.is_a?(ObjectSpace._id2ref(#{props.impl_type.object_id})) || #{varname}.is_a?(MMGeneric)"
       code << " || #{varname}.is_a?(BigDecimal)" if props.impl_type == Float && defined?(BigDecimal)
       code << "\n"
       expected = props.impl_type.to_s

data/lib/rgen/metamodel_builder/builder_runtime.rb

@@ -58,14 +58,17 @@ module BuilderRuntime
     end
   end
 
-	def getGeneric(role)
-		send("get#{firstToUpper(role.to_s)}")
-	end
+  alias getGeneric send
 
   def getGenericAsArray(role)
     result = getGeneric(role)
-    result = [result].compact unless result.is_a?(Array)
-    result
+    if result.nil?
+      []
+    elsif result.is_a?(Array)
+      result
+    else
+      [result]
+    end
   end
 
   def eIsSet(role)
@@ -100,6 +103,10 @@ module BuilderRuntime
 
   # if a block is given, calls the block on every contained element in depth first order. 
   # if the block returns :prune, recursion will stop at this point.
+  # 
+  # BEWARE of concurrent modification of contained elements while iterating!
+  # (adding/removing containers or contained elements)
+  # if you need to do such modifications, use the variant without a block instead.
   #
   # if no block is given builds and returns a list of all contained elements.
   #

data/lib/rgen/template_language/output_handler.rb

@@ -6,15 +6,28 @@ module RGen
 module TemplateLanguage
   
   class OutputHandler
-    attr_writer :indent
     attr_accessor :noIndentNextLine
     
     def initialize(indent=0, indentString="   ", mode=:explicit)
       self.mode = mode
-      @indent = indent
       @indentString = indentString
       @state = :wait_for_nonws
       @output = ""
+      @indent_string = @indentString*indent
+    end
+
+    def indent=(i)
+      @indent_string = @indentString*i
+    end
+
+    NL = "\n"
+    LFNL = "\r\n"
+    if RUBY_VERSION.start_with?("1.8")
+      NL_CHAR = 10
+      LF_CHAR = 13
+    else
+      NL_CHAR = "\n"
+      LF_CHAR = "\r"
     end
     
     # ERB will call this method for every string s which is part of the
@@ -22,36 +35,46 @@ module TemplateLanguage
     # call this method for every part of s which is terminated by a \n
     # 
     def concat(s)
-      return @output.concat(s) if s.is_a? OutputHandler
-      #puts [object_id, noIndentNextLine, @state, @output.to_s, s].inspect
-      s = s.to_str.gsub(/^[\t ]*\r?\n/,'') if @ignoreNextNL
-      s = s.to_str.gsub(/^\s+/,'') if @ignoreNextWS
-      @ignoreNextNL = @ignoreNextWS = false if s =~ /\S/
+      if @ignoreNextNL
+        idx = s.index(NL)
+        if idx && s[0..idx].strip.empty?
+          s = s[idx+1..-1]
+        end
+        @ignoreNextNL = false unless s.strip.empty?
+      end
+      if @ignoreNextWS
+        s = s.lstrip
+        @ignoreNextWS = false unless s.empty?
+      end
       if @mode == :direct
         @output.concat(s)
       elsif @mode == :explicit
         while s.size > 0
           if @state == :wait_for_nl
-            if s =~ /\A([^\r\n]*\r?\n)(.*)/m
-              rest = $2
-              @output.concat($1.gsub(/[\t ]+(?=\r|\n)/,''))
-              s = rest || ""
+            idx = s.index(NL)
+            if idx
+              if s[idx-1] == LF_CHAR
+                @output.concat(s[0..idx].rstrip)
+                @output.concat(LFNL)
+              else
+                @output.concat(s[0..idx].rstrip)
+                @output.concat(NL)
+              end
+              s = s[idx+1..-1]
               @state = :wait_for_nonws
             else
               @output.concat(s)
-              s = ""
+              break
             end
           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(@indentString * @indent)
+            s = s.lstrip
+            if !s.empty?
+              unless @noIndentNextLine || (@output[-1] && @output[-1] != NL_CHAR)
+                @output.concat(@indent_string)
               else
                 @noIndentNextLine = false
               end
               @state = :wait_for_nl
-            else
-              s = ""
             end
           end
         end
@@ -68,6 +91,16 @@ module TemplateLanguage
       @output.concat(s)
     end
     
+    def direct_concat_allow_indent(s)
+      unless @noIndentNextLine || (@output[-1] && @output[-1] != NL_CHAR)
+        @output.concat(@indent_string)
+      else
+        @noIndentNextLine = false
+      end
+      @state = :wait_for_nl
+      @output.concat(s)
+    end
+
     def ignoreNextNL
       @ignoreNextNL = true
     end
@@ -84,4 +117,4 @@ module TemplateLanguage
   
 end
   
-end
+end

data/lib/rgen/template_language/template_container.rb

@@ -84,7 +84,7 @@ module RGen
       end
       
       def ws
-        _direct_concat(" ")
+        _direct_concat(" ", true)
       end
       
       def iinc
@@ -134,7 +134,7 @@ module RGen
         sep = params[:separator]
         params[:foreach].each_with_index {|e,i|
           _direct_concat(sep.to_s) if sep && i > 0 
-          output = _expand(template, args, params.merge({:for => e}))
+          _expand(template, args, params.merge({:for => e}))
         }
       end
       
@@ -147,7 +147,12 @@ module RGen
         @indent = params[:indent] || @indent
         noIndentNextLine = params[:_noIndentNextLine] || 
           (@output.is_a?(OutputHandler) && @output.noIndentNextLine) || 
-          (@output.to_s.size > 0 && @output.to_s[-1] != "\n"[0]) 
+          # the following line actually defines the noIndentNextLine state:
+          # we don't indent the next line if the previous line was not finished,
+          # i.e. if output has been generated but is not terminated by a newline
+          # BEWARE: the initial evaluation of the ERB template during template loading
+          #         also writes to @output (it creates a String); we must ignore this
+          (@output.is_a?(OutputHandler) && @output.to_s.size > 0 && @output.to_s[-1] != "\n"[0]) 
         caller = params[:_caller] || self
         old_context, @context = @context, context if context
         local_output = nil
@@ -157,7 +162,7 @@ module RGen
           old_output, @output = @output, OutputHandler.new(@indent, @parent.indentString)
           @output.noIndentNextLine = noIndentNextLine
           _call_template(tplname, @context, args, caller == self)
-          old_output.noIndentNextLine = false if old_output.is_a?(OutputHandler) && !old_output.noIndentNextLine
+          old_output.noIndentNextLine = false if old_output.is_a?(OutputHandler) && !@output.noIndentNextLine
           local_output, @output = @output, old_output
         else
           local_output = @parent.expand(template, *(args.dup << {:for => @context, :indent => @indent, :_noIndentNextLine => noIndentNextLine, :_evalOnly => true, :_caller => caller}))
@@ -205,13 +210,18 @@ module RGen
         raise StandardError.new("Template class not matching: #{tpl} for #{context.class.name}") unless found
       end
         
-      def _direct_concat(s)
+      def _direct_concat(s, allow_indent=false)
         if @output.is_a? OutputHandler
-          @output.direct_concat(s)
+          if allow_indent
+            @output.direct_concat_allow_indent(s)
+          else
+            @output.direct_concat(s)
+          end
         else
           @output << s
         end
-      end
 
+      end
+
       def _detectNewLinePattern(text)
         tests = 0
         rnOccurances = 0

data/lib/rgen/template_language.rb

@@ -129,6 +129,7 @@ module RGen
 # Starting from this point one can add indentation and newlines as required by using
 # explicit formatting commands:
 # * <code><%nl%></code> (newline) starts a new line
+# * <code><%ws%></code> (whitespace) adds an explicit space
 # * <code><%iinc%></code> (indentation increment) increases the current indentation
 # * <code><%idec%></code> (indentation decrement) decreases the current indentation
 # * <code><%nonl%></code> (no newline) ignore next newline
@@ -294,4 +295,4 @@ module TemplateLanguage
 
 end
 
-end
+end

data/test/array_extensions_test.rb

@@ -1,9 +1,9 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/array_extensions'
 
-class ArrayExtensionsTest < Test::Unit::TestCase
+class ArrayExtensionsTest < MiniTest::Test
 
   def test_element_methods
     c = Struct.new("SomeClass",:name,:age)
@@ -11,11 +11,11 @@ class ArrayExtensionsTest < Test::Unit::TestCase
     a << c.new('MyName',33)
     a << c.new('YourName',22)
     assert_equal ["MyName", "YourName"], a >> :name
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       a.name
     end
     assert_equal [33, 22], a>>:age
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       a.age
     end
     # unfortunately, any method can be called on an empty array
@@ -42,11 +42,11 @@ class ArrayExtensionsTest < Test::Unit::TestCase
     # put something into the array that is not an MMBase
     a << "not a MMBase"
     # the dot operator will tell that there is something not a MMBase
-    assert_raise StandardError do
+    assert_raises StandardError do
       a.age
     end
     # the >> operator will try to call the method anyway
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       a >> :age
     end
   end
@@ -56,7 +56,7 @@ class ArrayExtensionsTest < Test::Unit::TestCase
   end
 
   def test_to_str_on_empty_array
-    assert_raise NoMethodError do
+    assert_raises NoMethodError do
       [].to_str
     end
   end

data/test/ea_instantiator_test.rb

@@ -1,6 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'metamodels/uml13_metamodel'
 require 'ea_support/ea_support'
@@ -9,7 +9,7 @@ require 'testmodel/class_model_checker'
 require 'testmodel/object_model_checker'
 require 'testmodel/ecore_model_checker'
 
-class EAInstantiatorTest < Test::Unit::TestCase
+class EAInstantiatorTest < MiniTest::Test
 
     include Testmodel::ClassModelChecker
     include Testmodel::ObjectModelChecker

data/test/ea_serializer_test.rb

@@ -1,12 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'metamodels/uml13_metamodel'
 require 'ea_support/ea_support'
 require 'rgen/serializer/xmi11_serializer'
 
-class EASerializerTest < Test::Unit::TestCase
+class EASerializerTest < MiniTest::Test
 
 	MODEL_DIR = File.join(File.dirname(__FILE__),"testmodel")
 	TEST_DIR = File.join(File.dirname(__FILE__),"ea_serializer_test")

data/test/ecore_self_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/ecore/ecore'
 require 'rgen/array_extensions'
 
-class ECoreSelfTest < Test::Unit::TestCase
+class ECoreSelfTest < MiniTest::Test
   include RGen::ECore
   
   def test_simple