lutaml 0.4.0 → 0.4.1.pre.alpha

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84bb179e752bc157f0de4a59ea8cf88e9bd1fe4430726dcefcf63269d12c86fb
-  data.tar.gz: a5f8917e80a33814b9cc6a9e3556b335da72fe05fd73e4d54dc294d1c4b6a27f
+  metadata.gz: 9856bef749609c2186daef72d9cac2275abdf35dee480be0658700d20e0f9e31
+  data.tar.gz: f5a0c9decbf6188da822b39655ee14d048387783b28d92a5fa280781e6c02a16
 SHA512:
-  metadata.gz: 64b11704d20aff55c53cb6b1d857d346a6e9016b84b091581372c38b100a3d21d499685550e8d5a8b132e4cc7de5e8da37c3efd14ae325d119a207a76fc0feea
-  data.tar.gz: f9800bc7e40536370807a3e4a3429d60dfa1f2fd728054adf6c9a8e73ba813b20bad80e22c85323309089eb41e1455806381513c139de1a99cc804ebb37378f2
+  metadata.gz: f4ccdf6b1a8ef299ce9a255b9615595f68ed6d07159808983451fe637cbda6747d71a03171c49d21f0b2797346e0daca0a9e94a8e55ca9614e734d54588a2b65
+  data.tar.gz: 37e385085efc088644b1d582144e5436ad5e4310899f25f4fbfafa090302410d8ce3343601a9c2250b4ac57f3a073b1c996bdbcd982602d6c58a7fc0197c3321

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

@@ -5,20 +5,6 @@ module Lutaml
   module Express
     module LutamlPath
       class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
-        SCHEMA_ATTRIBUTES = %w[
-          id
-          constants
-          declarations
-          entities
-          functions
-          interfaces
-          procedures
-          remarks
-          rules
-          subtype_constraints
-          types
-          version
-        ].freeze
         SOURCE_CODE_ATTRIBUTE_NAME = "sourcecode".freeze
 
         protected
@@ -26,20 +12,27 @@ module Lutaml
         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|
-              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)
+            res[schema.id] = serialize_value(schema).merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(schema))
+            res["schemas"].push(res[schema.id])
+          end
+        end
+
+        def serialize_value(object)
+          object.instance_variables.each_with_object({}) do |var, res|
+            variable = object.instance_variable_get(var)
+            if variable.respond_to?(:to_hash)
+              res[var.to_s.gsub("@", "")] = variable.to_hash.merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(variable))
+            elsif variable.is_a?(Array)
+              res[var.to_s.gsub("@", "")] = variable.map do |entity|
+                if entity.respond_to?(:to_hash)
+                  entity.to_hash.merge(SOURCE_CODE_ATTRIBUTE_NAME => entity_source_code(entity))
+                else
+                  entity
+                end
               end
+            else
+              res[var.to_s.gsub("@", "")] = variable
             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
 

data/lib/lutaml/lutaml_path/document_wrapper.rb

@@ -22,11 +22,11 @@ module Lutaml
           return attr_value.map(&method(:serialize_to_hash))
         end
 
-        attr_value
+        serialize_to_hash(attr_value)
       end
 
       def serialize_to_hash(object)
-        return object if [String, Integer, Float].include?(object.class)
+        return object if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass].include?(object.class)
 
         object.instance_variables.each_with_object({}) do |var, res|
           variable = object.instance_variable_get(var)
@@ -35,7 +35,11 @@ module Lutaml
                                             serialize_to_hash(n)
                                           end
                                         else
-                                          variable
+                                          if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass].include?(variable.class) || var == :@parent
+                                            variable
+                                          else
+                                            serialize_to_hash(variable)
+                                          end
                                         end
         end
       end

data/lib/lutaml/parser.rb

@@ -1,7 +1,7 @@
-# require "lutaml/express"
+require "lutaml/express"
 require "lutaml/uml"
 require "lutaml/uml/lutaml_path/document_wrapper"
-# require "lutaml/express/lutaml_path/document_wrapper"
+require "lutaml/express/lutaml_path/document_wrapper"
 
 module Lutaml
   class Parser
@@ -29,8 +29,8 @@ module Lutaml
 
     def parse_into_document
       case parse_type
-      # when "exp"
-      #   Lutaml::Express::Parsers::Exp.parse(file)
+      when "exp"
+        Lutaml::Express::Parsers::Exp.parse(file)
       when "lutaml"
         Lutaml::Uml::Parsers::Dsl.parse(file)
       when "yml"

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.4.0".freeze
+  VERSION = "0.4.1-alpha".freeze
 end

data/lutaml.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # spec.add_runtime_dependency "lutaml-express", "~> 0.1.3"
+  spec.add_runtime_dependency "lutaml-express", "~> 0.1.3"
   spec.add_runtime_dependency "lutaml-uml", "~> 0.2.5"
   spec.add_runtime_dependency "thor", "~> 1.0"
   spec.add_development_dependency "nokogiri", "~> 1.10"

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: lutaml
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1.pre.alpha
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-02-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: lutaml-express
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: lutaml-uml
   requirement: !ruby/object:Gem::Requirement
@@ -188,9 +202,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubygems_version: 3.0.3
 signing_key: