lutaml 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1bffadc6b3f176ed29fe3d8c001afc02c2f29cb848874af353235d17f7c8657a
-  data.tar.gz: b424788eca466bb15faa49ea4802c2a32b7d6d6986833e523a47ed821d9b7307
+  metadata.gz: 1d1809b80de4e3e3d8ed081e31f19008e3fcb30559a8e95b6156a03bfca36aa6
+  data.tar.gz: be6fd904458828f232294f03d0cdb1fec2dbc349301449ebb3f9a1a77b375195
 SHA512:
-  metadata.gz: e6dcff09dc1a2d4560ddea2c2d0f58255769e1ab9c55e75f1641f942c608fb04c1716efc3006bbd015a02a8d2fb383da3c8e1c59068009ea635eb813bf68647c
-  data.tar.gz: ead2205b1cc1887b8ec73e0dad6cc5a72cae141f21f725b32433af3b2a12061e2c9b701c94323e978cf4e8727485f500733ad2d5c4c1b305a800c3bcfa96f65c
+  metadata.gz: b58852c0e45b0ebe4bd27f7c782ee605abe4e448107c8371ddd98d5fb9f731053ec3f46565d34f43d9b6ca2363c09d7db55c6adba282db934c01a543f117b97e
+  data.tar.gz: 47326b6b3301018542b4764161e931df57e582c4e4d22d0f94961caf4fbe9a495b76fe65337fe22dd3c1e71b2c909da52e93caa000040566c36d145ae8733a63

data/.github/workflows/macos.yml

@@ -16,13 +16,16 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.6', '2.5' ]
         experimental: [false]
         include:
           - ruby: '2.7'
             experimental: true
     steps:
       - uses: actions/checkout@master
+      - name: Install build tools
+        run: |
+          brew install automake libtool
       - name: Use Ruby
         uses: actions/setup-ruby@v1
         with:

data/.github/workflows/ubuntu.yml

@@ -18,7 +18,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.6', '2.5' ]
         experimental: [false]
         include:
           - ruby: '2.7'

data/.github/workflows/windows.yml

@@ -16,7 +16,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
+        ruby: [ '2.6', '2.5' ]
         experimental: [false]
         # Does not supported yet:
         # Ruby (< 2.7.dev, >= 2.3), which is required by gem 'nokogiri (~> 1.10)', is not

data/lib/lutaml/express/lutaml_path/document_wrapper.rb

@@ -1,4 +1,5 @@
 require "lutaml/lutaml_path/document_wrapper"
+require "expressir/express_exp/formatter"
 
 module Lutaml
   module Express
@@ -12,25 +13,46 @@ module Lutaml
           functions
           interfaces
           procedures
+          remarks
           rules
           subtype_constraints
           types
           version
         ].freeze
+        SOURCE_CODE_ATTRIBUTE_NAME = "sourcecode".freeze
 
         protected
 
         def serialize_document(repository)
           repository.schemas.each_with_object({}) do |schema, res|
             res["schemas"] ||= []
-            serialized_schema = SCHEMA_ATTRIBUTES.each_with_object({}) do |name, nested_res|
+            serialized_schema = SCHEMA_ATTRIBUTES
+              .each_with_object({}) do |name, nested_res|
               attr_value = schema.send(name)
               nested_res[name] = serialize_value(attr_value)
+              if name == "entities"
+                nested_res[name] = merge_source_code_attr(nested_res[name],
+                                                          attr_value)
+              end
             end
             res[schema.id] = serialized_schema
+            serialized_schema = serialized_schema
+              .merge(SOURCE_CODE_ATTRIBUTE_NAME =>
+                                          entity_source_code(schema))
             res["schemas"].push(serialized_schema)
           end
         end
+
+        def merge_source_code_attr(serialized_entries, entities)
+          serialized_entries.map do |serialized|
+            entity = entities.detect { |n| n.id == serialized["id"] }
+            serialized.merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(entity))
+          end
+        end
+
+        def entity_source_code(entity)
+          Expressir::ExpressExp::Formatter.format(entity)
+        end
       end
     end
   end

data/lib/lutaml/lutaml_path/document_wrapper.rb

@@ -26,6 +26,8 @@ module Lutaml
       end
 
       def serialize_to_hash(object)
+        return object if [String, Integer, Float].include?(object.class)
+
         object.instance_variables.each_with_object({}) do |var, res|
           variable = object.instance_variable_get(var)
           res[var.to_s.gsub("@", "")] = if variable.is_a?(Array)

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.2".freeze
 end

data/lutaml.gemspec

@@ -24,12 +24,9 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "thor", "~> 1.0"
-  # spec.add_runtime_dependency "activesupport", "~> 5.0"
-  spec.add_runtime_dependency "lutaml-uml", "~> 0.2.5"
-  # spec.add_runtime_dependency "lutaml-sysml"
   spec.add_runtime_dependency "lutaml-express", "~> 0.1.3"
-  spec.add_development_dependency "jmespath", "~> 1.4"
+  spec.add_runtime_dependency "lutaml-uml", "~> 0.2.5"
+  spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_development_dependency "nokogiri", "~> 1.10"
 
   spec.add_development_dependency "bundler", "~> 2.0"

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-11-24 00:00:00.000000000 Z
+date: 2021-01-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: lutaml-express
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: lutaml-uml
   requirement: !ruby/object:Gem::Requirement
@@ -39,33 +39,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.2.5
 - !ruby/object:Gem::Dependency
-  name: lutaml-express
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.1.3
-- !ruby/object:Gem::Dependency
-  name: jmespath
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.4'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -212,7 +198,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.3
 signing_key:
 specification_version: 4
 summary: 'LutaML: data models in textual form'