expressir 1.4.0-x86_64-linux-gnu → 1.4.2-x86_64-linux-gnu

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b7fe865ac425f79d826213a2ae2952325884229351fadf5508708bb107ea0be8
-  data.tar.gz: d82d375842624d9a67e8b079ccc8b88b05db22727f7aaf2b42c913dc559a1486
+  metadata.gz: a6f67e50e78a4c82c30a4c8ec1bdc22dd251ec99931dcfe6ba9a67dcee150229
+  data.tar.gz: 0e59c1c75e5d7391dbe6e7b59c84f4d8cbea63e32d67932927aba4a3c35d5a99
 SHA512:
-  metadata.gz: d2451999c0403700fbfca2394aa332013b13153316c49b59f885b6e8b1d5bb308969023db4ae0ba0cca7bfc2b525a86a967c5a849a1756e9a2ccaaa7d8743f63
-  data.tar.gz: adec480ae3e84377a147d7e79f2e3b2cbed913477aa1acb25fd5361ab4bea39417e7723f38b2c4c3bba8bbce4163da1232e71d07d346a4d061512e60bc5edfe9
+  metadata.gz: 110f197147a211792a6cbf5fc2d5ce79f77cd65bda8f1496704b48c308398d2e003632cf8451f2d5d9694540e73ea6e60b473f16d7fdc13ffe36d21b0ef33485
+  data.tar.gz: 3db1b0776e78d8638332d60a01e9aadb27eafa0b01705344408e781f1d508bf4f5716405f677858161ba8ae664e3543b9f24e2f97c4db613832a79f28b3639ba

data/README.adoc

@@ -125,6 +125,36 @@ $ gem install expressir
 ----
 
 
+== Usage
+
+=== Filtering out schemas
+
+Use the `select_proc` argument of `to_hash`.
+
+Example:
+
+[source,ruby]
+----
+
+schema_yaml = YAML.load_file('documents/iso-10303-41/schemas.yaml')
+schema_paths = schema_yaml['schemas'].map {|x,y| y['path'].gsub("../../", "")}
+
+repo = Expressir::Express::Parser.from_files(schema_paths)
+
+filtered_schemas = ["action_schema", "date_time_schema"]
+select_proc = Proc.new do |value|
+  if value.is_a?(Expressir::Model::Declarations::Schema)
+    filtered_schemas.include?(value.id)
+  else
+    true
+  end
+end
+
+repo_hash = repo.to_hash(select_proc: select_proc)
+schemas = repo_hash['schemas']
+schemas.map {|s| s["id"] }
+----
+
 == Contributing
 
 First, thank you for contributing! We love pull requests from everyone. By
@@ -148,7 +178,8 @@ Here are a few technical guidelines to follow:
 
 Expressir is distributed under the BSD 2-clause license.
 
-Expressir is built on code originally from the NIST Reeper project.
+Expressir originally contained some code from the NIST Reeper project but
+has been completely rewritten.
 
 The https://www.nist.gov/services-resources/software/reeper[NIST Reeper license]
 is reproduced below:
@@ -169,5 +200,4 @@ ____
 
 == Credits
 
-Expressir is created using the structure and examples provided by
-the NIST Reeper software on https://sourceforge.net/p/reeper/[Sourceforge].
+Copyright Ribose Inc.

data/lib/expressir/cli.rb

@@ -11,6 +11,54 @@ module Expressir
       end
     end
 
