lutaml 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84bb179e752bc157f0de4a59ea8cf88e9bd1fe4430726dcefcf63269d12c86fb
-  data.tar.gz: a5f8917e80a33814b9cc6a9e3556b335da72fe05fd73e4d54dc294d1c4b6a27f
+  metadata.gz: 1927c6eca5571747313bd1f8f523fb7b7a469f3bb56c354e4fbdf3947c11ee8e
+  data.tar.gz: 52d43df8507b54408f5435033a385cf6f0d4ce6f2703a9ba308143dc24d0cb07
 SHA512:
-  metadata.gz: 64b11704d20aff55c53cb6b1d857d346a6e9016b84b091581372c38b100a3d21d499685550e8d5a8b132e4cc7de5e8da37c3efd14ae325d119a207a76fc0feea
-  data.tar.gz: f9800bc7e40536370807a3e4a3429d60dfa1f2fd728054adf6c9a8e73ba813b20bad80e22c85323309089eb41e1455806381513c139de1a99cc804ebb37378f2
+  metadata.gz: 22a613b2fc780af4aeaeb2b6977153f58b633335f241ff2c93fde544fbcb201d9ca8e46a866dc91b08607deac37c4bc1d1cd00c1f8f2dfc03ecbed1b7630791a
+  data.tar.gz: 700a0d0a1174c74632dc68c2b4f2c6265982e304cd1a30f1348323cb9646e9ae86d43ffb416cd9ff3b9c5b6ab0a438b4d524493f334cec32720f4025a1d3c362

data/Gemfile

@@ -1,4 +1,6 @@
 source "https://rubygems.org"
 
+gem "expressir"
+
 # Specify your gem's dependencies in lutaml.gemspec
 gemspec

data/README.adoc

@@ -37,7 +37,9 @@ In order to parse files supported by lutaml extensions, use Lutaml::Parser.parse
 [source,ruby]
 ----
 # example.exp is an EXPRESS repository file
-Lutaml::Parser.parse(File.new("example.exp")) # will produce Lutaml::LutamlPath::DocumentWrapper object with serialized express repository
+Lutaml::Parser.parse([File.new("example.exp")]) # will produce Lutaml::LutamlPath::DocumentWrapper object with serialized express repository
+# example.yaml is an EXPRESS cache file
+Lutaml::Parser.parse([File.new("example.yaml")], ::Lutaml::Parser::EXPRESS_CACHE_PARSE_TYPE)
 ----
 
 == With cli tool

data/lib/lutaml/command_line.rb

@@ -88,6 +88,7 @@ module Lutaml
 
         document = Lutaml::Parser
           .parse_into_document(File.new(input_path), @input_format)
+          .first
         result = @formatter.format(document)
 
         if @output_path

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

@@ -1,57 +1,15 @@
 require "lutaml/lutaml_path/document_wrapper"
-require "expressir/express_exp/formatter"
+require "lutaml/express/lutaml_path/formatter"
 
 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
 
         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)
-              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)
+          repository
+            .to_hash(formatter: Formatter)['schemas']
         end
       end
     end

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

@@ -0,0 +1,14 @@
+require "expressir/express_exp/formatter"
+require "expressir/express_exp/schema_head_formatter"
+require "expressir/express_exp/hyperlink_formatter"
+
+module Lutaml
+  module Express
+    module LutamlPath
+      class Formatter < Expressir::ExpressExp::Formatter
+        include Expressir::ExpressExp::SchemaHeadFormatter
+        include Expressir::ExpressExp::HyperlinkFormatter
+      end
+    end
+  end
+end

data/lib/lutaml/lutaml_path/document_wrapper.rb

@@ -1,9 +1,10 @@
 module Lutaml
   module LutamlPath
     class DocumentWrapper
-      attr_reader :serialized_document
+      attr_reader :serialized_document, :original_document
 
       def initialize(document)
+        @original_document = document
         @serialized_document = serialize_document(document)
       end
 
@@ -22,11 +23,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 +36,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,40 +1,49 @@
-# 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"
+require "expressir/express_exp/cache"
 
 module Lutaml
   class Parser
-    attr_reader :parse_type, :file
+    EXPRESS_CACHE_PARSE_TYPE = "exp.cache".freeze
+
+    attr_reader :parse_type, :file_list
 
     class << self
-      def parse(file, input_type = nil)
-        new(file, input_type).parse
+      def parse(file_list, input_type = nil)
+        file_list = file_list.is_a?(Array) ? file_list : [file_list]
+        new(Array(file_list), input_type).parse
       end
 
-      def parse_into_document(file, input_type = nil)
-        new(file, input_type).parse_into_document
+      def parse_into_document(file_list, input_type = nil)
+        file_list = file_list.is_a?(Array) ? file_list : [file_list]
+        new(Array(file_list), input_type).parse_into_document
       end
     end
 
-    def initialize(file, input_type)
-      @parse_type = input_type ? input_type : File.extname(file.path)[1..-1]
-      @file = file
+    def initialize(file_list, input_type)
+      @parse_type = input_type ? input_type : File.extname(file_list.first.path)[1..-1]
+      @file_list = file_list
     end
 
     def parse
-      document = parse_into_document
-      document_wrapper(document)
+      documents = parse_into_document
+      return [document_wrapper(documents)] if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
+
+      documents.map { |doc| document_wrapper(doc) }
     end
 
     def parse_into_document
       case parse_type
-      # when "exp"
-      #   Lutaml::Express::Parsers::Exp.parse(file)
+      when "exp"
+        Expressir::ExpressExp::Parser.from_files(file_list.map(&:path))
+      when EXPRESS_CACHE_PARSE_TYPE
+        Expressir::ExpressExp::Cache.from_file(file_list.first.path)
       when "lutaml"
-        Lutaml::Uml::Parsers::Dsl.parse(file)
+        file_list.map { |file| Lutaml::Uml::Parsers::Dsl.parse(file) }
       when "yml"
-        Lutaml::Uml::Parsers::Yaml.parse(file.path)
+        file_list.map { |file| Lutaml::Uml::Parsers::Yaml.parse(file.path) }
       else
         raise ArgumentError, "Unsupported file format"
       end
@@ -43,7 +52,7 @@ module Lutaml
     private
 
     def document_wrapper(document)
-      if parse_type == "exp"
+      if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
         return Lutaml::Express::LutamlPath::DocumentWrapper.new(document)
       end
 

data/lib/lutaml/version.rb

@@ -1,3 +1,3 @@
 module Lutaml
-  VERSION = "0.4.0".freeze
+  VERSION = "0.5.0".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.5.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-18 00:00:00.000000000 Z
+date: 2021-03-14 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
@@ -160,6 +174,7 @@ files:
 - lib/lutaml.rb
 - lib/lutaml/command_line.rb
 - lib/lutaml/express/lutaml_path/document_wrapper.rb
+- lib/lutaml/express/lutaml_path/formatter.rb
 - lib/lutaml/formatter.rb
 - lib/lutaml/formatter/base.rb
 - lib/lutaml/formatter/graphviz.rb