expressir 1.4.0-arm64-darwin → 1.4.2-arm64-darwin

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: ceb6203668e5d0f962eded0ef3567f7c74b41a2e14d08beecc39fde9eafe88b3
4
- data.tar.gz: a01b8e09235860e4fe1d9fb82602a8a1762298715b704a691001ca3e592dbceb
3
+ metadata.gz: c9c3cd226c3e6d6b4c0979cbe36c8b4b563ee319978dc4a80478019f07fbd83f
4
+ data.tar.gz: 28e20a730d54976ababedaee11b24c5b058bb75a5a057cdd9d55f476bb9f0e10
5
5
  SHA512:
6
- metadata.gz: 39719cac30836b18fe7ed225d6acca559f1ec93defa4b06e3f51abe0a9fe76abcbd23244959fadb8470aa5da1e064f6117f3f778659ef0267357e477c48ce6f7
7
- data.tar.gz: 6e0e05d3c1fcec7e746e3162ee225eca46affafafe3fd847779221af5c09e284035495c05f94a2793fa96433e79cdfb451df2846d1daab098aff1a5ff46b0c62
6
+ metadata.gz: 1685a9719c231f474abdf00db7a9db252a9b818a1b8dad5515997fdac6e3202ee34fae662e9c929a09b70fb0e232fe6bba8c2bab066b9813a23f2affff3d556d
7
+ data.tar.gz: 444d519147f63ce4802ebf4b4fc7233ff48a0fc130ad72ce614f4977b74682f0af32c7c76692f06ea98662cc3dfc326ec1f55324e4ffbb362a43ba3229172941
data/README.adoc CHANGED
@@ -125,6 +125,36 @@ $ gem install expressir
125
125
  ----
126
126
 
127
127
 
128
+ == Usage
129
+
130
+ === Filtering out schemas
131
+
132
+ Use the `select_proc` argument of `to_hash`.
133
+
134
+ Example:
135
+
136
+ [source,ruby]
137
+ ----
138
+
139
+ schema_yaml = YAML.load_file('documents/iso-10303-41/schemas.yaml')
140
+ schema_paths = schema_yaml['schemas'].map {|x,y| y['path'].gsub("../../", "")}
141
+
142
+ repo = Expressir::Express::Parser.from_files(schema_paths)
143
+
144
+ filtered_schemas = ["action_schema", "date_time_schema"]
145
+ select_proc = Proc.new do |value|
146
+ if value.is_a?(Expressir::Model::Declarations::Schema)
147
+ filtered_schemas.include?(value.id)
148
+ else
149
+ true
150
+ end
151
+ end
152
+
153
+ repo_hash = repo.to_hash(select_proc: select_proc)
154
+ schemas = repo_hash['schemas']
155
+ schemas.map {|s| s["id"] }
156
+ ----
157
+
128
158
  == Contributing
129
159
 
130
160
  First, thank you for contributing! We love pull requests from everyone. By
@@ -148,7 +178,8 @@ Here are a few technical guidelines to follow:
148
178
 
149
179
  Expressir is distributed under the BSD 2-clause license.
150
180
 
151
- Expressir is built on code originally from the NIST Reeper project.
181
+ Expressir originally contained some code from the NIST Reeper project but
182
+ has been completely rewritten.
152
183
 
153
184
  The https://www.nist.gov/services-resources/software/reeper[NIST Reeper license]
154
185
  is reproduced below:
@@ -169,5 +200,4 @@ ____
169
200
 
170
201
  == Credits
171
202
 
172
- Expressir is created using the structure and examples provided by
173
- the NIST Reeper software on https://sourceforge.net/p/reeper/[Sourceforge].
203
+ Copyright Ribose Inc.
data/lib/expressir/cli.rb CHANGED
@@ -11,6 +11,54 @@ module Expressir
11
11
  end
12
12
  end
13
13
 
