rgen 0.7.0 → 0.8.3

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 %>)

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

data/test/ecore_to_ruby_test.rb

@@ -0,0 +1,73 @@
+$:.unshift File.join(File.dirname(__FILE__),"..","lib")
+
+require 'minitest/autorun'
+require 'rgen/environment'
+require 'rgen/ecore/ecore'
+require 'rgen/ecore/ecore_ext'
+require 'rgen/ecore/ecore_to_ruby'
+
+class ECoreToRubyTest < MiniTest::Test
+
+module ContainerSimple
+end
+
+module ContainerUnder
+end
+
+def test_simple
+  p1 = create_ecore
+
+  mod = RGen::ECore::ECoreToRuby.new.create_module(p1)
+  
+  assert mod.const_defined?(:P11)
+  assert mod::P11.const_defined?(:C1)
+
+  # temporary path
+  assert mod::P11::C1.to_s.start_with?("#")
+
+  ContainerSimple.const_set("P1", mod)
+  assert_equal "ECoreToRubyTest::ContainerSimple::P1::P11::C1", ContainerSimple::P1::P11::C1.name
+end
+
+def test_under
+  p1 = create_ecore
+
+  RGen::ECore::ECoreToRuby.new.create_module(p1, ContainerUnder)
+  
+  assert ContainerUnder.const_defined?(:P1)
+  assert ContainerUnder::P1.const_defined?(:P11)
+  assert ContainerUnder::P1::P11.const_defined?(:C1)
+
+  assert_equal "ECoreToRubyTest::ContainerUnder::P1::P11::C1", ContainerUnder::P1::P11::C1.name
+end
+
+def test_under_temp_path
+  p1 = create_ecore
+
+  container = Module.new
+  RGen::ECore::ECoreToRuby.new.create_module(p1, container)
+  
+  assert container.const_defined?(:P1)
+  assert container::P1.const_defined?(:P11)
+  assert container::P1::P11.const_defined?(:C1)
+
+  # temporary path
+  assert container::P1::P11::C1.to_s.start_with?("#")
+
+  self.class.const_set("Container2", container)
+  assert_equal "ECoreToRubyTest::Container2::P1::P11::C1", container::P1::P11::C1.to_s
+end
+
+def create_ecore
+  p1 = RGen::ECore::EPackage.new(:name => "P1")
+  p11 = RGen::ECore::EPackage.new(:name => "P11", :eSuperPackage => p1)
+  p12 = RGen::ECore::EPackage.new(:name => "P12", :eSuperPackage => p1)
+  c1 = RGen::ECore::EClass.new(:name => "C1", :ePackage => p11)
+  c2 = RGen::ECore::EClass.new(:name => "C2", :ePackage => p12)
+  c3 = RGen::ECore::EClass.new(:name => "C3", :eSuperTypes => [c1, c2], :ePackage => p11)
+  p1
+end
+
+end
+
+

data/test/environment_test.rb

@@ -1,10 +1,10 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'rgen/metamodel_builder'
 
-class EnvironmentTest < Test::Unit::TestCase
+class EnvironmentTest < MiniTest::Test
 
 	class Model
 		attr_accessor :name

data/test/json_test.rb

@@ -1,12 +1,12 @@
 $:.unshift File.join(File.dirname(__FILE__),"..","lib")
 
-require 'test/unit'
+require 'minitest/autorun'
 require 'rgen/environment'
 require 'rgen/metamodel_builder'
 require 'rgen/serializer/json_serializer'
 require 'rgen/instantiator/json_instantiator'
 
-class JsonTest < Test::Unit::TestCase
+class JsonTest < MiniTest::Test
 
   module TestMM
     extend RGen::MetamodelBuilder::ModuleExtension
@@ -61,7 +61,7 @@ class JsonTest < Test::Unit::TestCase
     inst.instantiate(%q({ "_class": "TestNode", "text": "some text", "childs": [ 
   { "_class": "TestNode", "text": "child" }] }))
     root = env.find(:class => TestMM::TestNode, :text => "some text").first
-    assert_not_nil root
+    assert root != nil
     assert_equal 1, root.childs.size
     assert_equal TestMM::TestNode, root.childs.first.class
     assert_equal "child", root.childs.first.text
@@ -149,7 +149,7 @@ class JsonTest < Test::Unit::TestCase
   def test_json_instantiator_subpackage_no_shortname_opt
     env = RGen::Environment.new
     inst = RGen::Instantiator::JsonInstantiator.new(env, TestMMSubpackage, :short_class_names => false)
-    assert_raise RuntimeError do
+    assert_raises RuntimeError do
       inst.instantiate(%q({ "_class": "Data2", "data2": "something" }))
     end
   end