expressir 2.1.13 → 2.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7d262098d4474c3b7a65d50cccb3d5551a594d21d659e4b0cbc8acaa69f02114
-  data.tar.gz: f909fb6b738d0ffab12ca25dfdca0cb63292754aa1bcfb257e66a97cb37ac2ce
+  metadata.gz: 67f5ecd799b4d840e12c933335be6d93f8b20db9619b687dcb510d8837de9f97
+  data.tar.gz: 93eb64ed9c535fc16fb38c070d8a5f15ede607e94286465687ec857066bb8ee2
 SHA512:
-  metadata.gz: 4a6878cda43852822a1ec0784db0df16b9aee7989b38a855dcc6467c14a8b0ca9bf20faa7c7268d14533387d7b393c8f33d107c1a5891e6ab71fa2836947ba6a
-  data.tar.gz: 6cd7ad48ca0c33b70a0cd98881f4724848232f75915a421aeb78e5200cbe63af7c1284ef5cbfcd7e3bae8bbe6eaa0a4d8b3ecdeb9af4119a53b8c084076ce24f
+  metadata.gz: 6332c17449aa48036cf2f1bbc756715a45a0f0585dbd30fb2348331d28bf809c8e77071987b53f47f4ce994b48f15b35dea20e9901f8e74561876dce269eb302
+  data.tar.gz: 6742625b27b2e76e0f318acd212a5d741fb0779e0200a9cdeaea53feaaa0e80fee7475e81f29970c3f5bb83159e3ada07106fc7838b80e2d41c715b00bf357b0

data/.github/workflows/rake.yml

@@ -1,90 +1,15 @@
+# Auto-generated by Cimas: Do not edit it manually!
+# See https://github.com/metanorma/cimas
 name: rake
 
 on:
   push:
-    branches: [ main ]
-    paths-ignore:
-      - 'docs/**'
-      - '**.adoc'
-      - '**.md'
-      - .github/workflows/release.yml
-      - .github/workflows/codeql.yml
+    branches: [ master, main ]
+    tags: [ v* ]
   pull_request:
-  workflow_dispatch:
-
-concurrency:
-  group: '${{ github.workflow }}-${{ github.job }}-${{ github.head_ref || github.ref_name }}'
-  cancel-in-progress: true
-
-env:
-  RUBYGEM_VER: 3.4.22
 
 jobs:
-  rubocop:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.2
-          bundler-cache: true
-
-      - name: Rubocop
-        run: bundle exec rake rubocop
-
   rake:
-    name: test on ruby-${{ matrix.ruby }} ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.3', '3.2', '3.1', '3.0', '2.7' ]
-        os: [ ubuntu-latest, windows-latest, macos-latest ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Install Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-
-      - name: Run tests
-        run: |
-          bundle exec rake
-          cat .rspec_status
-
-  rake-alpine:
-    name: test on ruby-${{ matrix.ruby }} alpine container
-    runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '3.3', '3.2', '3.1', '3.0', '2.7' ]
-    container: ruby:${{ matrix.ruby }}-alpine
-    steps:
-      - name: Install packages
-        run: |
-          apk --no-cache --upgrade add build-base git bash tar
-
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Upgrade RubyGems
-        if: matrix.ruby == '3.0' || matrix.ruby == '2.7'
-        run: gem update --system ${{ env.RUBYGEM_VER }} --no-document
-
-      - name: Bundle
-        run: |
-          git config --global --add safe.directory $PWD
-          bundle install --jobs 4 --retry 3
-
-      - name: Run tests
-        run: |
-          bundle exec rake
-          cat .rspec_status
+    uses: metanorma/ci/.github/workflows/generic-rake.yml@main
+    secrets:
+      pat_token: ${{ secrets.LUTAML_CI_PAT_TOKEN }}

data/.rubocop_todo.yml

@@ -1,48 +1,17 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2025-01-30 03:38:19 UTC using RuboCop version 1.71.0.
+# on 2025-03-19 17:57:28 UTC using RuboCop version 1.74.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: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentOneStep, IndentationWidth.
-# SupportedStyles: case, end
-Layout/CaseIndentation:
-  Exclude:
-    - 'lib/expressir/model/model_element.rb'
-
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-Layout/ElseAlignment:
-  Exclude:
-    - 'lib/expressir/express/formatter.rb'
-
-# Offense count: 111
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyleAlignWith, Severity.
-# SupportedStylesAlignWith: keyword, variable, start_of_line
-Layout/EndAlignment:
-  Exclude:
-    - 'lib/expressir/express/formatter.rb'
-    - 'lib/expressir/model/model_element.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: special_inside_parentheses, consistent, align_brackets
-Layout/FirstArrayElementIndentation:
-  Exclude:
-    - 'lib/expressir/express/formatter.rb'
-
-# Offense count: 109
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: Width, AllowedPatterns.
-Layout/IndentationWidth:
+# Offense count: 1
+# Configuration parameters: Severity, Include.
+# Include: **/*.gemspec
+Gemspec/RequiredRubyVersion:
   Exclude:
-    - 'lib/expressir/express/formatter.rb'
+    - 'expressir.gemspec'
 
 # Offense count: 2
 # This cop supports safe autocorrection (--autocorrect).
@@ -52,34 +21,21 @@ Layout/LineLength:
   Exclude:
     - 'lib/expressir/express/parser.rb'
 
-# Offense count: 4
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle, IndentationWidth.
-# SupportedStyles: aligned, indented
-Layout/MultilineOperationIndentation:
-  Exclude:
-    - 'lib/expressir/express/formatter.rb'
-
-# Offense count: 1
-# Configuration parameters: AllowedParentClasses.
-Lint/MissingSuper:
-  Exclude:
-    - 'lib/expressir/model/cache.rb'
-
 # Offense count: 3
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'lib/expressir/express/visitor.rb'
 
