expressir 1.4.1-aarch64-linux-musl → 1.4.2-aarch64-linux-musl

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9fb400415f0b9a4f590d9208fd235fa13ef9c82f04530022859515671526b3a9
-  data.tar.gz: 88d7b42bd1e8a8b7e6e9c1939a11a30e0e3239f603ee11fe75d58b2eb650e223
+  metadata.gz: 992e6123d0f15fd00d3a5bb5d67a193d9349049660db03008490669d7831acbd
+  data.tar.gz: eebb64fdeaa5671574f1d0be6ccc5cdee9c4f7b30316648260350b70dff86acb
 SHA512:
-  metadata.gz: e0c130a088be2af900585efd372348c2e5c10477904fc38c43063a293351d374884010b40bc28a8e4e81b970a9096c16e12ce696a2c8e758df9566745903561b
-  data.tar.gz: 694280ee151d894899ed46c7bc444a6e0ca90f9d854098cb32062e8d943441c3fc224e8bbd1f2ef538ce2df1808e95808d49959ca48223df997ea18839dcf58e
+  metadata.gz: c545404cca9db60c03532602de632b04d9c81a268d233dd1fa3cd5186f5b5d105905b7c7c859b82a3c0a02a92bf19ca8b9a708d9fd3e68c7c6d882ac29f6633a
+  data.tar.gz: 30953b227f1878b4193b5b7f97d32c005220a6870f91986dea58a4812ae07673f69877da7c19e5959d60dcc55357068010381f3a3365583fd90d41247acfcb4b

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

@@ -18,16 +18,23 @@ module Expressir
           acc << schema.id unless schema.version&.value
           acc
         end
-      rescue StandardError => e
-        # pp e
+      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)
-      no_version = []
-      no_valid = []
+    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)
@@ -39,30 +46,17 @@ module Expressir
           next
         end
 
-        if ret.size
-          ret.each do |schema_id|
-            no_version << "Missing version string: schema `#{schema_id}` | #{x}"
-          end
+        ret.each do |schema_id|
+          no_version << "Missing version string: schema `#{schema_id}` | #{x}"
         end
       end
 
-      if !no_valid.empty?
-        puts "#{"*" * 20} RESULTS: FAILED TO PARSE #{"*" * 20}"
-        no_valid.each do |msg|
-          puts msg
-        end
-      end
+      _print_validation_errors(:failed_to_parse, no_valid)
+      _print_validation_errors(:missing_version_string, no_version)
 
-      if !no_version.empty?
-        puts "#{"*" * 20} RESULTS: MISSING VERSION STRING #{"*" * 20}"
-        no_version.each do |msg|
-          puts msg
-        end
-      end
+      exit 1 unless [no_valid, no_version].all?(&:empty?)
 
-      if no_valid.size || no_version.size
-        exit 1
-      end
+      puts "Validation passed for all EXPRESS schemas."
     end
 
     desc "version", "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.1".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.1
+  version: 1.4.2
 platform: aarch64-linux-musl
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-04-24 00:00:00.000000000 Z
+date: 2024-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor