expressir 0.2.21-x64-mingw32 → 1.0.0-x64-mingw32

Sign up to get free protection for your applications and to get access to all the features.
Files changed (158) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +7 -6
  3. data/.github/workflows/release.yml +22 -6
  4. data/.gitignore +2 -2
  5. data/demo.rb +5 -5
  6. data/exe/format +10 -73
  7. data/exe/format-test +81 -0
  8. data/expressir.gemspec +0 -1
  9. data/lib/expressir.rb +0 -1
  10. data/lib/expressir/cli.rb +0 -6
  11. data/lib/expressir/express/2.4/express_parser.so +0 -0
  12. data/lib/expressir/express/2.5/express_parser.so +0 -0
  13. data/lib/expressir/express/2.6/express_parser.so +0 -0
  14. data/lib/expressir/express/2.7/express_parser.so +0 -0
  15. data/lib/expressir/express/3.0/express_parser.so +0 -0
  16. data/lib/expressir/{express_exp → express}/cache.rb +3 -6
  17. data/lib/expressir/{express_exp → express}/formatter.rb +84 -68
  18. data/lib/expressir/express/hyperlink_formatter.rb +22 -0
  19. data/lib/expressir/express/model_visitor.rb +23 -0
  20. data/lib/expressir/{express_exp → express}/parser.rb +16 -5
  21. data/lib/expressir/express/resolve_references_model_visitor.rb +29 -0
  22. data/lib/expressir/{express_exp → express}/schema_head_formatter.rb +1 -1
  23. data/lib/expressir/{express_exp → express}/visitor.rb +67 -44
  24. data/lib/expressir/model.rb +5 -3
  25. data/lib/expressir/model/attribute.rb +13 -6
  26. data/lib/expressir/model/cache.rb +2 -2
  27. data/lib/expressir/model/constant.rb +10 -3
  28. data/lib/expressir/model/entity.rb +18 -16
  29. data/lib/expressir/model/enumeration_item.rb +8 -1
  30. data/lib/expressir/model/expressions/aggregate_initializer.rb +2 -2
  31. data/lib/expressir/model/expressions/aggregate_item.rb +2 -2
  32. data/lib/expressir/model/expressions/attribute_reference.rb +2 -2
  33. data/lib/expressir/model/expressions/binary_expression.rb +3 -3
  34. data/lib/expressir/model/expressions/call.rb +3 -3
  35. data/lib/expressir/model/expressions/entity_constructor.rb +3 -3
  36. data/lib/expressir/model/expressions/group_reference.rb +2 -2
  37. data/lib/expressir/model/expressions/index_reference.rb +3 -3
  38. data/lib/expressir/model/expressions/interval.rb +5 -5
  39. data/lib/expressir/model/expressions/query_expression.rb +6 -4
  40. data/lib/expressir/model/expressions/simple_reference.rb +5 -1
  41. data/lib/expressir/model/expressions/unary_expression.rb +2 -2
  42. data/lib/expressir/model/function.rb +23 -21
  43. data/lib/expressir/model/identifier.rb +6 -3
  44. data/lib/expressir/model/interface.rb +4 -4
  45. data/lib/expressir/model/interface_item.rb +2 -2
  46. data/lib/expressir/model/interfaced_item.rb +10 -9
  47. data/lib/expressir/model/literals/binary.rb +1 -1
  48. data/lib/expressir/model/literals/integer.rb +1 -1
  49. data/lib/expressir/model/literals/logical.rb +1 -1
  50. data/lib/expressir/model/literals/real.rb +1 -1
  51. data/lib/expressir/model/literals/string.rb +2 -2
  52. data/lib/expressir/model/model_element.rb +39 -27
  53. data/lib/expressir/model/parameter.rb +10 -3
  54. data/lib/expressir/model/procedure.rb +22 -20
  55. data/lib/expressir/model/remark_item.rb +15 -0
  56. data/lib/expressir/model/repository.rb +2 -2
  57. data/lib/expressir/model/rule.rb +27 -25
  58. data/lib/expressir/model/schema.rb +24 -20
  59. data/lib/expressir/model/schema_version.rb +15 -0
  60. data/lib/expressir/model/schema_version_item.rb +15 -0
  61. data/lib/expressir/model/statements/alias.rb +7 -5
  62. data/lib/expressir/model/statements/assignment.rb +2 -2
  63. data/lib/expressir/model/statements/call.rb +3 -3
  64. data/lib/expressir/model/statements/case.rb +4 -4
  65. data/lib/expressir/model/statements/case_action.rb +3 -3
  66. data/lib/expressir/model/statements/compound.rb +2 -2
  67. data/lib/expressir/model/statements/if.rb +5 -5
  68. data/lib/expressir/model/statements/repeat.rb +11 -9
  69. data/lib/expressir/model/statements/return.rb +1 -1
  70. data/lib/expressir/model/subtype_constraint.rb +13 -6
  71. data/lib/expressir/model/type.rb +12 -10
  72. data/lib/expressir/model/types/aggregate.rb +9 -2
  73. data/lib/expressir/model/types/array.rb +5 -5
  74. data/lib/expressir/model/types/bag.rb +3 -3
  75. data/lib/expressir/model/types/binary.rb +2 -2
  76. data/lib/expressir/model/types/enumeration.rb +5 -7
  77. data/lib/expressir/model/types/generic.rb +8 -1
  78. data/lib/expressir/model/types/generic_entity.rb +8 -1
  79. data/lib/expressir/model/types/list.rb +4 -4
  80. data/lib/expressir/model/types/real.rb +1 -1
  81. data/lib/expressir/model/types/select.rb +6 -8
  82. data/lib/expressir/model/types/set.rb +3 -3
  83. data/lib/expressir/model/types/string.rb +2 -2
  84. data/lib/expressir/model/unique_rule.rb +26 -0
  85. data/lib/expressir/model/variable.rb +10 -3
  86. data/lib/expressir/model/where_rule.rb +26 -0
  87. data/lib/expressir/version.rb +1 -1
  88. data/rakelib/cross-ruby.rake +1 -1
  89. data/spec/expressir/{express_exp → express}/cache_spec.rb +9 -9
  90. data/spec/expressir/express/formatter_spec.rb +127 -0
  91. data/spec/expressir/{express_exp → express}/parser_spec.rb +24 -24
  92. data/spec/expressir/model/model_element_spec.rb +112 -60
  93. data/{original/examples → spec}/syntax/multiple.exp +1 -1
  94. data/{original/examples → spec}/syntax/multiple.yaml +19 -5
  95. data/{original/examples → spec}/syntax/multiple_formatted.exp +1 -1
  96. data/{original/examples → spec}/syntax/multiple_hyperlink_formatted.exp +4 -4
  97. data/{original/examples → spec}/syntax/multiple_schema_head_hyperlink_formatted.exp +1 -1
  98. data/{original/examples → spec}/syntax/remark.exp +12 -10
  99. data/{original/examples → spec}/syntax/remark.yaml +36 -16
  100. data/{original/examples → spec}/syntax/remark_formatted.exp +3 -1
  101. data/spec/syntax/single.exp +4 -0
  102. data/spec/syntax/single.yaml +18 -0
  103. data/spec/syntax/single_formatted.exp +10 -0
  104. data/spec/syntax/single_formatted.yaml +36 -0
  105. data/{original/examples → spec}/syntax/syntax.exp +11 -11
  106. data/{original/examples → spec}/syntax/syntax.yaml +205 -108
  107. data/{original/examples → spec}/syntax/syntax_formatted.exp +11 -11
  108. data/spec/syntax/syntax_hyperlink_formatted.exp +902 -0
  109. data/{original/examples → spec}/syntax/syntax_schema_head_formatted.exp +1 -1
  110. metadata +41 -83
  111. data/lib/expressir/express.rb +0 -11
  112. data/lib/expressir/express/aggregate_dimension.rb +0 -38
  113. data/lib/expressir/express/attribute.rb +0 -15
  114. data/lib/expressir/express/comment.rb +0 -7
  115. data/lib/expressir/express/defined_type.rb +0 -36
  116. data/lib/expressir/express/derived.rb +0 -65
  117. data/lib/expressir/express/derived_aggregate.rb +0 -43
  118. data/lib/expressir/express/entity.rb +0 -137
  119. data/lib/expressir/express/explicit.rb +0 -70
  120. data/lib/expressir/express/explicit_aggregate.rb +0 -46
  121. data/lib/expressir/express/explicit_or_derived.rb +0 -16
  122. data/lib/expressir/express/global_rule.rb +0 -44
  123. data/lib/expressir/express/interface_specification.rb +0 -51
  124. data/lib/expressir/express/interfaced_item.rb +0 -38
  125. data/lib/expressir/express/inverse.rb +0 -46
  126. data/lib/expressir/express/inverse_aggregate.rb +0 -37
  127. data/lib/expressir/express/model_element.rb +0 -7
  128. data/lib/expressir/express/named_type.rb +0 -19
  129. data/lib/expressir/express/remark.rb +0 -8
  130. data/lib/expressir/express/repository.rb +0 -306
  131. data/lib/expressir/express/schema_definition.rb +0 -96
  132. data/lib/expressir/express/subtype_constraint.rb +0 -14
  133. data/lib/expressir/express/type.rb +0 -26
  134. data/lib/expressir/express/type_aggregate.rb +0 -42
  135. data/lib/expressir/express/type_enum.rb +0 -29
  136. data/lib/expressir/express/type_parser.rb +0 -45
  137. data/lib/expressir/express/type_select.rb +0 -82
  138. data/lib/expressir/express/unique_rule.rb +0 -35
  139. data/lib/expressir/express/where_rule.rb +0 -32
  140. data/lib/expressir/express_exp/2.4/express_parser.so +0 -0
  141. data/lib/expressir/express_exp/2.5/express_parser.so +0 -0
  142. data/lib/expressir/express_exp/2.6/express_parser.so +0 -0
  143. data/lib/expressir/express_exp/2.7/express_parser.so +0 -0
  144. data/lib/expressir/express_exp/3.0/express_parser.so +0 -0
  145. data/lib/expressir/express_exp/hyperlink_formatter.rb +0 -27
  146. data/lib/expressir/express_parser.rb +0 -30
  147. data/lib/expressir/model/informal_proposition.rb +0 -18
  148. data/lib/expressir/model/unique.rb +0 -19
  149. data/lib/expressir/model/where.rb +0 -19
  150. data/lib/expressir/parser.rb +0 -6
  151. data/lib/expressir/parser/owl_parser.rb +0 -8
  152. data/original/examples/syntax/single.exp +0 -3
  153. data/original/examples/syntax/single.yaml +0 -9
  154. data/original/examples/syntax/single_formatted.exp +0 -6
  155. data/original/examples/syntax/single_formatted.yaml +0 -19
  156. data/spec/acceptance/express_to_owl_spec.rb +0 -18
  157. data/spec/expressir/express/repository_spec.rb +0 -25
  158. data/spec/expressir/express_exp/formatter_spec.rb +0 -111
@@ -1,30 +0,0 @@
1
- require "expressir/parser"
2
-
3
- module Expressir
4
- class ExpressParser
5
- def initialize(file, options)
6
- @file = file
7
- @options = options
8
- end
9
-
10
- def to_owl
11
- owl_parser.parse(express_xml, options)
12
- end
13
-
14
- def self.to_owl(file, **options)
15
- new(file, options).to_owl
16
- end
17
-
18
- private
19
-
20
- attr_reader :file, :options
21
-
22
- def owl_parser
23
- Expressir::Parser::OwlParser
24
- end
25
-
26
- def express_xml
27
- Expressir::Express.from_xml(file)
28
- end
29
- end
30
- end
@@ -1,18 +0,0 @@
1
- module Expressir
2
- module Model
3
- class InformalProposition < ModelElement
4
- include Identifier
5
-
6
- undef :source
7
- undef :source=
8
-
9
- def initialize(options = {})
10
- @id = options[:id]
11
- @remarks = options.fetch(:remarks, [])
12
- # @source = options[:source]
13
-
14
- super
15
- end
16
- end
17
- end
18
- end
@@ -1,19 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Unique < ModelElement
4
- include Identifier
5
-
6
- attr_accessor :attributes
7
-
8
- def initialize(options = {})
9
- @id = options[:id]
10
- @remarks = options.fetch(:remarks, [])
11
- @source = options[:source]
12
-
13
- @attributes = options.fetch(:attributes, [])
14
-
15
- super
16
- end
17
- end
18
- end
19
- end
@@ -1,19 +0,0 @@
1
- module Expressir
2
- module Model
3
- class Where < ModelElement
4
- include Identifier
5
-
6
- attr_accessor :expression
7
-
8
- def initialize(options = {})
9
- @id = options[:id]
10
- @remarks = options.fetch(:remarks, [])
11
- @source = options[:source]
12
-
13
- @expression = options[:expression]
14
-
15
- super
16
- end
17
- end
18
- end
19
- end
@@ -1,6 +0,0 @@
1
- require "expressir/parser/owl_parser"
2
-
3
- module Expressir
4
- module Parser
5
- end
6
- end
@@ -1,8 +0,0 @@
1
- module Expressir
2
- module Parser
3
- class OwlParser
4
- def self.parse(express, options = {})
5
- end
6
- end
7
- end
8
- end
@@ -1,3 +0,0 @@
1
- SCHEMA single_schema;
2
- ENTITY empty_entity; END_ENTITY;
3
- END_SCHEMA;
@@ -1,9 +0,0 @@
1
- ---
2
- _class: Expressir::Model::Repository
3
- schemas:
4
- - _class: Expressir::Model::Schema
5
- file: original/examples/syntax/single.exp
6
- id: single_schema
7
- entities:
8
- - _class: Expressir::Model::Entity
9
- id: empty_entity
@@ -1,6 +0,0 @@
1
- SCHEMA single_schema;
2
-
3
- ENTITY empty_entity;
4
- END_ENTITY;
5
-
6
- END_SCHEMA;
@@ -1,19 +0,0 @@
1
- ---
2
- _class: Expressir::Model::Repository
3
- schemas:
4
- - _class: Expressir::Model::Schema
5
- file: original/examples/syntax/single.exp
6
- id: single_schema
7
- entities:
8
- - _class: Expressir::Model::Entity
9
- id: empty_entity
10
- source: |-
11
- ENTITY empty_entity;
12
- END_ENTITY;
13
- source: |-
14
- SCHEMA single_schema;
15
-
16
- ENTITY empty_entity;
17
- END_ENTITY;
18
-
19
- END_SCHEMA;
@@ -1,18 +0,0 @@
1
- require "spec_helper"
2
-
3
- RSpec.describe "Expressir" do
4
- describe "express-to-owl" do
5
- pending "Still needs implementation"
6
-
7
- it "convert express to owl system" do
8
- command = %W(express-to-owl #{sample_file})
9
- capture_stdout { Expressir::Cli.start(command) }
10
- end
11
- end
12
-
13
- def sample_file
14
- @sample_file ||= Expressir.root_path.join(
15
- "original", "examples", "ap233", "ap233e1_arm_lf_stepmod-2010-11-12.xml"
16
- )
17
- end
18
- end
@@ -1,25 +0,0 @@
1
- require "spec_helper"
2
-
3
- RSpec.describe Expressir::Express::Repository do
4
- describe ".from_file" do
5
- it "build an instance from a file" do
6
- name = "Ap233_systems_engineering_arm_LF"
7
-
8
- repo = Expressir::Express::Repository.from_xml(sample_file)
9
- schema = repo.schemas.first
10
-
11
- expect(repo.name).to eq(name)
12
- expect(repo.schemas.count).to eq(1)
13
- expect(schema.name).to eq(name)
14
- expect(schema.contents.count).to eq(795)
15
- expect(schema.contents.first.schema).to eq(name)
16
- expect(schema.contents.first.name).to eq("Abs_function")
17
- end
18
- end
19
-
20
- def sample_file
21
- @sample_file ||= Expressir.root_path.join(
22
- "original", "examples", "ap233", "ap233e1_arm_lf_stepmod-2010-11-12.xml"
23
- )
24
- end
25
- end
@@ -1,111 +0,0 @@
1
- require "yaml"
2
- require "spec_helper"
3
- require "expressir/express_exp/parser"
4
- require "expressir/express_exp/formatter"
5
- require "expressir/express_exp/schema_head_formatter"
6
- require "expressir/express_exp/hyperlink_formatter"
7
-
8
- RSpec.describe Expressir::ExpressExp::Formatter do
9
- describe ".format" do
10
- it "exports an object (single.exp)" do
11
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
12
- formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "single_formatted.exp")
13
-
14
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
15
-
16
- result = Expressir::ExpressExp::Formatter.format(repo)
17
- # File.write(formatted_exp_file, result)
18
- expected_result = File.read(formatted_exp_file)
19
-
20
- expect(result).to eq(expected_result)
21
- end
22
-
23
- it "exports an object (multiple.exp)" do
24
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
25
- formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple_formatted.exp")
26
-
27
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
28
-
29
- result = Expressir::ExpressExp::Formatter.format(repo)
30
- # File.write(formatted_exp_file, result)
31
- expected_result = File.read(formatted_exp_file)
32
-
33
- expect(result).to eq(expected_result)
34
- end
35
-
36
- it "exports an object (remark.exp)" do
37
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
38
- formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark_formatted.exp")
39
-
40
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
41
-
42
- result = Expressir::ExpressExp::Formatter.format(repo)
43
- # File.write(formatted_exp_file, result)
44
- expected_result = File.read(formatted_exp_file)
45
-
46
- expect(result).to eq(expected_result)
47
- end
48
-
49
- it "exports an object (syntax.exp)" do
50
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
51
- formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax_formatted.exp")
52
-
53
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
54
-
55
- result = Expressir::ExpressExp::Formatter.format(repo)
56
- # File.write(formatted_exp_file, result)
57
- expected_result = File.read(formatted_exp_file)
58
-
59
- expect(result).to eq(expected_result)
60
- end
61
-
62
- it "exports an object with schema head formatter (syntax.exp)" do
63
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
64
- formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax_schema_head_formatted.exp")
65
-
66
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
67
-
68
- formatter = Class.new(Expressir::ExpressExp::Formatter) do
69
- include Expressir::ExpressExp::SchemaHeadFormatter
70
- end
71
- result = formatter.format(repo)
72
- # File.write(formatted_exp_file, result)
73
- expected_result = File.read(formatted_exp_file)
74
-
75
- expect(result).to eq(expected_result)
76
- end
77
-
78
- it "exports an object with hyperlink formatter (multiple.exp)" do
79
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
80
- formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple_hyperlink_formatted.exp")
81
-
82
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
83
-
84
- formatter = Class.new(Expressir::ExpressExp::Formatter) do
85
- include Expressir::ExpressExp::HyperlinkFormatter
86
- end
87
- result = formatter.format(repo)
88
- # File.write(formatted_exp_file, result)
89
- expected_result = File.read(formatted_exp_file)
90
-
91
- expect(result).to eq(expected_result)
92
- end
93
-
94
- it "exports an object with schema head and hyperlink formatter (multiple.exp)" do
95
- exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
96
- formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple_schema_head_hyperlink_formatted.exp")
97
-
98
- repo = Expressir::ExpressExp::Parser.from_file(exp_file)
99
-
100
- formatter = Class.new(Expressir::ExpressExp::Formatter) do
101
- include Expressir::ExpressExp::SchemaHeadFormatter
102
- include Expressir::ExpressExp::HyperlinkFormatter
103
- end
104
- result = formatter.format(repo)
105
- # File.write(formatted_exp_file, result)
106
- expected_result = File.read(formatted_exp_file)
107
-
108
- expect(result).to eq(expected_result)
109
- end
110
- end
111
- end