-# Offense count: 2
+# Offense count: 3
 # This cop supports safe autocorrection (--autocorrect).
 # Configuration parameters: AutoCorrect, AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods, NotImplementedExceptions.
 # NotImplementedExceptions: NotImplementedError
 Lint/UnusedMethodArgument:
   Exclude:
+    - 'lib/expressir/express/cache.rb'
     - 'lib/expressir/express/parser.rb'
 
-# Offense count: 54
+# Offense count: 48
 # Configuration parameters: AllowedMethods, AllowedPatterns, CountRepeatedAttributes, Max.
 Metrics/AbcSize:
   Exclude:
@@ -87,9 +43,6 @@ Metrics/AbcSize:
     - 'lib/expressir/express/hyperlink_formatter.rb'
     - 'lib/expressir/express/resolve_references_model_visitor.rb'
     - 'lib/expressir/express/visitor.rb'
-    - 'lib/expressir/model/declarations/function.rb'
-    - 'lib/expressir/model/declarations/procedure.rb'
-    - 'lib/expressir/model/declarations/rule.rb'
     - 'lib/expressir/model/declarations/schema.rb'
     - 'lib/expressir/model/model_element.rb'
 
@@ -97,34 +50,30 @@ Metrics/AbcSize:
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 # AllowedMethods: refine
 Metrics/BlockLength:
-  Max: 29
+  Max: 141
 
 # Offense count: 40
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/CyclomaticComplexity:
   Exclude:
     - 'lib/expressir/express/formatter.rb'
+    - 'lib/expressir/express/model_visitor.rb'
     - 'lib/expressir/express/visitor.rb'
-    - 'lib/expressir/model/declarations/function.rb'
-    - 'lib/expressir/model/declarations/procedure.rb'
-    - 'lib/expressir/model/declarations/rule.rb'
     - 'lib/expressir/model/declarations/schema.rb'
     - 'lib/expressir/model/model_element.rb'
+    - 'spec/support/model_element_helper.rb'
 
-# Offense count: 74
+# Offense count: 67
 # Configuration parameters: CountComments, CountAsOne, AllowedMethods, AllowedPatterns.
 Metrics/MethodLength:
-  Max: 135
+  Max: 34
 
-# Offense count: 36
+# Offense count: 32
 # Configuration parameters: AllowedMethods, AllowedPatterns, Max.
 Metrics/PerceivedComplexity:
   Exclude:
     - 'lib/expressir/express/formatter.rb'
     - 'lib/expressir/express/visitor.rb'
-    - 'lib/expressir/model/declarations/function.rb'
-    - 'lib/expressir/model/declarations/procedure.rb'
-    - 'lib/expressir/model/declarations/rule.rb'
     - 'lib/expressir/model/declarations/schema.rb'
     - 'lib/expressir/model/model_element.rb'
 
@@ -137,11 +86,3 @@ Performance/FixedSize:
 Style/MissingRespondToMissing:
   Exclude:
     - 'lib/expressir/express/visitor.rb'
-
-# Offense count: 2
-# This cop supports safe autocorrection (--autocorrect).
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: single_quotes, double_quotes
-Style/StringLiteralsInInterpolation:
-  Exclude:
-    - 'lib/expressir/model/model_element.rb'

data/Gemfile

@@ -6,11 +6,10 @@ source "https://rubygems.org"
 gemspec
 
 gem "pry"
-gem "rake", "~> 13.0"
-gem "rspec", "~> 3.0"
-gem "rubocop", "~> 1.21"
+gem "rake"
+gem "rspec"
+gem "rubocop"
 gem "rubocop-performance"
 gem "rubocop-rake", require: false
 gem "rubocop-rspec", require: false
-gem "webrick", "~> 1.7"
-gem "yard", "~> 0.9"
+gem "yard"

data/expressir.gemspec

@@ -23,7 +23,7 @@ Gem::Specification.new do |spec|
   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.required_ruby_version = Gem::Requirement.new(">= 3.0.0")
 
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject do |f|
@@ -34,6 +34,8 @@ Gem::Specification.new do |spec|
   spec.test_files = `git ls-files -- {spec}/*`.split("\n")
 
   spec.add_dependency "liquid"
+  spec.add_dependency "lutaml-model", "~>0.7"
   spec.add_dependency "parslet", "~> 2.0"
   spec.add_dependency "thor", "~> 1.0"
+  spec.add_dependency "zeitwerk", "~> 2.6"
 end

data/lib/expressir/express/cache.rb

@@ -1,5 +1,4 @@
 require "zlib"
-require_relative "../model"
 
 module Expressir
   module Express
@@ -16,10 +15,10 @@ module Expressir
         cache = Model::Cache.new(
           version: version,
           content: content,
+          root_path: root_path,
         )
 
-        hash = cache.to_hash(root_path: root_path)
-        yaml = YAML.dump(hash)
+        yaml = cache.to_yaml
         yaml_compressed = Zlib::Deflate.deflate(yaml)
 
         File.binwrite(file, yaml_compressed)
@@ -36,14 +35,13 @@ module Expressir
 
         yaml_compressed = File.binread(file)
         yaml = Zlib::Inflate.inflate(yaml_compressed)
-        hash = YAML.safe_load(yaml, permitted_classes: [Symbol])
-        cache = Model::ModelElement.from_hash(hash, root_path: root_path)
+        cache = Model::Cache.from_yaml(yaml)
 
         if cache.version != version
           raise Error.new("Cache version mismatch, cache version is #{cache.version}, Expressir version is #{version}")
         end
 
-        cache.content
+        cache
       end
     end
   end