expressir 1.4.3 → 2.1.0

data/.github/workflows/stress.yml

@@ -8,7 +8,6 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  BUNDLER_VER: 2.4.22
   GC_STRESS: true
 
 jobs:
@@ -24,28 +23,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v4
-        with:
-          submodules: recursive
-
-      - name: Setup packages
-        if: startsWith(matrix.os, 'macos')
-        run: brew install autoconf automake libtool
 
       - name: Install Ruby
         uses: ruby/setup-ruby@master
         with:
           ruby-version: ${{ matrix.ruby }}
-          bundler: ${{ env.BUNDLER_VER }}
-          # Rice gem has issues with bundler cache
-          # more info https://github.com/lutaml/expressir/runs/2097658383?check_suite_focus=true#step:7:2126
-          # but it is not the only issue
-          bundler-cache: false
-
-      - name: Bundle
-        run: bundle install --jobs 4 --retry 3
-
-      - name: Build native extension
-        run: bundle exec rake compile
+          bundler-cache: true
 
       - name: Run tests
         run: |

data/.rubocop.yml

@@ -1,4 +1,5 @@
 inherit_from:
+  - .rubocop_todo.yml
   - https://raw.githubusercontent.com/riboseinc/oss-guides/master/ci/rubocop.yml
 
 AllCops:

data/.rubocop_todo.yml

@@ -0,0 +1,21 @@
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2024-11-19 15:15:51 UTC using RuboCop version 1.68.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: Max, AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, AllowedPatterns.
+# URISchemes: http, https
+Layout/LineLength:
+  Exclude:
+    - 'exe/expressir-format-test'
+
+# Offense count: 1
+# Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
+# AllowedMethods: refine
+Metrics/BlockLength:
+  Max: 36

data/Gemfile

@@ -1,4 +1,16 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Specify your gem's dependencies in reeper.gemspec
 gemspec
+
+gem "pry"
+gem "rake", "~> 13.0"
+gem "rspec", "~> 3.0"
+gem "rubocop", "~> 1.21"
+gem "rubocop-performance", require: false
+gem "rubocop-rake", require: false
+gem "rubocop-rspec", require: false
+gem "webrick", "~> 1.7"
+gem "yard", "~> 0.9"

data/README.adoc

@@ -18,23 +18,22 @@ Expressir consists of 3 parts:
 ** EXPRESS data modelling language (ISO 10303-11:2007)
 ** EXPRESS data modelling language in XML (STEPmod)
 ** EXPRESS XML (ISO 10303-28:2007)
-"`Industrial automation systems and integration — Product data representation and exchange — Part 28: Implementation methods: XML representations of EXPRESS schemas and data, using XML schemas`")
+"`Industrial automation systems and integration — Product data representation and exchange — Part 28: Implementation methods: XML representations of EXPRESS schemas and data, using XML schemas`"
 
 . Data model. The data model (`lib/expressir/express`) is the Ruby data model that fully represents an EXPRESS data model.
 
 . Converters. A converter transforms the EXPRESS Ruby data model into an interoperable export format, including:
 ** EXPRESS data modelling language (ISO 10303-11:2007)
-** W3C OWL
-** OMG SysML (XMI 2.1, XMI 2.5)
-** OMG UML 2 (XMI 2.1)
-** OMG UML 2 for Eclipse (XMI 2.1)
+// ** W3C OWL
+// ** OMG SysML (XMI 2.1, XMI 2.5)
+// ** OMG UML 2 (XMI 2.1)
+// ** OMG UML 2 for Eclipse (XMI 2.1)
 
 
 == Usage
 
 This gem ships with a CLI tool. To check what's available you can simply run
-the script directly from `exe/expressir`, by default it will display some usage
-instructions.
+`expressir`, by default it will display some usage instructions.
 
 [source, sh]
 ----
@@ -87,18 +86,6 @@ Run the test suite
 bundle exec rake
 ----
 
-=== Grammar updates
-
-THe EXPRESS grammar is lined as Git submodule at `ext/express-grammar`.
-
-Should you update it, please run `rake generate`. This command will generate
-source code for updated native extension using the `antlr4-native` gem. Please
-note that we create several classes on top of `antlr4-native` output so using
-embedded rake task is a real requirement.
-
-When a new extension is generated and tested, please check in updated C++ files
-to git (`rake generate` is NOT a CI step, extension source files are pulled from
-the repo).
 
 
 == Installation