+    no_commands do
+      def _validate_schema(path)
+        repository = Expressir::Express::Parser.from_file(path)
+        repository.schemas.inject([]) do |acc, schema|
+          acc << schema.id unless schema.version&.value
+          acc
+        end
+      rescue StandardError
+        nil
+      end
+
+      def _print_validation_errors(type, array)
+        return if array.empty?
+
+        puts "#{'*' * 20} RESULTS: #{type.to_s.upcase.gsub('_', ' ')} #{'*' * 20}"
+        array.each do |msg|
+          puts msg
+        end
+      end
+    end
+
+    desc "validate *PATH", "validate EXPRESS schema located at PATH"
+    def validate(*paths) # rubocop:disable Metrics/AbcSize,Metrics/MethodLength
+      no_version = no_valid = []
+
+      paths.each do |path|
+        x = Pathname.new(path).realpath.relative_path_from(Dir.pwd)
+        puts "Validating #{x}"
+        ret = _validate_schema(path)
+
+        if ret.nil?
+          no_valid << "Failed to parse: #{x}"
+          next
+        end
+
+        ret.each do |schema_id|
+          no_version << "Missing version string: schema `#{schema_id}` | #{x}"
+        end
+      end
+
+      _print_validation_errors(:failed_to_parse, no_valid)
+      _print_validation_errors(:missing_version_string, no_version)
+
+      exit 1 unless [no_valid, no_version].all?(&:empty?)
+
+      puts "Validation passed for all EXPRESS schemas."
+    end
+
     desc "version", "Expressir Version"
     def version
       say(Expressir::VERSION)

data/lib/expressir/model/model_element.rb

@@ -94,8 +94,13 @@ module Expressir
       # @param [String] root_path
       # @param [Express::Formatter] formatter
       # @param [Boolean] include_empty
+      # @param [Proc] select_proc
       # @return [Hash]
-      def to_hash(root_path: nil, formatter: nil, include_empty: nil)
+      def to_hash(root_path: nil, formatter: nil, include_empty: nil, select_proc: nil)
+        # Filter out entries
+        has_filter = !select_proc.nil? && select_proc.is_a?(Proc)
+        return nil if has_filter && !select_proc.call(self)
+
         hash = {}
         hash[CLASS_KEY] = self.class.name
 
@@ -106,20 +111,32 @@ module Expressir
           # skip empty values
           next unless !empty or include_empty
 
-          hash[variable.to_s] = case value
-          when Array
-            value.map do |value|
-              if value.is_a? ModelElement
-                value.to_hash(root_path: root_path, formatter: formatter, include_empty: include_empty)
-              else
-                value
-              end
-            end
-          when ModelElement
-            value.to_hash(root_path: root_path, formatter: formatter, include_empty: include_empty)
-          else
-            value
-          end
+          value_hash = case value
+                       when Array
+                         value.map do |v|
+                           if v.is_a? ModelElement
+                             v.to_hash(
+                               root_path: root_path,
+                               formatter: formatter,
+                               include_empty: include_empty,
+                               select_proc: select_proc
+                             )
+                           else
+                             v
+                           end
+                         end.compact
+                       when ModelElement
+                         value.to_hash(
+                           root_path: root_path,
+                           formatter: formatter,
+                           include_empty: include_empty,
+                           select_proc: select_proc
+                         )
+                       else
+                         value
+                       end
+
+          hash[variable.to_s] = value_hash unless value_hash.nil?
         end
 
         if self.is_a? Declarations::Schema and file

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "1.4.0".freeze
+  VERSION = "1.4.2".freeze
 end

data/spec/expressir/model/model_element_spec.rb

@@ -23,6 +23,31 @@ RSpec.describe Expressir::Model::ModelElement do
       GC.verify_compaction_references
       GC.verify_internal_consistency
     end
+
+    it "exports objects filtered by select_proc (multiple.exp)" do |example|
+      print "\n[#{example.description}] "
+      exp_file = Expressir.root_path.join("spec", "syntax", "multiple.exp")
+
+      repo = Expressir::Express::Parser.from_file(exp_file)
+
+      filtered_schemas = ["multiple_schema2", "multiple_schema3"]
+      select_proc = Proc.new do |value|
+        if value.is_a?(Expressir::Model::Declarations::Schema)
+          filtered_schemas.include?(value.id)
+        else
+          true
+        end
+      end
+
+      result = repo.to_hash(select_proc: select_proc)
+
+      expect(result["schemas"].map { |s| s["id"] }.sort).to eq(filtered_schemas)
+
+      # Validate Object Space
+      GC.start
+      GC.verify_compaction_references
+      GC.verify_internal_consistency
+    end
   end
 
   describe ".from_hash" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.2
 platform: x86_64-linux-gnu
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-23 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor