lutaml 0.5.0 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/lib/lutaml/express/lutaml_path/document_wrapper.rb +1 -1
  3. data/lib/lutaml/express/lutaml_path/formatter.rb +6 -6
  4. data/lib/lutaml/lutaml_path/document_wrapper.rb +2 -2
  5. data/lib/lutaml/parser.rb +7 -4
  6. data/lib/lutaml/version.rb +1 -1
  7. data/lutaml.gemspec +3 -2
  8. metadata +24 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 1927c6eca5571747313bd1f8f523fb7b7a469f3bb56c354e4fbdf3947c11ee8e
4
- data.tar.gz: 52d43df8507b54408f5435033a385cf6f0d4ce6f2703a9ba308143dc24d0cb07
3
+ metadata.gz: e567451b5036eb1068b2b87c3b27e3536830e648020994119f4588884689d1ec
4
+ data.tar.gz: f02aeff378a3f805d455fd78d9626c6328edb08fdf56c824ac88d3a32d9734f1
5
5
  SHA512:
6
- metadata.gz: 22a613b2fc780af4aeaeb2b6977153f58b633335f241ff2c93fde544fbcb201d9ca8e46a866dc91b08607deac37c4bc1d1cd00c1f8f2dfc03ecbed1b7630791a
7
- data.tar.gz: 700a0d0a1174c74632dc68c2b4f2c6265982e304cd1a30f1348323cb9646e9ae86d43ffb416cd9ff3b9c5b6ab0a438b4d524493f334cec32720f4025a1d3c362
6
+ metadata.gz: 6e3c659130912d34ca2ee7a4959ac8a5d4aef44d825bda7b9f5241185ed894c257474c4da9fa5182b3daa9012fa7c0dbd0238364f87f84501e1d6309f58e32c7
7
+ data.tar.gz: 0da4238a756bc875831991c14b77db36e471fd9c955ce4bac2c536200f54d707136d63e82e02b108f3c9f1c08786c4f8aa8502e2157cfc407056fbd5d912d039
data/lib/lutaml/express/lutaml_path/document_wrapper.rb CHANGED
@@ -9,7 +9,7 @@ module Lutaml
9
9
 
10
10
  def serialize_document(repository)
11
11
  repository
12
- .to_hash(formatter: Formatter)['schemas']
12
+ .to_hash(formatter: Formatter, include_empty: true)
13
13
  end
14
14
  end
15
15
  end
data/lib/lutaml/express/lutaml_path/formatter.rb CHANGED
@@ -1,13 +1,13 @@
1
- require "expressir/express_exp/formatter"
2
- require "expressir/express_exp/schema_head_formatter"
3
- require "expressir/express_exp/hyperlink_formatter"
1
+ require "expressir/express/formatter"
2
+ require "expressir/express/schema_head_formatter"
3
+ require "expressir/express/hyperlink_formatter"
4
4
 
5
5
  module Lutaml
6
6
  module Express
7
7
  module LutamlPath
8
- class Formatter < Expressir::ExpressExp::Formatter
9
- include Expressir::ExpressExp::SchemaHeadFormatter
10
- include Expressir::ExpressExp::HyperlinkFormatter
8
+ class Formatter < Expressir::Express::Formatter
9
+ include Expressir::Express::SchemaHeadFormatter
10
+ include Expressir::Express::HyperlinkFormatter
11
11
  end
12
12
  end
13
13
  end
data/lib/lutaml/lutaml_path/document_wrapper.rb CHANGED
@@ -27,7 +27,7 @@ module Lutaml
27
27
  end
28
28
 
29
29
  def serialize_to_hash(object)
30
- return object if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass].include?(object.class)
30
+ return object if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass, Hash].include?(object.class)
31
31
 
32
32
  object.instance_variables.each_with_object({}) do |var, res|
33
33
  variable = object.instance_variable_get(var)
@@ -36,7 +36,7 @@ module Lutaml
36
36
  serialize_to_hash(n)
37
37
  end
38
38
  else
39
- if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass].include?(variable.class) || var == :@parent
39
+ if [String, Integer, Float, FalseClass, TrueClass, Symbol, NilClass, Hash].include?(variable.class) || var == :@parent
40
40
  variable
41
41
  else
42
42
  serialize_to_hash(variable)
data/lib/lutaml/parser.rb CHANGED
@@ -1,8 +1,9 @@
1
1
  require "lutaml/express"
