rgen 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1c27a6cc15f063ebc9483cb56253ebd20721cd2
-  data.tar.gz: b30dfcf5b91d19a8d26b0cc66a5dec9d3c0471c9
+  metadata.gz: e58b57346e1f7e95fcaa15f29112706c911d20ed
+  data.tar.gz: 6551cb4e9579f7e76582018876973edd9a58d0e6
 SHA512:
-  metadata.gz: 5b74eb0928f9e39911b25dddbff8c73b12a331d651d59fdb27672794c6f6477bcdf23b3e8ac17ca97c2b3138dc33a3788a48ae6100493a710ff06e5557093dc8
-  data.tar.gz: cfe2866c2692b7a408cd460205cdc105f2cf792262104adfb6a0f0aa55bf917c26193766abebf43ccfd2f218f74e78910f20b82fa17d585beaca5345301bf985
+  metadata.gz: 1e82e58dd4eaf95de47ef1714a778558a6bd3cb76f8229fb43e029a98f9e03c6234ee2fab831adde1d7de1b953665afab031f27f39b0ad7a060a91c4ed7c7328
+  data.tar.gz: 47b73a00783a82d630b0771fb55b01c4da6adffe73a459cd35828dd5040644b8b0f6cd00a565a4abf257d8c4d2e97ca17db2c072cbe05e8ae44fe9b2b3a2637e

data/CHANGELOG

@@ -217,4 +217,8 @@
 =0.8.3
 
 * Performance improvement: getGeneric made a lot faster
- 
+
+=0.8.4
+
+* 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.

data/Project.yaml

@@ -0,0 +1,21 @@
+name: rgen
+gemspec: rgen.gemspec
+git: https://github.com/mthiede/rgen.git
+version: 0.8.4
+summary: Ruby Modelling and Generator Framework
+email: martin dot thiede at gmx de
+homepage: http://ruby-gen.org
+rubyforge_project: rgen
+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.
+authors: [Martin Thiede]
+rdoc_options: [--main, README.rdoc, -x, test, -x, metamodels, -x, ea_support/uml13*]
+extra_rdoc_files: [README.rdoc, CHANGELOG, MIT-LICENSE]
+include_files: ['lib/**/*', 'test/**/*', README.rdoc, CHANGELOG, MIT-LICENSE, Rakefile]
+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}

data/Rakefile

@@ -29,3 +29,10 @@ end
 task :release => [:prepare_package_rdoc, :package]
 
 task :clobber => [:clobber_rdoc, :clobber_package]
+
+task :ecore_to_json do
+  require 'rgen/ecore/ecore_to_json'
+
+  exporter = RGen::ECore::ECoreToJson.new
+  File.write('ecore.json', exporter.epackage_to_json_string(RGen.ecore, exporter.ecore_datatypes))
+end

data/lib/rgen/ecore/ecore_to_json.rb

