expressir 0.2.19 → 0.2.27

data/original/examples/syntax/syntax_schema_head_formatted.exp

@@ -1,4 +1,4 @@
-SCHEMA syntax_schema 'version';
+SCHEMA syntax_schema '{ISO standard 10303 part(41) object(1) version(8)}';
 
 USE FROM contract_schema;
 USE FROM contract_schema

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

data/spec/expressir/express_exp/formatter_spec.rb

@@ -75,6 +75,22 @@ RSpec.describe Expressir::ExpressExp::Formatter do
       expect(result).to eq(expected_result)
     end
 
+    it "exports an object with hyperlink formatter (syntax.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
+      formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax_hyperlink_formatted.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      formatter = Class.new(Expressir::ExpressExp::Formatter) do
+        include Expressir::ExpressExp::HyperlinkFormatter
+      end
+      result = formatter.format(repo)
+      # File.write(formatted_exp_file, result)
+      expected_result = File.read(formatted_exp_file)
+
+      expect(result).to eq(expected_result)
+    end
+
     it "exports an object with hyperlink formatter (multiple.exp)" do
       exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
       formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple_hyperlink_formatted.exp")

data/spec/expressir/express_exp/parser_spec.rb

@@ -86,7 +86,7 @@ RSpec.describe Expressir::ExpressExp::Parser do
       expect(schemas[0].file).to eq(exp_files[0].to_s)
       expect(schemas[0].id).to eq("single_schema")
       expect(schemas[1].file).to eq(exp_files[1].to_s)
-      expect(schemas[1].id).to eq("multiple_schema1")
+      expect(schemas[1].id).to eq("multiple_schema")
       expect(schemas[2].file).to eq(exp_files[1].to_s)
       expect(schemas[2].id).to eq("multiple_schema2")
       expect(schemas[3].file).to eq(exp_files[1].to_s)

data/spec/expressir/model/model_element_spec.rb

@@ -71,7 +71,57 @@ RSpec.describe Expressir::Model::ModelElement do
   end
 
   describe ".find" do
-    it "finds an object" do
+    it "finds an object (single.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      # universal scope
+      expect(repo.find('single_schema')).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.find('single_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+
+      # schema scope
+      schema = repo.schemas.first
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+    end
+
+    it "finds an object (multiple.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      # universal scope
+      expect(repo.find('multiple_schema')).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.find('multiple_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
+      expect(repo.find('multiple_schema.attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
+
+      # schema scope
+      schema = repo.schemas.first
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity2')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity3')).to be_instance_of(Expressir::Model::Entity)
+      expect(schema.find('attribute_entity4')).to be_instance_of(Expressir::Model::Entity)
+    end
+
+    it "finds an object (syntax.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      # universal scope
+      expect(repo.find('syntax_schema')).to be_instance_of(Expressir::Model::Schema)
+      expect(repo.find('syntax_schema.empty_entity')).to be_instance_of(Expressir::Model::Entity)
+
+      # schema scope
+      schema = repo.schemas.first
+      expect(schema.find('empty_entity')).to be_instance_of(Expressir::Model::Entity)
+    end
+
+    it "finds an object (remark.exp)" do
       exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
 
       repo = Expressir::ExpressExp::Parser.from_file(exp_file)
@@ -82,8 +132,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_type')).to be_instance_of(Expressir::Model::Type)
       expect(repo.find('remark_schema.remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(repo.find('remark_schema.remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(repo.find('remark_schema.remark_entity')).to be_instance_of(Expressir::Model::Entity)
       expect(repo.find('remark_schema.remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
@@ -92,8 +142,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
       expect(repo.find('remark_schema.remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(repo.find('remark_schema.remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(repo.find('remark_schema.remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
       expect(repo.find('remark_schema.remark_function')).to be_instance_of(Expressir::Model::Function)
       expect(repo.find('remark_schema.remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
@@ -114,8 +164,9 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(repo.find('remark_schema.remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
       expect(repo.find('remark_schema.remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(repo.find('remark_schema.remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(repo.find('remark_schema.remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(repo.find('remark_schema.remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # schema scope
       schema = repo.schemas.first
@@ -123,8 +174,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_type')).to be_instance_of(Expressir::Model::Type)
       expect(schema.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(schema.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_enumeration_item')).to be_instance_of(Expressir::Model::EnumerationItem)
       expect(schema.find('remark_entity')).to be_instance_of(Expressir::Model::Entity)
       expect(schema.find('remark_entity.remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
@@ -133,8 +184,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_entity.UR1')).to be_instance_of(Expressir::Model::Unique)
       expect(schema.find('remark_entity.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_entity.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(schema.find('remark_entity.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_entity.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
       expect(schema.find('remark_subtype_constraint')).to be_instance_of(Expressir::Model::SubtypeConstraint)
       expect(schema.find('remark_function')).to be_instance_of(Expressir::Model::Function)
       expect(schema.find('remark_function.remark_parameter')).to be_instance_of(Expressir::Model::Parameter)
@@ -155,15 +206,16 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(schema.find('remark_rule.remark_variable')).to be_instance_of(Expressir::Model::Variable)
       expect(schema.find('remark_rule.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(schema.find('remark_rule.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(schema.find('remark_rule.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_rule.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(schema.find('remark_item')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # type scope
       type = schema.types.first
       expect(type.find('WR1')).to be_instance_of(Expressir::Model::Where)
       expect(type.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(type.find('IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(type.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(type.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # entity scope
       entity = schema.entities.first
@@ -173,8 +225,8 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(entity.find('UR1')).to be_instance_of(Expressir::Model::Unique)
       expect(entity.find('WR1')).to be_instance_of(Expressir::Model::Where)
       expect(entity.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(entity.find('IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(entity.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(entity.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # function scope
       function = schema.functions.first
@@ -200,15 +252,15 @@ RSpec.describe Expressir::Model::ModelElement do
       expect(rule.find('remark_variable')).to be_instance_of(Expressir::Model::Variable)
       expect(rule.find('WR1')).to be_instance_of(Expressir::Model::Where)
       expect(rule.find('wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(rule.find('IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(rule.find('IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(rule.find('ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
 
       # retry search in parent scope
       expect(entity.find('remark_type')).to be_instance_of(Expressir::Model::Type)
       expect(entity.find('remark_type.WR1')).to be_instance_of(Expressir::Model::Where)
       expect(entity.find('remark_type.wr:WR1')).to be_instance_of(Expressir::Model::Where)
-      expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::InformalProposition)
-      expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::InformalProposition)
+      expect(entity.find('remark_type.IP1')).to be_instance_of(Expressir::Model::RemarkItem)
+      expect(entity.find('remark_type.ip:IP1')).to be_instance_of(Expressir::Model::RemarkItem)
     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.27
 platform: ruby
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-10 00:00:00.000000000 Z
+date: 2021-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -190,6 +190,7 @@ files:
 - docs/development.md
 - exe/expressir
 - exe/format
+- exe/format-test
 - exe/generate-parser
 - expressir.gemspec
 - ext/express-parser/antlr4-upstream/runtime/Cpp/runtime/CMakeLists.txt
@@ -568,14 +569,18 @@ files:
 - lib/expressir/express/type_select.rb
 - lib/expressir/express/unique_rule.rb
 - lib/expressir/express/where_rule.rb
+- lib/expressir/express_exp/cache.rb
 - lib/expressir/express_exp/formatter.rb
 - lib/expressir/express_exp/hyperlink_formatter.rb
+- lib/expressir/express_exp/model_visitor.rb
 - lib/expressir/express_exp/parser.rb
+- lib/expressir/express_exp/resolve_references_model_visitor.rb
 - lib/expressir/express_exp/schema_head_formatter.rb
 - lib/expressir/express_exp/visitor.rb
 - 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
@@ -593,7 +598,6 @@ files:
 - lib/expressir/model/expressions/unary_expression.rb
 - lib/expressir/model/function.rb
 - lib/expressir/model/identifier.rb
-- lib/expressir/model/informal_proposition.rb
 - lib/expressir/model/interface.rb
 - lib/expressir/model/interface_item.rb
 - lib/expressir/model/interfaced_item.rb
@@ -605,9 +609,12 @@ files:
 - lib/expressir/model/model_element.rb
 - lib/expressir/model/parameter.rb
 - lib/expressir/model/procedure.rb
+- lib/expressir/model/remark_item.rb
 - lib/expressir/model/repository.rb
 - lib/expressir/model/rule.rb
 - lib/expressir/model/schema.rb
+- lib/expressir/model/schema_version.rb
+- lib/expressir/model/schema_version_item.rb
 - lib/expressir/model/statements/alias.rb
 - lib/expressir/model/statements/assignment.rb
 - lib/expressir/model/statements/call.rb
@@ -688,6 +695,7 @@ files:
 - original/examples/syntax/syntax.exp
 - original/examples/syntax/syntax.yaml
 - original/examples/syntax/syntax_formatted.exp
+- original/examples/syntax/syntax_hyperlink_formatted.exp
 - original/examples/syntax/syntax_schema_head_formatted.exp
 - original/exp2ruby.rb
 - original/expsm.rb
@@ -700,6 +708,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

data/lib/expressir/model/informal_proposition.rb

@@ -1,18 +0,0 @@
-module Expressir
-  module Model
-    class InformalProposition < ModelElement
-      include Identifier
-
-      undef :source
-      undef :source=
-
-      def initialize(options = {})
-        @id = options[:id]
-        @remarks = options.fetch(:remarks, [])
-        # @source = options[:source]
-
-        super
-      end
-    end
-  end
-end