expressir 0.2.26-x86_64-darwin → 1.2.0-x86_64-darwin

Sign up to get free protection for your applications and to get access to all the features.
Files changed (210) hide show
  1. checksums.yaml +4 -4
  2. data/.github/workflows/rake.yml +50 -5
  3. data/.github/workflows/release.yml +8 -0
  4. data/.gitignore +2 -2
  5. data/.hound.yml +3 -0
  6. data/.rubocop.yml +6 -506
  7. data/.yardopts +11 -0
  8. data/Rakefile +3 -0
  9. data/demo.rb +5 -5
  10. data/exe/format +8 -8
  11. data/exe/format-test +11 -11
  12. data/expressir.gemspec +4 -2
  13. data/lib/expressir/cli.rb +0 -6
  14. data/lib/expressir/{express_exp/2.7 → express/2.4}/express_parser.bundle +0 -0
  15. data/lib/expressir/{express_exp → express}/2.5/express_parser.bundle +0 -0
  16. data/lib/expressir/{express_exp/2.4 → express/2.6}/express_parser.bundle +0 -0
  17. data/lib/expressir/{express_exp/2.6 → express/2.7}/express_parser.bundle +0 -0
  18. data/lib/expressir/{express_exp → express}/3.0/express_parser.bundle +0 -0
  19. data/lib/expressir/express/cache.rb +51 -0
  20. data/lib/expressir/{express_exp → express}/formatter.rb +304 -237
  21. data/lib/expressir/{express_exp → express}/hyperlink_formatter.rb +16 -2
  22. data/lib/expressir/{express_exp → express}/model_visitor.rb +2 -1
  23. data/lib/expressir/{express_exp → express}/parser.rb +19 -13
  24. data/lib/expressir/{express_exp → express}/resolve_references_model_visitor.rb +9 -7
  25. data/lib/expressir/express/schema_head_formatter.rb +23 -0
  26. data/lib/expressir/{express_exp → express}/visitor.rb +318 -270
  27. data/lib/expressir/model/cache.rb +6 -2
  28. data/lib/expressir/model/data_type.rb +9 -0
  29. data/lib/expressir/model/data_types/aggregate.rb +31 -0
  30. data/lib/expressir/model/data_types/array.rb +31 -0
  31. data/lib/expressir/model/data_types/bag.rb +25 -0
  32. data/lib/expressir/model/data_types/binary.rb +22 -0
  33. data/lib/expressir/model/data_types/boolean.rb +10 -0
  34. data/lib/expressir/model/data_types/enumeration.rb +25 -0
  35. data/lib/expressir/model/data_types/enumeration_item.rb +26 -0
  36. data/lib/expressir/model/data_types/generic.rb +26 -0
  37. data/lib/expressir/model/data_types/generic_entity.rb +26 -0
  38. data/lib/expressir/model/data_types/integer.rb +10 -0
  39. data/lib/expressir/model/data_types/list.rb +28 -0
  40. data/lib/expressir/model/data_types/logical.rb +10 -0
  41. data/lib/expressir/model/data_types/number.rb +10 -0
  42. data/lib/expressir/model/data_types/real.rb +19 -0
  43. data/lib/expressir/model/data_types/select.rb +28 -0
  44. data/lib/expressir/model/data_types/set.rb +25 -0
  45. data/lib/expressir/model/data_types/string.rb +22 -0
  46. data/lib/expressir/model/declaration.rb +9 -0
  47. data/lib/expressir/model/declarations/attribute.rb +47 -0
  48. data/lib/expressir/model/declarations/constant.rb +34 -0
  49. data/lib/expressir/model/declarations/entity.rb +53 -0
  50. data/lib/expressir/model/declarations/function.rb +67 -0
  51. data/lib/expressir/model/declarations/interface.rb +28 -0
  52. data/lib/expressir/model/declarations/interface_item.rb +23 -0
  53. data/lib/expressir/model/declarations/interfaced_item.rb +37 -0
  54. data/lib/expressir/model/declarations/parameter.rb +34 -0
  55. data/lib/expressir/model/declarations/procedure.rb +64 -0
  56. data/lib/expressir/model/declarations/remark_item.rb +21 -0
  57. data/lib/expressir/model/declarations/rule.rb +71 -0
  58. data/lib/expressir/model/declarations/schema.rb +117 -0
  59. data/lib/expressir/model/declarations/schema_version.rb +22 -0
  60. data/lib/expressir/model/declarations/schema_version_item.rb +22 -0
  61. data/lib/expressir/model/declarations/subtype_constraint.rb +40 -0
  62. data/lib/expressir/model/declarations/type.rb +45 -0
  63. data/lib/expressir/model/declarations/unique_rule.rb +31 -0
  64. data/lib/expressir/model/declarations/variable.rb +34 -0
  65. data/lib/expressir/model/declarations/where_rule.rb +31 -0
  66. data/lib/expressir/model/expression.rb +9 -0
  67. data/lib/expressir/model/expressions/aggregate_initializer.rb +7 -3
  68. data/lib/expressir/model/expressions/aggregate_initializer_item.rb +22 -0
  69. data/lib/expressir/model/expressions/binary_expression.rb +16 -5
  70. data/lib/expressir/model/expressions/entity_constructor.rb +9 -4
  71. data/lib/expressir/model/expressions/function_call.rb +22 -0
  72. data/lib/expressir/model/expressions/interval.rb +17 -6
  73. data/lib/expressir/model/expressions/query_expression.rb +11 -7
  74. data/lib/expressir/model/expressions/unary_expression.rb +9 -3
  75. data/lib/expressir/model/identifier.rb +26 -4
  76. data/lib/expressir/model/literal.rb +9 -0
  77. data/lib/expressir/model/literals/binary.rb +6 -2
  78. data/lib/expressir/model/literals/integer.rb +6 -2
  79. data/lib/expressir/model/literals/logical.rb +6 -2
  80. data/lib/expressir/model/literals/real.rb +6 -2
  81. data/lib/expressir/model/literals/string.rb +8 -3
  82. data/lib/expressir/model/model_element.rb +63 -37
  83. data/lib/expressir/model/reference.rb +9 -0
  84. data/lib/expressir/model/references/attribute_reference.rb +22 -0
  85. data/lib/expressir/model/references/group_reference.rb +22 -0
  86. data/lib/expressir/model/references/index_reference.rb +27 -0
  87. data/lib/expressir/model/references/simple_reference.rb +24 -0
  88. data/lib/expressir/model/repository.rb +6 -2
  89. data/lib/expressir/model/statement.rb +9 -0
  90. data/lib/expressir/model/statements/alias.rb +12 -8
  91. data/lib/expressir/model/statements/assignment.rb +8 -3
  92. data/lib/expressir/model/statements/case.rb +11 -5
  93. data/lib/expressir/model/statements/case_action.rb +8 -3
  94. data/lib/expressir/model/statements/compound.rb +7 -3
  95. data/lib/expressir/model/statements/escape.rb +3 -1
  96. data/lib/expressir/model/statements/if.rb +12 -6
  97. data/lib/expressir/model/statements/null.rb +3 -1
  98. data/lib/expressir/model/statements/procedure_call.rb +22 -0
  99. data/lib/expressir/model/statements/repeat.rb +20 -12
  100. data/lib/expressir/model/statements/return.rb +6 -2
  101. data/lib/expressir/model/statements/skip.rb +3 -1
  102. data/lib/expressir/model/supertype_expression.rb +9 -0
  103. data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb +29 -0
  104. data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb +19 -0
  105. data/lib/expressir/model.rb +52 -43
  106. data/lib/expressir/version.rb +1 -1
  107. data/lib/expressir.rb +0 -1
  108. data/rakelib/cross-ruby.rake +1 -1
  109. data/spec/expressir/{express_exp → express}/cache_spec.rb +9 -9
  110. data/spec/expressir/express/formatter_spec.rb +127 -0
  111. data/spec/expressir/{express_exp → express}/parser_spec.rb +23 -23
  112. data/spec/expressir/model/model_element_spec.rb +153 -153
  113. data/{original/examples → spec}/syntax/multiple.exp +0 -0
  114. data/spec/syntax/multiple.yaml +198 -0
  115. data/{original/examples → spec}/syntax/multiple_formatted.exp +0 -0
  116. data/{original/examples → spec}/syntax/multiple_hyperlink_formatted.exp +0 -0
  117. data/{original/examples → spec}/syntax/multiple_schema_head_hyperlink_formatted.exp +0 -0
  118. data/{original/examples → spec}/syntax/remark.exp +0 -0
  119. data/{original/examples → spec}/syntax/remark.yaml +73 -73
  120. data/{original/examples → spec}/syntax/remark_formatted.exp +0 -0
  121. data/{original/examples → spec}/syntax/single.exp +1 -1
  122. data/spec/syntax/single.yaml +18 -0
  123. data/{original/examples → spec}/syntax/single_formatted.exp +1 -1
  124. data/{original/examples → spec}/syntax/single_formatted.yaml +9 -6
  125. data/{original/examples → spec}/syntax/syntax.exp +11 -11
  126. data/{original/examples → spec}/syntax/syntax.yaml +1100 -1111
  127. data/{original/examples → spec}/syntax/syntax_formatted.exp +11 -11
  128. data/{original/examples → spec}/syntax/syntax_hyperlink_formatted.exp +11 -11
  129. data/{original/examples → spec}/syntax/syntax_schema_head_formatted.exp +1 -1
  130. metadata +128 -121
  131. data/lib/expressir/express/aggregate_dimension.rb +0 -38
  132. data/lib/expressir/express/attribute.rb +0 -15
  133. data/lib/expressir/express/comment.rb +0 -7
  134. data/lib/expressir/express/defined_type.rb +0 -36
  135. data/lib/expressir/express/derived.rb +0 -65
  136. data/lib/expressir/express/derived_aggregate.rb +0 -43
  137. data/lib/expressir/express/entity.rb +0 -137
  138. data/lib/expressir/express/explicit.rb +0 -70
  139. data/lib/expressir/express/explicit_aggregate.rb +0 -46
  140. data/lib/expressir/express/explicit_or_derived.rb +0 -16
  141. data/lib/expressir/express/global_rule.rb +0 -44
  142. data/lib/expressir/express/interface_specification.rb +0 -51
  143. data/lib/expressir/express/interfaced_item.rb +0 -38
  144. data/lib/expressir/express/inverse.rb +0 -46
  145. data/lib/expressir/express/inverse_aggregate.rb +0 -37
  146. data/lib/expressir/express/model_element.rb +0 -7
  147. data/lib/expressir/express/named_type.rb +0 -19
  148. data/lib/expressir/express/remark.rb +0 -8
  149. data/lib/expressir/express/repository.rb +0 -306
  150. data/lib/expressir/express/schema_definition.rb +0 -96
  151. data/lib/expressir/express/subtype_constraint.rb +0 -14
  152. data/lib/expressir/express/type.rb +0 -26
  153. data/lib/expressir/express/type_aggregate.rb +0 -42
  154. data/lib/expressir/express/type_enum.rb +0 -29
  155. data/lib/expressir/express/type_parser.rb +0 -45
  156. data/lib/expressir/express/type_select.rb +0 -82
  157. data/lib/expressir/express/unique_rule.rb +0 -35
  158. data/lib/expressir/express/where_rule.rb +0 -32
  159. data/lib/expressir/express.rb +0 -11
  160. data/lib/expressir/express_exp/cache.rb +0 -48
  161. data/lib/expressir/express_exp/schema_head_formatter.rb +0 -9
  162. data/lib/expressir/express_parser.rb +0 -30
  163. data/lib/expressir/model/attribute.rb +0 -38
  164. data/lib/expressir/model/constant.rb +0 -28
  165. data/lib/expressir/model/entity.rb +0 -42
  166. data/lib/expressir/model/enumeration_item.rb +0 -22
  167. data/lib/expressir/model/expressions/aggregate_item.rb +0 -17
  168. data/lib/expressir/model/expressions/attribute_reference.rb +0 -17
  169. data/lib/expressir/model/expressions/call.rb +0 -17
  170. data/lib/expressir/model/expressions/group_reference.rb +0 -17
  171. data/lib/expressir/model/expressions/index_reference.rb +0 -19
  172. data/lib/expressir/model/expressions/simple_reference.rb +0 -19
  173. data/lib/expressir/model/function.rb +0 -57
  174. data/lib/expressir/model/interface.rb +0 -20
  175. data/lib/expressir/model/interface_item.rb +0 -15
  176. data/lib/expressir/model/interfaced_item.rb +0 -27
  177. data/lib/expressir/model/parameter.rb +0 -28
  178. data/lib/expressir/model/procedure.rb +0 -55
  179. data/lib/expressir/model/remark_item.rb +0 -15
  180. data/lib/expressir/model/rule.rb +0 -60
  181. data/lib/expressir/model/schema.rb +0 -100
  182. data/lib/expressir/model/statements/call.rb +0 -17
  183. data/lib/expressir/model/subtype_constraint.rb +0 -32
  184. data/lib/expressir/model/type.rb +0 -37
  185. data/lib/expressir/model/types/aggregate.rb +0 -28
  186. data/lib/expressir/model/types/array.rb +0 -23
  187. data/lib/expressir/model/types/bag.rb +0 -19
  188. data/lib/expressir/model/types/binary.rb +0 -17
  189. data/lib/expressir/model/types/boolean.rb +0 -8
  190. data/lib/expressir/model/types/enumeration.rb +0 -21
  191. data/lib/expressir/model/types/generic.rb +0 -24
  192. data/lib/expressir/model/types/generic_entity.rb +0 -24
  193. data/lib/expressir/model/types/integer.rb +0 -8
  194. data/lib/expressir/model/types/list.rb +0 -21
  195. data/lib/expressir/model/types/logical.rb +0 -8
  196. data/lib/expressir/model/types/number.rb +0 -8
  197. data/lib/expressir/model/types/real.rb +0 -15
  198. data/lib/expressir/model/types/select.rb +0 -23
  199. data/lib/expressir/model/types/set.rb +0 -19
  200. data/lib/expressir/model/types/string.rb +0 -17
  201. data/lib/expressir/model/unique.rb +0 -26
  202. data/lib/expressir/model/variable.rb +0 -28
  203. data/lib/expressir/model/where.rb +0 -26
  204. data/lib/expressir/parser/owl_parser.rb +0 -8
  205. data/lib/expressir/parser.rb +0 -6
  206. data/original/examples/syntax/multiple.yaml +0 -198
  207. data/original/examples/syntax/single.yaml +0 -15
  208. data/spec/acceptance/express_to_owl_spec.rb +0 -18
  209. data/spec/expressir/express/repository_spec.rb +0 -25
  210. data/spec/expressir/express_exp/formatter_spec.rb +0 -127
data/exe/format CHANGED
@@ -1,17 +1,17 @@
1
1
  #!/usr/bin/env ruby
2
2
 
3
3
  require "yaml"
4
- require "expressir/express_exp/parser"
5
- require "expressir/express_exp/formatter"
6
- require "expressir/express_exp/schema_head_formatter"
7
- require "expressir/express_exp/hyperlink_formatter"
4
+ require "expressir/express/parser"
5
+ require "expressir/express/formatter"
6
+ require "expressir/express/schema_head_formatter"
7
+ require "expressir/express/hyperlink_formatter"
8
8
 
9
9
  exp_files = ARGV
10
10
 
11
- repository = Expressir::ExpressExp::Parser.from_files(exp_files)
12
- formatter = Class.new(Expressir::ExpressExp::Formatter) do
13
- include Expressir::ExpressExp::SchemaHeadFormatter
14
- include Expressir::ExpressExp::HyperlinkFormatter
11
+ repository = Expressir::Express::Parser.from_files(exp_files)
12
+ formatter = Class.new(Expressir::Express::Formatter) do
13
+ include Expressir::Express::SchemaHeadFormatter
14
+ include Expressir::Express::HyperlinkFormatter
15
15
  end
16
16
  result = repository.to_hash(formatter: formatter, skip_empty: true)
