rgen 0.8.4 → 0.9.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e58b57346e1f7e95fcaa15f29112706c911d20ed
-  data.tar.gz: 6551cb4e9579f7e76582018876973edd9a58d0e6
+  metadata.gz: 5091748f0290a5b0c82cf66e3bf2fea91ac774f6
+  data.tar.gz: db0663f172064272ed0bcd037e6715c12729429b
 SHA512:
-  metadata.gz: 1e82e58dd4eaf95de47ef1714a778558a6bd3cb76f8229fb43e029a98f9e03c6234ee2fab831adde1d7de1b953665afab031f27f39b0ad7a060a91c4ed7c7328
-  data.tar.gz: 47b73a00783a82d630b0771fb55b01c4da6adffe73a459cd35828dd5040644b8b0f6cd00a565a4abf257d8c4d2e97ca17db2c072cbe05e8ae44fe9b2b3a2637e
+  metadata.gz: 1355aa9282e5c3a18a93b65788f4fb5a4f92b26bb5cf89fa50e7ec71bd63dad090af06b73e292e959a7750fe08d75a5e0e4a5f0010fe84bb162c6eed1af338d1
+  data.tar.gz: 3f8755a969d35c22d4d8b3bcabeb6c75799b48b416d242a83530afbdc8b7364e682ba59750eddc375a454b450ef1ed5d32941951d7397430f4172d37aa1841a7

data/CHANGELOG

@@ -222,3 +222,7 @@
 
 * Add early loading for types which have attributes conflicting with Ruby reserved words.
 * Change type checking code to use ObjectSpace to find class objects. This is to find classes with an unbound name.
+
+=0.9.0
+
+* Update to support Ruby 2.7, drop support for older Rubies

data/Project.yaml

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

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems/package_task'
 require 'rdoc/task'
-require 'bundler/setup'
 require 'rake/testtask'
 
 RGenGemSpec = eval(File.read('rgen.gemspec'))

data/lib/rgen/ecore/ecore.rb

@@ -12,9 +12,11 @@ module RGen
     extend RGen::MetamodelBuilder::ModuleExtension
     
     class EObject < RGen::MetamodelBuilder::MMBase
+      abstract
     end
     
     class EModelElement < RGen::MetamodelBuilder::MMBase
+      abstract
     end
     
     class EAnnotation < RGen::MetamodelBuilder::MMMultiple(EModelElement, EObject)
@@ -22,10 +24,12 @@ module RGen
     end
     
     class ENamedElement < EModelElement
+      abstract
       has_attr 'name', String
     end
     
     class ETypedElement < ENamedElement
+      abstract
       has_attr 'lowerBound', Integer, :defaultValueLiteral => "0"
       has_attr 'ordered', Boolean, :defaultValueLiteral => "true"
       has_attr 'unique', Boolean, :defaultValueLiteral => "true"
@@ -43,6 +47,7 @@ module RGen
     end
     
     class EStructuralFeature < ETypedElement
+      abstract
       has_attr 'changeable', Boolean, :defaultValueLiteral => "true"
       has_attr 'defaultValue', Object, :derived=>true
       has_attr 'defaultValueLiteral', String
@@ -76,6 +81,7 @@ module RGen
     end
     
     class EClassifier < ENamedElement
+      abstract
       has_attr 'defaultValue', Object, :derived=>true
       has_attr 'instanceClass', Object, :derived=>true
       has_attr 'instanceClassName', String

data/lib/rgen/ecore/ecore_to_json.rb

@@ -1,5 +1,6 @@
 require 'rgen/ecore/ecore'
 require 'json'
+require 'andand'
 
 module RGen
 
@@ -105,10 +106,9 @@ def eenum(enum)
   merge(edatatype(enum), {
     :_class_ref => 'RGen.ECore.EEnum',
     :eLiterals => enum.eLiterals.map do |l|
-      merge({}, {
+      merge(enamedelement(l), {
         :_class_ref => 'RGen.ECore.EEnumLiteral',
         :value => l.value,
-        :literal => l.literal
       })
     end      
   })
@@ -116,6 +116,7 @@ end
 
 def eannotation(e)
   merge(emodelelement(e), {
+    :_class_ref => 'RGen.ECore.EAnnotation',
     :source => e.source,
     :details => e.details.map do |d|
       merge({}, {
@@ -172,7 +173,7 @@ def ref_id(obj)
 end
   
 def ref_parts(obj)
-  return [obj.name] unless obj&.eContainer
+  return [obj.name] unless obj.andand.eContainer
   ref_parts(obj.eContainer) << obj.name 
 end
   

data/test/metamodel_builder_test.rb

@@ -196,7 +196,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises StandardError do
       sc.name = 5
     end
-    assert_match /In (\w+::)+SimpleClass : Can not use a Fixnum where a String is expected/, err.message
+    assert_match /In (\w+::)+SimpleClass : Can not use a (Integer|Fixnum) where a String is expected/, err.message
     assert_equal "EString", mm::SimpleClass.ecore.eAttributes.find{|a| a.name=="name"}.eType.name
 
     assert_equal "xtest", sc.stringWithDefault
@@ -264,7 +264,7 @@ class MetamodelBuilderTest < MiniTest::Test
       assert_equal "123456789012345680.0", sprintf("%.1f", sc.floatWithDefault)
     end
     sc.floatWithDefault = nil
-    sc.floatWithDefault = BigDecimal.new("123456789012345678.0")
+    sc.floatWithDefault = BigDecimal("123456789012345678.0")
     assert sc.floatWithDefault.is_a?(BigDecimal)
     assert_equal "123456789012345678.0", sc.floatWithDefault.to_s("F")
 
@@ -298,7 +298,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises(StandardError) do
       o.addLiterals(1)
     end
-    assert_match /In (\w+::)+ManyAttrClass : Can not use a Fixnum where a String is expected/, err.message
+    assert_match /In (\w+::)+ManyAttrClass : Can not use a (Integer|Fixnum) where a String is expected/, err.message
 
     assert_equal [], o.literals
     o.addLiterals("a")
@@ -333,7 +333,7 @@ class MetamodelBuilderTest < MiniTest::Test
     err = assert_raises(StandardError) do
       o.literals = 1
     end
-    assert_match /In (\w+::)+ManyAttrClass : Can not use a Fixnum where a Enumerable is expected/, err.message
+    assert_match /In (\w+::)+ManyAttrClass : Can not use a (Integer|Fixnum) where a Enumerable is expected/, err.message
  
     o.bools = [true, false, true, false]
     assert_equal [true, false, true, false], o.bools

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: rgen
 version: !ruby/object:Gem::Version
-  version: 0.8.4
+  version: 0.9.0
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-28 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.8.1
+        version: 1.11.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.6.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.6.8.1
+        version: 1.11.2
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -78,6 +78,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: andand
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.3
 description: RGen is a framework for Model Driven Software Development (MDSD) in Ruby.
   This means that it helps you build Metamodels, instantiate Models, modify and transform
   Models and finally generate arbitrary textual content from it.
@@ -278,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.2
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Ruby Modelling and Generator Framework