2
2
  require "lutaml/uml"
3
+ require "lutaml/xmi"
3
4
  require "lutaml/uml/lutaml_path/document_wrapper"
4
5
  require "lutaml/express/lutaml_path/document_wrapper"
5
- require "expressir/express_exp/cache"
6
+ require "expressir/express/cache"
6
7
 
7
8
  module Lutaml
8
9
  class Parser
@@ -29,7 +30,7 @@ module Lutaml
29
30
 
30
31
  def parse
31
32
  documents = parse_into_document
32
- return [document_wrapper(documents)] if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
33
+ return document_wrapper(documents) if ["exp", EXPRESS_CACHE_PARSE_TYPE].include?(parse_type)
33
34
 
34
35
  documents.map { |doc| document_wrapper(doc) }
35
36
  end
@@ -37,9 +38,11 @@ module Lutaml
37
38
  def parse_into_document
38
39
  case parse_type
39
40
  when "exp"
40
- Expressir::ExpressExp::Parser.from_files(file_list.map(&:path))
41
+ Expressir::Express::Parser.from_files(file_list.map(&:path))
41
42
  when EXPRESS_CACHE_PARSE_TYPE
42
- Expressir::ExpressExp::Cache.from_file(file_list.first.path)
43
+ Expressir::Express::Cache.from_file(file_list.first.path)
44
+ when 'xmi'
45
+ file_list.map { |file| Lutaml::XMI::Parsers::XML.parse(file) }
43
46
  when "lutaml"
44
47
  file_list.map { |file| Lutaml::Uml::Parsers::Dsl.parse(file) }
45
48
  when "yml"
data/lib/lutaml/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Lutaml
2
- VERSION = "0.5.0".freeze
2
+ VERSION = "0.7.0".freeze
3
3
  end
data/lutaml.gemspec CHANGED
@@ -27,8 +27,9 @@ Gem::Specification.new do |spec|
27
27
  spec.executables = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
28
28
  spec.require_paths = ["lib"]
29
29
 
30
- spec.add_runtime_dependency "lutaml-express", "~> 0.1.3"
31
- spec.add_runtime_dependency "lutaml-uml", "~> 0.2.5"
30
+ spec.add_runtime_dependency "lutaml-express"
31
+ spec.add_runtime_dependency "lutaml-uml"
32
+ spec.add_runtime_dependency "lutaml-xmi"
32
33
  spec.add_runtime_dependency "thor", "~> 1.0"
33
34
  spec.add_development_dependency "nokogiri", "~> 1.10"
34
35
 
metadata CHANGED
@@ -1,43 +1,57 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: lutaml
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.5.0
4
+ version: 0.7.0
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2021-03-14 00:00:00.000000000 Z
11
+ date: 2021-04-18 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: lutaml-express
15
15
  requirement: !ruby/object:Gem::Requirement
16
16
  requirements:
17
- - - "~>"
17
+ - - ">="
18
18
  - !ruby/object:Gem::Version
19
- version: 0.1.3
19
+ version: '0'
20
20
  type: :runtime
21
21
  prerelease: false
22
22
  version_requirements: !ruby/object:Gem::Requirement
23
23
  requirements:
24
- - - "~>"
24
+ - - ">="
25
25
  - !ruby/object:Gem::Version
26
- version: 0.1.3
26
+ version: '0'
27
27
  - !ruby/object:Gem::Dependency
28
28
  name: lutaml-uml
29
29
  requirement: !ruby/object:Gem::Requirement
30
30
  requirements:
31
- - - "~>"
31
+ - - ">="
32
32
  - !ruby/object:Gem::Version
33
- version: 0.2.5
33
+ version: '0'
34
34
  type: :runtime
35
35
  prerelease: false
36
36
  version_requirements: !ruby/object:Gem::Requirement
37
37
  requirements:
38
- - - "~>"
38
+ - - ">="
39
39
  - !ruby/object:Gem::Version
40
- version: 0.2.5
40
+ version: '0'
41
+ - !ruby/object:Gem::Dependency
42
+ name: lutaml-xmi
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ">="
46
+ - !ruby/object:Gem::Version
47
+ version: '0'
48
+ type: :runtime
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ">="
53
+ - !ruby/object:Gem::Version
54
+ version: '0'
41
55
  - !ruby/object:Gem::Dependency
42
56
  name: thor
43
57
  requirement: !ruby/object:Gem::Requirement