expressir 0.2.16-arm64-darwin → 0.2.17-arm64-darwin

data/original/examples/syntax/syntax_schema_head_formatted.exp

@@ -0,0 +1,18 @@
+SCHEMA syntax_schema 'version';
+
+USE FROM contract_schema;
+USE FROM contract_schema
+  (contract);
+USE FROM contract_schema
+  (contract,
+   contract2);
+USE FROM contract_schema
+  (contract AS contract2);
+REFERENCE FROM contract_schema;
+REFERENCE FROM contract_schema
+  (contract);
+REFERENCE FROM contract_schema
+  (contract,
+   contract2);
+REFERENCE FROM contract_schema
+  (contract AS contract2);

data/spec/expressir/express_exp/formatter_spec.rb

@@ -0,0 +1,110 @@
+require "spec_helper"
+require "expressir/express_exp/parser"
+require "expressir/express_exp/formatter"
+require "expressir/express_exp/schema_head_formatter"
+require "expressir/express_exp/hyperlink_formatter"
+
+RSpec.describe Expressir::ExpressExp::Formatter do
+  describe ".format" do
+    it "exports an object (single.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
+      formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "single_formatted.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      result = Expressir::ExpressExp::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 (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_formatted.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      result = Expressir::ExpressExp::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 (remark.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
+      formatted_exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark_formatted.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      result = Expressir::ExpressExp::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 (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_formatted.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      result = Expressir::ExpressExp::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 schema head 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_schema_head_formatted.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      formatter = Class.new(Expressir::ExpressExp::Formatter) do
+        include Expressir::ExpressExp::SchemaHeadFormatter
+      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")
+
+      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 schema head and 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_schema_head_hyperlink_formatted.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      formatter = Class.new(Expressir::ExpressExp::Formatter) do
+        include Expressir::ExpressExp::SchemaHeadFormatter
+        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
+  end
+end

data/spec/expressir/express_exp/parser_spec.rb

@@ -0,0 +1,98 @@
+require "yaml"
+require "spec_helper"
+require "expressir/express_exp/parser"
+
+RSpec.describe Expressir::ExpressExp::Parser do
+  describe ".from_file" do
+    it "parses a file (single.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single.yaml")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      # File.write(yaml_file, result)
+      expected_result = File.read(yaml_file)
+      
+      expect(result).to eq(expected_result)
+    end
+
+    it "parses a file (multiple.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.yaml")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      # File.write(yaml_file, result)
+      expected_result = File.read(yaml_file)
+      
+      expect(result).to eq(expected_result)
+    end
+
+    it "parses a file (syntax.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.exp")
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.yaml")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      # File.write(yaml_file, result)
+      expected_result = File.read(yaml_file)
+      
+      expect(result).to eq(expected_result)
+    end
+
+    it "parses a file (remark.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "remark.yaml")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      # File.write(yaml_file, result)
+      expected_result = File.read(yaml_file)
+      
+      expect(result).to eq(expected_result)
+    end
+
+    it "parses a file including original source (multiple.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+
+      input = File.read(exp_file)
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file, include_source: true)
+
+      schema = repo.schemas.first
+      start_index = input.index("SCHEMA")
+      stop_index = input.index("END_SCHEMA;") + "END_SCHEMA;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(schema.source).to eq(expected_result)
+
+      entity = schema.entities.first
+      start_index = input.index("ENTITY")
+      stop_index = input.index("END_ENTITY;") + "END_ENTITY;".length - 1
+      expected_result = input[start_index..stop_index]
+      expect(entity.source).to eq(expected_result)
+    end
+  end
+
+  describe ".from_files" do
+    it "parses multiple files (single.exp, multiple.exp)" do
+      exp_files = [
+        Expressir.root_path.join("original", "examples", "syntax", "single.exp"),
+        Expressir.root_path.join("original", "examples", "syntax", "multiple.exp")
+      ]
+
+      repo = Expressir::ExpressExp::Parser.from_files(exp_files)
+
+      schemas = repo.schemas
+      expect(schemas.count).to eq(5)
+      expect(schemas[0].file).to eq(exp_files[0])
+      expect(schemas[0].id).to eq("single_schema")
+      expect(schemas[1].file).to eq(exp_files[1])
+      expect(schemas[1].id).to eq("multiple_schema1")
+      expect(schemas[2].file).to eq(exp_files[1])
+      expect(schemas[2].id).to eq("multiple_schema2")
+      expect(schemas[3].file).to eq(exp_files[1])
+      expect(schemas[3].id).to eq("multiple_schema3")
+      expect(schemas[4].file).to eq(exp_files[1])
+      expect(schemas[4].id).to eq("multiple_schema4")
+    end
+  end
+end

data/spec/expressir/model/{model_element/find_spec.rb → model_element_spec.rb}

@@ -2,9 +2,76 @@ require "spec_helper"
 require "expressir/express_exp/parser"
 
 RSpec.describe Expressir::Model::ModelElement do
+  describe ".to_hash" do
+    it "exports an object with a formatter (single.exp)" do
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "single.exp")
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single_formatted.yaml")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
+
+      result = YAML.dump(repo.to_hash(skip_empty: true, formatter: Expressir::ExpressExp::Formatter))
+      # File.write(yaml_file, result)
+      expected_result = File.read(yaml_file)
+      
+      expect(result).to eq(expected_result)
+    end
+  end
+
+  describe ".from_hash" do
+    it "parses an object (single.yaml)" do
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "single.yaml")
+
+      input = YAML.load(File.read(yaml_file))
+      repo = Expressir::Model::ModelElement.from_hash(input)
+
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      expected_result = File.read(yaml_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "parses an object (multiple.yaml)" do
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "multiple.yaml")
+
+      input = YAML.load(File.read(yaml_file))
+      repo = Expressir::Model::ModelElement.from_hash(input)
+
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      expected_result = File.read(yaml_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "parses an object (syntax.yaml)" do
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "syntax.yaml")
+
+      input = YAML.load(File.read(yaml_file))
+      repo = Expressir::Model::ModelElement.from_hash(input)
+
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      expected_result = File.read(yaml_file)
+
+      expect(result).to eq(expected_result)
+    end
+
+    it "parses an object (remark.yaml)" do
+      yaml_file = Expressir.root_path.join("original", "examples", "syntax", "remark.yaml")
+
+      input = YAML.load(File.read(yaml_file))
+      repo = Expressir::Model::ModelElement.from_hash(input)
+
+      result = YAML.dump(repo.to_hash(skip_empty: true))
+      expected_result = File.read(yaml_file)
+
+      expect(result).to eq(expected_result)
+    end
+  end
+
   describe ".find" do
     it "finds an object" do
-      repo = Expressir::ExpressExp::Parser.from_file(sample_file)
+      exp_file = Expressir.root_path.join("original", "examples", "syntax", "remark.exp")
+
+      repo = Expressir::ExpressExp::Parser.from_file(exp_file)
 
       # universal scope
       expect(repo.find('remark_schema')).to be_instance_of(Expressir::Model::Schema)
@@ -12,14 +79,18 @@ 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_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)
       expect(repo.find('remark_schema.remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(repo.find('remark_schema.remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(repo.find('remark_schema.remark_entity.remark_unique')).to be_instance_of(Expressir::Model::Unique)
+      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_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)
@@ -40,19 +111,27 @@ 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)
 
       # schema scope
       schema = repo.schemas.first
       expect(schema.find('remark_constant')).to be_instance_of(Expressir::Model::Constant)
       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_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)
       expect(schema.find('remark_entity.remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(schema.find('remark_entity.remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(schema.find('remark_entity.remark_unique')).to be_instance_of(Expressir::Model::Unique)
+      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_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)
@@ -73,20 +152,26 @@ 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)
 
       # 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)
 
       # entity scope
       entity = schema.entities.first
       expect(entity.find('remark_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(entity.find('remark_derived_attribute')).to be_instance_of(Expressir::Model::Attribute)
       expect(entity.find('remark_inverse_attribute')).to be_instance_of(Expressir::Model::Attribute)
-      expect(entity.find('remark_unique')).to be_instance_of(Expressir::Model::Unique)
+      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)
 
       # function scope
       function = schema.functions.first
@@ -112,17 +197,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)
 
       # 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)
     end
   end
-
-  def sample_file
-    @sample_file ||= Expressir.root_path.join(
-      "original", "examples", "syntax", "remark.exp"
-    )
-  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: expressir
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.2.17
 platform: arm64-darwin
 authors:
 - Ribose Inc.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-03-05 00:00:00.000000000 Z
+date: 2021-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -320,14 +320,22 @@ files:
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.owl
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xmi
 - original/examples/plcs/ap239e2_arm_lf_stepmod-2010-01-25.xml
-- original/examples/syntax/hyperlink.exp
-- original/examples/syntax/hyperlink_formatted.exp
+- original/examples/syntax/multiple.exp
+- original/examples/syntax/multiple.yaml
+- original/examples/syntax/multiple_formatted.exp
+- original/examples/syntax/multiple_hyperlink_formatted.exp
+- original/examples/syntax/multiple_schema_head_hyperlink_formatted.exp
 - original/examples/syntax/remark.exp
+- original/examples/syntax/remark.yaml
 - original/examples/syntax/remark_formatted.exp
-- original/examples/syntax/simple.exp
-- original/examples/syntax/source.exp
+- original/examples/syntax/single.exp
+- original/examples/syntax/single.yaml
+- original/examples/syntax/single_formatted.exp
+- original/examples/syntax/single_formatted.yaml
 - original/examples/syntax/syntax.exp
+- original/examples/syntax/syntax.yaml
 - original/examples/syntax/syntax_formatted.exp
+- original/examples/syntax/syntax_schema_head_formatted.exp
 - original/exp2ruby.rb
 - original/expsm.rb
 - original/mapping_owl.rb
@@ -339,16 +347,9 @@ files:
 - spec/acceptance/express_to_owl_spec.rb
 - spec/acceptance/version_spec.rb
 - spec/expressir/express/repository_spec.rb
-- spec/expressir/express_exp/formatter/remark_spec.rb
-- spec/expressir/express_exp/formatter/syntax_spec.rb
-- spec/expressir/express_exp/hyperlink_formatter_spec.rb
-- spec/expressir/express_exp/parser/multiple_spec.rb
-- spec/expressir/express_exp/parser/remark_spec.rb
-- spec/expressir/express_exp/parser/source_spec.rb
-- spec/expressir/express_exp/parser/syntax_spec.rb
-- spec/expressir/express_exp/schema_head_formatter_spec.rb
-- spec/expressir/model/model_element/find_spec.rb
-- spec/expressir/model/model_element/hash_spec.rb
+- spec/expressir/express_exp/formatter_spec.rb
+- spec/expressir/express_exp/parser_spec.rb
+- spec/expressir/model/model_element_spec.rb
 - spec/expressr_spec.rb
 - spec/spec_helper.rb
 - spec/support/console_helper.rb