rgen 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5091748f0290a5b0c82cf66e3bf2fea91ac774f6
-  data.tar.gz: db0663f172064272ed0bcd037e6715c12729429b
+  metadata.gz: 718b7e6aeacd446bb08225196146552c65033210
+  data.tar.gz: cc635adbb4efece25018192e3252329908c33816
 SHA512:
-  metadata.gz: 1355aa9282e5c3a18a93b65788f4fb5a4f92b26bb5cf89fa50e7ec71bd63dad090af06b73e292e959a7750fe08d75a5e0e4a5f0010fe84bb162c6eed1af338d1
-  data.tar.gz: 3f8755a969d35c22d4d8b3bcabeb6c75799b48b416d242a83530afbdc8b7364e682ba59750eddc375a454b450ef1ed5d32941951d7397430f4172d37aa1841a7
+  metadata.gz: df6c209888d596ff60c3ec98727a725ff5bc3633c4623064394d3836348538d69e0ffa3fb279f9d41aade24fcc7620c3e5f5b0a32d38654f0509fc952991cbeb
+  data.tar.gz: 622b0cd9abe40acba98091eb0fdcb7c2abcc73cde5c755ed51da2792f22d1c40b7546eb71e2a8905305a1718c79d330686954056e2e81c3b76569ad3e0d25b5e

data/CHANGELOG

@@ -225,4 +225,12 @@
 
 =0.9.0
 
-* Update to support Ruby 2.7, drop support for older Rubies
+* 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})
+
+=0.10.0
+
+* Added support for Ruby up to 3.2

data/Project.yaml

@@ -1,7 +1,7 @@
 name: rgen
 gemspec: rgen.gemspec
 git: https://github.com/mthiede/rgen.git
-version: 0.9.0
+version: 0.10.0
 summary: Ruby Modelling and Generator Framework
 email: martin dot thiede at gmx de
 homepage: http://ruby-gen.org
@@ -15,7 +15,7 @@ exclude_files: ['**/*.bak']
 encrypt_sources: false
 dependencies:
   https://rubygems.org:
-    - {name: nokogiri,           version: ['>= 1.11.2', '< 1.12'],    development: true}
+    - {name: nokogiri,           version: ['>= 1.14.2', '< 1.15'],    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}

data/lib/rgen/ecore/ecore.rb

@@ -25,7 +25,7 @@ module RGen
     
     class ENamedElement < EModelElement
       abstract
-      has_attr 'name', String
+      has_attr 'name', String, :lowerBound => 1
     end
     
     class ETypedElement < ENamedElement
@@ -148,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

@@ -134,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

data/lib/rgen/template_language/template_container.rb

@@ -29,7 +29,7 @@ module RGen
   	      	@@metamodels = @metamodels
     	    	fileContent = f.read
       	  	_detectNewLinePattern(fileContent)
-        		ERB.new(fileContent,nil,nil,'@output').result(binding)
+        		ERB.new(fileContent, eoutvar:'@output').result(binding)
           rescue Exception => e
             processAndRaise(e)
           end

data/test/metamodel_builder_test.rb

@@ -226,7 +226,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       sc.allowed = :someSymbol
     end
-    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(:someSymbol\) where a \[true,false\] is expected/, err.message
+    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(someSymbol\)\(:someSymbol\) where a \[true,false\] is expected/, err.message
     err = assert_raises StandardError do
       sc.allowed = "a string"
     end
@@ -244,7 +244,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       sc.kind = :false
     end
-    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(:false\) where a \[:simple,:extended\] is expected/, err.message
+    assert_match /In (\w+::)+SimpleClass : Can not use a Symbol\(false\)\(:false\) where a \[:simple,:extended\] is expected/, err.message
     err = assert_raises StandardError do
       sc.kind = "a string"
     end
@@ -280,7 +280,6 @@ class MetamodelBuilderTest < MiniTest::Test
     assert_equal 5, sc.longWithDefault
     sc.longWithDefault = (2**(0.size * 8 -2) -1) + 1
     assert_equal (2**(0.size * 8 -2) -1) + 1, sc.longWithDefault
-    assert sc.longWithDefault.is_a?(Bignum)
     assert sc.longWithDefault.is_a?(Integer)
     err = assert_raises StandardError do
       sc.longWithDefault = "a string"
@@ -616,7 +615,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       bc.addAClasses :notaaclass
     end
-    assert_match /In (\w+::)+BClassMM : Can not use a Symbol\(:notaaclass\) where a (\w+::)+AClassMM is expected/, err.message
+    assert_match /In (\w+::)+BClassMM : Can not use a Symbol\(notaaclass\)\(:notaaclass\) where a (\w+::)+AClassMM is expected/, err.message
     
     # remove the AClass from the BClass
     bc.removeAClasses ac
@@ -632,7 +631,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       ac.addBClasses :notabclass
     end
-    assert_match /In (\w+::)+AClassMM : Can not use a Symbol\(:notabclass\) where a (\w+::)+BClassMM is expected/, err.message
+    assert_match /In (\w+::)+AClassMM : Can not use a Symbol\(notabclass\)\(:notabclass\) where a (\w+::)+BClassMM is expected/, err.message
     
     # remove the BClass from the AClass
     ac.removeBClasses bc

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/template_language_test.rb

@@ -61,7 +61,7 @@ class TemplateContainerTest < MiniTest::Test
   def test_with_model
     tc = RGen::TemplateLanguage::DirectoryTemplateContainer.new([MyMM, CCodeMM], OUTPUT_DIR)
     tc.load(TEMPLATES_DIR)
-    File.delete(OUTPUT_DIR+"/testout.txt") if File.exists? OUTPUT_DIR+"/testout.txt"
+    File.delete(OUTPUT_DIR+"/testout.txt") if File.exist? OUTPUT_DIR+"/testout.txt"
     tc.expand('root::Root', :for => TEST_MODEL, :indent => 1)
     result = expected = ""
     File.open(OUTPUT_DIR+"/testout.txt") {|f| result = f.read}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgen
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-30 00:00:00.000000000 Z
+date: 2023-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.14.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.11.2
+        version: 1.14.2
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '1.15'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement