lutaml-express 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cfc0bc6b2ffb2f237b0feecae3c16fc2989f7c90bdfec27f39b1c8eab2f9e532
-  data.tar.gz: 55fade4b6c10f2521dd404bd0cc1934a73128c5d6c5d273c90022e9cf422413e
+  metadata.gz: 186bebe05de57a700b45e296dabab446a4029352488a03f6439266ce9aee2f1e
+  data.tar.gz: 2f5c29642b6abf6de7f79d76ca3e5b04d4b6319a058ec86dbf7fc15cf3c2ee43
 SHA512:
-  metadata.gz: b7acf19de4cd29f7344c3d1638ca57b44d55c01c02fb651a7d4a965853a56a1c702dbc3e5c1ac6acf2264d9db3fe9ad19e420fd436564a56301802cda25e60f6
-  data.tar.gz: 3c1db516c6f26b796428eeef5073bb7d934862a6afaacadd99ce933a8aacdd15e2d3f727a7be6f5742996b98888cd1bca15fd91865fad18f6a2926adae53dede
+  metadata.gz: 180628e30407629fff9e9f98039ac1864008d496ba1d1c50919692b21cc59169b41777c6a9c15fb9e196448cc658503ae03ea8d2a791471cd3029f010e3fbd5e
+  data.tar.gz: f098b29854f5a29213a1e6b47a9e7ad14c5c159a220040b079d9418c2c4d3d8400bb5274f4d607c95222ff4a2b72b34da72887c9966b337eb28da1fd4468c92e

data/.github/workflows/rake.yml

@@ -0,0 +1,49 @@
+name: rake
+
+on:
+  push:
+    branches: [ master, main ]
+    tags: [ v* ]
+  pull_request:
+
+jobs:
+  rake:
+    name: Test on Ruby ${{ matrix.ruby }} ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    continue-on-error: ${{ matrix.experimental }}
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [ '2.7', '2.6', '2.5', '2.4' ]
+        os: [ ubuntu-latest, windows-latest, macos-latest ]
+        experimental: [ false ]
+        include:
+          - ruby: '3.0'
+            os: 'ubuntu-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'windows-latest'
+            experimental: true
+          - ruby: '3.0'
+            os: 'macos-latest'
+            experimental: true
+    steps:
+      - uses: actions/checkout@master
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: bundle exec rake
+
+  tests-passed:
+    needs: rake
+    runs-on: ubuntu-latest
+    steps:
+      - uses: peter-evans/repository-dispatch@v1
+        with:
+          token: ${{ secrets.METANORMA_CI_PAT_TOKEN || secrets.GITHUB_TOKEN }}
+          repository: ${{ github.repository }}
+          event-type: notify
+          client-payload: '{"ref": "${{ github.ref }}", "sha": "${{ github.sha }}"}'

data/.github/workflows/release.yml

@@ -0,0 +1,43 @@
+name: release
+
+on:
+  workflow_dispatch:
+    inputs:
+      next_version:
+        description: |
+          Next release version. Possible values: x.y.z, major, minor, patch or pre|rc|etc
+        required: true
+        default: 'patch'
+  push:
+    tags: [ v* ]
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true
+
+      - run: gem install gem-release
+
+      - if: ${{ github.event_name == 'workflow_dispatch' }}
+        run: |
+          git config user.name github-actions
+          git config user.email github-actions@github.com
+          gem bump --version ${{ github.event.inputs.next_version }} --tag --push
+
+      - name: publish to rubygems.org
+        env:
+          RUBYGEMS_API_KEY: ${{ secrets.LUTAML_CI_RUBYGEMS_API_KEY }}
+        run: |
+          gem install gem-release
+          cat > ~/.gem/credentials << EOF
+          ---
+          :rubygems_api_key: ${RUBYGEMS_API_KEY}
+          EOF
+          chmod 0600 ~/.gem/credentials
+          gem release

data/Gemfile

@@ -6,7 +6,5 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
-gem "lutaml",
-  git: "git@github.com:lutaml/lutaml.git",
-  branch: "feature/objects-lookup-dsl"
+gem "lutaml", "~> 0.3.0"
 gem "jmespath", "~> 1.4"

data/README.adoc

@@ -1,3 +1,7 @@
+image:https://img.shields.io/gem/v/lutaml-express.svg["Gem Version", link="https://rubygems.org/gems/lutaml-express"]
+// image:https://codeclimate.com/github/lutaml/lutaml-express/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/lutaml/lutaml-express"]
+image:https://github.com/lutaml/lutaml-express/workflows/rake/badge.svg["Build Status", link="https://github.com/lutaml/lutaml-express/actions?workflow=rake"]
+
 = lutaml-express
 
 == Functionality
@@ -48,4 +52,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/[USERN
 
 == Code of Conduct
 
-Everyone interacting in the Lutaml::Uml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lutaml-express/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the Lutaml::Uml project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/lutaml-express/blob/master/CODE_OF_CONDUCT.md).

data/lib/lutaml/express.rb

@@ -2,7 +2,6 @@
 
 require "lutaml/express/version"
 require "lutaml/express/parsers/exp"
-require 'lutaml/express/lutaml_path/document_wrapper'
 
 module Lutaml
   module Express

data/lib/lutaml/express/parsers/exp.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 require 'expressir'
-require 'expressir/express_exp/parser'
+require 'expressir/express/parser'
 
 module Lutaml
   module Express
@@ -13,7 +13,7 @@ module Lutaml
         #
         # @return [Expressir::Model::Repository]
         def self.parse(io, options = {})
-          Expressir::ExpressExp::Parser.from_exp(io.path)
+          Expressir::Express::Parser.from_file(io.path)
         end
       end
     end

data/lib/lutaml/express/version.rb

@@ -2,6 +2,6 @@
 
 module Lutaml
   module Express
-    VERSION = "0.1.0"
+    VERSION = "0.2.0"
   end
 end

data/lutaml-express.gemspec

@@ -23,13 +23,12 @@ Gem::Specification.new do |spec|
   spec.bindir        = "exe"
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "expressir", "~> 0.2.0"
+  spec.add_runtime_dependency "expressir", "~> 1.0.0"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "nokogiri", "~> 1.10"
   spec.add_development_dependency "rubocop", "~> 0.54.0"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "pry", "~> 0.12.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lutaml-express
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-10-24 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: expressir
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +80,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -129,9 +115,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/macos.yml"
-- ".github/workflows/ubuntu.yml"
-- ".github/workflows/windows.yml"
+- ".github/workflows/rake.yml"
+- ".github/workflows/release.yml"
 - ".gitignore"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -140,12 +125,10 @@ files:
 - bin/console
 - bin/setup
 - lib/lutaml/express.rb
-- lib/lutaml/express/lutaml_path/document_wrapper.rb
 - lib/lutaml/express/parsers/exp.rb
 - lib/lutaml/express/version.rb
 - lutaml-express.gemspec
 - spec/express/express_spec.rb
-- spec/express/lutaml_path/document_wrapper_spec.rb
 - spec/express/parsers/exp_spec.rb
 - spec/fixtures/test.exp
 - spec/spec_helper.rb

data/.github/workflows/macos.yml

@@ -1,36 +0,0 @@
-name: macos
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/ubuntu.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-macos:
-    name: Test on Ruby ${{ matrix.ruby }} macOS
-    runs-on: macos-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          sudo gem install bundler --force
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/ubuntu.yml

@@ -1,38 +0,0 @@
-name: ubuntu
-
-on:
-  push:
-    branches: [ master ]
-    tags:
-      - '*'
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/windows.yml
-
-jobs:
-  test-linux:
-    name: Test on Ruby ${{ matrix.ruby }} Ubuntu
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        include:
-          - ruby: '2.7'
-            experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        run: |
-          gem install bundler
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/.github/workflows/windows.yml