data/Rakefile

@@ -1,17 +1,16 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
-require "rake/extensiontask"
-require "rubocop/rake_task"
-require "yard"
 
 RSpec::Core::RakeTask.new(:spec)
 
-task default: :spec
-
-GEMSPEC = Gem::Specification.load("expressir.gemspec")
+require "rubocop/rake_task"
 
 RuboCop::RakeTask.new
 
-Gem::PackageTask.new(GEMSPEC).define
+task default: %i[spec rubocop]
+
+require "yard"
 
 YARD::Rake::YardocTask.new

data/exe/{format-test → expressir-format-test}

@@ -75,7 +75,7 @@ formatter = Class.new(Expressir::Express::Formatter) do
   include Expressir::Express::SchemaHeadFormatter
   include Expressir::Express::HyperlinkFormatter
 end
-result = repository.to_hash(formatter: formatter)
+repository.to_hash(formatter: formatter)
 puts "Repository.to_hash time: #{(Time.now - start).round(2)}s"
 
 # puts YAML.dump(result)

data/expressir.gemspec

@@ -3,46 +3,37 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "expressir/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = "expressir"
-  spec.version       = Expressir::VERSION
-  spec.authors       = ["Ribose Inc."]
-  spec.email         = ["open.source@ribose.com"]
+  spec.name = "expressir"
+  spec.version = Expressir::VERSION
+  spec.authors = ["Ribose Inc."]
+  spec.email = ["open.source@ribose.com"]
 
-  spec.summary       = "ISO EXPRESS parser and tools in Ruby."
-  spec.description   = "Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set of Ruby tools for accessing ISO EXPRESS data models."
-  spec.homepage      = "https://github.com/lutaml/expressir"
-  spec.license       = "MIT"
+  spec.summary = "EXPRESS parser and toolkit for Ruby"
+  spec.description = "Expressir (“EXPRESS in Ruby”) is a Ruby parser for EXPRESS and a set of tools for accessing EXPRESS data models."
+
+  spec.homepage = "https://github.com/lutaml/expressir"
+  spec.license = "BSD-2-Clause"
+
+  spec.bindir = "exe"
+  spec.require_paths = ["lib"]
+  spec.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = spec.homepage
   spec.metadata["changelog_uri"] = "https://github.com/lutaml/expressir/releases"
+  spec.metadata["rubygems_mfa_required"] = "true"
 
   spec.required_ruby_version = Gem::Requirement.new(">= 2.7.0")
 
-  spec.files         = `git ls-files`.split("\n")\
-    + Dir.glob("ext/express_parser/antlr4-upstream/runtime/Cpp/runtime/**/*")
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      f.match(%r{^(test|spec|features)/})
+    end
+  end
 
-  spec.test_files    = `git ls-files -- {spec}/*`.split("\n")
+  spec.test_files = `git ls-files -- {spec}/*`.split("\n")
 
-  spec.bindir        = "exe"
-  spec.require_paths = ["lib"]
-  spec.executables   = %w[expressir]
-
-  spec.extensions = File.join(*%w(ext express_parser extconf.rb))
-
-  spec.add_runtime_dependency "rice", "~> 4.2"
-  spec.add_runtime_dependency "thor", "~> 1.0"
-  spec.add_development_dependency "antlr4-native", "~> 2.2"
-  spec.add_development_dependency "asciidoctor", "~> 2.0.13"
-  spec.add_development_dependency "bundler", "~> 2.3"
-  spec.add_development_dependency "byebug", "~> 11.1"
-  spec.add_development_dependency "pry", "~> 0.12.2"
-  spec.add_development_dependency "rake", "~> 13.0"
-  spec.add_development_dependency "rake-compiler", "~> 1.2"
-  spec.add_development_dependency "rake-compiler-dock", "~> 1.5"
-  spec.add_development_dependency "rspec", "~> 3.11"
-  spec.add_development_dependency "rubocop", "1.58"
-  spec.add_development_dependency "rubocop-performance", "~> 1.19"
-  spec.add_development_dependency "webrick", "~> 1.7.0"
-  spec.add_development_dependency "yard", "~> 0.9.26"
+  spec.add_dependency "thor", "~> 1.0"
+  spec.add_dependency "parslet", "~> 2.0"
+  spec.add_dependency "liquid"
 end