17
17
 
data/exe/format-test CHANGED
@@ -2,11 +2,11 @@
2
2
 
3
3
  require "yaml"
4
4
  require "tempfile"
5
- require "expressir/express_exp/parser"
6
- require "expressir/express_exp/formatter"
7
- require "expressir/express_exp/schema_head_formatter"
8
- require "expressir/express_exp/hyperlink_formatter"
9
- require "expressir/express_exp/cache"
5
+ require "expressir/express/parser"
6
+ require "expressir/express/formatter"
7
+ require "expressir/express/schema_head_formatter"
8
+ require "expressir/express/hyperlink_formatter"
9
+ require "expressir/express/cache"
10
10
 
11
11
  exp_files = [
12
12
  # basic test
@@ -53,17 +53,17 @@ exp_files = [
53
53
  ]
54
54
 
55
55
  start = Time.now
56
- repository = Expressir::ExpressExp::Parser.from_files(exp_files)
56
+ repository = Expressir::Express::Parser.from_files(exp_files)
57
57
  puts "Parser.from_files time: #{(Time.now - start).round(2)}s"
58
58
 
59
59
  temp_file = Tempfile.new
60
60
  begin
61
61
  start = Time.now
62
- Expressir::ExpressExp::Cache.to_file(temp_file, repository)
62
+ Expressir::Express::Cache.to_file(temp_file, repository)
63
63
  puts "Cache.to_file time: #{(Time.now - start).round(2)}s"
64
64
 
65
65
  start = Time.now
66
- repository = Expressir::ExpressExp::Cache.from_file(temp_file)
66
+ repository = Expressir::Express::Cache.from_file(temp_file)
67
67
  puts "Cache.from_file time: #{(Time.now - start).round(2)}s"
68
68
  ensure
69
69
  temp_file.close
@@ -71,9 +71,9 @@ ensure
71
71
  end
72
72
 
73
73
  start = Time.now
74
- formatter = Class.new(Expressir::ExpressExp::Formatter) do
75
- include Expressir::ExpressExp::SchemaHeadFormatter
76
- include Expressir::ExpressExp::HyperlinkFormatter
74
+ formatter = Class.new(Expressir::Express::Formatter) do
75
+ include Expressir::Express::SchemaHeadFormatter
76
+ include Expressir::Express::HyperlinkFormatter
77
77
  end
78
78
  result = repository.to_hash(formatter: formatter, skip_empty: true)
79
79
  puts "Repository.to_hash time: #{(Time.now - start).round(2)}s"
data/expressir.gemspec CHANGED
@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
30
30
 
31
31
  spec.extensions = File.join(*%w(ext express-parser extconf.rb))
32
32
 
33
- spec.add_runtime_dependency "nokogiri", "~> 1.10"
34
33
  spec.add_runtime_dependency "thor", "~> 1.0"
35
- spec.add_runtime_dependency "rice", "~> 3"
34
+ spec.add_runtime_dependency "rice", "~> 4.0.3"
35
+ spec.add_development_dependency "asciidoctor", "~> 2.0.13"
36
36
  spec.add_development_dependency "antlr4-native", "~> 1.1.0"
37
37
  spec.add_development_dependency "bundler", "~> 2.0"
38
38
  spec.add_development_dependency "pry", "~> 0.12.2"
@@ -41,4 +41,6 @@ Gem::Specification.new do |spec|
41
41
  spec.add_development_dependency "rake-compiler", "~> 1.1"
42
42
  spec.add_development_dependency "rake-compiler-dock", "~> 1.1"
43
43
  spec.add_development_dependency "rspec", "~> 3.0"
44
+ spec.add_development_dependency "yard", "~> 0.9.26"
45
+ spec.add_development_dependency "webrick", "~> 1.7.0"
44
46
  end
data/lib/expressir/cli.rb CHANGED
@@ -1,6 +1,5 @@
1
1
  require "thor"
2
2
  require "expressir/cli/ui"
3
- require "expressir/express_parser"
4
3
 
5
4
  module Expressir
6
5
  module Cli
@@ -17,11 +16,6 @@ module Expressir
17
16
  def version
18
17
  Cli.ui.say("Version #{Expressir::VERSION}")
19
18
  end
20
-
21
- desc "express-to-owl FILE", "Express to OWL conversion"
22
- def express_to_owl(file)
23
- Cli.ui.say(ExpressParser.to_owl(file))
24
- end
25
19
  end
26
20
  end
27
21
  end
@@ -0,0 +1,51 @@
1
+ require 'yaml'
2
+ require 'zlib'
3
+ require 'expressir/model'
4
+
5
+ module Expressir
6
+ module Express
7
+ class Cache
8
+ # Save Express model into a cache file
9
+ # @param file [String] cache file path
10
+ # @param content [Model::ModelElement] Express model
11
+ # @param root_path [String] Express repository root path, to be stripped from Express file paths to create a portable cache file
12
+ # @param test_overwrite_version [String] don't use, only for tests
13
+ # @return [nil]
14
+ def self.to_file(file, content, root_path: nil, test_overwrite_version: nil)
15
+ version = test_overwrite_version || VERSION
16
+
17
+ cache = Model::Cache.new(
18
+ version: version,
19
+ content: content
20
+ )
21
+
22
+ hash = cache.to_hash(root_path: root_path)
23
+ yaml = YAML.dump(hash)
24
+ yaml_compressed = Zlib::Deflate.deflate(yaml)
25
+
26
+ File.binwrite(file, yaml_compressed)
27
+ nil
28
+ end
29
+
30
+ # Load Express model from a cache file
31
+ # @param file [String] cache file path
32
+ # @param root_path [String] Express repository root path, to be prepended to Express file paths if loading a portable cache file
33
+ # @param test_overwrite_version [String] don't use, only for tests
34
+ # @return [Model::ModelElement] Express model
35
+ def self.from_file(file, root_path: nil, test_overwrite_version: nil)
36
+ version = test_overwrite_version || VERSION
37
+
38
+ yaml_compressed = File.binread(file)
39
+ yaml = Zlib::Inflate.inflate(yaml_compressed)
40
+ hash = YAML.load(yaml)
41
+ cache = Model::ModelElement.from_hash(hash, root_path: root_path)
42
+
43
+ if cache.version != version
44
+ raise Error.new("Cache version mismatch, cache version is #{cache.version}, Expressir version is #{version}")
45
+ end
46
+
47
+ cache.content
48
+ end
49
+ end
50
+ end
51
+ end