@@ -1,41 +0,0 @@
-name: windows
-
-on:
-  push:
-    branches: [ master ]
-  pull_request:
-    paths-ignore:
-      - .github/workflows/macos.yml
-      - .github/workflows/ubuntu.yml
-
-jobs:
-  test-windows:
-    name: Test on Ruby ${{ matrix.ruby }} Windows
-    runs-on: windows-latest
-    continue-on-error: ${{ matrix.experimental }}
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby: [ '2.6', '2.5', '2.4' ]
-        experimental: [false]
-        # Does not supported yet:
-        # Ruby (< 2.7.dev, >= 2.3), which is required by gem 'nokogiri (~> 1.10)', is not
-        #   available in the local ruby installation
-        # include:
-        #   - ruby: '2.7'
-        #     experimental: true
-    steps:
-      - uses: actions/checkout@master
-      - name: Use Ruby
-        uses: actions/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-      - name: Update gems
-        shell: pwsh
-        run: |
-          gem install bundler
-          bundle config --local path vendor/bundle
-          bundle install --jobs 4 --retry 3
-      - name: Run specs
-        run: |
-          bundle exec rake

data/lib/lutaml/express/lutaml_path/document_wrapper.rb

@@ -1,37 +0,0 @@
-require 'lutaml/lutaml_path/document_wrapper'
-
-module Lutaml
-  module Express
-    module LutamlPath
-      class DocumentWrapper < ::Lutaml::LutamlPath::DocumentWrapper
-        SCHEMA_ATTRIBUTES = %w[
-          id
-          constants
-          declarations
-          entities
-          functions
-          interfaces
-          procedures
-          rules
-          subtype_constraints
-          types
-          version
-        ].freeze
-
-        protected
-
-        def serialize_document(repository)
-          repository.schemas.each_with_object({}) do |schema, res|
-            res['schemas'] ||= []
-            serialized_schema = SCHEMA_ATTRIBUTES.each_with_object({}) do |name, nested_res|
-              attr_value = schema.send(name)
-              nested_res[name] = serialize_value(attr_value)
-            end
-            res[schema.id] = serialized_schema
-            res['schemas'].push(serialized_schema)
-          end
-        end
-      end
-    end
-  end
-end

data/spec/express/lutaml_path/document_wrapper_spec.rb

@@ -1,38 +0,0 @@
-# frozen_string_literal: true
-
-require "spec_helper"
-
-RSpec.describe Lutaml::Express::LutamlPath::DocumentWrapper do
-  describe ".parse" do
-    subject(:lutaml_path) { described_class.new(repository) }
-    subject(:serialized_document) do
-      lutaml_path.serialized_document
-    end
-
-    context "when simple diagram without attributes" do
-      let(:repository) do
-        Lutaml::Express::Parsers::Exp.parse(File.new(fixtures_path("test.exp")))
-      end
-      let(:schema) { 'annotated_3d_model_data_quality_criteria_schema' }
-      let(:entities_names) do
-        %w[
-          a3m_data_quality_criteria_representation
-          a3m_data_quality_criterion
-          a3m_data_quality_criterion_specific_applied_value
-          a3m_data_quality_target_accuracy_association
-          a3m_detailed_report_request
-          a3m_summary_report_request_with_representative_value]
-      end
-
-      it "serializes repository attributes" do
-        expect(serialized_document.keys).to(eq(['schemas', schema]))
-        expect(serialized_document['schemas'].map {|n| n['id'] }).to(eq([schema]))
-      end
-
-      it "correctly finds elements by jmespath expression" do
-        expect(serialized_document['schemas'].first['entities']
-                .map {|n| n['id'] }).to(eq(entities_names))
-      end
-    end
-  end
-end