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.
- checksums.yaml +4 -4
- data/.github/workflows/rake.yml +50 -5
- data/.github/workflows/release.yml +8 -0
- data/.gitignore +2 -2
- data/.hound.yml +3 -0
- data/.rubocop.yml +6 -506
- data/.yardopts +11 -0
- data/Rakefile +3 -0
- data/demo.rb +5 -5
- data/exe/format +8 -8
- data/exe/format-test +11 -11
- data/expressir.gemspec +4 -2
- data/lib/expressir/cli.rb +0 -6
- data/lib/expressir/{express_exp/2.7 → express/2.4}/express_parser.bundle +0 -0
- data/lib/expressir/{express_exp → express}/2.5/express_parser.bundle +0 -0
- data/lib/expressir/{express_exp/2.4 → express/2.6}/express_parser.bundle +0 -0
- data/lib/expressir/{express_exp/2.6 → express/2.7}/express_parser.bundle +0 -0
- data/lib/expressir/{express_exp → express}/3.0/express_parser.bundle +0 -0
- data/lib/expressir/express/cache.rb +51 -0
- data/lib/expressir/{express_exp → express}/formatter.rb +304 -237
- data/lib/expressir/{express_exp → express}/hyperlink_formatter.rb +16 -2
- data/lib/expressir/{express_exp → express}/model_visitor.rb +2 -1
- data/lib/expressir/{express_exp → express}/parser.rb +19 -13
- data/lib/expressir/{express_exp → express}/resolve_references_model_visitor.rb +9 -7
- data/lib/expressir/express/schema_head_formatter.rb +23 -0
- data/lib/expressir/{express_exp → express}/visitor.rb +318 -270
- data/lib/expressir/model/cache.rb +6 -2
- data/lib/expressir/model/data_type.rb +9 -0
- data/lib/expressir/model/data_types/aggregate.rb +31 -0
- data/lib/expressir/model/data_types/array.rb +31 -0
- data/lib/expressir/model/data_types/bag.rb +25 -0
- data/lib/expressir/model/data_types/binary.rb +22 -0
- data/lib/expressir/model/data_types/boolean.rb +10 -0
- data/lib/expressir/model/data_types/enumeration.rb +25 -0
- data/lib/expressir/model/data_types/enumeration_item.rb +26 -0
- data/lib/expressir/model/data_types/generic.rb +26 -0
- data/lib/expressir/model/data_types/generic_entity.rb +26 -0
- data/lib/expressir/model/data_types/integer.rb +10 -0
- data/lib/expressir/model/data_types/list.rb +28 -0
- data/lib/expressir/model/data_types/logical.rb +10 -0
- data/lib/expressir/model/data_types/number.rb +10 -0
- data/lib/expressir/model/data_types/real.rb +19 -0
- data/lib/expressir/model/data_types/select.rb +28 -0
- data/lib/expressir/model/data_types/set.rb +25 -0
- data/lib/expressir/model/data_types/string.rb +22 -0
- data/lib/expressir/model/declaration.rb +9 -0
- data/lib/expressir/model/declarations/attribute.rb +47 -0
- data/lib/expressir/model/declarations/constant.rb +34 -0
- data/lib/expressir/model/declarations/entity.rb +53 -0
- data/lib/expressir/model/declarations/function.rb +67 -0
- data/lib/expressir/model/declarations/interface.rb +28 -0
- data/lib/expressir/model/declarations/interface_item.rb +23 -0
- data/lib/expressir/model/declarations/interfaced_item.rb +37 -0
- data/lib/expressir/model/declarations/parameter.rb +34 -0
- data/lib/expressir/model/declarations/procedure.rb +64 -0
- data/lib/expressir/model/declarations/remark_item.rb +21 -0
- data/lib/expressir/model/declarations/rule.rb +71 -0
- data/lib/expressir/model/declarations/schema.rb +117 -0
- data/lib/expressir/model/declarations/schema_version.rb +22 -0
- data/lib/expressir/model/declarations/schema_version_item.rb +22 -0
- data/lib/expressir/model/declarations/subtype_constraint.rb +40 -0
- data/lib/expressir/model/declarations/type.rb +45 -0
- data/lib/expressir/model/declarations/unique_rule.rb +31 -0
- data/lib/expressir/model/declarations/variable.rb +34 -0
- data/lib/expressir/model/declarations/where_rule.rb +31 -0
- data/lib/expressir/model/expression.rb +9 -0
- data/lib/expressir/model/expressions/aggregate_initializer.rb +7 -3
- data/lib/expressir/model/expressions/aggregate_initializer_item.rb +22 -0
- data/lib/expressir/model/expressions/binary_expression.rb +16 -5
- data/lib/expressir/model/expressions/entity_constructor.rb +9 -4
- data/lib/expressir/model/expressions/function_call.rb +22 -0
- data/lib/expressir/model/expressions/interval.rb +17 -6
- data/lib/expressir/model/expressions/query_expression.rb +11 -7
- data/lib/expressir/model/expressions/unary_expression.rb +9 -3
- data/lib/expressir/model/identifier.rb +26 -4
- data/lib/expressir/model/literal.rb +9 -0
- data/lib/expressir/model/literals/binary.rb +6 -2
- data/lib/expressir/model/literals/integer.rb +6 -2
- data/lib/expressir/model/literals/logical.rb +6 -2
- data/lib/expressir/model/literals/real.rb +6 -2
- data/lib/expressir/model/literals/string.rb +8 -3
- data/lib/expressir/model/model_element.rb +63 -37
- data/lib/expressir/model/reference.rb +9 -0
- data/lib/expressir/model/references/attribute_reference.rb +22 -0
- data/lib/expressir/model/references/group_reference.rb +22 -0
- data/lib/expressir/model/references/index_reference.rb +27 -0
- data/lib/expressir/model/references/simple_reference.rb +24 -0
- data/lib/expressir/model/repository.rb +6 -2
- data/lib/expressir/model/statement.rb +9 -0
- data/lib/expressir/model/statements/alias.rb +12 -8
- data/lib/expressir/model/statements/assignment.rb +8 -3
- data/lib/expressir/model/statements/case.rb +11 -5
- data/lib/expressir/model/statements/case_action.rb +8 -3
- data/lib/expressir/model/statements/compound.rb +7 -3
- data/lib/expressir/model/statements/escape.rb +3 -1
- data/lib/expressir/model/statements/if.rb +12 -6
- data/lib/expressir/model/statements/null.rb +3 -1
- data/lib/expressir/model/statements/procedure_call.rb +22 -0
- data/lib/expressir/model/statements/repeat.rb +20 -12
- data/lib/expressir/model/statements/return.rb +6 -2
- data/lib/expressir/model/statements/skip.rb +3 -1
- data/lib/expressir/model/supertype_expression.rb +9 -0
- data/lib/expressir/model/supertype_expressions/binary_supertype_expression.rb +29 -0
- data/lib/expressir/model/supertype_expressions/oneof_supertype_expression.rb +19 -0
- data/lib/expressir/model.rb +52 -43
- data/lib/expressir/version.rb +1 -1
- data/lib/expressir.rb +0 -1
- data/rakelib/cross-ruby.rake +1 -1
- data/spec/expressir/{express_exp → express}/cache_spec.rb +9 -9
- data/spec/expressir/express/formatter_spec.rb +127 -0
- data/spec/expressir/{express_exp → express}/parser_spec.rb +23 -23
- data/spec/expressir/model/model_element_spec.rb +153 -153
- data/{original/examples → spec}/syntax/multiple.exp +0 -0
- data/spec/syntax/multiple.yaml +198 -0
- data/{original/examples → spec}/syntax/multiple_formatted.exp +0 -0
- data/{original/examples → spec}/syntax/multiple_hyperlink_formatted.exp +0 -0
- data/{original/examples → spec}/syntax/multiple_schema_head_hyperlink_formatted.exp +0 -0
- data/{original/examples → spec}/syntax/remark.exp +0 -0
- data/{original/examples → spec}/syntax/remark.yaml +73 -73
- data/{original/examples → spec}/syntax/remark_formatted.exp +0 -0
- data/{original/examples → spec}/syntax/single.exp +1 -1
- data/spec/syntax/single.yaml +18 -0
- data/{original/examples → spec}/syntax/single_formatted.exp +1 -1
- data/{original/examples → spec}/syntax/single_formatted.yaml +9 -6
- data/{original/examples → spec}/syntax/syntax.exp +11 -11
- data/{original/examples → spec}/syntax/syntax.yaml +1100 -1111
- data/{original/examples → spec}/syntax/syntax_formatted.exp +11 -11
- data/{original/examples → spec}/syntax/syntax_hyperlink_formatted.exp +11 -11
- data/{original/examples → spec}/syntax/syntax_schema_head_formatted.exp +1 -1
- metadata +128 -121
- data/lib/expressir/express/aggregate_dimension.rb +0 -38
- data/lib/expressir/express/attribute.rb +0 -15
- data/lib/expressir/express/comment.rb +0 -7
- data/lib/expressir/express/defined_type.rb +0 -36
- data/lib/expressir/express/derived.rb +0 -65
- data/lib/expressir/express/derived_aggregate.rb +0 -43
- data/lib/expressir/express/entity.rb +0 -137
- data/lib/expressir/express/explicit.rb +0 -70
- data/lib/expressir/express/explicit_aggregate.rb +0 -46
- data/lib/expressir/express/explicit_or_derived.rb +0 -16
- data/lib/expressir/express/global_rule.rb +0 -44
- data/lib/expressir/express/interface_specification.rb +0 -51
- data/lib/expressir/express/interfaced_item.rb +0 -38
- data/lib/expressir/express/inverse.rb +0 -46
- data/lib/expressir/express/inverse_aggregate.rb +0 -37
- data/lib/expressir/express/model_element.rb +0 -7
- data/lib/expressir/express/named_type.rb +0 -19
- data/lib/expressir/express/remark.rb +0 -8
- data/lib/expressir/express/repository.rb +0 -306
- data/lib/expressir/express/schema_definition.rb +0 -96
- data/lib/expressir/express/subtype_constraint.rb +0 -14
- data/lib/expressir/express/type.rb +0 -26
- data/lib/expressir/express/type_aggregate.rb +0 -42
- data/lib/expressir/express/type_enum.rb +0 -29
- data/lib/expressir/express/type_parser.rb +0 -45
- data/lib/expressir/express/type_select.rb +0 -82
- data/lib/expressir/express/unique_rule.rb +0 -35
- data/lib/expressir/express/where_rule.rb +0 -32
- data/lib/expressir/express.rb +0 -11
- data/lib/expressir/express_exp/cache.rb +0 -48
- data/lib/expressir/express_exp/schema_head_formatter.rb +0 -9
- data/lib/expressir/express_parser.rb +0 -30
- data/lib/expressir/model/attribute.rb +0 -38
- data/lib/expressir/model/constant.rb +0 -28
- data/lib/expressir/model/entity.rb +0 -42
- data/lib/expressir/model/enumeration_item.rb +0 -22
- data/lib/expressir/model/expressions/aggregate_item.rb +0 -17
- data/lib/expressir/model/expressions/attribute_reference.rb +0 -17
- data/lib/expressir/model/expressions/call.rb +0 -17
- data/lib/expressir/model/expressions/group_reference.rb +0 -17
- data/lib/expressir/model/expressions/index_reference.rb +0 -19
- data/lib/expressir/model/expressions/simple_reference.rb +0 -19
- data/lib/expressir/model/function.rb +0 -57
- data/lib/expressir/model/interface.rb +0 -20
- data/lib/expressir/model/interface_item.rb +0 -15
- data/lib/expressir/model/interfaced_item.rb +0 -27
- data/lib/expressir/model/parameter.rb +0 -28
- data/lib/expressir/model/procedure.rb +0 -55
- data/lib/expressir/model/remark_item.rb +0 -15
- data/lib/expressir/model/rule.rb +0 -60
- data/lib/expressir/model/schema.rb +0 -100
- data/lib/expressir/model/statements/call.rb +0 -17
- data/lib/expressir/model/subtype_constraint.rb +0 -32
- data/lib/expressir/model/type.rb +0 -37
- data/lib/expressir/model/types/aggregate.rb +0 -28
- data/lib/expressir/model/types/array.rb +0 -23
- data/lib/expressir/model/types/bag.rb +0 -19
- data/lib/expressir/model/types/binary.rb +0 -17
- data/lib/expressir/model/types/boolean.rb +0 -8
- data/lib/expressir/model/types/enumeration.rb +0 -21
- data/lib/expressir/model/types/generic.rb +0 -24
- data/lib/expressir/model/types/generic_entity.rb +0 -24
- data/lib/expressir/model/types/integer.rb +0 -8
- data/lib/expressir/model/types/list.rb +0 -21
- data/lib/expressir/model/types/logical.rb +0 -8
- data/lib/expressir/model/types/number.rb +0 -8
- data/lib/expressir/model/types/real.rb +0 -15
- data/lib/expressir/model/types/select.rb +0 -23
- data/lib/expressir/model/types/set.rb +0 -19
- data/lib/expressir/model/types/string.rb +0 -17
- data/lib/expressir/model/unique.rb +0 -26
- data/lib/expressir/model/variable.rb +0 -28
- data/lib/expressir/model/where.rb +0 -26
- data/lib/expressir/parser/owl_parser.rb +0 -8
- data/lib/expressir/parser.rb +0 -6
- data/original/examples/syntax/multiple.yaml +0 -198
- data/original/examples/syntax/single.yaml +0 -15
- data/spec/acceptance/express_to_owl_spec.rb +0 -18
- data/spec/expressir/express/repository_spec.rb +0 -25
- 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/
|
5
|
-
require "expressir/
|
6
|
-
require "expressir/
|
7
|
-
require "expressir/
|
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::
|
12
|
-
formatter = Class.new(Expressir::
|
13
|
-
include Expressir::
|
14
|
-
include Expressir::
|
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/
|
6
|
-
require "expressir/
|
7
|
-
require "expressir/
|
8
|
-
require "expressir/
|
9
|
-
require "expressir/
|
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::
|
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::
|
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::
|
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::
|
75
|
-
include Expressir::
|
76
|
-
include Expressir::
|
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
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
Binary file
|
@@ -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
|