expressir 0.2.19-x64-mingw32 → 0.2.21-x64-mingw32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 963caf9af7bd040e1f026e8afa954005db3d9a8f8967afabf98f5dd7c5466700
-  data.tar.gz: 35fbe83171c059f36a920c2cd29afac398faccbb3c627ba06002f3d71fced758
+  metadata.gz: 0e991de8c97827d3add5e3ba867357dce84a9ac3cb358161ac3d01fb90f13b7f
+  data.tar.gz: b2de64ce5948597f31fde3867d9c55a8f957b8f008b2446fd1b706a5e730afa1
 SHA512:
-  metadata.gz: 7174e01b018c930bba79f34b64d164997ccbcb9bc9f63a3ed33d3339b8d25234dd101aa7e8ac0449a354d3941df883515d926a4aee5310dc15a3a381ab7cbb4f
-  data.tar.gz: e23a7bd47ab28afdea70dbae56f999a9520798c3d614e3435cc16351f4e2be9c066d63dfb2c983d5e9d592e2308d9488ab9d3aeaee57fb4aaba91154c6b6be6b
+  metadata.gz: 132c38604635a7dfddd9922a661547177e6d4210f6a91904413c2ddda80846d61afaa750819c43a3819906e676b6b26465e4d9ffefa7574d3018774c4a4b7f6f
+  data.tar.gz: 39131591150b11cc43a021eca3468b79dce5b6384d796fb6ad5926675f9d67c08689129ce252e75b58607496a718c8c1ea2d80d83b69c8c10186031afa52bb55

data/.github/workflows/release.yml

@@ -1,9 +1,15 @@
 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* ]
-  workflow_dispatch:
 
 jobs:
   pack:
@@ -20,9 +26,15 @@ jobs:
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
+          bundler-cache: true
 
-      - run: bundle install --jobs 4 --retry 3
+      - 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
 
+      # build gem WITHOUT pre-built native extension
       - run: gem build expressir.gemspec
 
       - if: matrix.host == 'linux'
@@ -31,6 +43,7 @@ jobs:
           name: pkg-ruby
           path: expressir-*.gem
 
+      # build gem WITH pre-built native extension
       - run: bundle exec rake gem:${{ matrix.host }}
 
       - uses: actions/upload-artifact@v2
@@ -38,8 +51,7 @@ jobs:
           name: pkg-${{ matrix.host }}
           path: pkg/*.gem
 
-
-  release:
+  publish:
     runs-on: ubuntu-18.04
     needs: pack
     steps:

data/README.adoc

@@ -1,8 +1,8 @@
 = Expressir: EXPRESS in Ruby
 
-image:https://github.com/lutaml/expressir/workflows/ubuntu/badge.svg[ubuntu]
-image:https://github.com/lutaml/expressir/workflows/macos/badge.svg[macos]
-image:https://github.com/lutaml/expressir/workflows/windows/badge.svg[windows]
+image:https://img.shields.io/gem/v/expressir.svg["Gem Version", link="https://rubygems.org/gems/expressir"]
+// image:https://codeclimate.com/github/lutaml/expressir/badges/gpa.svg["Code Climate", link="https://codeclimate.com/github/lutaml/expressir"]
+image:https://github.com/lutaml/expressir/workflows/rake/badge.svg["Build Status", link="https://github.com/lutaml/expressir/actions?workflow=rake"]
 
 == Purpose
 

data/exe/format

@@ -1,10 +1,12 @@
 #!/usr/bin/env ruby
 
 require "yaml"
+require "tempfile"
 require "expressir/express_exp/parser"
 require "expressir/express_exp/formatter"
 require "expressir/express_exp/schema_head_formatter"
 require "expressir/express_exp/hyperlink_formatter"
+require "expressir/express_exp/cache"
 
 exp_files = [
   # basic test
@@ -22,44 +24,58 @@ exp_files = [
   # '../iso-10303-stepmod/data/resources/iso13584_expressions_schema/iso13584_expressions_schema.exp',
   # annotated-express test (12s)
   # see https://github.com/metanorma/annotated-express/blob/master/data/documents/resources/fundamentals_of_product_description_and_support/sections/04-schemas.adoc
-  # '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/application_context_schema/application_context_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/approval_schema/approval_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/certification_schema/certification_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/contract_schema/contract_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/date_time_schema/date_time_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/document_schema/document_schema.exp',
-  # '../iso-10303-stepmod/data/resources/effectivity_schema/effectivity_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/experience_schema/experience_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/external_reference_schema/external_reference_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/group_schema/group_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/language_schema/language_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/location_schema/location_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/management_resources_schema/management_resources_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/measure_schema/measure_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/person_organization_schema/person_organization_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/process_property_schema/process_property_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/product_definition_schema/product_definition_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/product_property_definition_schema/product_property_definition_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/product_property_representation_schema/product_property_representation_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/qualifications_schema/qualifications_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/security_classification_schema/security_classification_schema_annotated.exp',
-  # '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/action_schema/action_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/application_context_schema/application_context_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/approval_schema/approval_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/basic_attribute_schema/basic_attribute_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/certification_schema/certification_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/contract_schema/contract_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/date_time_schema/date_time_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/document_schema/document_schema.exp',
+  '../iso-10303-stepmod/data/resources/effectivity_schema/effectivity_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/experience_schema/experience_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/external_reference_schema/external_reference_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/group_schema/group_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/language_schema/language_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/location_schema/location_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/management_resources_schema/management_resources_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/measure_schema/measure_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/person_organization_schema/person_organization_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/process_property_schema/process_property_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/product_definition_schema/product_definition_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/product_property_definition_schema/product_property_definition_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/product_property_representation_schema/product_property_representation_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/qualifications_schema/qualifications_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/security_classification_schema/security_classification_schema_annotated.exp',
+  '../iso-10303-stepmod/data/resources/support_resource_schema/support_resource_schema_annotated.exp',
   # full test (6m18s + 8s = 6m26s)
-  *`bundle exec ../stepmod-utils/exe/stepmod-find-express-files ../iso-10303-stepmod`.strip.split("\n").map{|file| File.exists?(file.sub(/\.exp$/, '_annotated.exp')) ? file.sub(/\.exp$/, '_annotated.exp') : file}
+  # *`bundle exec ../stepmod-utils/exe/stepmod-find-express-files ../iso-10303-stepmod`.strip.split("\n").map{|file| File.exists?(file.sub(/\.exp$/, '_annotated.exp')) ? file.sub(/\.exp$/, '_annotated.exp') : file}
 ]
 
 start = Time.now
 repository = Expressir::ExpressExp::Parser.from_files(exp_files)
-puts "Parsing time: #{Time.now - start}"
-start2 = Time.now
+puts "Parser.from_files time:  #{(Time.now - start).round(2)}s"
+
+temp_file = Tempfile.new
+begin
+  start = Time.now
+  Expressir::ExpressExp::Cache.to_file(temp_file, repository)
+  puts "Cache.to_file time:      #{(Time.now - start).round(2)}s"
+
+  start = Time.now
+  repository = Expressir::ExpressExp::Cache.from_file(temp_file)
+  puts "Cache.from_file time:    #{(Time.now - start).round(2)}s"
+ensure
+  temp_file.close
+  temp_file.unlink
+end
+
+start = Time.now
 formatter = Class.new(Expressir::ExpressExp::Formatter) do
   include Expressir::ExpressExp::SchemaHeadFormatter
   include Expressir::ExpressExp::HyperlinkFormatter
 end
 result = repository.to_hash(formatter: formatter, skip_empty: true)
-puts "Formatting & serializing time: #{Time.now - start2}"
-puts "Total time: #{Time.now - start}"
+puts "Repository.to_hash time: #{(Time.now - start).round(2)}s"
 
 # puts YAML.dump(result)

data/lib/expressir/express_exp/cache.rb

@@ -0,0 +1,48 @@
+require 'yaml'
+require 'zlib'
+require 'expressir/model'
+
+module Expressir
+  module ExpressExp
+    class Cache
+      def self.to_file(file, content, options = {})
+        root_path = options[:root_path]
+        test_overwrite_version = options[:test_overwrite_version] # don't use, only for tests
+
+        version = test_overwrite_version || VERSION
+
+        cache = Model::Cache.new({
+          version: version,
+          content: content
+        })
+
+        hash = cache.to_hash(root_path: root_path, skip_empty: true)
+        yaml = YAML.dump(hash)
+        yaml_compressed = Zlib::Deflate.deflate(yaml)
+
+        File.binwrite(file, yaml_compressed)
+      end
+
+      def self.from_file(file, options = {})
+        root_path = options[:root_path]
+        test_overwrite_version = options[:test_overwrite_version] # don't use, only for tests
+
+        version = test_overwrite_version || VERSION
+
+        yaml_compressed = File.binread(file)
+        yaml = Zlib::Inflate.inflate(yaml_compressed)
+        hash = YAML.load(yaml)
+        cache = Model::ModelElement.from_hash(hash, root_path: root_path)
+
+        if cache.version != version
+          raise CacheLoadError.new("Cache version mismatch, cache version is #{cache.version}, Expressir version is #{VERSION}")
+        end
+
+        cache.content
+      end
+    end
+
+    class CacheLoadError < StandardError
+    end
+  end
+end

data/lib/expressir/model.rb

@@ -1,5 +1,7 @@
 require 'expressir/model/model_element'
 
+require 'expressir/model/cache'
+
 require 'expressir/model/identifier'
 
 require 'expressir/model/attribute'

data/lib/expressir/model/cache.rb

@@ -0,0 +1,13 @@
+module Expressir
+  module Model
+    class Cache < ModelElement
+      attr_accessor :version
+      attr_accessor :content
+
+      def initialize(options = {})
+        @version = options[:version]
+        @content = options[:content]
+      end
+    end
+  end
+end

data/lib/expressir/version.rb

@@ -1,3 +1,3 @@
 module Expressir
-  VERSION = "0.2.19".freeze
+  VERSION = "0.2.21".freeze
 end

data/spec/expressir/express_exp/cache_spec.rb

@@ -0,0 +1,64 @@
+require "yaml"
+require "tempfile"
+require "spec_helper"
+require "expressir/express_exp/parser"
+require "expressir/express_exp/cache"
+
+RSpec.describe Expressir::ExpressExp::Cache do
+  TEST_VERSION = "0.0.0"
+
+  describe ".to_file" do
+    it "exports an object" do
+      temp_file = Tempfile.new
+
+      repository = Expressir::Model::Repository.new
+
+      begin
+        Expressir::ExpressExp::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
+
+        size = File.size(temp_file)
+
+        expect(size).to be > 0
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+  end
+
+  describe ".from_file" do
+    it "parses a file" do
+      temp_file = Tempfile.new
+
+      repository = Expressir::Model::Repository.new
+
+      begin
+        Expressir::ExpressExp::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
+
+        result = Expressir::ExpressExp::Cache.from_file(temp_file, test_overwrite_version: TEST_VERSION)
+
+        expect(result).to be_instance_of(Expressir::Model::Repository)
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+
+    it "fails parsing a file from a different Expressir version" do
+      temp_file = Tempfile.new
+
+      repository = Expressir::Model::Repository.new
+
+      begin
+        Expressir::ExpressExp::Cache.to_file(temp_file, repository, test_overwrite_version: TEST_VERSION)
+
+        expect do
+          Expressir::ExpressExp::Cache.from_file(temp_file)
+        end.to raise_error(Expressir::ExpressExp::CacheLoadError)
+      ensure
+        temp_file.close
+        temp_file.unlink
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.19
+  version: 0.2.21
 platform: x64-mingw32
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -215,6 +215,7 @@ files:
 - lib/expressir/express_exp/2.6/express_parser.so
 - lib/expressir/express_exp/2.7/express_parser.so
 - lib/expressir/express_exp/3.0/express_parser.so
+- lib/expressir/express_exp/cache.rb
 - lib/expressir/express_exp/formatter.rb
 - lib/expressir/express_exp/hyperlink_formatter.rb
 - lib/expressir/express_exp/parser.rb
@@ -223,6 +224,7 @@ files:
 - lib/expressir/express_parser.rb
 - lib/expressir/model.rb
 - lib/expressir/model/attribute.rb
+- lib/expressir/model/cache.rb
 - lib/expressir/model/constant.rb
 - lib/expressir/model/entity.rb
 - lib/expressir/model/enumeration_item.rb
@@ -347,6 +349,7 @@ files:
 - spec/acceptance/express_to_owl_spec.rb
 - spec/acceptance/version_spec.rb
 - spec/expressir/express/repository_spec.rb
+- spec/expressir/express_exp/cache_spec.rb
 - spec/expressir/express_exp/formatter_spec.rb
 - spec/expressir/express_exp/parser_spec.rb
 - spec/expressir/model/model_element_spec.rb