@@ -0,0 +1,188 @@
+require 'rgen/ecore/ecore'
+require 'json'
+
+module RGen
+
+module ECore
+
+# ECoreToJson can turn ECore models into their JSON metamodel representations
+class ECoreToJson
+
+def initialize
+
+end
+  
+def root_elements_to_json_string(root_elements)
+  JSON.pretty_generate(root_elements.map do |el|
+    if el.is_a?(RGen::ECore::EPackage)
+      epackage(el)
+    elsif el.is_a?(RGen::ECore::EClass)
+      eclass(el)
+    else
+      raise "Not implemented for #{el}"
+    end
+  end)
+end
+
+def epackage_to_json(package)
+  epackage(package)
+end
+
+def ecore_datatypes
+  [RGen::ECore::EString, RGen::ECore::EInt, RGen::ECore::ELong, RGen::ECore::EBoolean, RGen::ECore::EFloat,
+   RGen::ECore::ERubyObject, RGen::ECore::EJavaObject, RGen::ECore::ERubyClass, RGen::ECore::EJavaClass]
+      .map {|dt| edatatype(dt)}
+end
+
+def epackage_to_json_pretty_string(package, append = [])
+  JSON.pretty_generate([epackage_to_json(package)] + append)
+end
+
+def epackage_to_json_string(package, append = [])
+  JSON.generate([epackage_to_json(package)] + append)
+end
+  
+def emodelelement(me)
+  {
+    :eAnnotations => me.eAnnotations.map { |e| eannotation(e) }
+  }
+end
+
+
+def enamedelement(ne)
+  merge(emodelelement(ne), {:name => ne.name})
+end
+
+def epackage(package)
+  merge(enamedelement(package), {
+    :_class_ref => 'RGen.ECore.EPackage',
+    :eClassifiers => package.eClassifiers.map do |classifier|
+      if classifier.is_a?(RGen::ECore::EClass)
+        eclass(classifier)
+      elsif classifier.is_a?(RGen::ECore::EEnum)
+        eenum(classifier)
+      else
+        edatatype(classifier)
+      end
+    end,
+    :eSubpackages => package.eSubpackages.map { |sp| epackage(sp) },
+    :nsURI => package.nsURI,
+    :nsPrefix => package.nsPrefix
+  })
+end
+  
+def eclassifier(classifier)
+  enamedelement(classifier).merge({
+    # omit :instanceClassName => classifier.instanceClassName
+  })
+end
+  
+def eclass(_class)
+  merge(eclassifier(_class), {
+    :_class_ref => 'RGen.ECore.EClass',
+    :abstract => _class.abstract,
+    :interface => _class.interface,
+    :eStructuralFeatures => _class.eStructuralFeatures.map do |sf|
+      if sf.is_a?(RGen::ECore::EReference)
+        ereference(sf)
+      else
+        eattribute(sf)
+      end
+    end,
+    :eSuperTypes => _class.eSuperTypes.map { |st| {:_ref => ref_id(st)} }
+  })
+end
+  
+def edatatype(_datatype)
+  merge(eclassifier(_datatype), {
+    :_class_ref => 'RGen.ECore.EDataType',
+    :serializable => _datatype.serializable,
+    :instanceClassName => _datatype.instanceClassName
+  })
+end
+
+def eenum(enum)
+  merge(edatatype(enum), {
+    :_class_ref => 'RGen.ECore.EEnum',
+    :eLiterals => enum.eLiterals.map do |l|
+      merge({}, {
+        :_class_ref => 'RGen.ECore.EEnumLiteral',
+        :value => l.value,
+        :literal => l.literal
+      })
+    end      
+  })
+end
+
+def eannotation(e)
+  merge(emodelelement(e), {
+    :source => e.source,
+    :details => e.details.map do |d|
+      merge({}, {
+          :_class_ref => 'RGen.ECore.EStringToStringMapEntry',
+          :key => d.key,
+          :value => d.value
+      })
+    end
+  })
+end
+
+def etypedelement(te)
+  merge(enamedelement(te), {
+    :ordered => te.ordered,
+    :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
+
+def estructuralfeature(sf)
+  merge(etypedelement(sf), {
+    :changeable => sf.changeable,
+    :volatile => sf.volatile,
+    :transient => sf.transient,
+    :defaultValueLiteral => sf.defaultValueLiteral,
+    :unsettable => sf.unsettable,
+    :derived => sf.derived,
+  })
+end
+  
+def eattribute(attr)
+  merge(estructuralfeature(attr), {
+    :_class_ref => 'RGen.ECore.EAttribute',
+    :iD => attr.iD
+  })
+end
+  
+def ereference(ref)
+  merge(estructuralfeature(ref), {
+    :_class_ref => 'RGen.ECore.EReference',
+    :containment => ref.containment,
+    :resolveProxies => ref.resolveProxies,
+    :eOpposite => ref.eOpposite ? {:_ref => "#{ref_id(ref.eOpposite.eContainer)}.#{ref.eOpposite.name}"} : nil
+  })
+end
+  
+def ref_id(obj)
+  res = ref_parts(obj)
+  res.join('.')
+end
+  
+def ref_parts(obj)
+  return [obj.name] unless obj&.eContainer
+  ref_parts(obj.eContainer) << obj.name 
+end
+  
+def merge(hash, values)
+  values.each { |k, v| hash[k] = v unless v.nil? }
+  hash
+end
+  
+end
+  
+end
+  
+end

data/lib/rgen/ecore/ecore_to_ruby.rb

@@ -1,3 +1,4 @@
+require 'set'
 require 'rgen/ecore/ecore'
 
 module RGen
@@ -11,6 +12,7 @@ class ECoreToRuby
     @modules = {}
     @classifiers = {}
     @features_added = {}
+    @reserved = Set.new(Object.methods)
   end
 
   # Create a Ruby module representing +epackage+.
@@ -50,12 +52,23 @@ class ECoreToRuby
         end
       end
 
+      load_classes_with_reserved_keywords(epackage)
       mod
     end
   end
 
   private
 
+  def load_classes_with_reserved_keywords(epackage)
+    epackage.eAllClassifiers.each do |eclass|
+      # we early load classes which have ruby reserved keywords
+      if eclass.is_a?(RGen::ECore::EClass)
+        reserved_used = eclass.eStructuralFeatures.any? { |f| @reserved.include?(f.name.to_sym) }
+        add_features(eclass) if reserved_used
+      end
+    end
+  end
+
   def create_module_internal(epackage, under, temp)
     return @modules[epackage] if @modules[epackage]
     

data/lib/rgen/metamodel_builder/builder_extensions.rb

@@ -539,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/test/metamodel_builder_test.rb

@@ -170,10 +170,12 @@ class MetamodelBuilderTest < MiniTest::Test
 
     class ReservedNameClass < RGen::MetamodelBuilder::MMBase
       has_attr 'class', String
+      has_attr 'method', String
     end
 
     class ManyReservedNameClass < RGen::MetamodelBuilder::MMBase
       has_many_attr 'class', String
+      has_many_attr 'method', String
     end
 
   end
@@ -1488,22 +1490,28 @@ class MetamodelBuilderTest < MiniTest::Test
 
   def test_reserved_names
     e = mm::ReservedNameClass.new
-    e.setGeneric("class", "X")
-    assert_equal "X", e.getGeneric(:class)
-    assert_equal "X", e.getGeneric("class")
-    assert_equal ["X"], e.getGenericAsArray(:class)
-    assert_equal ["X"], e.getGenericAsArray("class")
+    %w(class method).each do |reserved|
+      e.setGeneric(reserved, "X")
+      assert_equal "X", e.getGeneric(reserved.to_sym)
+      assert_equal "X", e.getGeneric(reserved)
+      assert_equal ["X"], e.getGenericAsArray(reserved.to_sym)
+      assert_equal ["X"], e.getGenericAsArray(reserved)
+    end
     assert_equal "X", e.getClass
+    assert_equal "X", e.getMethod
   end
 
   def test_reserved_names_many
     e = mm::ManyReservedNameClass.new
-    e.addGeneric("class", "X")
-    e.addGeneric("class", "Y")
-    assert_equal ["X", "Y"], e.getGeneric(:class)
-    assert_equal ["X", "Y"], e.getGeneric("class")
-    assert_equal ["X", "Y"], e.getGenericAsArray(:class)
-    assert_equal ["X", "Y"], e.getGenericAsArray("class")
+    %w(class method).each do |reserved|
+      e.addGeneric(reserved, "X")
+      e.addGeneric(reserved, "Y")
+      assert_equal ["X", "Y"], e.getGeneric(reserved.to_sym)
+      assert_equal ["X", "Y"], e.getGeneric(reserved)
+      assert_equal ["X", "Y"], e.getGenericAsArray(reserved.to_sym)
+      assert_equal ["X", "Y"], e.getGenericAsArray(reserved)
+    end
     assert_equal ["X", "Y"], e.getClass
+    assert_equal ["X", "Y"], e.getMethod
   end
 end

data/test/template_language_test.rb

@@ -181,13 +181,13 @@ class TemplateContainerTest < MiniTest::Test
     tc.expand('line_endings/mixed::Mixed', :for => :dummy)
 
     unix = binread(OUTPUT_DIR+'/line_endings_unix.txt')
-    assert unix.include?("|\n") && !unix.include?("|\r\n")
+    assert unix.include?("|\n") && !unix.include?("|\r\n"), unix
 
     windows = binread(OUTPUT_DIR+'/line_endings_windows.txt')
-    assert windows.include?("|\r\n") && !windows.include?("|\n")
+    assert windows.include?("|\r\n") && !windows.include?("|\n"), windows
 
     mixed = binread(OUTPUT_DIR+'/line_endings_mixed.txt')
-    assert mixed.include?("|\r\n") && mixed.include?("|\n")
+    assert mixed.include?("|\r\n") && mixed.include?("|\n"), mixed
   end
 
   def test_ws

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rgen
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Martin Thiede
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2017-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8.1
@@ -26,17 +26,31 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: 1.6.0
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.6.8.1
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '12.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.1
@@ -46,14 +60,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.10'
+        version: '5.0'
     - - ">="
       - !ruby/object:Gem::Version
         version: 5.10.1
+- !ruby/object:Gem::Dependency
+  name: minitest-fail-fast
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 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.
-email: martin dot thiede at gmx de
+email: 
 executables: []
 extensions: []
 extra_rdoc_files:
@@ -63,6 +91,7 @@ extra_rdoc_files:
 files:
 - CHANGELOG
 - MIT-LICENSE
+- Project.yaml
 - README.rdoc
 - Rakefile
 - lib/ea_support/ea_support.rb
@@ -84,6 +113,7 @@ files:
 - lib/rgen/ecore/ecore_builder_methods.rb
 - lib/rgen/ecore/ecore_ext.rb
 - lib/rgen/ecore/ecore_interface.rb
+- lib/rgen/ecore/ecore_to_json.rb
 - lib/rgen/ecore/ecore_to_ruby.rb
 - lib/rgen/ecore/ruby_to_ecore.rb
 - lib/rgen/environment.rb
@@ -247,7 +277,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: rgen
+rubyforge_project: 
 rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4