14
+ no_commands do
15
+ def _validate_schema(path)
16
+ repository = Expressir::Express::Parser.from_file(path)
17
+ repository.schemas.inject([]) do |acc, schema|
18
+ acc << schema.id unless schema.version&.value
19
+ acc
20
+ end
21
+ rescue StandardError
22
+ nil
23
+ end
24
+
25
+ def _print_validation_errors(type, array)
26
+ return if array.empty?
27
+
28
+ puts "#{'*' * 20} RESULTS: #{type.to_s.upcase.gsub('_', ' ')} #{'*' * 20}"
29
+ array.each do |msg|
30
+ puts msg
31
+ end
32
+ end
33
+ end
34
+
35
+ desc "validate *PATH", "validate EXPRESS schema located at PATH"
36
+ def validate(*paths) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
37
+ no_version = no_valid = []
38
+
39
+ paths.each do |path|
40
+ x = Pathname.new(path).realpath.relative_path_from(Dir.pwd)
41
+ puts "Validating #{x}"
42
+ ret = _validate_schema(path)
43
+
44
+ if ret.nil?
45
+ no_valid << "Failed to parse: #{x}"
46
+ next
47
+ end
48
+
49
+ ret.each do |schema_id|
50
+ no_version << "Missing version string: schema `#{schema_id}` | #{x}"
51
+ end
52
+ end
53
+
54
+ _print_validation_errors(:failed_to_parse, no_valid)
55
+ _print_validation_errors(:missing_version_string, no_version)
56
+
57
+ exit 1 unless [no_valid, no_version].all?(&:empty?)
58
+
59
+ puts "Validation passed for all EXPRESS schemas."
60
+ end
61
+
14
62
  desc "version", "Expressir Version"
15
63
  def version
16
64
  say(Expressir::VERSION)
@@ -94,8 +94,13 @@ module Expressir
94
94
  # @param [String] root_path
95
95
  # @param [Express::Formatter] formatter
96
96
  # @param [Boolean] include_empty
97
+ # @param [Proc] select_proc
97
98
  # @return [Hash]
98
- def to_hash(root_path: nil, formatter: nil, include_empty: nil)
99
+ def to_hash(root_path: nil, formatter: nil, include_empty: nil, select_proc: nil)
100
+ # Filter out entries
101
+ has_filter = !select_proc.nil? && select_proc.is_a?(Proc)
102
+ return nil if has_filter && !select_proc.call(self)
103
+
99
104
  hash = {}
100
105
  hash[CLASS_KEY] = self.class.name
101
106
 
@@ -106,20 +111,32 @@ module Expressir
106
111
  # skip empty values
107
112
  next unless !empty or include_empty
108
113
 
109
- hash[variable.to_s] = case value
110
- when Array
111
- value.map do |value|
112
- if value.is_a? ModelElement
113
- value.to_hash(root_path: root_path, formatter: formatter, include_empty: include_empty)
114
- else
115
- value
116
- end
117
- end
118
- when ModelElement
119
- value.to_hash(root_path: root_path, formatter: formatter, include_empty: include_empty)
120
- else
121
- value
122
- end
114
+ value_hash = case value
115
+ when Array
116
+ value.map do |v|
117
+ if v.is_a? ModelElement
118
+ v.to_hash(
119
+ root_path: root_path,
120
+ formatter: formatter,
121
+ include_empty: include_empty,
122
+ select_proc: select_proc
123
+ )
124
+ else
125
+ v
126
+ end
127
+ end.compact
128
+ when ModelElement
129
+ value.to_hash(
130
+ root_path: root_path,
131
+ formatter: formatter,
132
+ include_empty: include_empty,
133
+ select_proc: select_proc
134
+ )
135
+ else
136
+ value
137
+ end
138
+
139
+ hash[variable.to_s] = value_hash unless value_hash.nil?
123
140
  end
124
141
 
125
142
  if self.is_a? Declarations::Schema and file
@@ -1,3 +1,3 @@
1
1
  module Expressir
2
- VERSION = "1.4.0".freeze
2
+ VERSION = "1.4.2".freeze
3
3
  end
@@ -23,6 +23,31 @@ RSpec.describe Expressir::Model::ModelElement do
23
23
  GC.verify_compaction_references
24
24
  GC.verify_internal_consistency
25
25
  end
26
+
27
+ it "exports objects filtered by select_proc (multiple.exp)" do |example|
28
+ print "\n[#{example.description}] "
29
+ exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
30
+
31
+ repo = Expressir::Express::Parser.from_file(exp_file)
32
+
33
+ filtered_schemas = ["multiple_schema2", "multiple_schema3"]
34
+ select_proc = Proc.new do |value|
35
+ if value.is_a?(Expressir::Model::Declarations::Schema)
36
+ filtered_schemas.include?(value.id)
37
+ else
38
+ true
39
+ end
40
+ end
41
+
42
+ result = repo.to_hash(select_proc: select_proc)
43
+
44
+ expect(result["schemas"].map { |s| s["id"] }.sort).to eq(filtered_schemas)
45
+
46
+ # Validate Object Space
47
+ GC.start
48
+ GC.verify_compaction_references
49
+ GC.verify_internal_consistency
50
+ end
26
51
  end
27
52
 
28
53
  describe ".from_hash" do
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: expressir
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.0
4
+ version: 1.4.2
5
5
  platform: arm64-darwin
6
6
  authors:
7
7
  - Ribose Inc.
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-04-23 00:00:00.000000000 Z
11
+ date: 2024-05-06 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: thor